Use collator to search for screens (#2426).

[dcpomatic.git] / src / wx / screens_panel.h

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 1eff50a59b21833f5a33b4a0ce8bdc3007ce271d..65dfbdddb5f76abfe8467cf99eed03d6fc221f79 100644 (file)
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -19,12 +19,14 @@
 */
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include "lib/collator.h"
+#include "lib/config.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treelist.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>
@@ -37,7 +39,6 @@ namespace dcpomatic {
 
 
 class Cinema;
-struct UCollator;
 
 
 class ScreensPanel : public wxPanel
@@ -57,20 +58,28 @@ private:
        boost::optional<wxTreeListItem> add_screen (std::shared_ptr<Cinema>, std::shared_ptr<dcpomatic::Screen>);
        void add_cinema_clicked ();
        void edit_cinema_clicked ();
+       void edit_cinema(std::shared_ptr<Cinema> cinema);
        void remove_cinema_clicked ();
        void add_screen_clicked ();
        void edit_screen_clicked ();
+       void edit_screen(std::shared_ptr<dcpomatic::Screen> screen);
        void remove_screen_clicked ();
        void selection_changed_shim (wxTreeListEvent &);
        void selection_changed ();
        void search_changed ();
        void checkbox_changed (wxTreeListEvent& ev);
+       void item_activated(wxTreeListEvent& ev);
        std::shared_ptr<Cinema> cinema_for_operation () const;
        void set_screen_checked (wxTreeListItem item, bool checked);
        void setup_cinema_checked_state (wxTreeListItem screen);
-       int compare (std::string const& utf8_a, std::string const& utf8_b);
        void check_all ();
        void uncheck_all ();
+       bool notify_cinemas_changed();
+       void clear_and_re_add();
+       void config_changed(Config::Property);
+       void convert_to_lower(std::string& s);
+       bool matches_search(std::shared_ptr<const Cinema> cinema, std::string search);
+       std::list<std::shared_ptr<Cinema>> sorted_cinemas() const;
 
        std::shared_ptr<Cinema> item_to_cinema (wxTreeListItem item) const;
        std::shared_ptr<dcpomatic::Screen> item_to_screen (wxTreeListItem item) const;
@@ -107,5 +116,8 @@ private:
        bool _ignore_selection_change = false;
        bool _ignore_check_change = false;
 
-       UCollator* _collator = nullptr;
+       Collator _collator;
+
+       boost::signals2::scoped_connection _config_connection;
+       bool _ignore_cinemas_changed = false;
 };