Speed things up by sorting before adding cinemas.

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

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index a00e5d39f28e2f1483bcf297db0397bb0b84a0c7..7a075bf49069008aa599d30bed2991653f3b0464 100644 (file)
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -52,7 +52,7 @@ public:
 
 private:
        void add_cinemas ();
-       boost::optional<wxTreeListItem> add_cinema (std::shared_ptr<Cinema>);
+       boost::optional<wxTreeListItem> add_cinema (std::shared_ptr<Cinema>, wxTreeListItem previous);
        boost::optional<wxTreeListItem> add_screen (std::shared_ptr<Cinema>, std::shared_ptr<dcpomatic::Screen>);
        void add_cinema_clicked ();
        void edit_cinema_clicked ();
@@ -65,6 +65,9 @@ private:
        void search_changed ();
        void checkbox_changed (wxTreeListEvent& ev);
        boost::optional<std::pair<wxTreeListItem, 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;
@@ -85,27 +88,24 @@ private:
 
        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;
+       /* 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::map<wxTreeListItem, std::shared_ptr<Cinema>> _item_to_cinema;
        std::map<wxTreeListItem, std::shared_ptr<dcpomatic::Screen>> _item_to_screen;
        std::map<std::shared_ptr<Cinema>, wxTreeListItem> _cinema_to_item;
        std::map<std::shared_ptr<dcpomatic::Screen>, wxTreeListItem> _screen_to_item;
 
-       bool _ignore_selection_change;
+       bool _ignore_selection_change = false;
+       bool _ignore_check_change = false;
 
-       class Comparator : public wxTreeListItemComparator
-       {
-       public:
-               Comparator ();
-               ~Comparator ();
-
-               int Compare (wxTreeListCtrl* tree_list, unsigned, wxTreeListItem a, wxTreeListItem b) override;
-
-       private:
-               UCollator* _collator;
-       };
-
-       Comparator _comparator;
+       UCollator* _collator = nullptr;
 };