0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved and renamed option "Scroll tracking of unit actions"...

Browse source 
...(now in Advanced Preferences)

The new name is "Follow Unit Actions".
This commit is contained in:
Ignacio R. Morelle 2011-06-18 21:47:32 +00:00
parent 9e03262638
commit bc82c3b3ee
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -3,6 +3,8 @@ Version 1.9.7+svn:
* Updated translations:
* User interface:
* Moved Reverse Time Graphics display option to Advanced Preferences
* Moved Scroll Tracking of Unit Actions display option to Advanced
Preferences, renamed to Follow Unit Actions
Version 1.9.7:
* Graphics:

8
data/advanced_preferences.cfg
View file

@ -125,6 +125,14 @@
default=no
[/advanced_preference]
[advanced_preference]
field=scroll_to_action
name= _ "Follow Unit Actions"
description= _ "Choose whether the map view should scroll to a unit when an action or move is animated"
type=boolean
default=yes
[/advanced_preference]
#[advanced_preference]
# field=dummy_slider
# name="Dummy Slider"

2
players_changelog
View file

@ -8,6 +8,8 @@ Version 1.9.7+svn:
* User interface:
* Moved Reverse Time Graphics option to Advanced Preferences.
* Moved Scroll Tracking of Unit Actions display option to Advanced
Preferences, renamed to Follow Unit Actions.
Version 1.9.7:

11
src/game_preferences_display.cpp
View file

@ -101,7 +101,7 @@ private:
scroll_slider_, chat_lines_slider_,
buffer_size_slider_, idle_anim_slider_, autosavemax_slider_, advanced_slider_;
gui::list_slider<double> turbo_slider_;
gui::button fullscreen_button_, scroll_to_action_button_,turbo_button_, show_ai_moves_button_,
gui::button fullscreen_button_, turbo_button_, show_ai_moves_button_,
interrupt_when_ally_sighted_button_,
show_grid_button_, save_replays_button_, delete_saves_button_,
show_lobby_joins_button1_,
@ -159,7 +159,6 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
fullscreen_button_(disp.video(), _("Full Screen"), gui::button::TYPE_CHECK),
scroll_to_action_button_(disp.video(), _("Enable scroll tracking of unit actions"), gui::button::TYPE_CHECK),
turbo_button_(disp.video(), _("Accelerated Speed"), gui::button::TYPE_CHECK),
show_ai_moves_button_(disp.video(), _("Skip AI Moves"), gui::button::TYPE_CHECK),
interrupt_when_ally_sighted_button_(disp.video(), _("Interrupt move when an ally is sighted"), gui::button::TYPE_CHECK),
@ -297,9 +296,6 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
fullscreen_button_.set_check(fullscreen());
fullscreen_button_.set_help_string(_("Choose whether the game should run full screen or in a window"));
scroll_to_action_button_.set_check(scroll_to_action());
scroll_to_action_button_.set_help_string(_("Should the map view scroll to a unit when an action or move is animated."));
turbo_button_.set_check(turbo());
turbo_button_.set_help_string(_("Make units move and fight faster"));
@ -426,7 +422,6 @@ handler_vector preferences_dialog::handler_members()
h.push_back(&buffer_size_slider_);
h.push_back(&advanced_slider_);
h.push_back(&fullscreen_button_);
h.push_back(&scroll_to_action_button_);
h.push_back(&turbo_button_);
h.push_back(&idle_anim_button_);
h.push_back(&show_ai_moves_button_);
@ -537,7 +532,6 @@ void preferences_dialog::update_location(SDL_Rect const &rect)
// Display tab
ypos = rect.y + top_border;
fullscreen_button_.set_location(rect.x, ypos);
ypos += item_interline; scroll_to_action_button_.set_location(rect.x, ypos);
ypos += item_interline; show_color_cursors_button_.set_location(rect.x, ypos);
ypos += item_interline; show_floating_labels_button_.set_location(rect.x, ypos);
ypos += item_interline; show_haloing_button_.set_location(rect.x, ypos);
@ -749,8 +743,6 @@ void preferences_dialog::process_event()
throw video_mode_change_exception(fullscreen_button_.checked()
? video_mode_change_exception::MAKE_FULLSCREEN
: video_mode_change_exception::MAKE_WINDOWED);
if (scroll_to_action_button_.pressed())
set_scroll_to_action(scroll_to_action_button_.checked());
if (show_color_cursors_button_.pressed())
set_color_cursors(show_color_cursors_button_.checked());
if (show_haloing_button_.pressed())
@ -1118,7 +1110,6 @@ void preferences_dialog::set_selection(int index)
show_color_cursors_button_.hide(hide_display);
show_haloing_button_.hide(hide_display);
fullscreen_button_.hide(hide_display);
scroll_to_action_button_.hide(hide_display);
idle_anim_button_.hide(hide_display);
idle_anim_slider_label_.hide(hide_display);
idle_anim_slider_label_.enable(idle_anim());