projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: extract sorted_cinemas().
[dcpomatic.git]
/
src
/
wx
/
screens_panel.h
diff --git
a/src/wx/screens_panel.h
b/src/wx/screens_panel.h
index a91fbc0e055e41a49aa5c6e98dd753f4593e0083..b469c19e307dc49d32758588c33489cc32127f80 100644
(file)
--- 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
#include "lib/config.h"
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
@@
-38,7
+39,6
@@
namespace dcpomatic {
class Cinema;
class Cinema;
-struct UCollator;
class ScreensPanel : public wxPanel
class ScreensPanel : public wxPanel
@@
-69,12
+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);
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 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;
std::shared_ptr<Cinema> item_to_cinema (wxTreeListItem item) const;
std::shared_ptr<dcpomatic::Screen> item_to_screen (wxTreeListItem item) const;
@@
-111,7
+113,7
@@
private:
bool _ignore_selection_change = false;
bool _ignore_check_change = false;
bool _ignore_selection_change = false;
bool _ignore_check_change = false;
-
UCollator* _collator = nullpt
r;
+
Collator _collato
r;
boost::signals2::scoped_connection _config_connection;
bool _ignore_cinemas_changed = false;
boost::signals2::scoped_connection _config_connection;
bool _ignore_cinemas_changed = false;