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

tpreferences: refactored Advanced section to use a listbox

Browse source 
This allows the details widgets to stay in the same listbox cell as the main
displayed names
This commit is contained in:
Charles Dang 2016-02-05 17:27:44 +11:00
parent fda94c8148
commit 4e5a42cc42
4 changed files with 165 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -80,6 +80,16 @@
fixed_width = "true"
[/linked_group]
[linked_group]
id = "advanced_pref_name"
fixed_width = "true"
[/linked_group]
[linked_group]
id = "advanced_pref_value"
fixed_width = "true"
[/linked_group]
[tooltip]
id = "tooltip_large"
[/tooltip]

167
data/gui/default/window/preferences/05_advanced.cfg
View file

@ -12,107 +12,96 @@
border = "all"
border_size = 5
[tree_view]
[listbox]
id = "advanced_prefs"
definition = "default"
horizontal_scrollbar_mode = "never"
#vertical_scrollbar_mode = "initial_auto"
indention_step_size = 40
[node]
id = "pref_main"
[node_definition]
[row]
[column]
horizontal_grow = "true"
[toggle_panel]
id = "tree_view_node_icon"
[grid]
id = "pref_main_grid"
[row]
[column]
grow_factor = 0
border = "left,top,bottom"
border_size = 5
horizontal_alignment = "left"
[toggle_button]
id = "value_toggle"
definition = "default"
[/toggle_button]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
[label]
id = "tree_view_node_label"
definition = "gold_small"
[/label]
[/column]
[column]
grow_factor = 0
horizontal_alignment = "right"
border = "all"
border_size = 5
# TODO: fix scroll labels in tree views
#[scroll_label]
# id = "value"
# definition = "default"
# horizontal_scrollbar_mode = "never"
# vertical_scrollbar_mode = "never"
#[/scroll_label]
[label]
id = "value"
definition = "default"
[/label]
[/column]
[/row]
[/grid]
[/toggle_panel]
[/column]
[/row]
[/node_definition]
[/node]
[node]
id = "pref_details"
[node_definition]
[row]
[column]
horizontal_alignment = "left"
[list_definition]
[row]
[column]
vertical_grow = "true"
horizontal_grow = "true"
[toggle_panel]
definition = "default"
[grid]
id = "pref_setter_grid"
id = "pref_main_grid"
[row]
grow_factor = 1
[column]
grow_factor = 1
border = "top,right,bottom"
border_size = 10
horizontal_grow = "true"
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
[toggle_button]
id = "setter"
id = "value_toggle"
definition = "default"
[/toggle_button]
[/column]
[column]
grow_factor = 1
horizontal_grow = true
[grid]
[row]
[column]
grow_factor = 1
horizontal_alignment = "left"
border = "top,bottom,right"
border_size = 5
[label]
id = "pref_name"
definition = "gold_small"
linked_group = "advanced_pref_name"
[/label]
[/column]
[column]
grow_factor = 1
horizontal_alignment = "right"
border = "all"
border_size = 5
[label]
id = "value"
definition = "default_small"
text_alignment = "right"
linked_group = "advanced_pref_value"
[/label]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
grow_factor = 1
[column]
grow_factor = 0
horizontal_alignment = "left"
[spacer]
[/spacer]
[/column]
[column]
grow_factor = 1
border = "top,bottom,right"
border_size = 5
horizontal_grow = true
# Placeholder widget
[spacer]
id = "setter"
definition = "default"
[/spacer]
[/column]
[/row]
[/grid]
[/column]
[/row]
[/node_definition]
[/node]
[/tree_view]
[/toggle_panel]
[/column]
[/row]
[/list_definition]
[/listbox]
[/column]
[/row]
#enddef

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

@ -88,7 +88,7 @@ tpreferences::tpreferences(CVideo& video, const config& game_cfg)
: resolutions_(video.get_available_resolutions(true))
, adv_preferences_cfg_()
, friend_names_()
, last_selected_node_(NULL)
, last_selected_item_(0)
, accl_speeds_()
{
BOOST_FOREACH(const config& adv, game_cfg.child_range("advanced_preference")) {
@ -360,6 +360,14 @@ void tpreferences::remove_friend_list_entry(tlistbox& friends_list,
setup_friends_list(window);
}
// Helper function to get the main grid in each row of the advanced section
// lisbox, which contains the value and setter widgets.
static tgrid* get_advanced_row_grid(tlistbox& list, const int selected_row)
{
return dynamic_cast<tgrid*>(
list.get_row_grid(selected_row)->find("pref_main_grid", false));
}
/**
* Sets up states and callbacks for each of the widgets
*/
@ -622,10 +630,9 @@ void tpreferences::initialize_members(twindow& window)
// ADVANCED PANEL
//
ttree_view& advanced = find_widget<ttree_view>(&window, "advanced_prefs", false);
tlistbox& advanced = find_widget<tlistbox>(&window, "advanced_prefs", false);
typedef std::map<std::string, string_map> node_content;
node_content tree_group_item;
std::map<std::string, string_map> row_data;
BOOST_FOREACH(const config& option, adv_preferences_cfg_)
{
@ -634,25 +641,25 @@ void tpreferences::initialize_members(twindow& window)
option["type"].str());
const std::string& pref_name = option["field"].str();
tree_group_item["tree_view_node_label"]["label"] = option["name"];
row_data["pref_name"]["label"] = option["name"];
advanced.add_row(row_data);
ttree_view_node& pref_node = advanced.add_node("pref_main", tree_group_item);
ttree_view_node& detail_node = pref_node.add_child("pref_details", node_content());
const int this_row = advanced.get_item_count() - 1;
// Get the main grids from each node
tgrid* main_grid = dynamic_cast<tgrid*>(pref_node.find("pref_main_grid", true));
VALIDATE(main_grid, missing_widget("pref_main_grid"));
tgrid* details_grid = dynamic_cast<tgrid*>(detail_node.find("pref_setter_grid", true));
VALIDATE(details_grid, missing_widget("pref_setter_grid"));
// Get the main grid from each row
tgrid* main_grid = get_advanced_row_grid(advanced, this_row);
assert(main_grid);
// The toggle widget for toggle-type options (hidden for other types)
ttoggle_button& toggle_box = find_widget<ttoggle_button>(main_grid, "value_toggle", false);
toggle_box.set_visible(tcontrol::tvisible::hidden);
twidget& setter_main = find_widget<twidget>(main_grid, "setter", false);
setter_main.set_visible(tcontrol::tvisible::invisible);
switch (pref_type.v) {
case ADVANCED_PREF_TYPE::TOGGLE: {
pref_node.clear();
//main_grid->remove_child("setter");
toggle_box.set_visible(tcontrol::tvisible::visible);
@ -673,23 +680,23 @@ void tpreferences::initialize_members(twindow& window)
case ADVANCED_PREF_TYPE::SLIDER: {
tslider* setter_widget = new tslider;
setter_widget->set_definition("minimal");
setter_widget->set_id("control_slider");
setter_widget->set_id("setter");
// Maximum must be set first or this will assert
setter_widget->set_maximum_value(option["max"].to_int());
setter_widget->set_minimum_value(option["min"].to_int());
setter_widget->set_step_size(
option["step"].empty() ? 1 : option["step"].to_int());
delete details_grid->swap_child("setter", setter_widget, true);
delete main_grid->swap_child("setter", setter_widget, true);
// Needed to disambiguate overloaded function
typedef void (*setter) (const std::string &, int);
setter set_ptr = &preferences::set;
setup_single_slider("control_slider",
setup_single_slider("setter",
lexical_cast_default<int>(get(pref_name), option["default"].to_int()),
boost::bind(set_ptr, pref_name, _1),
*details_grid);
*main_grid);
bind_status_label(*setter_widget, "value", *main_grid);
@ -711,18 +718,18 @@ void tpreferences::initialize_members(twindow& window)
tcombobox* setter_widget = new tcombobox;
setter_widget->set_definition("default");
setter_widget->set_id("control_combobox");
setter_widget->set_id("setter");
delete details_grid->swap_child("setter", setter_widget, true);
delete main_grid->swap_child("setter", setter_widget, true);
// Needed to disambiguate overloaded function
typedef void (*setter) (const std::string &, const std::string &);
setter set_ptr = &preferences::set;
setup_combobox("control_combobox",
setup_combobox("setter",
combo_options, selected,
boost::bind(set_ptr, pref_name, _1),
*details_grid);
*main_grid);
bind_status_label(*setter_widget, "value", *main_grid);
@ -730,44 +737,68 @@ void tpreferences::initialize_members(twindow& window)
}
case ADVANCED_PREF_TYPE::SPECIAL: {
pref_node.clear();
//main_grid->remove_child("setter");
timage* value_widget = new timage;
value_widget->set_definition("default");
value_widget->set_label("icons/arrows/short_arrow_right_25.png");
value_widget->set_label("icons/arrows/arrows_blank_right_25.png~CROP(3,3,18,18)");
delete main_grid->swap_child("value", value_widget, true);
if (pref_name == "advanced_graphic_options") {
pref_node.set_callback_state_change(2,
boost::bind(show_advanced_graphics_dialog,
boost::ref(window.video())));
}
if (pref_name == "orb_color") {
// TODO
}
// Add more options here as needed
break;
}
}
}
connect_signal_mouse_left_click(advanced, boost::bind(
&tpreferences::on_node_select, this, boost::ref(advanced)));
#ifdef GUI2_EXPERIMENTAL_LISTBOX
connect_signal_notify_modified(advanced, boost::bind(
&tpreferences::on_advanced_prefs_list_select,
this,
boost::ref(advanced),
boost::ref(window)));
#else
advanced.set_callback_value_change(make_dialog_callback(
boost::bind(
&tpreferences::on_advanced_prefs_list_select,
this,
boost::ref(advanced),
boost::ref(window))));
#endif
last_selected_node_ = advanced.selected_item();
advanced.select_row(0);
}
void tpreferences::on_node_select(ttree_view& tree)
void tpreferences::on_advanced_prefs_list_select(tlistbox& list, twindow& window)
{
ttree_view_node* last_item = tree.selected_item();
const int selected_row = list.get_selected_row();
if(last_selected_node_ != last_item) {
last_selected_node_->fold();
last_selected_node_ = last_item;
const ADVANCED_PREF_TYPE& selected_type = ADVANCED_PREF_TYPE::string_to_enum(
adv_preferences_cfg_[selected_row]["type"].str());
const std::string& selected_field = adv_preferences_cfg_[selected_row]["field"].str();
if(selected_type == ADVANCED_PREF_TYPE::SPECIAL) {
if (selected_field == "advanced_graphic_options") {
show_advanced_graphics_dialog(window.video());
}
if (selected_field == "orb_color") {
// TODO
}
// Add more options here as needed
}
if(selected_type != ADVANCED_PREF_TYPE::TOGGLE && selected_type != ADVANCED_PREF_TYPE::SPECIAL) {
find_widget<twidget>(get_advanced_row_grid(list, selected_row), "setter", false)
.set_visible(tcontrol::tvisible::visible);
}
if(last_selected_item_ != selected_row) {
find_widget<twidget>(get_advanced_row_grid(list, last_selected_item_), "setter", false)
.set_visible(tcontrol::tvisible::invisible);
last_selected_item_ = selected_row;
}
}

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

@ -32,8 +32,6 @@ class tcontrol;
class tslider;
class ttext_box;
class ttoggle_button;
class ttree_view;
class ttree_view_node;
class tpreferences : public tdialog
{
@ -75,7 +73,7 @@ private:
/** Callback for selection changes */
void on_page_select(twindow& window);
void on_tab_select(twindow& window, const std::string& widget_id);
void on_node_select(ttree_view& tree);
void on_advanced_prefs_list_select(tlistbox& tree, twindow& window);
/** Special callback functions */
void handle_res_select(twindow& window);
@ -190,7 +188,7 @@ private:
std::vector<config> adv_preferences_cfg_;
std::vector<std::string> friend_names_;
ttree_view_node* last_selected_node_;
int last_selected_item_;
std::vector<t_string> accl_speeds_;
};