/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
using std::string;
using std::make_pair;
using boost::shared_ptr;
+using boost::optional;
ScreensPanel::ScreensPanel (wxWindow* parent)
: wxPanel (parent, wxID_ANY)
add_cinemas ();
- _targets->ExpandAll ();
-
wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL);
_add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema..."));
sizer->Add (targets, 1, wxEXPAND);
_search->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ScreensPanel::search_changed, this));
- _targets->Bind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this);
+ _targets->Bind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, this);
_add_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::add_cinema_clicked, this));
_edit_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::edit_cinema_clicked, this));
ScreensPanel::~ScreensPanel ()
{
- _targets->Unbind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this);
-}
-
-list<pair<wxTreeItemId, shared_ptr<Cinema> > >
-ScreensPanel::selected_cinemas () const
-{
- wxArrayTreeItemIds s;
- _targets->GetSelections (s);
-
- list<pair<wxTreeItemId, shared_ptr<Cinema> > > c;
- for (size_t i = 0; i < s.GetCount(); ++i) {
- map<wxTreeItemId, shared_ptr<Cinema> >::const_iterator j = _cinemas.find (s[i]);
- if (j != _cinemas.end ()) {
- c.push_back (make_pair (j->first, j->second));
- }
- }
-
- return c;
-}
-
-list<pair<wxTreeItemId, shared_ptr<Screen> > >
-ScreensPanel::selected_screens () const
-{
- wxArrayTreeItemIds s;
- _targets->GetSelections (s);
-
- list<pair<wxTreeItemId, shared_ptr<Screen> > > c;
- for (size_t i = 0; i < s.GetCount(); ++i) {
- map<wxTreeItemId, shared_ptr<Screen> >::const_iterator j = _screens.find (s[i]);
- if (j != _screens.end ()) {
- c.push_back (make_pair (j->first, j->second));
- }
- }
-
- return c;
+ _targets->Unbind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, this);
}
void
ScreensPanel::setup_sensitivity ()
{
- bool const sc = selected_cinemas().size() == 1;
- bool const ss = selected_screens().size() == 1;
+ bool const sc = _selected_cinemas.size() == 1;
+ bool const ss = _selected_screens.size() == 1;
_edit_cinema->Enable (sc);
- _remove_cinema->Enable (sc);
+ _remove_cinema->Enable (_selected_cinemas.size() >= 1);
_add_screen->Enable (sc);
_edit_screen->Enable (ss);
- _remove_screen->Enable (ss);
+ _remove_screen->Enable (_selected_screens.size() >= 1);
}
void
_targets->SortChildren (_root);
}
-void
+optional<wxTreeItemId>
ScreensPanel::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
{
- map<wxTreeItemId, shared_ptr<Cinema> >::const_iterator i = _cinemas.begin();
+ CinemaMap::const_iterator i = _cinemas.begin();
while (i != _cinemas.end() && i->second != c) {
++i;
}
if (i == _cinemas.end()) {
- return;
+ return optional<wxTreeItemId> ();
}
_screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s;
- _targets->Expand (i->first);
+ return i->first;
}
void
{
CinemaDialog* d = new CinemaDialog (this, "Add Cinema");
if (d->ShowModal () == wxID_OK) {
- shared_ptr<Cinema> c (new Cinema (d->name(), d->emails()));
+ shared_ptr<Cinema> c (new Cinema (d->name(), d->emails(), d->utc_offset_hour(), d->utc_offset_minute()));
Config::instance()->add_cinema (c);
add_cinema (c);
}
void
ScreensPanel::edit_cinema_clicked ()
{
- if (selected_cinemas().size() != 1) {
+ if (_selected_cinemas.size() != 1) {
return;
}
- pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
+ pair<wxTreeItemId, shared_ptr<Cinema> > c = *_selected_cinemas.begin();
- CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->emails);
+ CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->emails, c.second->utc_offset_hour(), c.second->utc_offset_minute());
if (d->ShowModal () == wxID_OK) {
c.second->name = d->name ();
c.second->emails = d->emails ();
+ 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()));
Config::instance()->changed ();
}
void
ScreensPanel::remove_cinema_clicked ()
{
- if (selected_cinemas().size() != 1) {
- return;
+ for (CinemaMap::iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) {
+ Config::instance()->remove_cinema (i->second);
+ _targets->Delete (i->first);
}
- pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
-
- Config::instance()->remove_cinema (c.second);
- _targets->Delete (c.first);
+ selection_changed ();
}
void
ScreensPanel::add_screen_clicked ()
{
- if (selected_cinemas().size() != 1) {
+ if (_selected_cinemas.size() != 1) {
return;
}
- shared_ptr<Cinema> c = selected_cinemas().front().second;
+ shared_ptr<Cinema> c = _selected_cinemas.begin()->second;
ScreenDialog* d = new ScreenDialog (this, "Add Screen");
if (d->ShowModal () != wxID_OK) {
shared_ptr<Screen> s (new Screen (d->name(), d->recipient(), d->trusted_devices()));
c->add_screen (s);
- add_screen (c, s);
+ optional<wxTreeItemId> id = add_screen (c, s);
+ if (id) {
+ _targets->Expand (id.get ());
+ }
Config::instance()->changed ();
void
ScreensPanel::edit_screen_clicked ()
{
- if (selected_screens().size() != 1) {
+ if (_selected_screens.size() != 1) {
return;
}
- pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
+ pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->recipient, s.second->trusted_devices);
if (d->ShowModal () == wxID_OK) {
void
ScreensPanel::remove_screen_clicked ()
{
- if (selected_screens().size() != 1) {
- return;
- }
-
- pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
+ for (ScreenMap::iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) {
+ CinemaMap::iterator j = _cinemas.begin ();
+ while (j != _cinemas.end ()) {
+ list<shared_ptr<Screen> > sc = j->second->screens ();
+ if (find (sc.begin(), sc.end(), i->second) != sc.end ()) {
+ break;
+ }
- map<wxTreeItemId, shared_ptr<Cinema> >::iterator i = _cinemas.begin ();
- while (i != _cinemas.end ()) {
- list<shared_ptr<Screen> > sc = i->second->screens ();
- if (find (sc.begin(), sc.end(), s.second) != sc.end ()) {
- break;
+ ++j;
}
- ++i;
- }
+ if (j == _cinemas.end()) {
+ continue;
+ }
- if (i == _cinemas.end()) {
- return;
+ j->second->remove_screen (i->second);
+ _targets->Delete (i->first);
}
- i->second->remove_screen (s.second);
- _targets->Delete (s.first);
-
Config::instance()->changed ();
}
{
list<shared_ptr<Screen> > s;
- list<pair<wxTreeItemId, shared_ptr<Cinema> > > cinemas = selected_cinemas ();
- for (list<pair<wxTreeItemId, shared_ptr<Cinema> > >::iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
+ for (CinemaMap::const_iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) {
list<shared_ptr<Screen> > sc = i->second->screens ();
for (list<shared_ptr<Screen> >::const_iterator j = sc.begin(); j != sc.end(); ++j) {
s.push_back (*j);
}
}
- list<pair<wxTreeItemId, shared_ptr<Screen> > > screens = selected_screens ();
- for (list<pair<wxTreeItemId, shared_ptr<Screen> > >::iterator i = screens.begin(); i != screens.end(); ++i) {
+ for (ScreenMap::const_iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) {
s.push_back (i->second);
}
}
void
-ScreensPanel::selection_changed (wxTreeEvent &)
+ScreensPanel::selection_changed_shim (wxTreeEvent &)
+{
+ selection_changed ();
+}
+
+void
+ScreensPanel::selection_changed ()
{
if (_ignore_selection_change) {
return;
_selected_screens.clear ();
for (size_t i = 0; i < s.GetCount(); ++i) {
- map<wxTreeItemId, shared_ptr<Cinema> >::const_iterator j = _cinemas.find (s[i]);
+ CinemaMap::const_iterator j = _cinemas.find (s[i]);
if (j != _cinemas.end ()) {
- _selected_cinemas.push_back (j->second);
+ _selected_cinemas[j->first] = j->second;
}
- map<wxTreeItemId, shared_ptr<Screen> >::const_iterator k = _screens.find (s[i]);
+ ScreenMap::const_iterator k = _screens.find (s[i]);
if (k != _screens.end ()) {
- _selected_screens.push_back (k->second);
+ _selected_screens[k->first] = k->second;
}
}
_ignore_selection_change = true;
- BOOST_FOREACH (shared_ptr<Cinema> i, _selected_cinemas) {
- map<wxTreeItemId, shared_ptr<Cinema> >::const_iterator j = _cinemas.begin ();
- while (j != _cinemas.end() && j->second != i) {
+ 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;
}
}
}
- BOOST_FOREACH (shared_ptr<Screen> i, _selected_screens) {
- map<wxTreeItemId, shared_ptr<Screen> >::const_iterator j = _screens.begin ();
- while (j != _screens.end() && j->second != i) {
+ 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;
}
projects / dcpomatic.git / blobdiff