upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-15 09:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed register_label2 to register_label.

Browse Source 
Brings it more in line with the other register functions, its interface
is the same as well.
This commit is contained in:
Mark de Wever 2011-07-31 16:56:13 +00:00
parent 44d5432e7d
commit 7025048073
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/dialogs/addon/description.cpp
View File

@ -79,13 +79,13 @@ REGISTER_DIALOG(addon_description)
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 @@ taddon_description::taddon_description(const addon_info& addon)
}
if(!languages.empty()) {
register_label2("translations", true, languages);
register_label("translations", true, languages);
}
}

2
src/gui/dialogs/dialog.cpp
View File

@ -193,7 +193,7 @@ tfield_text* tdialog::register_text2(const std::string& id
, 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)

4
src/gui/dialogs/dialog.hpp
View File

@ -303,7 +303,7 @@ protected:
* @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 @@ protected:
, const bool mandatory
, const std::string& filename)
{
return register_label2(id, mandatory, filename);
return register_label(id, mandatory, filename);
}
private:

4
src/gui/dialogs/editor_resize_map.cpp
View File

@ -101,8 +101,8 @@ teditor_resize_map::teditor_resize_map(
{
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)

14
src/gui/dialogs/game_save.cpp
View File

@ -50,7 +50,7 @@ REGISTER_DIALOG(game_save)
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 @@ tgame_save_message::tgame_save_message(
, 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 @@ tgame_save_oos::tgame_save_oos(
, 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);
}

2
src/gui/dialogs/mp_cmd_wrapper.cpp
View File

@ -83,7 +83,7 @@ tmp_cmd_wrapper::tmp_cmd_wrapper(const t_string& user)
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);
}

2
src/gui/dialogs/mp_login.cpp
View File

@ -63,7 +63,7 @@ REGISTER_DIALOG(mp_login)
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

2
src/gui/dialogs/network_transmission.cpp
View File

@ -65,7 +65,7 @@ tnetwork_transmission::tnetwork_transmission(
, 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)

4
src/gui/dialogs/simple_item_selector.cpp
View File

@ -70,8 +70,8 @@ tsimple_item_selector::tsimple_item_selector(const std::string& title, const std
, 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)

4
src/gui/dialogs/transient_message.cpp
View File

@ -31,8 +31,8 @@ ttransient_message::ttransient_message(const std::string& title
, 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);
}