Allow editing of a screen's cinema / adding a new screen when

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

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 69d74b13bb6f1f26652a04be2275d17268e84ed5..4885a84541eb42703f7b25f0b0601dca6a584a60 100644 (file)
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -23,8 +23,7 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <wx/srchctrl.h>
-#include <wx/treectrl.h>
-#include <boost/shared_ptr.hpp>
+#include <wx/treelist.h>
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>
@@ -33,45 +32,67 @@ namespace dcpomatic {
        class Screen;
 }
 
+
 class Cinema;
 
+
+/** Shim around wxTreeListCtrl so we can use strcoll() to compare things */
+class TreeListCtrl : public wxTreeListCtrl
+{
+public:
+       wxDECLARE_DYNAMIC_CLASS (TreeListCtrl);
+
+       TreeListCtrl () {}
+
+       TreeListCtrl (wxWindow* parent)
+               : wxTreeListCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTL_MULTIPLE | wxTL_3STATE | wxTL_NO_HEADER)
+       {}
+
+       virtual ~TreeListCtrl () {}
+
+private:
+       int OnCompareItems (wxTreeListItem const& a, wxTreeListItem const& b);
+};
+
+
 class ScreensPanel : public wxPanel
 {
 public:
        explicit ScreensPanel (wxWindow* parent);
        ~ScreensPanel ();
 
-       std::list<boost::shared_ptr<dcpomatic::Screen> > screens () const;
+       std::vector<std::shared_ptr<dcpomatic::Screen>> screens () const;
        void setup_sensitivity ();
 
        boost::signals2::signal<void ()> ScreensChanged;
 
 private:
        void add_cinemas ();
-       boost::optional<wxTreeItemId> add_cinema (boost::shared_ptr<Cinema>);
-       boost::optional<wxTreeItemId> add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<dcpomatic::Screen>);
+       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 ();
-       void selection_changed_shim (wxTreeEvent &);
+       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;
 
        wxSearchCtrl* _search;
-       wxTreeCtrl* _targets;
+       TreeListCtrl* _targets;
        wxButton* _add_cinema;
        wxButton* _edit_cinema;
        wxButton* _remove_cinema;
        wxButton* _add_screen;
        wxButton* _edit_screen;
        wxButton* _remove_screen;
-       wxTreeItemId _root;
 
-       typedef std::map<wxTreeItemId, boost::shared_ptr<Cinema> > CinemaMap;
-       typedef std::map<wxTreeItemId, boost::shared_ptr<dcpomatic::Screen> > ScreenMap;
+       typedef std::map<wxTreeListItem, std::shared_ptr<Cinema>> CinemaMap;
+       typedef std::map<wxTreeListItem, std::shared_ptr<dcpomatic::Screen>> ScreenMap;
 
        CinemaMap _cinemas;
        ScreenMap _screens;