X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.h;h=65dfbdddb5f76abfe8467cf99eed03d6fc221f79;hp=a91fbc0e055e41a49aa5c6e98dd753f4593e0083;hb=da13c2af9e8f19229061ca1939cbe8bd37c72eba;hpb=85be674b29dd61fe08a50f0b84c8402e9df61d94

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index a91fbc0e0..65dfbdddb 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -19,6 +19,7 @@
 */
 
 
+#include "lib/collator.h"
 #include "lib/config.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
@@ -38,7 +39,6 @@ namespace dcpomatic {
 
 
 class Cinema;
-struct UCollator;
 
 
 class ScreensPanel : public wxPanel
@@ -58,23 +58,28 @@ private:
 	boost::optional<wxTreeListItem> add_screen (std::shared_ptr<Cinema>, std::shared_ptr<dcpomatic::Screen>);
 	void add_cinema_clicked ();
 	void edit_cinema_clicked ();
+	void edit_cinema(std::shared_ptr<Cinema> cinema);
 	void remove_cinema_clicked ();
 	void add_screen_clicked ();
 	void edit_screen_clicked ();
+	void edit_screen(std::shared_ptr<dcpomatic::Screen> screen);
 	void remove_screen_clicked ();
 	void selection_changed_shim (wxTreeListEvent &);
 	void selection_changed ();
 	void search_changed ();
 	void checkbox_changed (wxTreeListEvent& ev);
+	void item_activated(wxTreeListEvent& ev);
 	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);
 	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 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;
@@ -111,7 +116,7 @@ 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;