Move credentials settings into certificate download dialogue (#1480).

[dcpomatic.git] / src / wx / full_config_dialog.cc

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index f586672a8e6d60fc6fa76ce8ec2dc095aa415d8e..ce199e58aae87b3975e3210c65caba1d66cc097a 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -981,145 +981,6 @@ private:
        wxButton* _reset_email;
 };
 
-class AccountsPage : public StandardPage
-{
-public:
-       AccountsPage (wxSize panel_size, int border)
-               : StandardPage (panel_size, border)
-       {}
-
-       wxString GetName () const
-       {
-               return _("Accounts");
-       }
-
-#ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
-       {
-               return wxBitmap ("accounts", wxBITMAP_TYPE_PNG_RESOURCE);
-       }
-#endif
-
-       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 user name"), 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 PasswordEntry (_panel);
-               table->Add (_barco_password->get_panel(), 1, wxEXPAND | wxALL);
-
-               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);
-
-               add_label_to_sizer (table, _panel, _("certificates.christiedigital.com password"), true);
-               _christie_password = new PasswordEntry (_panel);
-               table->Add (_christie_password->get_panel(), 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 PasswordEntry (_panel);
-               table->Add (_gdc_password->get_panel(), 1, wxEXPAND | wxALL);
-
-               _barco_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::barco_username_changed, this));
-               _barco_password->Changed.connect (boost::bind(&AccountsPage::barco_password_changed, this));
-               _christie_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::christie_username_changed, this));
-               _christie_password->Changed.connect (boost::bind(&AccountsPage::christie_password_changed, this));
-               _gdc_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::gdc_username_changed, this));
-               _gdc_password->Changed.connect (boost::bind(&AccountsPage::gdc_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(""));
-               checked_set (_gdc_username, config->gdc_username().get_value_or(""));
-               checked_set (_gdc_password, config->gdc_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 ()
-       {
-               string const s = _barco_password->get();
-               if (!s.empty()) {
-                       Config::instance()->set_barco_password(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 ()
-       {
-               string const s = _christie_password->get();
-               if (!s.empty()) {
-                       Config::instance()->set_christie_password(s);
-               } else {
-                       Config::instance()->unset_christie_password();
-               }
-       }
-
-       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 ()
-       {
-               string const s = _gdc_password->get();
-               if (!s.empty()) {
-                       Config::instance()->set_gdc_password(s);
-               } else {
-                       Config::instance()->unset_gdc_password();
-               }
-       }
-
-private:
-       wxTextCtrl* _barco_username;
-       PasswordEntry* _barco_password;
-       wxTextCtrl* _christie_username;
-       PasswordEntry* _christie_password;
-       wxTextCtrl* _gdc_username;
-       PasswordEntry* _gdc_password;
-};
-
-
 class NotificationsPage : public StandardPage
 {
 public:
@@ -1683,7 +1544,6 @@ create_full_config_dialog ()
        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));