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

port hotkey preferences dialog to gui2

Browse source
This commit is contained in:
gfgtdf 2016-02-15 17:05:17 +01:00
parent 43f7fced78
commit 0efda655b8
5 changed files with 354 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
data/gui/default/window/preferences.cfg
View file

@ -139,6 +139,26 @@
fixed_width = "true"
[/linked_group]
[linked_group]
id = "hotkeys_col_icon"
fixed_width = "true"
[/linked_group]
[linked_group]
id = "hotkeys_col_desc"
fixed_width = "true"
[/linked_group]
[linked_group]
id = "hotkeys_col_hotkey"
fixed_width = "true"
[/linked_group]
[linked_group]
id = "hotkeys_col_type"
fixed_width = "true"
[/linked_group]
[tooltip]
id = "tooltip_large"
[/tooltip]

196
data/gui/default/window/preferences/06_hotkeys.cfg Normal file
View file

@ -0,0 +1,196 @@
#textdomain wesnoth-lib
###
### Preferences dialog, Advanced page
###
[layer]
[row]
[column]
horizontal_grow = true
vertical_grow = true
[grid]
[row]
grow_factor = 1
[column]
horizontal_grow = "true"
vertical_alignment = "top"
[listbox]
id = "list_hotkeys"
definition = "default"
[header]
[row]
## The Icon column
[column]
grow_factor = 0
[spacer]
linked_group = "hotkeys_col_icon"
[/spacer]
[/column]
## The description column
[column]
grow_factor = 1
horizontal_grow = "true"
[toggle_button]
id = "sort_0"
definition = "listbox_header"
linked_group = "hotkeys_col_desc"
label = _ "Action"
[/toggle_button]
[/column]
## The hotkey column
[column]
grow_factor = 1
horizontal_grow = "true"
[toggle_button]
id = "sort_1"
definition = "listbox_header"
linked_group = "hotkeys_col_hotkey"
label = _ "Hotkey"
[/toggle_button]
[/column]
[column]
grow_factor = 0
horizontal_grow = "true"
[toggle_button]
id = "sort_2"
definition = "listbox_header"
linked_group = "hotkeys_col_type"
label = _ "G"
tooltip = _ "Available in game"
[/toggle_button]
[/column]
[column]
grow_factor = 0
horizontal_grow = "true"
[toggle_button]
id = "sort_3"
definition = "listbox_header"
linked_group = "hotkeys_col_type"
label = _ "E"
tooltip = _ "Available in editor"
[/toggle_button]
[/column]
[column]
grow_factor = 0
horizontal_grow = "true"
[toggle_button]
id = "sort_4"
definition = "listbox_header"
linked_group = "hotkeys_col_type"
label = _ "T"
tooltip = _ "Available in titlescreen"
[/toggle_button]
[/column]
[/row]
[/header]
[list_definition]
[row]
[column]
horizontal_grow = true
[toggle_panel]
definition = "default"
[grid]
[row]
[column]
grow_factor = 0
[spacer]
id = "img_icon"
linked_group = "hotkeys_col_icon"
[/spacer]
[/column]
## The description column
[column]
grow_factor = 1
horizontal_grow = true
## work around 'empty lines have height 0'
vertical_grow = true
[label]
id = "lbl_desc"
definition = "default"
linked_group = "hotkeys_col_desc"
characters_per_line = 30
[/label]
[/column]
## The hotkey column
[column]
grow_factor = 1
horizontal_grow = true
## work around 'empty lines have height 0'
vertical_grow = true
[label]
id = "lbl_hotkey"
definition = "default"
linked_group = "hotkeys_col_hotkey"
[/label]
[/column]
[column]
grow_factor = 0
[label]
id = "lbl_is_game"
definition = "default"
linked_group = "hotkeys_col_type"
text_alignment = "center"
[/label]
[/column]
[column]
grow_factor = 0
[label]
id = "lbl_is_editor"
definition = "default"
linked_group = "hotkeys_col_type"
text_alignment = "center"
[/label]
[/column]
[column]
grow_factor = 0
[label]
id = "lbl_is_titlescreen"
definition = "default"
linked_group = "hotkeys_col_type"
text_alignment = "center"
[/label]
[/column]
[/row]
[/grid]
[/toggle_panel]
[/column]
[/row]
[/list_definition]
[/listbox]
[/column]
[/row]
[row]
grow_factor = 0
[column]
horizontal_grow = true
vertical_alignment = "top"
[grid]
[row]
[column]
grow_factor = 0
[button]
label = _"Add hotkey"
id = "btn_add_hotkey"
[/button]
[/column]
[column]
grow_factor = 0
[button]
label = _"Clear hotkey"
id = "btn_clear_hotkey"
[/button]
[/column]
[column]
grow_factor = 1
[spacer]
[/spacer]
[/column]
[/row]
[/grid]
[/column]
[/row]
[/grid]
[/column]
[/row]
[/layer]

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

@ -18,12 +18,15 @@
#include "gui/dialogs/preferences_dialog.hpp"
#include "game_preferences.hpp"
#include "hotkey/hotkey_command.hpp"
#include "hotkey/hotkey_item.hpp"
#include "preferences.hpp"
#include "preferences_display.hpp"
#include "lobby_preferences.hpp"
#include "gettext.hpp"
#include "video.hpp"
#include "formula_string_utils.hpp"
#include "gui/dialogs/message.hpp"
#include "gui/auxiliary/find_widget.tpp"
// Sub-dialog includes
@ -69,7 +72,28 @@ struct advanced_preferences_sorter
return lhs["name"].t_str().str() < rhs["name"].t_str().str();
}
};
template<hotkey::scope scope, bool reverse>
struct hotkey_sort_by_type
{
hotkey_sort_by_type(const hotkey::t_hotkey_command_list& l) : hotkey_commands_(&l) {}
bool operator()(int lhs, int rhs) const
{
return reverse ? (*hotkey_commands_)[lhs].scope[scope] < (*hotkey_commands_)[rhs].scope[scope]
: (*hotkey_commands_)[lhs].scope[scope] > (*hotkey_commands_)[rhs].scope[scope];
}
const hotkey::t_hotkey_command_list* hotkey_commands_;
};
template<bool reverse>
struct hotkey_sort_by_desc
{
hotkey_sort_by_desc(const hotkey::t_hotkey_command_list& l) : hotkey_commands_(&l) {}
bool operator()(int lhs, int rhs) const
{
return reverse ? (*hotkey_commands_)[lhs].description.str() < (*hotkey_commands_)[rhs].description.str()
: (*hotkey_commands_)[lhs].description.str() > (*hotkey_commands_)[rhs].description.str();
}
const hotkey::t_hotkey_command_list* hotkey_commands_;
};
const std::string bool_to_display_string(bool value)
{
return value ? _("yes") : _("no");
@ -830,6 +854,113 @@ void tpreferences::initialize_members(twindow& window)
#endif
advanced.select_row(0);
//
// HOTKEYS PANEL
//
row_data.clear();
t_string& row_action = row_data["lbl_desc"]["label"];
t_string& row_hotkey = row_data["lbl_hotkey"]["label"];
t_string& row_is_g = row_data["lbl_is_game"]["label"];
t_string& row_is_e = row_data["lbl_is_editor"]["label"];
t_string& row_is_t = row_data["lbl_is_titlescreen"]["label"];
tlistbox& hotkey_list = find_widget<tlistbox>(&window, "list_hotkeys", false);
FOREACH(const AUTO& hotkey_item, hotkey::get_hotkey_commands())
{
row_action = hotkey_item.description;
row_hotkey = hotkey::get_names(hotkey_item.command);
//TODO: maybe use symbos/colors instead of yes no to be language independed and to save space.
row_is_g = hotkey_item.scope[hotkey::SCOPE_GAME] ? _("yes") : _("no");
row_is_e = hotkey_item.scope[hotkey::SCOPE_EDITOR] ? _("yes") : _("no");
row_is_t = hotkey_item.scope[hotkey::SCOPE_MAIN_MENU] ? _("yes") : _("no");
hotkey_list.add_row(row_data);
}
std::vector<tgenerator_::torder_func> order_funcs(2);
order_funcs[0] = hotkey_sort_by_desc<false>(hotkey::get_hotkey_commands());
order_funcs[1] = hotkey_sort_by_desc<true>(hotkey::get_hotkey_commands());
hotkey_list.set_column_order(0, order_funcs);
hotkey_list.set_column_order(1, order_funcs);
order_funcs[0] = hotkey_sort_by_type<hotkey::SCOPE_GAME, false>(hotkey::get_hotkey_commands());
order_funcs[1] = hotkey_sort_by_type<hotkey::SCOPE_GAME, true>(hotkey::get_hotkey_commands());
hotkey_list.set_column_order(2, order_funcs);
order_funcs[0] = hotkey_sort_by_type<hotkey::SCOPE_EDITOR, false>(hotkey::get_hotkey_commands());
order_funcs[1] = hotkey_sort_by_type<hotkey::SCOPE_EDITOR, true>(hotkey::get_hotkey_commands());
hotkey_list.set_column_order(3, order_funcs);
order_funcs[0] = hotkey_sort_by_type<hotkey::SCOPE_MAIN_MENU, false>(hotkey::get_hotkey_commands());
order_funcs[1] = hotkey_sort_by_type<hotkey::SCOPE_MAIN_MENU, true>(hotkey::get_hotkey_commands());
hotkey_list.set_column_order(4, order_funcs);
connect_signal_mouse_left_click(
find_widget<tbutton>(&window, "btn_add_hotkey", false), boost::bind(
&tpreferences::add_hotkey_callback,
this,
boost::ref(hotkey_list)));
connect_signal_mouse_left_click(
find_widget<tbutton>(&window, "btn_clear_hotkey", false), boost::bind(
&tpreferences::remove_hotkey_callback,
this,
boost::ref(hotkey_list)));
}
void tpreferences::add_hotkey_callback(tlistbox& hotkeys)
{
CVideo& video = hotkeys.get_window()->video();
int row_number = hotkeys.get_selected_row();
const hotkey::hotkey_command& hotkey_item = hotkey::get_hotkey_commands()[row_number];
hotkey::hotkey_ptr newhk = hotkey::show_binding_dialog(video, hotkey_item.command);
hotkey::hotkey_ptr oldhk;
// only if not cancelled.
if (newhk.get() == NULL) {
return;
}
BOOST_FOREACH(const hotkey::hotkey_ptr& hk, hotkey::get_hotkeys()) {
if(newhk->bindings_equal(hk)) {
oldhk = hk;
}
}
hotkey::scope_changer scope_restorer;
hotkey::set_active_scopes(hotkey_item.scope);
if(oldhk && oldhk->get_command() == hotkey_item.command) {
return;
}
if (oldhk) {
utils::string_map symbols;
symbols["hotkey_sequence"] = oldhk->get_name();
symbols["old_hotkey_action"] = hotkey::get_description(oldhk->get_command());
symbols["new_hotkey_action"] = hotkey::get_description(newhk->get_command());
std::string text = vgettext("\"$hotkey_sequence|\" is in use by \n\"$old_hotkey_action|\". Do you wish to reassign it to \"$new_hotkey_action|\"?", symbols);
const int res = gui2::show_message(video,
_("Reassign Hotkey"), text,
gui2::tmessage::yes_no_buttons);
if (res != gui2::twindow::OK) {
return;
}
}
hotkey::add_hotkey(newhk);
//Wew need to recalculate all hotkey names in because we migth have removed an hotkey from another command.
for(size_t i = 0; i < hotkeys.get_item_count(); ++i) {
const hotkey::hotkey_command& hotkey_item_row = hotkey::get_hotkey_commands()[i];
find_widget<tlabel>(hotkeys.get_row_grid(i), "lbl_hotkey", false).set_label(hotkey::get_names(hotkey_item_row.command));
}
}
void tpreferences::default_hotkey_callback(tlistbox& hotkeys)
{
clear_hotkeys();
gui2::show_transient_message(hotkeys.get_window()->video(), _("Hotkeys Reset"), _("All hotkeys have been reset to their default values."));
//TODO: updatet listbox& hotkeys with the new values, note that clearing hotkeys might remove some wml defined hotkeys from the list.
//So we eigher have to recalculate the layout or
}
void tpreferences::remove_hotkey_callback(tlistbox& hotkeys)
{
int row_number = hotkeys.get_selected_row();
const hotkey::hotkey_command& hotkey_item = hotkey::get_hotkey_commands()[row_number];
hotkey::clear_hotkeys(hotkey_item.command);
find_widget<tlabel>(hotkeys.get_row_grid(row_number), "lbl_hotkey", false).set_label(hotkey::get_names(hotkey_item.command));
}
void tpreferences::on_advanced_prefs_list_select(tlistbox& list, twindow& window)
@ -919,6 +1050,7 @@ void tpreferences::pre_show(CVideo& /*video*/, twindow& window)
add_pager_row(selector, "music.png", _("Prefs section^Sound"));
add_pager_row(selector, "multiplayer.png", _("Prefs section^Multiplayer"));
add_pager_row(selector, "advanced.png", _("Prefs section^Advanced"));
add_pager_row(selector, "advanced.png", _("Prefs section^Hotkeys"));
// Initializes tabs for the various pages. This should be done before
// setting up the member callbacks.

3
src/gui/dialogs/preferences_dialog.hpp
View file

@ -86,6 +86,9 @@ private:
void accl_speed_slider_callback(tslider& slider);
void max_autosaves_slider_callback(tslider& slider, tcontrol& status_label);
void font_scaling_slider_callback(tslider& slider);
void add_hotkey_callback(tlistbox& hotkeys);
void remove_hotkey_callback(tlistbox& hotkeys);
void default_hotkey_callback(tlistbox& hotkeys);
/**
* Sets the initial state and callback for a simple bool-state toggle button

2
src/hotkey/hotkey_command.hpp
View file

@ -241,7 +241,7 @@ public:
private:
hk_scopes prev_scope_active_;
};
typedef boost::ptr_vector<hotkey_command> t_hotkey_command_list;
/// returns a container that contains all currently active hotkey_commands.
/// everything that wants a hotkey, must be in this container.
const boost::ptr_vector<hotkey_command>& get_hotkey_commands();