X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=2075515f353fe46edae7eb3b02ec13ae0064508f;hb=f1f30972e5d1dee08a607a05b6d782540c11595e;hp=908e94f4dab8b0bbb5d2f46796705f0a76d63846;hpb=e340b96b4a33725e70e3703b0c60ba8da95bca3b;p=dcpomatic.git diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index 908e94f4d..2075515f3 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2016 Carl Hetherington + Copyright (C) 2015-2022 Carl Hetherington This file is part of DCP-o-matic. @@ -18,53 +18,65 @@ */ -#include "lib/config.h" -#include "lib/cinema.h" -#include "lib/screen.h" -#include "screens_panel.h" -#include "wx_util.h" + #include "cinema_dialog.h" +#include "dcpomatic_button.h" #include "screen_dialog.h" -#include +#include "screens_panel.h" +#include "wx_util.h" +#include "lib/cinema.h" +#include "lib/config.h" +#include "lib/screen.h" + -using std::list; -using std::pair; using std::cout; +using std::make_pair; +using std::make_shared; using std::map; +using std::pair; +using std::shared_ptr; using std::string; -using std::make_pair; -using boost::shared_ptr; +using std::vector; using boost::optional; +using namespace dcpomatic; + ScreensPanel::ScreensPanel (wxWindow* parent) : wxPanel (parent, wxID_ANY) , _ignore_selection_change (false) { - wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto sizer = new wxBoxSizer (wxVERTICAL); - _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (200, -1)); + _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); - wxBoxSizer* targets = new wxBoxSizer (wxHORIZONTAL); - _targets = new wxTreeCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_MULTIPLE | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT); + auto targets = new wxBoxSizer (wxHORIZONTAL); + _targets = new wxTreeListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTL_MULTIPLE | wxTL_3STATE | wxTL_NO_HEADER); + _targets->AppendColumn (wxT("foo")); + _targets->SetSortColumn (0); + _targets->SetItemComparator (&_comparator); + targets->Add (_targets, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); add_cinemas (); - wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL); + auto target_buttons = new wxBoxSizer (wxVERTICAL); - _add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema...")); + _add_cinema = new Button (this, _("Add Cinema...")); target_buttons->Add (_add_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - _edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema...")); + _edit_cinema = new Button (this, _("Edit Cinema...")); target_buttons->Add (_edit_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - _remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema")); + _remove_cinema = new Button (this, _("Remove Cinema")); target_buttons->Add (_remove_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - _add_screen = new wxButton (this, wxID_ANY, _("Add Screen...")); + _add_screen = new Button (this, _("Add Screen...")); target_buttons->Add (_add_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - _edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen...")); + _edit_screen = new Button (this, _("Edit Screen...")); target_buttons->Add (_edit_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - _remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen")); + _remove_screen = new Button (this, _("Remove Screen")); target_buttons->Add (_remove_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); targets->Add (target_buttons, 0, 0); @@ -72,7 +84,8 @@ ScreensPanel::ScreensPanel (wxWindow* parent) sizer->Add (targets, 1, wxEXPAND); _search->Bind (wxEVT_TEXT, boost::bind (&ScreensPanel::search_changed, this)); - _targets->Bind (wxEVT_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, this); + _targets->Bind (wxEVT_TREELIST_SELECTION_CHANGED, &ScreensPanel::selection_changed_shim, this); + _targets->Bind (wxEVT_TREELIST_ITEM_CHECKED, &ScreensPanel::checkbox_changed, 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)); @@ -85,132 +98,167 @@ ScreensPanel::ScreensPanel (wxWindow* parent) SetSizer (sizer); } + ScreensPanel::~ScreensPanel () { - _targets->Unbind (wxEVT_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, this); + _targets->Unbind (wxEVT_TREELIST_SELECTION_CHANGED, &ScreensPanel::selection_changed_shim, this); + _targets->Unbind (wxEVT_TREELIST_ITEM_CHECKED, &ScreensPanel::checkbox_changed, this); } + void ScreensPanel::setup_sensitivity () { bool const sc = _selected_cinemas.size() == 1; bool const ss = _selected_screens.size() == 1; - _edit_cinema->Enable (sc); + _edit_cinema->Enable (sc || ss); _remove_cinema->Enable (_selected_cinemas.size() >= 1); - _add_screen->Enable (sc); + _add_screen->Enable (sc || ss); _edit_screen->Enable (ss); _remove_screen->Enable (_selected_screens.size() >= 1); } -void -ScreensPanel::add_cinema (shared_ptr c) + +optional +ScreensPanel::add_cinema (shared_ptr cinema) { - string search = wx_to_std (_search->GetValue ()); + auto search = wx_to_std (_search->GetValue ()); transform (search.begin(), search.end(), search.begin(), ::tolower); if (!search.empty ()) { - string name = c->name; + auto name = cinema->name; transform (name.begin(), name.end(), name.begin(), ::tolower); if (name.find (search) == string::npos) { - return; + return {}; } } - _cinemas[_targets->AppendItem (_root, std_to_wx (c->name))] = c; + auto id = _targets->AppendItem(_targets->GetRootItem(), std_to_wx(cinema->name)); - list > sc = c->screens (); - for (list >::iterator i = sc.begin(); i != sc.end(); ++i) { - add_screen (c, *i); + _cinemas.push_back(make_pair(id, cinema)); + + for (auto screen: cinema->screens()) { + add_screen (cinema, screen); } - _targets->SortChildren (_root); + return id; } -optional -ScreensPanel::add_screen (shared_ptr c, shared_ptr s) + +optional +ScreensPanel::add_screen (shared_ptr cinema, shared_ptr screen) { - CinemaMap::const_iterator i = _cinemas.begin(); - while (i != _cinemas.end() && i->second != c) { - ++i; + auto cinema_iter = _cinemas.begin(); + while (cinema_iter != _cinemas.end() && cinema_iter->second != cinema) { + ++cinema_iter; } - if (i == _cinemas.end()) { - return optional (); + if (cinema_iter == _cinemas.end()) { + return {}; } - _screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s; - return i->first; + _screens.push_back(make_pair(_targets->AppendItem(cinema_iter->first, std_to_wx(screen->name)), screen)); + return cinema_iter->first; } + void ScreensPanel::add_cinema_clicked () { - CinemaDialog* d = new CinemaDialog (GetParent(), _("Add Cinema")); + auto d = new CinemaDialog (GetParent(), _("Add Cinema")); if (d->ShowModal () == wxID_OK) { - shared_ptr c (new Cinema (d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute())); - Config::instance()->add_cinema (c); - add_cinema (c); + auto cinema = make_shared(d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute()); + Config::instance()->add_cinema (cinema); + auto id = add_cinema (cinema); + if (id) { + _targets->UnselectAll (); + _targets->Select (*id); + } } d->Destroy (); } + +optional>> +ScreensPanel::cinema_for_operation () const +{ + if (_selected_cinemas.size() == 1) { + return make_pair(_selected_cinemas.begin()->first, _selected_cinemas.begin()->second); + } else if (_selected_screens.size() == 1) { + return make_pair(_targets->GetItemParent(_selected_screens.begin()->first), _selected_screens.begin()->second->cinema); + } + + return {}; +} + + void ScreensPanel::edit_cinema_clicked () { - if (_selected_cinemas.size() != 1) { + auto cinema = cinema_for_operation (); + if (!cinema) { return; } - pair > c = *_selected_cinemas.begin(); - - CinemaDialog* d = new CinemaDialog ( - GetParent(), _("Edit cinema"), c.second->name, c.second->emails, c.second->notes, c.second->utc_offset_hour(), c.second->utc_offset_minute() + auto d = new CinemaDialog ( + GetParent(), _("Edit cinema"), cinema->second->name, cinema->second->emails, cinema->second->notes, cinema->second->utc_offset_hour(), cinema->second->utc_offset_minute() ); - if (d->ShowModal () == wxID_OK) { - c.second->name = d->name (); - c.second->emails = d->emails (); - c.second->notes = d->notes (); - c.second->set_utc_offset_hour (d->utc_offset_hour ()); - c.second->set_utc_offset_minute (d->utc_offset_minute ()); - _targets->SetItemText (c.first, std_to_wx (d->name())); + if (d->ShowModal() == wxID_OK) { + cinema->second->name = d->name (); + cinema->second->emails = d->emails (); + cinema->second->notes = d->notes (); + cinema->second->set_utc_offset_hour (d->utc_offset_hour ()); + cinema->second->set_utc_offset_minute (d->utc_offset_minute ()); + _targets->SetItemText (cinema->first, std_to_wx(d->name())); Config::instance()->changed (Config::CINEMAS); } d->Destroy (); } + void ScreensPanel::remove_cinema_clicked () { - for (CinemaMap::iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) { - Config::instance()->remove_cinema (i->second); - _targets->Delete (i->first); + if (_selected_cinemas.size() == 1) { + if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove the cinema '%s'?"), std_to_wx(_selected_cinemas.begin()->second->name)))) { + return; + } + } else { + if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove %d cinemas?"), int(_selected_cinemas.size())))) { + return; + } + } + + for (auto const& i: _selected_cinemas) { + Config::instance()->remove_cinema (i.second); + _targets->DeleteItem (i.first); } selection_changed (); } + void ScreensPanel::add_screen_clicked () { - if (_selected_cinemas.size() != 1) { + auto cinema = cinema_for_operation (); + if (!cinema) { return; } - shared_ptr c = _selected_cinemas.begin()->second; - - ScreenDialog* d = new ScreenDialog (GetParent(), _("Add Screen")); + auto d = new ScreenDialog (GetParent(), _("Add Screen")); if (d->ShowModal () != wxID_OK) { d->Destroy (); return; } - BOOST_FOREACH (shared_ptr i, c->screens ()) { - if (i->name == d->name()) { + for (auto screen: cinema->second->screens()) { + if (screen->name == d->name()) { error_dialog ( GetParent(), wxString::Format ( @@ -222,9 +270,9 @@ ScreensPanel::add_screen_clicked () } } - shared_ptr s (new Screen (d->name(), d->recipient(), d->trusted_devices())); - c->add_screen (s); - optional id = add_screen (c, s); + auto screen = std::make_shared(d->name(), d->notes(), d->recipient(), d->recipient_file(), d->trusted_devices()); + cinema->second->add_screen (screen); + auto id = add_screen (cinema->second, screen); if (id) { _targets->Expand (id.get ()); } @@ -234,6 +282,7 @@ ScreensPanel::add_screen_clicked () d->Destroy (); } + void ScreensPanel::edit_screen_clicked () { @@ -241,17 +290,25 @@ ScreensPanel::edit_screen_clicked () return; } - pair > s = *_selected_screens.begin(); + auto edit_screen = *_selected_screens.begin(); - ScreenDialog* d = new ScreenDialog (GetParent(), _("Edit screen"), s.second->name, s.second->notes, s.second->recipient, s.second->trusted_devices); - if (d->ShowModal () != wxID_OK) { + auto d = new ScreenDialog ( + GetParent(), _("Edit screen"), + edit_screen.second->name, + edit_screen.second->notes, + edit_screen.second->recipient, + edit_screen.second->recipient_file, + edit_screen.second->trusted_devices + ); + + if (d->ShowModal() != wxID_OK) { d->Destroy (); return; } - shared_ptr c = s.second->cinema; - BOOST_FOREACH (shared_ptr i, c->screens ()) { - if (i != s.second && i->name == d->name()) { + auto cinema = edit_screen.second->cinema; + for (auto screen: cinema->screens()) { + if (screen != edit_screen.second && screen->name == d->name()) { error_dialog ( GetParent(), wxString::Format ( @@ -263,24 +320,36 @@ ScreensPanel::edit_screen_clicked () } } - s.second->name = d->name (); - s.second->notes = d->notes (); - s.second->recipient = d->recipient (); - s.second->trusted_devices = d->trusted_devices (); - _targets->SetItemText (s.first, std_to_wx (d->name())); + edit_screen.second->name = d->name (); + edit_screen.second->notes = d->notes (); + edit_screen.second->recipient = d->recipient (); + edit_screen.second->recipient_file = d->recipient_file (); + edit_screen.second->trusted_devices = d->trusted_devices (); + _targets->SetItemText (edit_screen.first, std_to_wx(d->name())); Config::instance()->changed (Config::CINEMAS); d->Destroy (); } + void ScreensPanel::remove_screen_clicked () { - for (ScreenMap::iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) { - CinemaMap::iterator j = _cinemas.begin (); + if (_selected_screens.size() == 1) { + if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove the screen '%s'?"), std_to_wx(_selected_screens.begin()->second->name)))) { + return; + } + } else { + if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove %d screens?"), int(_selected_screens.size())))) { + return; + } + } + + for (auto const& i: _selected_screens) { + auto j = _cinemas.begin (); while (j != _cinemas.end ()) { - list > sc = j->second->screens (); - if (find (sc.begin(), sc.end(), i->second) != sc.end ()) { + auto sc = j->second->screens (); + if (find (sc.begin(), sc.end(), i.second) != sc.end ()) { break; } @@ -291,41 +360,39 @@ ScreensPanel::remove_screen_clicked () continue; } - j->second->remove_screen (i->second); - _targets->Delete (i->first); + j->second->remove_screen (i.second); + _targets->DeleteItem (i.first); } Config::instance()->changed (Config::CINEMAS); } -list > + +vector> ScreensPanel::screens () const { - list > s; + vector> output; - for (CinemaMap::const_iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) { - list > sc = i->second->screens (); - for (list >::const_iterator j = sc.begin(); j != sc.end(); ++j) { - s.push_back (*j); + for (auto item = _targets->GetFirstItem(); item.IsOk(); item = _targets->GetNextItem(item)) { + if (_targets->GetCheckedState(item) == wxCHK_CHECKED) { + auto screen_iter = screen_by_tree_list_item(item); + if (screen_iter != _screens.end()) { + output.push_back (screen_iter->second); + } } } - for (ScreenMap::const_iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) { - s.push_back (i->second); - } - - s.sort (); - s.unique (); - - return s; + return output; } + void -ScreensPanel::selection_changed_shim (wxTreeEvent &) +ScreensPanel::selection_changed_shim (wxTreeListEvent &) { selection_changed (); } + void ScreensPanel::selection_changed () { @@ -333,37 +400,36 @@ ScreensPanel::selection_changed () return; } - wxArrayTreeItemIds s; - _targets->GetSelections (s); + wxTreeListItems selection; + _targets->GetSelections (selection); _selected_cinemas.clear (); _selected_screens.clear (); - for (size_t i = 0; i < s.GetCount(); ++i) { - CinemaMap::const_iterator j = _cinemas.find (s[i]); - if (j != _cinemas.end ()) { - _selected_cinemas[j->first] = j->second; + for (size_t i = 0; i < selection.size(); ++i) { + auto cinema = cinema_by_tree_list_item(selection[i]); + if (cinema != _cinemas.end ()) { + _selected_cinemas.push_back(*cinema); } - ScreenMap::const_iterator k = _screens.find (s[i]); - if (k != _screens.end ()) { - _selected_screens[k->first] = k->second; + auto screen = screen_by_tree_list_item(selection[i]); + if (screen != _screens.end ()) { + _selected_screens.push_back(*screen); } } setup_sensitivity (); - ScreensChanged (); } + void ScreensPanel::add_cinemas () { - _root = _targets->AddRoot ("Foo"); - - BOOST_FOREACH (shared_ptr i, Config::instance()->cinemas ()) { - add_cinema (i); + for (auto cinema: Config::instance()->cinemas()) { + add_cinema (cinema); } } + void ScreensPanel::search_changed () { @@ -375,28 +441,85 @@ ScreensPanel::search_changed () _ignore_selection_change = true; - for (CinemaMap::const_iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) { - /* The wxTreeItemIds will now be different, so we must search by cinema */ - CinemaMap::const_iterator j = _cinemas.begin (); - while (j != _cinemas.end() && j->second != i->second) { - ++j; + for (auto const& selection: _selected_cinemas) { + /* The wxTreeListItems will now be different, so we must search by cinema */ + auto cinema = _cinemas.begin (); + while (cinema != _cinemas.end() && cinema->second != selection.second) { + ++cinema; } - if (j != _cinemas.end ()) { - _targets->SelectItem (j->first); + if (cinema != _cinemas.end()) { + _targets->Select (cinema->first); } } - for (ScreenMap::const_iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) { - ScreenMap::const_iterator j = _screens.begin (); - while (j != _screens.end() && j->second != i->second) { - ++j; + for (auto const& selection: _selected_screens) { + auto screen = _screens.begin (); + while (screen != _screens.end() && screen->second != selection.second) { + ++screen; } - if (j != _screens.end ()) { - _targets->SelectItem (j->first); + if (screen != _screens.end()) { + _targets->Select (screen->first); } } _ignore_selection_change = false; } + + +void +ScreensPanel::checkbox_changed (wxTreeListEvent& ev) +{ + auto cinema_iter = cinema_by_tree_list_item(ev.GetItem()); + if (cinema_iter != _cinemas.end()) { + /* Cinema: check/uncheck all children */ + auto const checked = _targets->GetCheckedState(ev.GetItem()); + for (auto child = _targets->GetFirstChild(ev.GetItem()); child.IsOk(); child = _targets->GetNextSibling(child)) { + _targets->CheckItem(child, checked); + } + } else { + /* Screen: set cinema to checked/unchecked/3state */ + auto parent = _targets->GetItemParent(ev.GetItem()); + DCPOMATIC_ASSERT (parent.IsOk()); + int checked = 0; + int unchecked = 0; + for (auto child = _targets->GetFirstChild(parent); child.IsOk(); child = _targets->GetNextSibling(child)) { + if (_targets->GetCheckedState(child) == wxCHK_CHECKED) { + ++checked; + } else { + ++unchecked; + } + } + if (checked == 0) { + _targets->CheckItem(parent, wxCHK_UNCHECKED); + } else if (unchecked == 0) { + _targets->CheckItem(parent, wxCHK_CHECKED); + } else { + _targets->CheckItem(parent, wxCHK_UNDETERMINED); + } + } + + ScreensChanged (); +} + + +ScreensPanel::Cinemas::iterator +ScreensPanel::cinema_by_tree_list_item (wxTreeListItem item) +{ + return std::find_if( + _cinemas.begin(), _cinemas.end(), + [item](pair> const& s) { return s.first == item; } + ); +} + + +ScreensPanel::Screens::const_iterator +ScreensPanel::screen_by_tree_list_item (wxTreeListItem item) const +{ + return std::find_if( + _screens.begin(), _screens.end(), + [item](pair> const& s) { return s.first == item; } + ); +} +