Cleanup: add convert_to_lower() and matches_search().

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

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 7a075bf49069008aa599d30bed2991653f3b0464..73da029d0e4a6f83fa745045b2ddbf7b08a6b332 100644 (file)
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -19,15 +19,18 @@
 */
 
 
-#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>
+#include <set>
 
 
 namespace dcpomatic {
@@ -36,7 +39,6 @@ namespace dcpomatic {
 
 
 class Cinema;
-class UCollator;
 
 
 class ScreensPanel : public wxPanel
@@ -64,13 +66,16 @@ private:
        void selection_changed ();
        void search_changed ();
        void checkbox_changed (wxTreeListEvent& ev);
-       boost::optional<std::pair<wxTreeListItem, std::shared_ptr<Cinema>>> cinema_for_operation () const;
+       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);
-
-       typedef std::vector<std::pair<wxTreeListItem, std::shared_ptr<Cinema>>> Cinemas;
-       typedef std::vector<std::pair<wxTreeListItem, std::shared_ptr<dcpomatic::Screen>>> Screens;
+       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 lower_case_search);
 
        std::shared_ptr<Cinema> item_to_cinema (wxTreeListItem item) const;
        std::shared_ptr<dcpomatic::Screen> item_to_screen (wxTreeListItem item) const;
@@ -85,19 +90,19 @@ private:
        wxButton* _add_screen;
        wxButton* _edit_screen;
        wxButton* _remove_screen;
+       wxButton* _check_all;
+       wxButton* _uncheck_all;
 
-       Cinemas _cinemas;
-       Screens _screens;
        /* We want to be able to search (and so remove selected things from the view)
         * but not deselect them, so we maintain lists of selected cinemas and screens.
         */
-       Cinemas _selected_cinemas;
-       Screens _selected_screens;
+       std::vector<std::shared_ptr<Cinema>> _selected_cinemas;
+       std::vector<std::shared_ptr<dcpomatic::Screen>> _selected_screens;
        /* Likewise with checked screens, except that we can work out which cinemas
         * are checked from which screens are checked, so we don't need to store the
         * cinemas.
         */
-       Screens _checked_screens;
+       std::set<std::shared_ptr<dcpomatic::Screen>> _checked_screens;
 
        std::map<wxTreeListItem, std::shared_ptr<Cinema>> _item_to_cinema;
        std::map<wxTreeListItem, std::shared_ptr<dcpomatic::Screen>> _item_to_screen;
@@ -107,5 +112,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;
 };