X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=306e1f208ca7874ae883d4a24e3dce9af11548e5;hb=1f82930e73679d6aec5223caa255f564339a1a2a;hp=e65e931d023b2db5bda5381a096e03d269a1d3f0;hpb=e7bc3bd16456c17bc6fe1d7981040b14e820505e;p=dcpomatic.git diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index e65e931d0..306e1f208 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -28,13 +28,14 @@ #include #include #include -#include +#include #include "lib/config.h" #include "lib/ratio.h" #include "lib/scaler.h" #include "lib/filter.h" #include "lib/dcp_content_type.h" #include "lib/colour_conversion.h" +#include "lib/log.h" #include "config_dialog.h" #include "wx_util.h" #include "editable_list.h" @@ -106,25 +107,6 @@ public: _num_local_encoding_threads = new wxSpinCtrl (panel); table->Add (_num_local_encoding_threads, 1); - add_label_to_sizer (table, panel, _("Outgoing mail server"), true); - _mail_server = new wxTextCtrl (panel, wxID_ANY); - table->Add (_mail_server, 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); - - add_label_to_sizer (table, panel, _("Mail password"), true); - _mail_password = new wxTextCtrl (panel, wxID_ANY); - table->Add (_mail_password, 1, wxEXPAND | wxALL); - - wxStaticText* plain = add_label_to_sizer (table, panel, _("(password will be stored on disk in plaintext)"), false); - plain->SetFont (font); - table->AddSpacer (0); - - add_label_to_sizer (table, panel, _("From address for KDM emails"), true); - _kdm_from = new wxTextCtrl (panel, wxID_ANY); - table->Add (_kdm_from, 1, wxEXPAND | wxALL); _check_for_updates = new wxCheckBox (panel, wxID_ANY, _("Check for updates on startup")); table->Add (_check_for_updates, 1, wxEXPAND | wxALL); @@ -163,14 +145,6 @@ public: _num_local_encoding_threads->SetValue (config->num_local_encoding_threads ()); _num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this)); - _mail_server->SetValue (std_to_wx (config->mail_server ())); - _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_server_changed, this)); - _mail_user->SetValue (std_to_wx (config->mail_user ())); - _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_user_changed, this)); - _mail_password->SetValue (std_to_wx (config->mail_password ())); - _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_password_changed, this)); - _kdm_from->SetValue (std_to_wx (config->kdm_from ())); - _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::kdm_from_changed, this)); _check_for_updates->SetValue (config->check_for_updates ()); _check_for_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_updates_changed, this)); _check_for_test_updates->SetValue (config->check_for_test_updates ()); @@ -222,26 +196,6 @@ private: } } - void mail_server_changed () - { - Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ())); - } - - void mail_user_changed () - { - Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ())); - } - - void mail_password_changed () - { - Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ())); - } - - void kdm_from_changed () - { - Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ())); - } - void check_for_updates_changed () { Config::instance()->set_check_for_updates (_check_for_updates->GetValue ()); @@ -260,10 +214,6 @@ private: wxCheckBox* _set_language; wxChoice* _language; wxSpinCtrl* _num_local_encoding_threads; - wxTextCtrl* _mail_server; - wxTextCtrl* _mail_user; - wxTextCtrl* _mail_password; - wxTextCtrl* _kdm_from; wxCheckBox* _check_for_updates; wxCheckBox* _check_for_test_updates; }; @@ -317,6 +267,10 @@ public: add_label_to_sizer (table, panel, _("Default ISDCF name details"), true); _isdcf_metadata_button = new wxButton (panel, wxID_ANY, _("Edit...")); table->Add (_isdcf_metadata_button); + + add_label_to_sizer (table, panel, _("Default scale to"), true); + _scale = new wxChoice (panel, wxID_ANY); + table->Add (_scale); add_label_to_sizer (table, panel, _("Default container"), true); _container = new wxChoice (panel, wxID_ANY); @@ -366,6 +320,10 @@ public: vector ratio = Ratio::all (); int n = 0; for (vector::iterator i = ratio.begin(); i != ratio.end(); ++i) { + _scale->Append (std_to_wx ((*i)->nickname ())); + if (*i == config->default_scale ()) { + _scale->SetSelection (n); + } _container->Append (std_to_wx ((*i)->nickname ())); if (*i == config->default_container ()) { _container->SetSelection (n); @@ -373,6 +331,7 @@ public: ++n; } + _scale->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::scale_changed, this)); _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::container_changed, this)); vector const ct = DCPContentType::all (); @@ -431,6 +390,12 @@ private: { Config::instance()->set_default_still_length (_still_length->GetValue ()); } + + void scale_changed () + { + vector ratio = Ratio::all (); + Config::instance()->set_default_scale (ratio[_scale->GetSelection()]); + } void container_changed () { @@ -446,14 +411,14 @@ private: void issuer_changed () { - libdcp::XMLMetadata m = Config::instance()->dcp_metadata (); + dcp::XMLMetadata m = Config::instance()->dcp_metadata (); m.issuer = wx_to_std (_issuer->GetValue ()); Config::instance()->set_dcp_metadata (m); } void creator_changed () { - libdcp::XMLMetadata m = Config::instance()->dcp_metadata (); + dcp::XMLMetadata m = Config::instance()->dcp_metadata (); m.creator = wx_to_std (_creator->GetValue ()); Config::instance()->set_dcp_metadata (m); } @@ -467,6 +432,7 @@ private: #else wxDirPickerCtrl* _directory; #endif + wxChoice* _scale; wxChoice* _container; wxChoice* _dcp_content_type; wxTextCtrl* _issuer; @@ -697,23 +663,118 @@ public: #endif wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); panel->SetSizer (s); + + wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + table->AddGrowableCol (1, 1); + s->Add (table, 1, wxEXPAND | wxALL, _border); + + add_label_to_sizer (table, panel, _("Outgoing mail server"), true); + _mail_server = new wxTextCtrl (panel, wxID_ANY); + table->Add (_mail_server, 1, wxEXPAND | wxALL); - _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE); - s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border); + add_label_to_sizer (table, panel, _("Mail user name"), true); + _mail_user = new wxTextCtrl (panel, wxID_ANY); + table->Add (_mail_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); + + wxStaticText* plain = add_label_to_sizer (table, panel, _("(password will be stored on disk in plaintext)"), false); + wxFont font = plain->GetFont(); + font.SetStyle (wxFONTSTYLE_ITALIC); + font.SetPointSize (font.GetPointSize() - 1); + plain->SetFont (font); + table->AddSpacer (0); + + add_label_to_sizer (table, panel, _("Subject"), true); + _kdm_subject = new wxTextCtrl (panel, wxID_ANY); + table->Add (_kdm_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); + + add_label_to_sizer (table, panel, _("CC address"), true); + _kdm_cc = new wxTextCtrl (panel, wxID_ANY); + table->Add (_kdm_cc, 1, wxEXPAND | wxALL); + + _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE); + s->Add (_kdm_email, 1.5, wxEXPAND | wxALL, _border); + + _reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text")); + s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border); + + Config* config = Config::instance (); + _mail_server->SetValue (std_to_wx (config->mail_server ())); + _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_server_changed, this)); + _mail_user->SetValue (std_to_wx (config->mail_user ())); + _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this)); + _mail_password->SetValue (std_to_wx (config->mail_password ())); + _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this)); + _kdm_subject->SetValue (std_to_wx (config->kdm_subject ())); + _kdm_subject->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_subject_changed, this)); + _kdm_from->SetValue (std_to_wx (config->kdm_from ())); + _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this)); + _kdm_cc->SetValue (std_to_wx (config->kdm_cc ())); + _kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this)); _kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this)); - _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ())); + _kdm_email->SetValue (std_to_wx (Config::instance()->kdm_email ())); + _reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this)); return panel; } -private: +private: + void mail_server_changed () + { + Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ())); + } + + void mail_user_changed () + { + Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ())); + } + + void mail_password_changed () + { + Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ())); + } + + void kdm_subject_changed () + { + Config::instance()->set_kdm_subject (wx_to_std (_kdm_subject->GetValue ())); + } + + void kdm_from_changed () + { + Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ())); + } + + void kdm_cc_changed () + { + Config::instance()->set_kdm_cc (wx_to_std (_kdm_cc->GetValue ())); + } + void kdm_email_changed () { Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ())); } + void reset_kdm_email () + { + Config::instance()->reset_kdm_email (); + _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ())); + } + + wxTextCtrl* _mail_server; + wxTextCtrl* _mail_user; + wxTextCtrl* _mail_password; + wxTextCtrl* _kdm_subject; + wxTextCtrl* _kdm_from; + wxTextCtrl* _kdm_cc; wxTextCtrl* _kdm_email; + wxButton* _reset_kdm_email; }; class AdvancedPage : public wxStockPreferencesPage, public Page @@ -735,10 +796,15 @@ public: wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); s->Add (table, 1, wxALL | wxEXPAND, _border); - - add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true); - _maximum_j2k_bandwidth = new wxSpinCtrl (panel); - table->Add (_maximum_j2k_bandwidth, 1); + + { + add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _maximum_j2k_bandwidth = new wxSpinCtrl (panel); + s->Add (_maximum_j2k_bandwidth, 1); + add_label_to_sizer (s, panel, _("Mbit/s"), false); + table->Add (s, 1); + } _allow_any_dcp_frame_rate = new wxCheckBox (panel, wxID_ANY, _("Allow any DCP frame rate")); table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL); @@ -753,7 +819,7 @@ public: _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors")); table->AddSpacer (0); table->Add (_log_error, 1, wxEXPAND | wxALL); - _log_timing = new wxCheckBox (panel, wxID_ANY, _("Timing")); + _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing")); table->AddSpacer (0); table->Add (_log_timing, 1, wxEXPAND | wxALL); @@ -827,10 +893,7 @@ create_config_dialog () wxSize ps = wxSize (480, -1); int const border = 16; #else - /* We seem to need to specify height here, otherwise the general panel - is too short (at least on Linux). - */ - wxSize ps = wxSize (-1, 400); + wxSize ps = wxSize (-1, -1); int const border = 8; #endif