X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=80db5b7c0af4e0aca0d05b24fa820aafb3a92517;hb=1473441e9436fb921b34b62d802d4313427c9129;hp=8e176b4d6fa319c92aa311357b7947c8864777f5;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;p=dcpomatic.git diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 8e176b4d6..80db5b7c0 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -38,6 +38,7 @@ #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" @@ -110,7 +111,7 @@ private: 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; @@ -333,7 +334,7 @@ private: 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); @@ -768,11 +769,11 @@ private: 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); @@ -877,7 +878,7 @@ private: _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 (); @@ -964,7 +965,7 @@ public: 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); @@ -972,7 +973,7 @@ public: _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); @@ -980,10 +981,20 @@ public: _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 () @@ -994,6 +1005,8 @@ public: 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 () @@ -1036,11 +1049,33 @@ public: } } + 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; }; @@ -1114,7 +1149,7 @@ private: _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 (); @@ -1245,7 +1280,7 @@ private: _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));