Revert overwrite changes; remove our replacement of file extension (#1383).

[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 bf26519e1fb2206cb1519cc9e00e65d6d03cf9f0..96a4c86e9b00d164578a799a8290704f808bc1db 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -85,6 +85,11 @@ private:
                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));
@@ -138,6 +143,10 @@ private:
                _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);
@@ -157,6 +166,14 @@ private:
        {
                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
@@ -179,11 +196,20 @@ private:
                 );
 
                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 ();
        }
 
+       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 ()
@@ -248,6 +274,7 @@ private:
                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;
@@ -943,8 +970,18 @@ 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);
+               _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 ()
@@ -953,6 +990,8 @@ public:
 
                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 ()
@@ -975,9 +1014,31 @@ public:
                }
        }
 
+       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;
 };