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

tpreferences: reimplement radio toggle setup to use groups

Browse source
This commit is contained in:
Charles Dang 2016-02-07 14:05:14 +11:00
parent dfe7fcca88
commit 6d883e10f4
2 changed files with 29 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -248,22 +248,24 @@ void tpreferences::setup_combobox(
callback, options.second));
}
template <typename T>
void tpreferences::setup_radio_toggle(
const std::string& toggle_id,
LOBBY_JOINS enum_value,
int start_value,
std::vector<std::pair<ttoggle_button*, int> >& vec,
const T& enum_value,
const int start_value,
tgroup<T>& group,
boost::function<void(int)> callback,
twindow& window)
{
ttoggle_button& button = find_widget<ttoggle_button>(&window, toggle_id, false);
button.set_value(enum_value == start_value);
connect_signal_mouse_left_click(button, boost::bind(
&tpreferences::toggle_radio_callback,
this, boost::ref(vec), boost::ref(start_value), &button));
group.add_member(&button, enum_value);
vec.push_back(std::make_pair(&button, enum_value));
connect_signal_mouse_left_click(button, boost::bind(
&tpreferences::toggle_radio_callback<T>,
this, group, callback));
}
template <typename T>
@ -629,11 +631,11 @@ void tpreferences::initialize_members(twindow& window)
/* LOBBY JOIN NOTIFICATIONS */
setup_radio_toggle("lobby_joins_none", SHOW_NONE,
lobby_joins(), lobby_joins_, window);
lobby_joins(), lobby_joins_group, _set_lobby_joins, window);
setup_radio_toggle("lobby_joins_friends", SHOW_FRIENDS,
lobby_joins(), lobby_joins_, window);
lobby_joins(), lobby_joins_group, _set_lobby_joins, window);
setup_radio_toggle("lobby_joins_all", SHOW_ALL,
lobby_joins(), lobby_joins_, window);
lobby_joins(), lobby_joins_group, _set_lobby_joins, window);
/* FRIENDS LIST */
setup_friends_list(window);
@ -1022,25 +1024,12 @@ void tpreferences::font_scaling_slider_callback(tslider& slider)
font_scaling_ = slider.get_value();
}
template <typename T>
void tpreferences::toggle_radio_callback(
const std::vector<std::pair<ttoggle_button*, int> >& vec,
int& value,
ttoggle_button* active)
tgroup<T>& group,
boost::function<void(int)> setter)
{
FOREACH(const AUTO & e, vec)
{
ttoggle_button* const b = e.first;
if(b == NULL) {
continue;
} else if(b == active && !b->get_value()) {
b->set_value(true);
} else if(b == active) {
value = e.second;
_set_lobby_joins(value);
} else if(b != active && b->get_value()) {
b->set_value(false);
}
}
setter(group.get_active_member_value());
}
void tpreferences::on_page_select(twindow& window)

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

@ -20,6 +20,7 @@
#include "game_preferences.hpp"
#include "make_enum.hpp"
#include "gui/dialogs/dialog.hpp"
#include "gui/widgets/group.hpp"
// This file is not named preferences.hpp in order -I conflicts with
// src/preferences.hpp.
@ -67,7 +68,7 @@ private:
void edit_friend_list_entry(tlistbox& friends, ttext_box& textbox);
void remove_friend_list_entry(tlistbox& friends_list,
void remove_friend_list_entry(tlistbox& friends_list,
ttext_box& textbox, twindow& window);
void add_tab(tlistbox& tab_bar, const std::string& label);
@ -152,17 +153,21 @@ private:
* If (at a later date) more groups need to be added, this will have to be
* generalized.
*/
tgroup<preferences::LOBBY_JOINS> lobby_joins_group;
template <typename T>
void setup_radio_toggle(
const std::string& toggle_id,
preferences::LOBBY_JOINS enum_value,
int start_value,
std::vector<std::pair<ttoggle_button*, int> >& vec,
const T& enum_value,
const int start_value,
tgroup<T>& group,
boost::function<void(int)> callback,
twindow& window);
template <typename T>
void toggle_radio_callback(
const std::vector<std::pair<ttoggle_button*, int> >& vec,
int& value,
ttoggle_button* active);
tgroup<T>& group,
boost::function<void(int)> setter);
/**
* Sets up a label that always displays the value of another widget.
@ -183,10 +188,7 @@ private:
void status_label_callback(T& parent_widget,
tcontrol& label_widget, const std::string& suffix = "");
typedef std::pair<ttoggle_button*, int> lobby_radio_toggle;
std::vector<lobby_radio_toggle> lobby_joins_;
MAKE_ENUM(ADVANCED_PREF_TYPE,
MAKE_ENUM(ADVANCED_PREF_TYPE,
(TOGGLE, "boolean")
(SLIDER, "int")
(COMBO, "combo")