X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=2f1db11c2600d3c16f8207c58ae01e31d64a1f5e;hb=8b2a3f31b6b4238d8534549f495e7276174ddfba;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..2f1db11c2 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 columns; @@ -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 (); @@ -1046,11 +1076,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 +1115,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 +1246,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 +1309,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 +1328,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 +1343,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); @@ -1358,26 +1388,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