#include "nag_dialog.h"
#include "config_move_dialog.h"
#include "config_dialog.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
#include "lib/config.h"
#include "lib/ratio.h"
#include "lib/filter.h"
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..."));
+ Button* export_cinemas = new Button (_panel, _("Export..."));
table->Add (export_cinemas, wxGBPosition (r, 2));
++r;
add_play_sound_controls (table, r);
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
- _analyse_ebur128 = new wxCheckBox (_panel, wxID_ANY, _("Find integrated loudness, true peak and loudness range when analysing audio"));
+ _analyse_ebur128 = new CheckBox (_panel, _("Find integrated loudness, true peak and loudness range when analysing audio"));
table->Add (_analyse_ebur128, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
#endif
- _automatic_audio_analysis = new wxCheckBox (_panel, wxID_ANY, _("Automatically analyse content audio"));
+ _automatic_audio_analysis = new CheckBox (_panel, _("Automatically analyse content audio"));
table->Add (_automatic_audio_analysis, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
);
if (d->ShowModal () == wxID_OK) {
- boost::filesystem::copy_file (Config::instance()->cinemas_file(), path_from_file_dialog (d, "xml"));
+ boost::filesystem::copy_file (Config::instance()->cinemas_file(), wx_to_std(d->GetPath()));
}
d->Destroy ();
}
table->Add (_directory, 1, wxEXPAND);
add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true);
- _isdcf_metadata_button = new wxButton (_panel, wxID_ANY, _("Edit..."));
+ _isdcf_metadata_button = new Button (_panel, _("Edit..."));
table->Add (_isdcf_metadata_button);
add_label_to_sizer (table, _panel, _("Default container"), true);
table->Add (_kdm_directory, 1, wxEXPAND);
- _upload_after_make_dcp = new wxCheckBox (_panel, wxID_ANY, _("Default to enabling upload of DCP to TMS"));
+ _upload_after_make_dcp = new CheckBox (_panel, _("Default to enabling upload of DCP to TMS"));
table->Add (_upload_after_make_dcp, 1, wxEXPAND);
_still_length->SetRange (1, 3600);
private:
void setup ()
{
- _use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Search network for servers"));
+ _use_any_servers = new CheckBox (_panel, _("Search network for servers"));
_panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border);
vector<string> columns;
void tms_protocol_changed ()
{
- Config::instance()->set_tms_protocol (static_cast<Protocol> (_tms_protocol->GetSelection ()));
+ Config::instance()->set_tms_protocol(static_cast<FileTransferProtocol>(_tms_protocol->GetSelection()));
}
void tms_ip_changed ()
_port = new wxSpinCtrl (_panel, wxID_ANY);
_port->SetRange (0, 65535);
s->Add (_port);
+ add_label_to_sizer (s, _panel, _("protocol"), false);
+ _protocol = new wxChoice (_panel, wxID_ANY);
+ /* Make sure this matches the switches in config_changed and port_changed below */
+ _protocol->Append (_("Auto"));
+ _protocol->Append (_("Plain"));
+ _protocol->Append (_("STARTTLS"));
+ _protocol->Append (_("SSL"));
+ s->Add (_protocol);
table->Add (s, 1, wxEXPAND | wxALL);
}
- add_label_to_sizer (table, _panel, _("Mail user name"), true);
+ add_label_to_sizer (table, _panel, _("User name"), true);
_user = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_user, 1, wxEXPAND | wxALL);
- add_label_to_sizer (table, _panel, _("Mail password"), true);
+ add_label_to_sizer (table, _panel, _("Password"), true);
_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));
+ _protocol->Bind (wxEVT_CHOICE, boost::bind (&EmailPage::protocol_changed, this));
_user->Bind (wxEVT_TEXT, boost::bind (&EmailPage::user_changed, this));
_password->Bind (wxEVT_TEXT, boost::bind (&EmailPage::password_changed, this));
}
checked_set (_server, config->mail_server ());
checked_set (_port, config->mail_port ());
+ switch (config->mail_protocol()) {
+ case EMAIL_PROTOCOL_AUTO:
+ checked_set (_protocol, 0);
+ break;
+ case EMAIL_PROTOCOL_PLAIN:
+ checked_set (_protocol, 1);
+ break;
+ case EMAIL_PROTOCOL_STARTTLS:
+ checked_set (_protocol, 2);
+ break;
+ case EMAIL_PROTOCOL_SSL:
+ checked_set (_protocol, 3);
+ break;
+ }
checked_set (_user, config->mail_user ());
checked_set (_password, config->mail_password ());
}
Config::instance()->set_mail_port (_port->GetValue ());
}
+ void protocol_changed ()
+ {
+ switch (_protocol->GetSelection()) {
+ case 0:
+ Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_AUTO);
+ break;
+ case 1:
+ Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_PLAIN);
+ break;
+ case 2:
+ Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_STARTTLS);
+ break;
+ case 3:
+ Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_SSL);
+ break;
+ }
+ }
+
void user_changed ()
{
Config::instance()->set_mail_user (wx_to_std (_user->GetValue ()));
wxTextCtrl* _server;
wxSpinCtrl* _port;
+ wxChoice* _protocol;
wxTextCtrl* _user;
wxTextCtrl* _password;
};
_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"));
+ _reset_email = new Button (_panel, _("Reset to default subject and text"));
_panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border);
_cc->layout ();
table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
- add_label_to_sizer (table, _panel, _("certificates.barco.com username"), true);
+ add_label_to_sizer (table, _panel, _("certificates.barco.com user name"), true);
_barco_username = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_barco_username, 1, wxEXPAND | wxALL);
_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);
+ add_label_to_sizer (table, _panel, _("certificates.christiedigital.com user name"), true);
_christie_username = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_christie_username, 1, wxEXPAND | wxALL);
_christie_password = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_christie_password, 1, wxEXPAND | wxALL);
+ add_label_to_sizer (table, _panel, _("GDC user name"), true);
+ _gdc_username = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_gdc_username, 1, wxEXPAND | wxALL);
+
+ add_label_to_sizer (table, _panel, _("GDC password"), true);
+ _gdc_password = new wxTextCtrl (_panel, wxID_ANY);
+ table->Add (_gdc_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));
+ _gdc_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::gdc_username_changed, this));
+ _gdc_password->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::gdc_password_changed, this));
}
void config_changed ()
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(""));
+ checked_set (_gdc_username, config->gdc_username().get_value_or(""));
+ checked_set (_gdc_password, config->gdc_password().get_value_or(""));
}
void barco_username_changed ()
}
}
+ void gdc_username_changed ()
+ {
+ wxString const s = _gdc_username->GetValue();
+ if (!s.IsEmpty()) {
+ Config::instance()->set_gdc_username (wx_to_std(s));
+ } else {
+ Config::instance()->unset_gdc_username ();
+ }
+ }
+
+ void gdc_password_changed ()
+ {
+ wxString const s = _gdc_password->GetValue();
+ if (!s.IsEmpty()) {
+ Config::instance()->set_gdc_password (wx_to_std(s));
+ } else {
+ Config::instance()->unset_gdc_password ();
+ }
+ }
+
private:
wxTextCtrl* _barco_username;
wxTextCtrl* _barco_password;
wxTextCtrl* _christie_username;
wxTextCtrl* _christie_password;
+ wxTextCtrl* _gdc_username;
+ wxTextCtrl* _gdc_password;
};
table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
- _enable_message_box = new wxCheckBox (_panel, wxID_ANY, _("Message box"));
+ _enable_message_box = new CheckBox (_panel, _("Message box"));
table->Add (_enable_message_box, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
- _enable_email = new wxCheckBox (_panel, wxID_ANY, _("Email"));
+ _enable_email = new CheckBox (_panel, _("Email"));
table->Add (_enable_email, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
_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"));
+ _reset_email = new Button (_panel, _("Reset to default subject and text"));
_panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border);
_cc->layout ();
_cover_sheet = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
_panel->GetSizer()->Add (_cover_sheet, 0, wxEXPAND | wxALL, _border);
- _reset_cover_sheet = new wxButton (_panel, wxID_ANY, _("Reset to default text"));
+ _reset_cover_sheet = new Button (_panel, _("Reset to default text"));
_panel->GetSizer()->Add (_reset_cover_sheet, 0, wxEXPAND | wxALL, _border);
_cover_sheet->Bind (wxEVT_TEXT, boost::bind (&CoverSheetPage::cover_sheet_changed, this));
flags |= wxALIGN_RIGHT;
text += wxT (":");
#endif
- wxStaticText* m = new wxStaticText (parent, wxID_ANY, text);
+ wxStaticText* m = new StaticText (parent, text);
table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
}
table->Add (s, 1);
}
- _allow_any_dcp_frame_rate = new wxCheckBox (_panel, wxID_ANY, _("Allow any DCP frame rate"));
+ _allow_any_dcp_frame_rate = new CheckBox (_panel, _("Allow any DCP frame rate"));
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"));
+ _allow_any_container = new CheckBox (_panel, _("Allow non-standard container ratios"));
table->Add (_allow_any_container, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
restart->SetFont (font);
table->AddSpacer (0);
- _only_servers_encode = new wxCheckBox (_panel, wxID_ANY, _("Only servers encode"));
+ _only_servers_encode = new CheckBox (_panel, _("Only servers encode"));
table->Add (_only_servers_encode, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
{
add_top_aligned_label_to_sizer (table, _panel, _("DCP metadata filename format"));
dcp::NameFormat::Map titles;
- titles['t'] = "type (cpl/pkl)";
+ titles['t'] = wx_to_std (_("type (cpl/pkl)"));
dcp::NameFormat::Map examples;
examples['t'] = "cpl";
_dcp_metadata_filename_format = new NameFormatEditor (
{
add_top_aligned_label_to_sizer (table, _panel, _("DCP asset filename format"));
dcp::NameFormat::Map titles;
- titles['t'] = "type (j2c/pcm/sub)";
- titles['r'] = "reel number";
- titles['n'] = "number of reels";
- titles['c'] = "content filename";
+ titles['t'] = wx_to_std (_("type (j2c/pcm/sub)"));
+ titles['r'] = wx_to_std (_("reel number"));
+ titles['n'] = wx_to_std (_("number of reels"));
+ titles['c'] = wx_to_std (_("content filename"));
dcp::NameFormat::Map examples;
examples['t'] = "j2c";
examples['r'] = "1";
{
add_top_aligned_label_to_sizer (table, _panel, _("Log"));
wxBoxSizer* t = new wxBoxSizer (wxVERTICAL);
- _log_general = new wxCheckBox (_panel, wxID_ANY, _("General"));
+ _log_general = new CheckBox (_panel, _("General"));
t->Add (_log_general, 1, wxEXPAND | wxALL);
- _log_warning = new wxCheckBox (_panel, wxID_ANY, _("Warnings"));
+ _log_warning = new CheckBox (_panel, _("Warnings"));
t->Add (_log_warning, 1, wxEXPAND | wxALL);
- _log_error = new wxCheckBox (_panel, wxID_ANY, _("Errors"));
+ _log_error = new CheckBox (_panel, _("Errors"));
t->Add (_log_error, 1, wxEXPAND | wxALL);
/// TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
- _log_timing = new wxCheckBox (_panel, wxID_ANY, S_("Config|Timing"));
+ _log_timing = new CheckBox (_panel, S_("Config|Timing"));
t->Add (_log_timing, 1, wxEXPAND | wxALL);
- _log_debug_decode = new wxCheckBox (_panel, wxID_ANY, _("Debug: decode"));
+ _log_debug_decode = new CheckBox (_panel, _("Debug: decode"));
t->Add (_log_debug_decode, 1, wxEXPAND | wxALL);
- _log_debug_encode = new wxCheckBox (_panel, wxID_ANY, _("Debug: encode"));
+ _log_debug_encode = new CheckBox (_panel, _("Debug: encode"));
t->Add (_log_debug_encode, 1, wxEXPAND | wxALL);
- _log_debug_email = new wxCheckBox (_panel, wxID_ANY, _("Debug: email sending"));
+ _log_debug_email = new CheckBox (_panel, _("Debug: email sending"));
t->Add (_log_debug_email, 1, wxEXPAND | wxALL);
table->Add (t, 0, wxALL, 6);
}
#ifdef DCPOMATIC_WINDOWS
- _win32_console = new wxCheckBox (_panel, wxID_ANY, _("Open console window"));
+ _win32_console = new CheckBox (_panel, _("Open console window"));
table->Add (_win32_console, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
#endif
the containing window doesn't shrink too much when we select those panels.
This is obviously an unpleasant hack.
*/
- wxSize ps = wxSize (600, -1);
+ wxSize ps = wxSize (700, -1);
int const border = 16;
#else
wxSize ps = wxSize (-1, -1);
projects / dcpomatic.git / blobdiff