Implemented SearchCtrl class instead of SearchComboBox

Search string are synchronized between Plater and Tabs.

List with options and filtered list are in Sidebar.
All options list on tabs and Plater use this data from Sidebar

Note: SearchComboBox.cpp(hpp) was renamed to Search.cpp(hpp)
This commit is contained in:
YuSanka 2020-04-03 10:01:23 +02:00
parent 5f31d9ed41
commit 5ca6b9f8d0
9 changed files with 283 additions and 48 deletions

View file

@ -33,7 +33,7 @@
#include "Event.hpp"
#include "wxExtensions.hpp"
#include "ConfigManipulation.hpp"
#include "SearchComboBox.hpp"
#include "Search.hpp"
namespace Slic3r {
namespace GUI {
@ -122,7 +122,8 @@ protected:
std::string m_name;
const wxString m_title;
PresetBitmapComboBox* m_presets_choice;
SearchComboBox* m_search_cb;
// SearchComboBox* m_search_cb;
SearchCtrl* m_search;
ScalableButton* m_btn_save_preset;
ScalableButton* m_btn_delete_preset;
ScalableButton* m_btn_hide_incompatible_presets;
@ -308,9 +309,11 @@ public:
DynamicPrintConfig* get_config() { return m_config; }
PresetCollection* get_presets() { return m_presets; }
SearchComboBox* get_search_cb() { return m_search_cb; }
// SearchComboBox* get_search_cb() { return m_search_cb; }
size_t get_selected_preset_item() { return m_selected_preset_item; }
void set_search_line(const std::string& search_line);
void on_value_change(const std::string& opt_key, const boost::any& value);
void update_wiping_button_visibility();