X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fscreens_panel.h;h=b469c19e307dc49d32758588c33489cc32127f80;hb=493ed4867d46e03a08905dd7a938a90c3262b58f;hp=bf68870a6f5f71fa03b103b75f3d2431fa7dd552;hpb=06581bf43d6471acc33740a1e8384f71cb8951f2;p=dcpomatic.git

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index bf68870a6..b469c19e3 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -19,12 +19,14 @@
 */
 
 
-#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>
@@ -37,7 +39,6 @@ namespace dcpomatic {
 
 
 class Cinema;
-class UCollator;
 
 
 class ScreensPanel : public wxPanel
@@ -68,10 +69,14 @@ private:
 	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::list<std::shared_ptr<Cinema>> sorted_cinemas() const;
 
 	std::shared_ptr<Cinema> item_to_cinema (wxTreeListItem item) const;
 	std::shared_ptr<dcpomatic::Screen> item_to_screen (wxTreeListItem item) const;
@@ -86,9 +91,8 @@ private:
 	wxButton* _add_screen;
 	wxButton* _edit_screen;
 	wxButton* _remove_screen;
-
-	Cinemas _cinemas;
-	Screens _screens;
+	wxButton* _check_all;
+	wxButton* _uncheck_all;
 
 	/* 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.
@@ -109,5 +113,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;
 };