Use a vector<pair<...>> to store screens and cinemas instead of a map.

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

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index f7d81b9615afbd39b93b57dec2d6d391041f5bcf..c0b90dfcf08237d9fa80a96cfb873d962fdcc336 100644 (file)
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -1,62 +1,100 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2022 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <wx/treectrl.h>
-#include <boost/shared_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
+#include <wx/srchctrl.h>
+#include <wx/treelist.h>
+#include <boost/signals2.hpp>
 #include <list>
 #include <map>
 
+
+namespace dcpomatic {
+       class Screen;
+}
+
+
 class Cinema;
-class Screen;
+
 
 class ScreensPanel : public wxPanel
 {
 public:
-       ScreensPanel (wxWindow* parent);
+       explicit ScreensPanel (wxWindow* parent);
+       ~ScreensPanel ();
 
-       std::list<boost::shared_ptr<Screen> > screens () const;
+       std::vector<std::shared_ptr<dcpomatic::Screen>> screens () const;
        void setup_sensitivity ();
 
        boost::signals2::signal<void ()> ScreensChanged;
 
 private:
-       void add_cinema (boost::shared_ptr<Cinema>);
-       void add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<Screen>);
+       void add_cinemas ();
+       boost::optional<wxTreeListItem> add_cinema (std::shared_ptr<Cinema>);
+       boost::optional<wxTreeListItem> add_screen (std::shared_ptr<Cinema>, std::shared_ptr<dcpomatic::Screen>);
        void add_cinema_clicked ();
        void edit_cinema_clicked ();
        void remove_cinema_clicked ();
        void add_screen_clicked ();
        void edit_screen_clicked ();
        void remove_screen_clicked ();
-       std::list<std::pair<wxTreeItemId, boost::shared_ptr<Cinema> > > selected_cinemas () const;
-       std::list<std::pair<wxTreeItemId, boost::shared_ptr<Screen> > > selected_screens () const;
+       void selection_changed_shim (wxTreeListEvent &);
        void selection_changed ();
+       void search_changed ();
+       void checkbox_changed (wxTreeListEvent& ev);
+       boost::optional<std::pair<wxTreeListItem, std::shared_ptr<Cinema>>> cinema_for_operation () const;
 
-       wxTreeCtrl* _targets;
+       typedef std::vector<std::pair<wxTreeListItem, std::shared_ptr<Cinema>>> Cinemas;
+       typedef std::vector<std::pair<wxTreeListItem, std::shared_ptr<dcpomatic::Screen>>> Screens;
+
+       Cinemas::iterator cinema_by_tree_list_item (wxTreeListItem item);
+       Screens::const_iterator screen_by_tree_list_item (wxTreeListItem item) const;
+
+       wxSearchCtrl* _search;
+       wxTreeListCtrl* _targets;
        wxButton* _add_cinema;
        wxButton* _edit_cinema;
        wxButton* _remove_cinema;
        wxButton* _add_screen;
        wxButton* _edit_screen;
        wxButton* _remove_screen;
-       wxTreeItemId _root;
-       std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas;
-       std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens;
+
+       Cinemas _cinemas;
+       Screens _screens;
+       Cinemas _selected_cinemas;
+       Screens _selected_screens;
+
+       bool _ignore_selection_change;
+
+       class Comparator : public wxTreeListItemComparator
+       {
+       public:
+               int Compare (wxTreeListCtrl* tree_list, unsigned, wxTreeListItem a, wxTreeListItem b) override
+               {
+                       return strcoll(wx_to_std(tree_list->GetItemText(a)).c_str(), wx_to_std(tree_list->GetItemText(b)).c_str());
+               }
+       };
+
+       Comparator _comparator;
 };