Merge master.

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

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index ea1a7319e8a440a514c0e150d5eef43482598209..c3eebc01515451d5a33529926bc6f039c6cbd166 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -18,7 +18,7 @@
 */
 
 /** @file src/config_dialog.cc
- *  @brief A dialogue to edit DVD-o-matic configuration.
+ *  @brief A dialogue to edit DCP-o-matic configuration.
  */
 
 #include <iostream>
@@ -41,22 +41,24 @@ using namespace std;
 using boost::bind;
 
 ConfigDialog::ConfigDialog (wxWindow* parent)
-       : wxDialog (parent, wxID_ANY, _("DVD-o-matic Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+       : wxDialog (parent, wxID_ANY, _("DCP-o-matic Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
        wxFlexGridSizer* table = new wxFlexGridSizer (3, 6, 6);
        table->AddGrowableCol (1, 1);
 
-       add_label_to_sizer (table, this, _("User interface language"));
+       _set_language = new wxCheckBox (this, wxID_ANY, _("Set language"));
+       table->Add (_set_language, 1, wxEXPAND);
        _language = new wxChoice (this, wxID_ANY);
        _language->Append (wxT ("English"));
        _language->Append (wxT ("Français"));
        _language->Append (wxT ("Italiano"));
        _language->Append (wxT ("Español"));
+       _language->Append (wxT ("Svenska"));
        table->Add (_language, 1, wxEXPAND);
        table->AddSpacer (0);
 
        table->AddSpacer (0);
-       wxStaticText* restart = add_label_to_sizer (table, this, _("(restart DVD-o-matic to see language changes)"));
+       wxStaticText* restart = add_label_to_sizer (table, this, _("(restart DCP-o-matic to see language changes)"));
        wxFont font = restart->GetFont();
        font.SetStyle (wxFONTSTYLE_ITALIC);
        font.SetPointSize (font.GetPointSize() - 1);
@@ -149,16 +151,23 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
                
        Config* config = Config::instance ();
 
+       _set_language->SetValue (config->language ());
+
        if (config->language().get_value_or ("") == "fr") {
                _language->SetSelection (1);
        } else if (config->language().get_value_or ("") == "it") {
                _language->SetSelection (2);
        } else if (config->language().get_value_or ("") == "es") {
                _language->SetSelection (3);
+       } else if (config->language().get_value_or ("") == "sv") {
+               _language->SetSelection (4);
        } else {
                _language->SetSelection (0);
        }
-       
+
+       setup_language_sensitivity ();
+
+       _set_language->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (ConfigDialog::set_language_changed), 0, this);
        _language->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::language_changed), 0, this);
        _tms_ip->SetValue (std_to_wx (config->tms_ip ()));
        _tms_ip->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ConfigDialog::tms_ip_changed), 0, this);
@@ -217,7 +226,7 @@ ConfigDialog::language_changed (wxCommandEvent &)
 {
        switch (_language->GetSelection ()) {
        case 0:
-               Config::instance()->set_language ("");
+               Config::instance()->set_language ("en");
                break;
        case 1:
                Config::instance()->set_language ("fr");
@@ -228,6 +237,9 @@ ConfigDialog::language_changed (wxCommandEvent &)
        case 3:
                Config::instance()->set_language ("es");
                break;
+       case 4:
+               Config::instance()->set_language ("sv");
+               break;
        }
 }
 
@@ -371,3 +383,20 @@ ConfigDialog::edit_default_dci_metadata_clicked (wxCommandEvent &)
        Config::instance()->set_default_dci_metadata (d->dci_metadata ());
        d->Destroy ();
 }
+
+void
+ConfigDialog::set_language_changed (wxCommandEvent& ev)
+{
+       setup_language_sensitivity ();
+       if (_set_language->GetValue ()) {
+               language_changed (ev);
+       } else {
+               Config::instance()->unset_language ();
+       }
+}
+
+void
+ConfigDialog::setup_language_sensitivity ()
+{
+       _language->Enable (_set_language->GetValue ());
+}