: wxDialog (parent, wxID_ANY, _("Make KDMs"))
{
wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL);
-
- add_label_to_sizer (vertical, this, "Make KDMs for");
-
wxBoxSizer* targets = new wxBoxSizer (wxHORIZONTAL);
_targets = new wxTreeCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_MULTIPLE | wxTR_HAS_BUTTONS);
wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL);
_add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema..."));
- target_buttons->Add (_add_cinema, 1, 0, 6);
+ target_buttons->Add (_add_cinema, 1, wxEXPAND, 6);
_edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema..."));
- target_buttons->Add (_edit_cinema, 1, 0, 6);
+ target_buttons->Add (_edit_cinema, 1, wxEXPAND, 6);
_remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema"));
- target_buttons->Add (_remove_cinema, 1, 0, 6);
+ target_buttons->Add (_remove_cinema, 1, wxEXPAND, 6);
_add_screen = new wxButton (this, wxID_ANY, _("Add Screen..."));
- target_buttons->Add (_add_screen, 1, 0, 6);
+ target_buttons->Add (_add_screen, 1, wxEXPAND, 6);
_edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen..."));
- target_buttons->Add (_edit_screen, 1, 0, 6);
+ target_buttons->Add (_edit_screen, 1, wxEXPAND, 6);
_remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen"));
- target_buttons->Add (_remove_screen, 1, 0, 6);
+ target_buttons->Add (_remove_screen, 1, wxEXPAND, 6);
targets->Add (target_buttons, 0, 0, 6);
vertical->Add (targets, 1, wxEXPAND | wxALL, 6);
wxFlexGridSizer* table = new wxFlexGridSizer (3, 2, 6);
- add_label_to_sizer (table, this, "From");
+ add_label_to_sizer (table, this, "From", true);
_from_date = new wxDatePickerCtrl (this, wxID_ANY);
table->Add (_from_date, 1, wxEXPAND);
_from_time = new wxTimePickerCtrl (this, wxID_ANY);
table->Add (_from_time, 1, wxEXPAND);
- add_label_to_sizer (table, this, "To");
- _to_date = new wxDatePickerCtrl (this, wxID_ANY);
- table->Add (_to_date, 1, wxEXPAND);
- _to_time = new wxTimePickerCtrl (this, wxID_ANY);
- table->Add (_to_time, 1, wxEXPAND);
+ add_label_to_sizer (table, this, "Until", true);
+ _until_date = new wxDatePickerCtrl (this, wxID_ANY);
+ table->Add (_until_date, 1, wxEXPAND);
+ _until_time = new wxTimePickerCtrl (this, wxID_ANY);
+ table->Add (_until_time, 1, wxEXPAND);
- add_label_to_sizer (table, this, "Write to");
+ add_label_to_sizer (table, this, "Write to", true);
#ifdef __WXMSW__
_folder = new DirPickerCtrl (this);
vertical->Add (table, 0, wxEXPAND | wxALL, 6);
- wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+ wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
if (buttons) {
vertical->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
{
_cinemas[_targets->AppendItem (_root, std_to_wx (c->name))] = c;
- for (list<shared_ptr<Screen> >::iterator i = c->screens.begin(); i != c->screens.end(); ++i) {
+ list<shared_ptr<Screen> > sc = c->screens ();
+ for (list<shared_ptr<Screen> >::iterator i = sc.begin(); i != sc.end(); ++i) {
add_screen (c, *i);
}
}
ScreenDialog* d = new ScreenDialog (this, "Add Screen");
d->ShowModal ();
- shared_ptr<Screen> s (new Screen (d->name()));
- c->screens.push_back (s);
+ shared_ptr<Screen> s (new Screen (d->name(), d->certificate()));
+ c->add_screen (s);
add_screen (c, s);
Config::instance()->write ();
pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
- ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name);
+ ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->certificate);
d->ShowModal ();
s.second->name = d->name ();
+ s.second->certificate = d->certificate ();
_targets->SetItemText (s.first, std_to_wx (d->name()));
Config::instance()->write ();
pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
map<wxTreeItemId, shared_ptr<Cinema> >::iterator i = _cinemas.begin ();
- while (i != _cinemas.end() && find (i->second->screens.begin(), i->second->screens.end(), s.second) == i->second->screens.end()) {
+ list<shared_ptr<Screen> > sc = i->second->screens ();
+ while (i != _cinemas.end() && find (sc.begin(), sc.end(), s.second) == sc.end()) {
++i;
}
return;
}
- i->second->screens.remove (s.second);
+ i->second->remove_screen (s.second);
_targets->Delete (s.first);
Config::instance()->write ();
}
+
+list<shared_ptr<Screen> >
+KDMDialog::screens () const
+{
+ 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) {
+ 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) {
+ s.push_back (i->second);
+ }
+
+ s.sort ();
+ s.unique ();
+
+ return s;
+}
+
+boost::posix_time::ptime
+KDMDialog::from () const
+{
+ return posix_time (_from_date, _from_time);
+}
+
+boost::posix_time::ptime
+KDMDialog::posix_time (wxDatePickerCtrl* date_picker, wxTimePickerCtrl* time_picker)
+{
+ wxDateTime const date = date_picker->GetValue ();
+ wxDateTime const time = time_picker->GetValue ();
+ return boost::posix_time::ptime (
+ boost::gregorian::date (date.GetYear(), date.GetMonth() + 1, date.GetDay()),
+ boost::posix_time::time_duration (time.GetHour(), time.GetMinute(), time.GetSecond())
+ );
+}
+
+boost::posix_time::ptime
+KDMDialog::until () const
+{
+ return posix_time (_until_date, _until_time);
+}
+
+string
+KDMDialog::directory () const
+{
+ return wx_to_std (_folder->GetPath ());
+}
projects / dcpomatic.git / blobdiff