X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=9f684a3464bf90e0fa92100dc4bb872d44c0fb83;hb=d0c1a424686345942bf916fd9fcfa0f399adfd11;hp=d21c8a2c11e8d01384fa59f8ce84ede1f2c75127;hpb=89abe02431bd8d885197883a3ffafdc8d836dce4;p=dcpomatic.git

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index d21c8a2c1..9f684a346 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -36,6 +36,9 @@
 #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"
@@ -85,6 +88,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));
@@ -103,19 +111,19 @@ 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;
 
 		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;
 
@@ -138,6 +146,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 +169,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 +199,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 +277,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;
@@ -304,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);
@@ -354,7 +384,7 @@ private:
 
 		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);
@@ -558,7 +588,7 @@ public:
 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;
@@ -739,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);
 
@@ -848,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 ();
@@ -935,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);
 
@@ -943,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);
 
@@ -951,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 ()
@@ -965,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 ()
@@ -1007,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;
 };
 
 
@@ -1046,11 +1110,11 @@ private:
 		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);
 
@@ -1085,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 ();
@@ -1216,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));
@@ -1279,7 +1343,7 @@ private:
 		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);
 	}
 
@@ -1298,11 +1362,11 @@ private:
 			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);
 
@@ -1313,7 +1377,7 @@ private:
 		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);
 
@@ -1328,7 +1392,7 @@ private:
 		{
 			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 (
@@ -1340,10 +1404,10 @@ private:
 		{
 			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";
@@ -1358,26 +1422,26 @@ private:
 		{
 			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