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

Addons Manager: removed Options button

Browse source 
All the useful filter options have been migrated to in-dialog widgets, so the Options dialog isn't needed anymore.
Do note that the default filter order and ascending/descending options weren't migrated, but they could still be
if it was deemed necessary.
This commit is contained in:
Charles Dang 2017-02-24 17:01:04 +11:00
parent ca8c02db5f
commit 73ba4cc4b1
3 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
data/gui/window/addon_manager.cfg
View file

@ -672,19 +672,6 @@
[/menu_button]
[/column]
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "right"
[button]
id = "options"
definition = "settings"
[/button]
[/column]
[column]
grow_factor = 0
border = "all"

18
src/gui/dialogs/addon/manager.cpp
View file

@ -28,7 +28,6 @@
#include "gettext.hpp"
#include "gui/auxiliary/filter.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/addon/filter_options.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/message.hpp"
#include "gui/dialogs/transient_message.hpp"
@ -407,10 +406,6 @@ void addon_manager::pre_show(window& window)
url_copy_button,
std::bind(&addon_manager::copy_url_callback, this, std::ref(url_textbox)));
connect_signal_mouse_left_click(
find_widget<button>(&window, "options", false),
std::bind(&addon_manager::options_button_callback, this, std::ref(window)));
connect_signal_mouse_left_click(
find_widget<button>(&window, "show_help", false),
std::bind(&addon_manager::show_help, this, std::ref(window)));
@ -475,19 +470,6 @@ void addon_manager::load_addon_list(window& window)
find_widget<button>(&window, "update_all", false).set_active(has_upgradable_addons);
}
void addon_manager::options_button_callback(window& window)
{
gui2::dialogs::addon_filter_options dlg;
// TODO
//dlg.set_displayed_status(f_.status);
//dlg.set_displayed_types(f_.types);
//dlg.set_sort(f_.sort);
//dlg.set_direction(f_.direction);
dlg.show(window.video());
}
boost::dynamic_bitset<> addon_manager::get_status_filter_visibility(const window& window) const
{
const menu_button& status_filter = find_widget<const menu_button>(&window, "install_status_filter", false);

1
src/gui/dialogs/addon/manager.hpp
View file

@ -88,7 +88,6 @@ private:
void browse_url_callback(text_box& url_box);
void copy_url_callback(text_box& url_box);
void options_button_callback(window& window);
void filter_callback(window& window);
void show_help(window& window);