X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.h;h=73da029d0e4a6f83fa745045b2ddbf7b08a6b332;hp=1eff50a59b21833f5a33b4a0ce8bdc3007ce271d;hb=ed0b5670e65647a9f0555ed66f81125678d193a7;hpb=a1f9a0afa98dda1bcc4c730ebb03efb25bbb38ca;ds=sidebyside diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h index 1eff50a59..73da029d0 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 -DCPOMATIC_ENABLE_WARNINGS +#include "lib/collator.h" +#include "lib/config.h" +#include +LIBDCP_DISABLE_WARNINGS #include #include +#include +LIBDCP_ENABLE_WARNINGS #include #include #include @@ -37,7 +39,6 @@ namespace dcpomatic { class Cinema; -struct UCollator; class ScreensPanel : public wxPanel @@ -68,9 +69,13 @@ private: std::shared_ptr 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 cinema, std::string lower_case_search); std::shared_ptr item_to_cinema (wxTreeListItem item) const; std::shared_ptr item_to_screen (wxTreeListItem item) const; @@ -107,5 +112,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; };