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

tpreferences: use simpler method for initializing sorting options

Browse source
This commit is contained in:
Charles Dang 2016-08-09 10:34:58 +11:00
parent 0215646f1c
commit ff2a48aa09
2 changed files with 21 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,42 +74,6 @@ struct advanced_preferences_sorter
}
};
template<hotkey::scope scope, template<class> class Dir>
struct hotkey_sort_by_type
{
hotkey_sort_by_type(const gui2::tpreferences::t_visible_hotkeys& l) : hotkey_commands_(&l) {}
bool operator()(int lhs, int rhs) const
{
Dir<bool> compare;
return compare((*hotkey_commands_)[lhs]->scope[scope] , (*hotkey_commands_)[rhs]->scope[scope]);
}
const gui2::tpreferences::t_visible_hotkeys* hotkey_commands_;
};
template<template<class> class Dir>
struct hotkey_sort_by_desc
{
hotkey_sort_by_desc(const gui2::tpreferences::t_visible_hotkeys& l) : hotkey_commands_(&l) {}
bool operator()(int lhs, int rhs) const
{
Dir<std::string> compare;
return compare((*hotkey_commands_)[lhs]->description.str() , (*hotkey_commands_)[rhs]->description.str());
}
const gui2::tpreferences::t_visible_hotkeys* hotkey_commands_;
};
template<template<class> class Dir>
struct hotkey_sort_by_command
{
hotkey_sort_by_command(const gui2::tpreferences::t_visible_hotkeys& l) : hotkey_commands_(&l) {}
bool operator()(int lhs, int rhs) const
{
Dir<std::string> compare;
return compare(hotkey::get_names((*hotkey_commands_)[lhs]->command) , hotkey::get_names((*hotkey_commands_)[rhs]->command));
}
const gui2::tpreferences::t_visible_hotkeys* hotkey_commands_;
};
const std::string bool_to_display_string(bool value)
{
return value ? _("yes") : _("no");
@ -443,6 +407,18 @@ static tgrid* get_advanced_row_grid(tlistbox& list, const int selected_row)
list.get_row_grid(selected_row)->find("pref_main_grid", false));
}
template<typename Fcn>
void tpreferences::init_sorting_option(generator_sort_array& order_funcs, Fcn filter_on)
{
order_funcs[0] = [this, filter_on](unsigned i1, unsigned i2) {
return filter_on(visible_hotkeys_[i1]) < filter_on(visible_hotkeys_[i2]);
};
order_funcs[1] = [this, filter_on](unsigned i1, unsigned i2) {
return filter_on(visible_hotkeys_[i1]) > filter_on(visible_hotkeys_[i2]);
};
}
/**
* Sets up states and callbacks for each of the widgets
*/
@ -896,26 +872,21 @@ void tpreferences::initialize_members(twindow& window)
generator_sort_array order_funcs;
// Action column
order_funcs[0] = hotkey_sort_by_desc<std::less>(visible_hotkeys_);
order_funcs[1] = hotkey_sort_by_desc<std::greater>(visible_hotkeys_);
init_sorting_option(order_funcs, [](const hotkey::hotkey_command* key) { return key->description.str(); });
hotkey_list.set_column_order(0, order_funcs);
// Hotkey column
order_funcs[0] = hotkey_sort_by_command<std::less>(visible_hotkeys_);
order_funcs[1] = hotkey_sort_by_command<std::greater>(visible_hotkeys_);
init_sorting_option(order_funcs, [](const hotkey::hotkey_command* key) { return hotkey::get_names(key->command); });
hotkey_list.set_column_order(1, order_funcs);
// Scope columns
order_funcs[0] = hotkey_sort_by_type<hotkey::SCOPE_GAME, std::less>(visible_hotkeys_);
order_funcs[1] = hotkey_sort_by_type<hotkey::SCOPE_GAME, std::greater>(visible_hotkeys_);
init_sorting_option(order_funcs, [](const hotkey::hotkey_command* key) { return !key->scope[hotkey::SCOPE_GAME]; });
hotkey_list.set_column_order(2, order_funcs);
order_funcs[0] = hotkey_sort_by_type<hotkey::SCOPE_EDITOR, std::less>(visible_hotkeys_);
order_funcs[1] = hotkey_sort_by_type<hotkey::SCOPE_EDITOR, std::greater>(visible_hotkeys_);
init_sorting_option(order_funcs, [](const hotkey::hotkey_command* key) { return !key->scope[hotkey::SCOPE_EDITOR]; });
hotkey_list.set_column_order(3, order_funcs);
order_funcs[0] = hotkey_sort_by_type<hotkey::SCOPE_MAIN_MENU, std::less>(visible_hotkeys_);
order_funcs[1] = hotkey_sort_by_type<hotkey::SCOPE_MAIN_MENU, std::greater>(visible_hotkeys_);
init_sorting_option(order_funcs, [](const hotkey::hotkey_command* key) { return !key->scope[hotkey::SCOPE_MAIN_MENU]; });
hotkey_list.set_column_order(4, order_funcs);
connect_signal_mouse_left_click(

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

@ -20,6 +20,7 @@
#include "game_preferences.hpp"
#include "utils/make_enum.hpp"
#include "gui/dialogs/dialog.hpp"
#include "gui/widgets/generator.hpp"
#include "gui/widgets/group.hpp"
// This file is not named preferences.hpp in order -I conflicts with
@ -74,6 +75,9 @@ private:
void setup_friends_list(twindow& window);
void setup_hotkey_list(twindow& window);
template<typename Fcn>
void init_sorting_option(generator_sort_array& order_funcs, Fcn filter_on);
void add_friend_list_entry(const bool is_friend,
ttext_box& textbox, twindow& window);