Author: shadowmaster
Date: Fri May 18 22:11:11 2012
New Revision: 54210
URL: http://svn.gna.org/viewcvs/wesnoth?rev=54210&view=rev
Log:
gui1, gui2: Rename "Reselect difficulty" option to "Change difficulty"
This affects both internal ids and symbols and translatable strings.
Modified:
trunk/data/gui/default/window/game_load.cfg
trunk/src/dialogs.cpp
trunk/src/gui/dialogs/game_load.cpp
trunk/src/gui/dialogs/game_load.hpp
trunk/src/savegame.cpp
trunk/src/savegame.hpp
Modified: trunk/data/gui/default/window/game_load.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/game_load.cfg?rev=54210&r1=54209&r2=54210&view=diff
==============================================================================
--- trunk/data/gui/default/window/game_load.cfg (original)
+++ trunk/data/gui/default/window/game_load.cfg Fri May 18 22:11:11 2012
@@ -377,10 +377,10 @@
border_size = 10
[toggle_button]
-
id = "reselect_difficulty"
-
definition = "default"
-
-
label = _ "Reselect difficulty"
+
id = "change_difficulty"
+
definition = "default"
+
+
label = _ "Change difficulty"
tooltip = _ "Change campaign difficulty before loading"
[/toggle_button]
Modified: trunk/src/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/dialogs.cpp?rev=54210&r1=54209&r2=54210&view=diff
==============================================================================
--- trunk/src/dialogs.cpp (original)
+++ trunk/src/dialogs.cpp Fri May 18 22:11:11 2012
@@ -633,7 +633,7 @@
);
}
if(select_difficulty != NULL) {
- lmenu.add_option(_("Reselect difficulty"), false,
+ lmenu.add_option(_("Change difficulty"), false,
gui::dialog::BUTTON_CHECKBOX,
_("Change campaign difficulty before loading")
);
Modified: trunk/src/gui/dialogs/game_load.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/game_load.cpp?rev=54210&r1=54209&r2=54210&view=diff
==============================================================================
--- trunk/src/gui/dialogs/game_load.cpp (original)
+++ trunk/src/gui/dialogs/game_load.cpp Fri May 18 22:11:11 2012
@@ -92,11 +92,11 @@
tgame_load::tgame_load(const config& cache_config)
: txtFilter_(register_text("txtFilter", true))
- , chk_reselect_difficulty_(register_bool("reselect_difficulty", true))
+ , chk_change_difficulty_(register_bool("change_difficulty", true))
, chk_show_replay_(register_bool("show_replay", true))
, chk_cancel_orders_(register_bool("cancel_orders", true))
, filename_()
- , reselect_difficulty_(false)
+ , change_difficulty_(false)
, show_replay_(false)
, cancel_orders_(false)
, games_()
@@ -219,7 +219,7 @@
void tgame_load::post_show(twindow& window)
{
- reselect_difficulty_ =
chk_reselect_difficulty_->get_widget_value(window);
+ change_difficulty_ = chk_change_difficulty_->get_widget_value(window);
show_replay_ = chk_show_replay_->get_widget_value(window);
cancel_orders_ = chk_cancel_orders_->get_widget_value(window);
}
Modified: trunk/src/gui/dialogs/game_load.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/game_load.hpp?rev=54210&r1=54209&r2=54210&view=diff
==============================================================================
--- trunk/src/gui/dialogs/game_load.hpp (original)
+++ trunk/src/gui/dialogs/game_load.hpp Fri May 18 22:11:11 2012
@@ -30,7 +30,7 @@
explicit tgame_load(const config& cache_config);
const std::string& filename() const { return filename_; }
- bool reselect_difficulty() const { return reselect_difficulty_; }
+ bool change_difficulty() const { return change_difficulty_; }
bool show_replay() const { return show_replay_; }
bool cancel_orders() const { return cancel_orders_; }
@@ -55,12 +55,12 @@
void fill_game_list(twindow& window, std::vector<savegame::save_info>&
games);
tfield_text* txtFilter_;
- tfield_bool* chk_reselect_difficulty_;
+ tfield_bool* chk_change_difficulty_;
tfield_bool* chk_show_replay_;
tfield_bool* chk_cancel_orders_;
std::string filename_;
- bool reselect_difficulty_;
+ bool change_difficulty_;
bool show_replay_;
bool cancel_orders_;
Modified: trunk/src/savegame.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/savegame.cpp?rev=54210&r1=54209&r2=54210&view=diff
==============================================================================
--- trunk/src/savegame.cpp (original)
+++ trunk/src/savegame.cpp Fri May 18 22:11:11 2012
@@ -510,7 +510,7 @@
load_dialog.show(gui_.video());
if (load_dialog.get_retval() == gui2::twindow::OK) {
- select_difficulty_ = load_dialog.reselect_difficulty();
+ select_difficulty_ = load_dialog.change_difficulty();
filename_ = load_dialog.filename();
show_replay_ = load_dialog.show_replay();
Modified: trunk/src/savegame.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/savegame.hpp?rev=54210&r1=54209&r2=54210&view=diff
==============================================================================
--- trunk/src/savegame.hpp (original)
+++ trunk/src/savegame.hpp Fri May 18 22:11:11 2012
@@ -120,7 +120,7 @@
config load_config_; /** Config information of the savefile to be
loaded. */
bool show_replay_; /** State of the "show_replay" checkbox in the
load-game dialog. */
bool cancel_orders_; /** State of the "cancel_orders" checkbox in the
load-game dialog. */
- bool select_difficulty_; /** State of the "reselect_difficulty"
checkbox in the load-game dialog. */
+ bool select_difficulty_; /** State of the "change_difficulty" checkbox
in the load-game dialog. */
};
/** The base class for all savegame stuff */
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
