projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: add convert_to_lower() and matches_search().
[dcpomatic.git]
/
src
/
wx
/
screens_panel.h
diff --git
a/src/wx/screens_panel.h
b/src/wx/screens_panel.h
index 1eff50a59b21833f5a33b4a0ce8bdc3007ce271d..73da029d0e4a6f83fa745045b2ddbf7b08a6b332 100644
(file)
--- 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_EN
ABLE_WARNINGS
+#include "lib/
collator
.h"
+#include "lib/config.h"
+#include <
dcp/warnings
.h>
+
LIBDCP_DIS
ABLE_WARNINGS
#include <wx/srchctrl.h>
#include <wx/treelist.h>
#include <wx/srchctrl.h>
#include <wx/treelist.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <list>
#include <map>
#include <boost/signals2.hpp>
#include <list>
#include <map>
@@
-37,7
+39,6
@@
namespace dcpomatic {
class Cinema;
class Cinema;
-struct UCollator;
class ScreensPanel : public wxPanel
class ScreensPanel : public wxPanel
@@
-68,9
+69,13
@@
private:
std::shared_ptr<Cinema> cinema_for_operation () const;
void set_screen_checked (wxTreeListItem item, bool checked);
void setup_cinema_checked_state (wxTreeListItem screen);
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 ();
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::shared_ptr<Cinema> item_to_cinema (wxTreeListItem item) const;
std::shared_ptr<dcpomatic::Screen> item_to_screen (wxTreeListItem item) const;
std::shared_ptr<Cinema> item_to_cinema (wxTreeListItem item) const;
std::shared_ptr<dcpomatic::Screen> item_to_screen (wxTreeListItem item) const;
@@
-107,5
+112,8
@@
private:
bool _ignore_selection_change = false;
bool _ignore_check_change = false;
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;
};
};