*/
+#include "check_box.h"
#include "cinema_dialog.h"
#include "dcpomatic_button.h"
#include "screen_dialog.h"
#include "screens_panel.h"
-#include "wx_ptr.h"
#include "wx_util.h"
#include "lib/cinema.h"
#include "lib/config.h"
ScreensPanel::ScreensPanel (wxWindow* parent)
: wxPanel (parent, wxID_ANY)
{
- auto sizer = new wxBoxSizer (wxVERTICAL);
+ _overall_sizer = new wxBoxSizer(wxVERTICAL);
+
+ auto search_sizer = new wxBoxSizer(wxHORIZONTAL);
_search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height()));
#ifndef __WXGTK3__
/* The cancel button seems to be strangely broken in GTK3; clicking on it twice sometimes works */
_search->ShowCancelButton (true);
#endif
- sizer->Add (_search, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP);
+ search_sizer->Add(_search, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP);
+
+ _show_only_checked = new CheckBox(this, _("Show only checked"));
+ search_sizer->Add(_show_only_checked, 1, wxEXPAND | wxLEFT | wxBOTTOM, DCPOMATIC_SIZER_GAP);
+
+ _overall_sizer->Add(search_sizer);
auto targets = new wxBoxSizer (wxHORIZONTAL);
_targets = new wxTreeListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTL_MULTIPLE | wxTL_3STATE | wxTL_NO_HEADER);
targets->Add (side_buttons, 0, 0);
- sizer->Add (targets, 1, wxEXPAND);
+ _overall_sizer->Add (targets, 1, wxEXPAND);
- _search->Bind (wxEVT_TEXT, boost::bind (&ScreensPanel::search_changed, this));
+ _search->Bind (wxEVT_TEXT, boost::bind (&ScreensPanel::display_filter_changed, this));
+ _show_only_checked->Bind(wxEVT_CHECKBOX, boost::bind(&ScreensPanel::display_filter_changed, this));
_targets->Bind (wxEVT_TREELIST_SELECTION_CHANGED, &ScreensPanel::selection_changed_shim, this);
_targets->Bind (wxEVT_TREELIST_ITEM_CHECKED, &ScreensPanel::checkbox_changed, this);
+ _targets->Bind (wxEVT_TREELIST_ITEM_ACTIVATED, &ScreensPanel::item_activated, this);
_add_cinema->Bind (wxEVT_BUTTON, boost::bind (&ScreensPanel::add_cinema_clicked, this));
_edit_cinema->Bind (wxEVT_BUTTON, boost::bind (&ScreensPanel::edit_cinema_clicked, this));
_check_all->Bind (wxEVT_BUTTON, boost::bind(&ScreensPanel::check_all, this));
_uncheck_all->Bind (wxEVT_BUTTON, boost::bind(&ScreensPanel::uncheck_all, this));
- SetSizer (sizer);
+ SetSizer(_overall_sizer);
_config_connection = Config::instance()->Changed.connect(boost::bind(&ScreensPanel::config_changed, this, _1));
}
_add_screen->Enable (sc || ss);
_edit_screen->Enable (ss);
_remove_screen->Enable (_selected_screens.size() >= 1);
+
+ _show_only_checked->Enable(!_checked_screens.empty());
}
bool
-ScreensPanel::matches_search(shared_ptr<const Cinema> cinema, string lower_case_search)
+ScreensPanel::matches_search(shared_ptr<const Cinema> cinema, string search)
{
- if (lower_case_search.empty()) {
+ if (search.empty()) {
return true;
}
- auto name = cinema->name;
- convert_to_lower(name);
- return name.find(lower_case_search) != string::npos;
+ return _collator.find(search, cinema->name);
}
optional<wxTreeListItem>
ScreensPanel::add_cinema (shared_ptr<Cinema> cinema, wxTreeListItem previous)
{
- auto search = wx_to_std (_search->GetValue ());
- convert_to_lower(search);
+ auto const search = wx_to_std(_search->GetValue());
if (!matches_search(cinema, search)) {
return {};
}
+ if (_show_only_checked->get()) {
+ auto screens = cinema->screens();
+ auto iter = std::find_if(screens.begin(), screens.end(), [this](shared_ptr<dcpomatic::Screen> screen) {
+ return _checked_screens.find(screen) != _checked_screens.end();
+ });
+ if (iter == screens.end()) {
+ return {};
+ }
+ }
+
auto id = _targets->InsertItem(_targets->GetRootItem(), previous, std_to_wx(cinema->name));
_item_to_cinema[id] = cinema;
void
ScreensPanel::add_cinema_clicked ()
{
- auto dialog = make_wx<CinemaDialog>(GetParent(), _("Add Cinema"));
+ CinemaDialog dialog(GetParent(), _("Add Cinema"));
- if (dialog->ShowModal() == wxID_OK) {
- auto cinema = make_shared<Cinema>(dialog->name(), dialog->emails(), dialog->notes(), dialog->utc_offset_hour(), dialog->utc_offset_minute());
+ if (dialog.ShowModal() == wxID_OK) {
+ auto cinema = make_shared<Cinema>(dialog.name(), dialog.emails(), dialog.notes(), dialog.utc_offset_hour(), dialog.utc_offset_minute());
auto cinemas = sorted_cinemas();
wxTreeListItem previous = wxTLI_FIRST;
bool found = false;
- auto search = wx_to_std(_search->GetValue());
- convert_to_lower(search);
+ auto const search = wx_to_std(_search->GetValue());
for (auto existing_cinema: cinemas) {
if (!matches_search(existing_cinema, search)) {
continue;
}
- if (_collator.compare(dialog->name(), existing_cinema->name) < 0) {
+ if (_collator.compare(dialog.name(), existing_cinema->name) < 0) {
/* existing_cinema should be after the one we're inserting */
found = true;
break;
ScreensPanel::edit_cinema_clicked ()
{
auto cinema = cinema_for_operation ();
- if (!cinema) {
- return;
+ if (cinema) {
+ edit_cinema(cinema);
}
+}
- auto dialog = make_wx<CinemaDialog>(
+
+void
+ScreensPanel::edit_cinema(shared_ptr<Cinema> cinema)
+{
+ CinemaDialog dialog(
GetParent(), _("Edit cinema"), cinema->name, cinema->emails, cinema->notes, cinema->utc_offset_hour(), cinema->utc_offset_minute()
);
- if (dialog->ShowModal() == wxID_OK) {
- cinema->name = dialog->name();
- cinema->emails = dialog->emails();
- cinema->notes = dialog->notes();
- cinema->set_utc_offset_hour(dialog->utc_offset_hour());
- cinema->set_utc_offset_minute(dialog->utc_offset_minute());
+ if (dialog.ShowModal() == wxID_OK) {
+ cinema->name = dialog.name();
+ cinema->emails = dialog.emails();
+ cinema->notes = dialog.notes();
+ cinema->set_utc_offset_hour(dialog.utc_offset_hour());
+ cinema->set_utc_offset_minute(dialog.utc_offset_minute());
notify_cinemas_changed();
auto item = cinema_to_item(cinema);
DCPOMATIC_ASSERT(item);
- _targets->SetItemText (*item, std_to_wx(dialog->name()));
+ _targets->SetItemText (*item, std_to_wx(dialog.name()));
}
}
}
}
- for (auto const& cinema: _selected_cinemas) {
+ auto cinemas_to_remove = _selected_cinemas;
+
+ for (auto const& cinema: cinemas_to_remove) {
_ignore_cinemas_changed = true;
ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; };
+ for (auto screen: cinema->screens()) {
+ _checked_screens.erase(screen);
+ }
Config::instance()->remove_cinema(cinema);
auto item = cinema_to_item(cinema);
DCPOMATIC_ASSERT(item);
}
selection_changed ();
+ setup_show_only_checked();
}
return;
}
- auto dialog = make_wx<ScreenDialog>(GetParent(), _("Add Screen"));
+ ScreenDialog dialog(GetParent(), _("Add Screen"));
- if (dialog->ShowModal () != wxID_OK) {
+ if (dialog.ShowModal () != wxID_OK) {
return;
}
for (auto screen: cinema->screens()) {
- if (screen->name == dialog->name()) {
+ if (screen->name == dialog.name()) {
error_dialog (
GetParent(),
wxString::Format (
_("You cannot add a screen called '%s' as the cinema already has a screen with this name."),
- std_to_wx(dialog->name()).data()
+ std_to_wx(dialog.name()).data()
)
);
return;
}
}
- auto screen = std::make_shared<Screen>(dialog->name(), dialog->notes(), dialog->recipient(), dialog->recipient_file(), dialog->trusted_devices());
+ auto screen = std::make_shared<Screen>(dialog.name(), dialog.notes(), dialog.recipient(), dialog.recipient_file(), dialog.trusted_devices());
cinema->add_screen (screen);
notify_cinemas_changed();
void
ScreensPanel::edit_screen_clicked ()
{
- if (_selected_screens.size() != 1) {
- return;
+ if (_selected_screens.size() == 1) {
+ edit_screen(_selected_screens[0]);
}
+}
- auto edit_screen = _selected_screens[0];
- auto dialog = make_wx<ScreenDialog>(
+void
+ScreensPanel::edit_screen(shared_ptr<Screen> edit_screen)
+{
+ ScreenDialog dialog(
GetParent(), _("Edit screen"),
edit_screen->name,
edit_screen->notes,
edit_screen->trusted_devices
);
- if (dialog->ShowModal() != wxID_OK) {
+ if (dialog.ShowModal() != wxID_OK) {
return;
}
auto cinema = edit_screen->cinema;
for (auto screen: cinema->screens()) {
- if (screen != edit_screen && screen->name == dialog->name()) {
+ if (screen != edit_screen && screen->name == dialog.name()) {
error_dialog (
GetParent(),
wxString::Format (
_("You cannot change this screen's name to '%s' as the cinema already has a screen with this name."),
- std_to_wx(dialog->name()).data()
+ std_to_wx(dialog.name()).data()
)
);
return;
}
}
- edit_screen->name = dialog->name();
- edit_screen->notes = dialog->notes();
- edit_screen->recipient = dialog->recipient();
- edit_screen->recipient_file = dialog->recipient_file();
- edit_screen->trusted_devices = dialog->trusted_devices();
+ edit_screen->name = dialog.name();
+ edit_screen->notes = dialog.notes();
+ edit_screen->recipient = dialog.recipient();
+ edit_screen->recipient_file = dialog.recipient_file();
+ edit_screen->trusted_devices = dialog.trusted_devices();
notify_cinemas_changed();
auto item = screen_to_item(edit_screen);
DCPOMATIC_ASSERT (item);
- _targets->SetItemText (*item, std_to_wx(dialog->name()));
+ _targets->SetItemText(*item, std_to_wx(dialog.name()));
}
}
}
- for (auto const& screen: _selected_screens) {
+ for (auto screen: _selected_screens) {
+ _checked_screens.erase(screen);
screen->cinema->remove_screen(screen);
auto item = screen_to_item(screen);
DCPOMATIC_ASSERT(item);
*/
selection_changed();
notify_cinemas_changed();
+ setup_show_only_checked();
}
}
+/** Search and/or "show only checked" changed */
void
-ScreensPanel::search_changed ()
+ScreensPanel::display_filter_changed()
{
clear_and_re_add();
} else {
_checked_screens.erase(screen);
}
+
+ setup_show_only_checked();
}
clear_and_re_add();
}
}
+
+
+void
+ScreensPanel::item_activated(wxTreeListEvent& ev)
+{
+ auto iter = _item_to_cinema.find(ev.GetItem());
+ if (iter != _item_to_cinema.end()) {
+ edit_cinema(iter->second);
+ } else {
+ auto iter = _item_to_screen.find(ev.GetItem());
+ if (iter != _item_to_screen.end()) {
+ edit_screen(iter->second);
+ }
+ }
+}
+
+
+void
+ScreensPanel::setup_show_only_checked()
+{
+ if (_checked_screens.empty()) {
+ _show_only_checked->set_text(_("Show only checked"));
+ } else {
+ _show_only_checked->set_text(wxString::Format(_("Show only %d checked"), static_cast<int>(_checked_screens.size())));
+ }
+
+ _overall_sizer->Layout();
+ setup_sensitivity();
+}
+