Author: alink
Date: Thu May 29 04:51:32 2008
New Revision: 26909
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26909&view=rev
Log:
Simplify by removing an recently added unused feature for filter:
Filter only on some columns (ex avoid images url)
Modified:
trunk/src/construct_dialog.cpp
trunk/src/construct_dialog.hpp
trunk/src/dialogs.cpp
trunk/src/menu_events.cpp
Modified: trunk/src/construct_dialog.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/construct_dialog.cpp?rev=26909&r1=26908&r2=26909&view=diff
==============================================================================
--- trunk/src/construct_dialog.cpp (original)
+++ trunk/src/construct_dialog.cpp Thu May 29 04:51:32 2008
@@ -871,12 +871,12 @@
filtered_items_.clear();
index_map_.clear();
const std::string t = utils::wstring_to_string(text);
- for(size_t n = 0; n != to_filter_items_.size(); ++n) {
- if(n == 0 || std::search(to_filter_items_[n].begin(),
to_filter_items_[n].end(),
+ for(size_t n = 0; n != items_.size(); ++n) {
+ if(n == 0 || std::search(items_[n].begin(), items_[n].end(),
t.begin(),
t.end(),
-
chars_equal_insensitive) != to_filter_items_[n].end())
+
chars_equal_insensitive) != items_[n].end())
{
- filtered_items_.push_back(to_filter_items_[n]);
+ filtered_items_.push_back(items_[n]);
index_map_.push_back(n);
}
}
Modified: trunk/src/construct_dialog.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/construct_dialog.hpp?rev=26909&r1=26908&r2=26909&view=diff
==============================================================================
--- trunk/src/construct_dialog.hpp (original)
+++ trunk/src/construct_dialog.hpp Thu May 29 04:51:32 2008
@@ -122,11 +122,10 @@
class filter_textbox : public gui::dialog_textbox {
public:
filter_textbox(CVideo& video, const std::string& header,
- const std::vector<std::string>& items, const
std::vector<std::string>& to_filter_items,
+ const std::vector<std::string>& items,
dialog& dialog, int width = 250)
: dialog_textbox(new label(video, header), video, width),
items_(items),
- to_filter_items_(to_filter_items),
dialog_(dialog),
first_time_(true)
{
@@ -135,7 +134,7 @@
int get_index(int index) const;
private:
- std::vector<std::string> items_, to_filter_items_, filtered_items_;
+ std::vector<std::string> items_, filtered_items_;
std::vector<int> index_map_;
gui::dialog& dialog_;
bool first_time_;
Modified: trunk/src/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/dialogs.cpp?rev=26909&r1=26908&r2=26909&view=diff
==============================================================================
--- trunk/src/dialogs.cpp (original)
+++ trunk/src/dialogs.cpp Thu May 29 04:51:32 2008
@@ -649,7 +649,7 @@
sorter.set_alpha_sort(0).set_id_sort(1);
lmenu.set_menu(items, &sorter);
- gui::filter_textbox* filter = new gui::filter_textbox(disp.video(),
_("Filter: "), items, items, lmenu);
+ gui::filter_textbox* filter = new gui::filter_textbox(disp.video(),
_("Filter: "), items, lmenu);
lmenu.set_textbox(filter);
save_preview_pane
save_preview(disp.video(),game_config,&map_obj,games,summaries,*filter);
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=26909&r1=26908&r2=26909&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Thu May 29 04:51:32 2008
@@ -1660,7 +1660,7 @@
umenu.set_menu(options, &sorter);
gui::filter_textbox* filter = new
gui::filter_textbox(gui_->video(),
- _("Filter: "), options, options, umenu, 200);
+ _("Filter: "), options, umenu, 200);
umenu.set_textbox(filter);
//sort by race then by type name
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
