X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.h;h=9cf317c5a143becc3489d5474977197ea89c714f;hp=6cfff0a60f44d77bbe687c217a75d07fa253e77b;hb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;hpb=2034a89f30e4a976e44eb8d0a6b4ad6e3100cd4b

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 6cfff0a60..9cf317c5a 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -1,55 +1,66 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2016 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>
+DCPOMATIC_ENABLE_WARNINGS
+#include <wx/srchctrl.h>
 #include <wx/treectrl.h>
 #include <boost/shared_ptr.hpp>
+#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::list<boost::shared_ptr<dcpomatic::Screen> > screens () const;
 	void setup_sensitivity ();
 
 	boost::signals2::signal<void ()> ScreensChanged;
 
 private:
+	void add_cinemas ();
 	void add_cinema (boost::shared_ptr<Cinema>);
-	void add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<Screen>);
+	boost::optional<wxTreeItemId> add_screen (boost::shared_ptr<Cinema>, boost::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 (wxTreeEvent &);
+	void selection_changed_shim (wxTreeEvent &);
+	void selection_changed ();
+	void search_changed ();
 
+	wxSearchCtrl* _search;
 	wxTreeCtrl* _targets;
 	wxButton* _add_cinema;
 	wxButton* _edit_cinema;
@@ -58,6 +69,14 @@ private:
 	wxButton* _edit_screen;
 	wxButton* _remove_screen;
 	wxTreeItemId _root;
-	std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas;
-	std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens;
+
+	typedef std::map<wxTreeItemId, boost::shared_ptr<Cinema> > CinemaMap;
+	typedef std::map<wxTreeItemId, boost::shared_ptr<dcpomatic::Screen> > ScreenMap;
+
+	CinemaMap _cinemas;
+	ScreenMap _screens;
+	CinemaMap _selected_cinemas;
+	ScreenMap _selected_screens;
+
+	bool _ignore_selection_change;
 };