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

Resolve title-screen vs main menu inconsistency.

Browse source 
Discussed in #4390 and originally introduced in 7c8c3114.
This commit is contained in:
Wedge009 2021-07-26 20:11:50 +10:00
parent f5affe646a
commit 0709145670
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/gui/window/preferences/02_hotkeys.cfg
View file

@ -140,8 +140,8 @@
id = "sort_4"
definition = "listbox_header"
linked_group = "hotkeys_col_type"
# po: Translate T as the initial letter for Title Screen
label = _ "titlescreen_hotkeys^T"
# po: Translate M as the initial letter for Main Menu
label = _ "mainmenu_hotkeys^M"
tooltip = _ "Available at main menu"
[/toggle_button]
[/column]
@ -225,7 +225,7 @@
border = "all"
border_size = 5
[label]
id = "lbl_is_titlescreen"
id = "lbl_is_mainmenu"
definition = "default"
linked_group = "hotkeys_col_type"
[/label]

10
src/gui/dialogs/preferences_dialog.cpp
View file

@ -755,8 +755,8 @@ listbox& preferences_dialog::setup_hotkey_list()
t_string& row_is_g_markup = row_data["lbl_is_game"]["use_markup"];
t_string& row_is_e = row_data["lbl_is_editor"]["label"];
t_string& row_is_e_markup = row_data["lbl_is_editor"]["use_markup"];
t_string& row_is_t = row_data["lbl_is_titlescreen"]["label"];
t_string& row_is_t_markup = row_data["lbl_is_titlescreen"]["use_markup"];
t_string& row_is_m = row_data["lbl_is_mainmenu"]["label"];
t_string& row_is_m_markup = row_data["lbl_is_mainmenu"]["use_markup"];
listbox& hotkey_list = find_widget<listbox>(get_window(), "list_hotkeys", false);
@ -766,7 +766,7 @@ listbox& preferences_dialog::setup_hotkey_list()
// These translated initials should match those used in data/gui/window/preferences/02_hotkeys.cfg
std::string text_game_feature_on = "<span color='#0f0'>" + _("game_hotkeys^G") + "</span>";
std::string text_editor_feature_on = "<span color='#0f0'>" + _("editor_hotkeys^E") + "</span>";
std::string text_title_feature_on = "<span color='#0f0'>" + _("titlescreen_hotkeys^T") + "</span>";
std::string text_mainmenu_feature_on = "<span color='#0f0'>" + _("mainmenu_hotkeys^M") + "</span>";
for(const auto& hotkey_item : hotkey::get_hotkey_commands()) {
if(hotkey_item.hidden) {
@ -787,8 +787,8 @@ listbox& preferences_dialog::setup_hotkey_list()
row_is_g_markup = "true";
row_is_e = hotkey_item.scope[hotkey::SCOPE_EDITOR] ? text_editor_feature_on : "";
row_is_e_markup = "true";
row_is_t = hotkey_item.scope[hotkey::SCOPE_MAIN_MENU] ? text_title_feature_on : "";
row_is_t_markup = "true";
row_is_m = hotkey_item.scope[hotkey::SCOPE_MAIN_MENU] ? text_mainmenu_feature_on : "";
row_is_m_markup = "true";
hotkey_list.add_row(row_data);
}