Author: mordante
Date: Sun Jul 31 18:56:13 2011
New Revision: 50508
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50508&view=rev
Log:
Renamed register_label2 to register_label.
Brings it more in line with the other register functions, its interface
is the same as well.
Modified:
trunk/src/gui/dialogs/addon/description.cpp
trunk/src/gui/dialogs/dialog.cpp
trunk/src/gui/dialogs/dialog.hpp
trunk/src/gui/dialogs/editor_resize_map.cpp
trunk/src/gui/dialogs/game_save.cpp
trunk/src/gui/dialogs/mp_cmd_wrapper.cpp
trunk/src/gui/dialogs/mp_login.cpp
trunk/src/gui/dialogs/network_transmission.cpp
trunk/src/gui/dialogs/simple_item_selector.cpp
trunk/src/gui/dialogs/transient_message.cpp
Modified: trunk/src/gui/dialogs/addon/description.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/addon/description.cpp?rev=50508&r1=50507&r2=50508&view=diff
==============================================================================
--- trunk/src/gui/dialogs/addon/description.cpp (original)
+++ trunk/src/gui/dialogs/addon/description.cpp Sun Jul 31 18:56:13 2011
@@ -79,13 +79,13 @@
taddon_description::taddon_description(const addon_info& addon)
{
- register_label2("image", true, addon.icon);
- register_label2("title", true, addon.name);
- register_label2("version", true, addon.version);
- register_label2("author", true, addon.author);
- register_label2("size", true, addon.sizestr);
+ register_label("image", true, addon.icon);
+ register_label("title", true, addon.name);
+ register_label("version", true, addon.version);
+ register_label("author", true, addon.author);
+ register_label("size", true, addon.sizestr);
if(!addon.description.empty()) {
- register_label2("description", true, addon.description);
+ register_label("description", true, addon.description);
}
std::string languages;
@@ -101,7 +101,7 @@
}
if(!languages.empty()) {
- register_label2("translations", true, languages);
+ register_label("translations", true, languages);
}
}
Modified: trunk/src/gui/dialogs/dialog.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/dialog.cpp?rev=50508&r1=50507&r2=50508&view=diff
==============================================================================
--- trunk/src/gui/dialogs/dialog.cpp (original)
+++ trunk/src/gui/dialogs/dialog.cpp Sun Jul 31 18:56:13 2011
@@ -193,7 +193,7 @@
, callback_save_value);
}
-tfield_label* tdialog::register_label2(const std::string& id
+tfield_label* tdialog::register_label(const std::string& id
, const bool mandatory
, const std::string& text
, const bool use_markup)
Modified: trunk/src/gui/dialogs/dialog.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/dialog.hpp?rev=50508&r1=50507&r2=50508&view=diff
==============================================================================
--- trunk/src/gui/dialogs/dialog.hpp (original)
+++ trunk/src/gui/dialogs/dialog.hpp Sun Jul 31 18:56:13 2011
@@ -303,7 +303,7 @@
* @param text The text for the label.
* @param use_markup Whether or not use markup for the label.
*/
- tfield_label* register_label2(const std::string& id
+ tfield_label* register_label(const std::string& id
, const bool mandatory
, const std::string& text
, const bool use_markup = false);
@@ -313,7 +313,7 @@
, const bool mandatory
, const std::string& filename)
{
- return register_label2(id, mandatory, filename);
+ return register_label(id, mandatory, filename);
}
private:
Modified: trunk/src/gui/dialogs/editor_resize_map.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/editor_resize_map.cpp?rev=50508&r1=50507&r2=50508&view=diff
==============================================================================
--- trunk/src/gui/dialogs/editor_resize_map.cpp (original)
+++ trunk/src/gui/dialogs/editor_resize_map.cpp Sun Jul 31 18:56:13 2011
@@ -101,8 +101,8 @@
{
register_bool("copy_edge_terrain", false, copy_edge_terrain);
- register_label2("old_width", false, str_cast(width));
- register_label2("old_height", false, str_cast(height));
+ register_label("old_width", false, str_cast(width));
+ register_label("old_height", false, str_cast(height));
}
void teditor_resize_map::pre_show(CVideo& /*video*/, twindow& window)
Modified: trunk/src/gui/dialogs/game_save.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/game_save.cpp?rev=50508&r1=50507&r2=50508&view=diff
==============================================================================
--- trunk/src/gui/dialogs/game_save.cpp (original)
+++ trunk/src/gui/dialogs/game_save.cpp Sun Jul 31 18:56:13 2011
@@ -50,7 +50,7 @@
tgame_save::tgame_save(std::string& filename, const std::string& title)
{
register_text2("txtFilename", false, filename, true);
- register_label2("lblTitle", true, title);
+ register_label("lblTitle", true, title);
}
REGISTER_DIALOG(game_save_message)
@@ -60,9 +60,9 @@
, const std::string& filename
, const std::string& message)
{
- register_label2("lblTitle", true, title);
- register_label2("txtFilename", false, filename);
- register_label2("lblMessage", true, message);
+ register_label("lblTitle", true, title);
+ register_label("txtFilename", false, filename);
+ register_label("lblMessage", true, message);
}
REGISTER_DIALOG(game_save_oos)
@@ -73,9 +73,9 @@
, const std::string& filename
, const std::string& message)
{
- register_label2("lblTitle", true, title);
- register_label2("txtFilename", false, filename);
- register_label2("lblMessage", true, message);
+ register_label("lblTitle", true, title);
+ register_label("txtFilename", false, filename);
+ register_label("lblMessage", true, message);
register_bool("ignore_all", true, ignore_all);
}
Modified: trunk/src/gui/dialogs/mp_cmd_wrapper.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/mp_cmd_wrapper.cpp?rev=50508&r1=50507&r2=50508&view=diff
==============================================================================
--- trunk/src/gui/dialogs/mp_cmd_wrapper.cpp (original)
+++ trunk/src/gui/dialogs/mp_cmd_wrapper.cpp Sun Jul 31 18:56:13 2011
@@ -83,7 +83,7 @@
register_text2("message", false, message_, true);
register_text2("reason", false, reason_);
register_text2("time", false, time_);
- register_label2("user_label", false, user);
+ register_label("user_label", false, user);
set_always_save_fields(true);
}
Modified: trunk/src/gui/dialogs/mp_login.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/mp_login.cpp?rev=50508&r1=50507&r2=50508&view=diff
==============================================================================
--- trunk/src/gui/dialogs/mp_login.cpp (original)
+++ trunk/src/gui/dialogs/mp_login.cpp Sun Jul 31 18:56:13 2011
@@ -63,7 +63,7 @@
tmp_login::tmp_login(const std::string& label, const bool focus_password)
{
- register_label2("login_label", false, label);
+ register_label("login_label", false, label);
register_text2("user_name"
, true
, &preferences::login
Modified: trunk/src/gui/dialogs/network_transmission.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/network_transmission.cpp?rev=50508&r1=50507&r2=50508&view=diff
==============================================================================
--- trunk/src/gui/dialogs/network_transmission.cpp (original)
+++ trunk/src/gui/dialogs/network_transmission.cpp Sun Jul 31 18:56:13 2011
@@ -65,7 +65,7 @@
, pump_monitor(connection)
, subtitle_(subtitle)
{
- register_label2("title", true, title, false);
+ register_label("title", true, title, false);
}
void tnetwork_transmission::set_subtitle(const std::string& subtitle)
Modified: trunk/src/gui/dialogs/simple_item_selector.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/simple_item_selector.cpp?rev=50508&r1=50507&r2=50508&view=diff
==============================================================================
--- trunk/src/gui/dialogs/simple_item_selector.cpp (original)
+++ trunk/src/gui/dialogs/simple_item_selector.cpp Sun Jul 31 18:56:13 2011
@@ -70,8 +70,8 @@
, ok_label_()
, cancel_label_()
{
- register_label2("title", true, title, title_uses_markup);
- register_label2("message", true, message, message_uses_markup);
+ register_label("title", true, title, title_uses_markup);
+ register_label("message", true, message, message_uses_markup);
}
void tsimple_item_selector::pre_show(CVideo& /*video*/, twindow& window)
Modified: trunk/src/gui/dialogs/transient_message.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/transient_message.cpp?rev=50508&r1=50507&r2=50508&view=diff
==============================================================================
--- trunk/src/gui/dialogs/transient_message.cpp (original)
+++ trunk/src/gui/dialogs/transient_message.cpp Sun Jul 31 18:56:13 2011
@@ -31,8 +31,8 @@
, const bool message_use_markup
, const std::string& image)
{
- register_label2("title", true, title, title_use_markup);
- register_label2("message", true, message, message_use_markup);
+ register_label("title", true, title, title_use_markup);
+ register_label("message", true, message, message_use_markup);
register_image2("image", true, image);
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
