int r = 0;
add_language_controls (table, r);
+ add_label_to_sizer (table, _panel, _("Interface complexity"), true, wxGBPosition(r, 0));
+ _interface_complexity = new wxChoice (_panel, wxID_ANY);
+ table->Add (_interface_complexity, wxGBPosition (r, 1));
+ ++r;
+
add_label_to_sizer (table, _panel, _("Number of threads DCP-o-matic should use"), true, wxGBPosition (r, 0));
_master_encoding_threads = new wxSpinCtrl (_panel);
table->Add (_master_encoding_threads, wxGBPosition (r, 1));
add_label_to_sizer (table, _panel, _("Cinema and screen database file"), true, wxGBPosition (r, 0));
_cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml", true);
table->Add (_cinemas_file, wxGBPosition (r, 1));
+ wxButton* export_cinemas = new wxButton (_panel, wxID_ANY, _("Export..."));
+ table->Add (export_cinemas, wxGBPosition (r, 2));
++r;
add_play_sound_controls (table, r);
_config_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::config_file_changed, this));
_cinemas_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::cinemas_file_changed, this));
+ _interface_complexity->Append (_("Simple"));
+ _interface_complexity->Append (_("Full"));
+ _interface_complexity->Bind (wxEVT_CHOICE, boost::bind(&FullGeneralPage::interface_complexity_changed, this));
+
_master_encoding_threads->SetRange (1, 128);
_master_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::master_encoding_threads_changed, this));
_server_encoding_threads->SetRange (1, 128);
_server_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::server_encoding_threads_changed, this));
+ export_cinemas->Bind (wxEVT_BUTTON, boost::bind (&FullGeneralPage::export_cinemas_file, this));
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
_analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this));
{
Config* config = Config::instance ();
+ switch (config->interface_complexity()) {
+ case Config::INTERFACE_SIMPLE:
+ checked_set (_interface_complexity, 0);
+ break;
+ case Config::INTERFACE_FULL:
+ checked_set (_interface_complexity, 1);
+ break;
+ }
checked_set (_master_encoding_threads, config->master_encoding_threads ());
checked_set (_server_encoding_threads, config->server_encoding_threads ());
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
GeneralPage::config_changed ();
}
+ void export_cinemas_file ()
+ {
+ wxFileDialog* d = new wxFileDialog (
+ _panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"),
+ wxFD_SAVE | wxFD_OVERWRITE_PROMPT
+ );
+
+ if (d->ShowModal () == wxID_OK) {
+ boost::filesystem::copy_file (Config::instance()->cinemas_file(), path_from_file_dialog (d, "xml"));
+ }
+ d->Destroy ();
+ }
+
+ void interface_complexity_changed ()
+ {
+ if (_interface_complexity->GetSelection() == 0) {
+ Config::instance()->set_interface_complexity (Config::INTERFACE_SIMPLE);
+ } else {
+ Config::instance()->set_interface_complexity (Config::INTERFACE_FULL);
+ }
+ }
+
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
void analyse_ebur128_changed ()
Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ()));
}
+ wxChoice* _interface_complexity;
wxSpinCtrl* _master_encoding_threads;
wxSpinCtrl* _server_encoding_threads;
FilePickerCtrl* _config_file;
return s;
}
-class KDMEmailPage : public StandardPage
+class EmailPage : public StandardPage
{
public:
-
- KDMEmailPage (wxSize panel_size, int border)
-#ifdef DCPOMATIC_OSX
- /* We have to force both width and height of this one */
- : StandardPage (wxSize (480, 128), border)
-#else
+ EmailPage (wxSize panel_size, int border)
: StandardPage (panel_size, border)
-#endif
{}
wxString GetName () const
{
- return _("KDM Email");
+ return _("Email");
}
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
- return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
+ return wxBitmap ("email", wxBITMAP_TYPE_PNG_RESOURCE);
}
#endif
add_label_to_sizer (table, _panel, _("Outgoing mail server"), true);
{
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _mail_server = new wxTextCtrl (_panel, wxID_ANY);
- s->Add (_mail_server, 1, wxEXPAND | wxALL);
+ _server = new wxTextCtrl (_panel, wxID_ANY);
+ s->Add (_server, 1, wxEXPAND | wxALL);
add_label_to_sizer (s, _panel, _("port"), false);
- _mail_port = new wxSpinCtrl (_panel, wxID_ANY);
- _mail_port->SetRange (0, 65535);
- s->Add (_mail_port);
+ _port = new wxSpinCtrl (_panel, wxID_ANY);
+ _port->SetRange (0, 65535);
+ s->Add (_port);
table->Add (s, 1, wxEXPAND | wxALL);
}
add_label_to_sizer (table, _panel, _("Mail user name"), true);
- _mail_user = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_mail_user, 1, wxEXPAND | wxALL);
+ _user = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_user, 1, wxEXPAND | wxALL);
add_label_to_sizer (table, _panel, _("Mail password"), true);
- _mail_password = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_mail_password, 1, wxEXPAND | wxALL);
+ _password = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_password, 1, wxEXPAND | wxALL);
+
+ _server->Bind (wxEVT_TEXT, boost::bind (&EmailPage::server_changed, this));
+ _port->Bind (wxEVT_SPINCTRL, boost::bind (&EmailPage::port_changed, this));
+ _user->Bind (wxEVT_TEXT, boost::bind (&EmailPage::user_changed, this));
+ _password->Bind (wxEVT_TEXT, boost::bind (&EmailPage::password_changed, this));
+ }
+
+ void config_changed ()
+ {
+ Config* config = Config::instance ();
+
+ checked_set (_server, config->mail_server ());
+ checked_set (_port, config->mail_port ());
+ checked_set (_user, config->mail_user ());
+ checked_set (_password, config->mail_password ());
+ }
+
+ void server_changed ()
+ {
+ Config::instance()->set_mail_server (wx_to_std (_server->GetValue ()));
+ }
+
+ void port_changed ()
+ {
+ Config::instance()->set_mail_port (_port->GetValue ());
+ }
+
+ void user_changed ()
+ {
+ Config::instance()->set_mail_user (wx_to_std (_user->GetValue ()));
+ }
+
+ void password_changed ()
+ {
+ Config::instance()->set_mail_password (wx_to_std (_password->GetValue ()));
+ }
+
+ wxTextCtrl* _server;
+ wxSpinCtrl* _port;
+ wxTextCtrl* _user;
+ wxTextCtrl* _password;
+};
+
+class KDMEmailPage : public StandardPage
+{
+public:
+
+ KDMEmailPage (wxSize panel_size, int border)
+#ifdef DCPOMATIC_OSX
+ /* We have to force both width and height of this one */
+ : StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+#else
+ : StandardPage (panel_size, border)
+#endif
+ {}
+
+ wxString GetName () const
+ {
+ return _("KDM Email");
+ }
+
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
+
+private:
+ void setup ()
+ {
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
+ _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
add_label_to_sizer (table, _panel, _("Subject"), true);
- _kdm_subject = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_kdm_subject, 1, wxEXPAND | wxALL);
+ _subject = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_subject, 1, wxEXPAND | wxALL);
add_label_to_sizer (table, _panel, _("From address"), true);
- _kdm_from = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_kdm_from, 1, wxEXPAND | wxALL);
+ _from = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_from, 1, wxEXPAND | wxALL);
vector<string> columns;
columns.push_back (wx_to_std (_("Address")));
add_label_to_sizer (table, _panel, _("CC addresses"), true);
- _kdm_cc = new EditableList<string, EmailDialog> (
+ _cc = new EditableList<string, EmailDialog> (
_panel,
columns,
bind (&Config::kdm_cc, Config::instance()),
bind (&Config::set_kdm_cc, Config::instance(), _1),
bind (&column, _1)
);
- table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
+ table->Add (_cc, 1, wxEXPAND | wxALL);
add_label_to_sizer (table, _panel, _("BCC address"), true);
- _kdm_bcc = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_kdm_bcc, 1, wxEXPAND | wxALL);
+ _bcc = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_bcc, 1, wxEXPAND | wxALL);
- _kdm_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
- _panel->GetSizer()->Add (_kdm_email, 0, wxEXPAND | wxALL, _border);
+ _email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
+ _panel->GetSizer()->Add (_email, 0, wxEXPAND | wxALL, _border);
- _reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text"));
- _panel->GetSizer()->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
+ _reset_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text"));
+ _panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border);
- _kdm_cc->layout ();
+ _cc->layout ();
- _mail_server->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_server_changed, this));
- _mail_port->Bind (wxEVT_SPINCTRL, boost::bind (&KDMEmailPage::mail_port_changed, this));
- _mail_user->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_user_changed, this));
- _mail_password->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_password_changed, this));
- _kdm_subject->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_subject_changed, this));
- _kdm_from->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_from_changed, this));
- _kdm_bcc->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_bcc_changed, this));
- _kdm_email->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_email_changed, this));
- _reset_kdm_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_kdm_email, this));
+ _subject->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_subject_changed, this));
+ _from->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_from_changed, this));
+ _bcc->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_bcc_changed, this));
+ _email->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_email_changed, this));
+ _reset_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_email, this));
}
void config_changed ()
{
Config* config = Config::instance ();
- checked_set (_mail_server, config->mail_server ());
- checked_set (_mail_port, config->mail_port ());
- checked_set (_mail_user, config->mail_user ());
- checked_set (_mail_password, config->mail_password ());
- checked_set (_kdm_subject, config->kdm_subject ());
- checked_set (_kdm_from, config->kdm_from ());
- checked_set (_kdm_bcc, config->kdm_bcc ());
- checked_set (_kdm_email, Config::instance()->kdm_email ());
+ checked_set (_subject, config->kdm_subject ());
+ checked_set (_from, config->kdm_from ());
+ checked_set (_bcc, config->kdm_bcc ());
+ checked_set (_email, Config::instance()->kdm_email ());
}
- void mail_server_changed ()
+ void kdm_subject_changed ()
{
- Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ()));
+ Config::instance()->set_kdm_subject (wx_to_std (_subject->GetValue ()));
}
- void mail_port_changed ()
+ void kdm_from_changed ()
{
- Config::instance()->set_mail_port (_mail_port->GetValue ());
+ Config::instance()->set_kdm_from (wx_to_std (_from->GetValue ()));
}
- void mail_user_changed ()
+ void kdm_bcc_changed ()
{
- Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ()));
+ Config::instance()->set_kdm_bcc (wx_to_std (_bcc->GetValue ()));
}
- void mail_password_changed ()
+ void kdm_email_changed ()
{
- Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ()));
+ if (_email->GetValue().IsEmpty ()) {
+ /* Sometimes we get sent an erroneous notification that the email
+ is empty; I don't know why.
+ */
+ return;
+ }
+ Config::instance()->set_kdm_email (wx_to_std (_email->GetValue ()));
}
- void kdm_subject_changed ()
+ void reset_email ()
{
- Config::instance()->set_kdm_subject (wx_to_std (_kdm_subject->GetValue ()));
+ Config::instance()->reset_kdm_email ();
+ checked_set (_email, Config::instance()->kdm_email ());
}
- void kdm_from_changed ()
+ wxTextCtrl* _subject;
+ wxTextCtrl* _from;
+ EditableList<string, EmailDialog>* _cc;
+ wxTextCtrl* _bcc;
+ wxTextCtrl* _email;
+ wxButton* _reset_email;
+};
+
+class AccountsPage : public StandardPage
+{
+public:
+ AccountsPage (wxSize panel_size, int border)
+ : StandardPage (panel_size, border)
+ {}
+
+ wxString GetName () const
{
- Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
+ return _("Accounts");
}
- void kdm_bcc_changed ()
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
{
- Config::instance()->set_kdm_bcc (wx_to_std (_kdm_bcc->GetValue ()));
+ return wxBitmap ("accounts", wxBITMAP_TYPE_PNG_RESOURCE);
}
+#endif
- void kdm_email_changed ()
+ void setup ()
+ {
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
+ _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
+
+ add_label_to_sizer (table, _panel, _("certificates.barco.com username"), true);
+ _barco_username = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_barco_username, 1, wxEXPAND | wxALL);
+
+ add_label_to_sizer (table, _panel, _("certificates.barco.com password"), true);
+ _barco_password = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_barco_password, 1, wxEXPAND | wxALL);
+
+ add_label_to_sizer (table, _panel, _("certificates.christiedigital.com username"), true);
+ _christie_username = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_christie_username, 1, wxEXPAND | wxALL);
+
+ add_label_to_sizer (table, _panel, _("certificates.christiedigital.com password"), true);
+ _christie_password = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_christie_password, 1, wxEXPAND | wxALL);
+
+ _barco_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::barco_username_changed, this));
+ _barco_password->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::barco_password_changed, this));
+ _christie_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::christie_username_changed, this));
+ _christie_password->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::christie_password_changed, this));
+ }
+
+ void config_changed ()
+ {
+ Config* config = Config::instance ();
+
+ checked_set (_barco_username, config->barco_username().get_value_or(""));
+ checked_set (_barco_password, config->barco_password().get_value_or(""));
+ checked_set (_christie_username, config->christie_username().get_value_or(""));
+ checked_set (_christie_password, config->christie_password().get_value_or(""));
+ }
+
+ void barco_username_changed ()
+ {
+ wxString const s = _barco_username->GetValue();
+ if (!s.IsEmpty()) {
+ Config::instance()->set_barco_username (wx_to_std(s));
+ } else {
+ Config::instance()->unset_barco_username ();
+ }
+ }
+
+ void barco_password_changed ()
+ {
+ wxString const s = _barco_password->GetValue();
+ if (!s.IsEmpty()) {
+ Config::instance()->set_barco_password (wx_to_std(s));
+ } else {
+ Config::instance()->unset_barco_password ();
+ }
+ }
+
+ void christie_username_changed ()
+ {
+ wxString const s = _christie_username->GetValue();
+ if (!s.IsEmpty()) {
+ Config::instance()->set_christie_username (wx_to_std(s));
+ } else {
+ Config::instance()->unset_christie_username ();
+ }
+ }
+
+ void christie_password_changed ()
+ {
+ wxString const s = _christie_password->GetValue();
+ if (!s.IsEmpty()) {
+ Config::instance()->set_christie_password (wx_to_std(s));
+ } else {
+ Config::instance()->unset_christie_password ();
+ }
+ }
+
+private:
+ wxTextCtrl* _barco_username;
+ wxTextCtrl* _barco_password;
+ wxTextCtrl* _christie_username;
+ wxTextCtrl* _christie_password;
+};
+
+
+class NotificationsPage : public StandardPage
+{
+public:
+ NotificationsPage (wxSize panel_size, int border)
+#ifdef DCPOMATIC_OSX
+ /* We have to force both width and height of this one */
+ : StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+#else
+ : StandardPage (panel_size, border)
+#endif
+ {}
+
+ wxString GetName () const
+ {
+ return _("Notifications");
+ }
+
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("notifications", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
+
+private:
+ void setup ()
+ {
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
+ _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
+
+ _enable_message_box = new wxCheckBox (_panel, wxID_ANY, _("Message box"));
+ table->Add (_enable_message_box, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
+
+ _enable_email = new wxCheckBox (_panel, wxID_ANY, _("Email"));
+ table->Add (_enable_email, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
+
+ add_label_to_sizer (table, _panel, _("Subject"), true);
+ _subject = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_subject, 1, wxEXPAND | wxALL);
+
+ add_label_to_sizer (table, _panel, _("From address"), true);
+ _from = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_from, 1, wxEXPAND | wxALL);
+
+ add_label_to_sizer (table, _panel, _("To address"), true);
+ _to = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_to, 1, wxEXPAND | wxALL);
+
+ vector<string> columns;
+ columns.push_back (wx_to_std (_("Address")));
+ add_label_to_sizer (table, _panel, _("CC addresses"), true);
+ _cc = new EditableList<string, EmailDialog> (
+ _panel,
+ columns,
+ bind (&Config::notification_cc, Config::instance()),
+ bind (&Config::set_notification_cc, Config::instance(), _1),
+ bind (&column, _1)
+ );
+ table->Add (_cc, 1, wxEXPAND | wxALL);
+
+ add_label_to_sizer (table, _panel, _("BCC address"), true);
+ _bcc = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_bcc, 1, wxEXPAND | wxALL);
+
+ _email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
+ _panel->GetSizer()->Add (_email, 0, wxEXPAND | wxALL, _border);
+
+ _reset_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text"));
+ _panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border);
+
+ _cc->layout ();
+
+ _enable_message_box->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_message_box, Config::MESSAGE_BOX));
+ _enable_email->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_email, Config::EMAIL));
+
+ _subject->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_subject_changed, this));
+ _from->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_from_changed, this));
+ _to->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_to_changed, this));
+ _bcc->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_bcc_changed, this));
+ _email->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_email_changed, this));
+ _reset_email->Bind (wxEVT_BUTTON, boost::bind (&NotificationsPage::reset_email, this));
+
+ update_sensitivity ();
+ }
+
+ void update_sensitivity ()
+ {
+ bool const s = _enable_email->GetValue();
+ _subject->Enable(s);
+ _from->Enable(s);
+ _to->Enable(s);
+ _cc->Enable(s);
+ _bcc->Enable(s);
+ _email->Enable(s);
+ _reset_email->Enable(s);
+ }
+
+ void config_changed ()
+ {
+ Config* config = Config::instance ();
+
+ checked_set (_enable_message_box, config->notification(Config::MESSAGE_BOX));
+ checked_set (_enable_email, config->notification(Config::EMAIL));
+ checked_set (_subject, config->notification_subject ());
+ checked_set (_from, config->notification_from ());
+ checked_set (_to, config->notification_to ());
+ checked_set (_bcc, config->notification_bcc ());
+ checked_set (_email, Config::instance()->notification_email ());
+
+ update_sensitivity ();
+ }
+
+ void notification_subject_changed ()
+ {
+ Config::instance()->set_notification_subject (wx_to_std (_subject->GetValue ()));
+ }
+
+ void notification_from_changed ()
+ {
+ Config::instance()->set_notification_from (wx_to_std (_from->GetValue ()));
+ }
+
+ void notification_to_changed ()
+ {
+ Config::instance()->set_notification_to (wx_to_std (_to->GetValue ()));
+ }
+
+ void notification_bcc_changed ()
+ {
+ Config::instance()->set_notification_bcc (wx_to_std (_bcc->GetValue ()));
+ }
+
+ void notification_email_changed ()
{
- if (_kdm_email->GetValue().IsEmpty ()) {
+ if (_email->GetValue().IsEmpty ()) {
/* Sometimes we get sent an erroneous notification that the email
is empty; I don't know why.
*/
return;
}
- Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ()));
+ Config::instance()->set_notification_email (wx_to_std (_email->GetValue ()));
}
- void reset_kdm_email ()
+ void reset_email ()
{
- Config::instance()->reset_kdm_email ();
- checked_set (_kdm_email, Config::instance()->kdm_email ());
- }
-
- wxTextCtrl* _mail_server;
- wxSpinCtrl* _mail_port;
- wxTextCtrl* _mail_user;
- wxTextCtrl* _mail_password;
- wxTextCtrl* _kdm_subject;
- wxTextCtrl* _kdm_from;
- EditableList<string, EmailDialog>* _kdm_cc;
- wxTextCtrl* _kdm_bcc;
- wxTextCtrl* _kdm_email;
- wxButton* _reset_kdm_email;
+ Config::instance()->reset_notification_email ();
+ checked_set (_email, Config::instance()->notification_email ());
+ }
+
+ void type_changed (wxCheckBox* b, Config::Notification n)
+ {
+ Config::instance()->set_notification(n, b->GetValue());
+ update_sensitivity ();
+ }
+
+ wxCheckBox* _enable_message_box;
+ wxCheckBox* _enable_email;
+
+ wxTextCtrl* _subject;
+ wxTextCtrl* _from;
+ wxTextCtrl* _to;
+ EditableList<string, EmailDialog>* _cc;
+ wxTextCtrl* _bcc;
+ wxTextCtrl* _email;
+ wxButton* _reset_email;
};
class CoverSheetPage : public StandardPage
CoverSheetPage (wxSize panel_size, int border)
#ifdef DCPOMATIC_OSX
/* We have to force both width and height of this one */
- : StandardPage (wxSize (480, 128), border)
+ : StandardPage (wxSize (panel_size.GetWidth(), 128), border)
#else
: StandardPage (panel_size, border)
#endif
: StockPage (Kind_Advanced, panel_size, border)
, _maximum_j2k_bandwidth (0)
, _allow_any_dcp_frame_rate (0)
+ , _allow_any_container (0)
, _only_servers_encode (0)
, _log_general (0)
, _log_warning (0)
table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
+ _allow_any_container = new wxCheckBox (_panel, wxID_ANY, _("Allow non-standard container ratios"));
+ table->Add (_allow_any_container, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
+
+ wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see all ratios)"), false);
+ wxFont font = restart->GetFont();
+ font.SetStyle (wxFONTSTYLE_ITALIC);
+ font.SetPointSize (font.GetPointSize() - 1);
+ restart->SetFont (font);
+ table->AddSpacer (0);
+
_only_servers_encode = new wxCheckBox (_panel, wxID_ANY, _("Only servers encode"));
table->Add (_only_servers_encode, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
_maximum_j2k_bandwidth->SetRange (1, 1000);
_maximum_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
_allow_any_dcp_frame_rate->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
+ _allow_any_container->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_container_changed, this));
_only_servers_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::only_servers_encode_changed, this));
_frames_in_memory_multiplier->Bind (wxEVT_SPINCTRL, boost::bind(&AdvancedPage::frames_in_memory_multiplier_changed, this));
_dcp_metadata_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_metadata_filename_format_changed, this));
checked_set (_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000);
checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ());
+ checked_set (_allow_any_container, config->allow_any_container ());
checked_set (_only_servers_encode, config->only_servers_encode ());
checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL);
checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
Config::instance()->set_allow_any_dcp_frame_rate (_allow_any_dcp_frame_rate->GetValue ());
}
+ void allow_any_container_changed ()
+ {
+ Config::instance()->set_allow_any_container (_allow_any_container->GetValue ());
+ }
+
void only_servers_encode_changed ()
{
Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ());
wxSpinCtrl* _maximum_j2k_bandwidth;
wxSpinCtrl* _frames_in_memory_multiplier;
wxCheckBox* _allow_any_dcp_frame_rate;
+ wxCheckBox* _allow_any_container;
wxCheckBox* _only_servers_encode;
NameFormatEditor* _dcp_metadata_filename_format;
NameFormatEditor* _dcp_asset_filename_format;
the containing window doesn't shrink too much when we select those panels.
This is obviously an unpleasant hack.
*/
- wxSize ps = wxSize (520, -1);
+ wxSize ps = wxSize (600, -1);
int const border = 16;
#else
wxSize ps = wxSize (-1, -1);
e->AddPage (new FullGeneralPage (ps, border));
e->AddPage (new DefaultsPage (ps, border));
e->AddPage (new EncodingServersPage (ps, border));
- e->AddPage (new KeysPage (ps, border, true));
+ e->AddPage (new KeysPage (ps, border));
e->AddPage (new TMSPage (ps, border));
+ e->AddPage (new EmailPage (ps, border));
e->AddPage (new KDMEmailPage (ps, border));
+ e->AddPage (new AccountsPage (ps, border));
+ e->AddPage (new NotificationsPage (ps, border));
e->AddPage (new CoverSheetPage (ps, border));
e->AddPage (new AdvancedPage (ps, border));
return e;