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

Merge pull request #1832 from donovanamitchell/bug#1829

Browse source 
Fixed Bug#1829 Name filters are applied with type and status filters
This commit is contained in:
Jyrki Vesterinen 2017-07-12 13:36:11 +03:00 • committed by GitHub
commit 986b19011f
2 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -244,26 +244,9 @@ addon_manager::addon_manager(addons_client& client)
{
}
void addon_manager::on_filtertext_changed(text_box_base* textbox, const std::string& text)
void addon_manager::on_filtertext_changed(text_box_base* textbox)
{
addon_list& addons = find_widget<addon_list>(textbox->get_window(), "addons", true);
filter_transform filter(utils::split(text, ' '));
boost::dynamic_bitset<> res;
const config::const_child_itors& addon_cfgs = cfg_.child_range("campaign");
for(const auto& a : addons_)
{
const config& addon_cfg = *std::find_if(addon_cfgs.begin(), addon_cfgs.end(),
[&a](const config& cfg)
{
return cfg["name"] == a.first;
});
res.push_back(filter(addon_cfg));
}
addons.set_addon_shown(res);
apply_filters(*textbox->get_window());
}
static std::string describe_status_verbose(const addon_tracking_info& state)
@ -326,7 +309,7 @@ void addon_manager::pre_show(window& window)
addon_list& list = find_widget<addon_list>(&window, "addons", false);
text_box& filter = find_widget<text_box>(&window, "filter", false);
filter.set_text_changed_callback(std::bind(&addon_manager::on_filtertext_changed, this, _1, _2));
filter.set_text_changed_callback(std::bind(&addon_manager::on_filtertext_changed, this, _1));
#ifdef GUI2_EXPERIMENTAL_LISTBOX
connect_signal_notify_modified(list,
@ -516,6 +499,30 @@ void addon_manager::reload_list_and_reselect_item(const std::string id, window&
on_addon_select(window);
}
boost::dynamic_bitset<> addon_manager::get_name_filter_visibility(const window& window) const
{
const text_box& name_filter = find_widget<const text_box>(&window, "filter", false);
const std::string& text = name_filter.get_value();
filter_transform filter(utils::split(text, ' '));
boost::dynamic_bitset<> res;
const config::const_child_itors& addon_cfgs = cfg_.child_range("campaign");
for(const auto& a : addons_)
{
const config& addon_cfg = *std::find_if(addon_cfgs.begin(), addon_cfgs.end(),
[&a](const config& cfg)
{
return cfg["name"] == a.first;
});
res.push_back(filter(addon_cfg));
}
return res;
}
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);
@ -562,7 +569,10 @@ boost::dynamic_bitset<> addon_manager::get_type_filter_visibility(const window&
void addon_manager::apply_filters(window& window)
{
boost::dynamic_bitset<> res = get_status_filter_visibility(window) & get_type_filter_visibility(window);
boost::dynamic_bitset<> res =
get_status_filter_visibility(window)
& get_type_filter_visibility(window)
& get_name_filter_visibility(window);
find_widget<addon_list>(&window, "addons", false).set_addon_shown(res);
}

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

@ -47,7 +47,7 @@ public:
}
private:
void on_filtertext_changed(text_box_base* textbox, const std::string& text);
void on_filtertext_changed(text_box_base* textbox);
std::vector<selectable_item*> orders_;
@ -125,6 +125,7 @@ private:
void apply_filters(window& window);
void show_help(window& window);
boost::dynamic_bitset<> get_name_filter_visibility(const window& window) const;
boost::dynamic_bitset<> get_status_filter_visibility(const window& window) const;
boost::dynamic_bitset<> get_type_filter_visibility(const window& window) const;