Improve language setup.

4 files changed, 36 insertions, 3 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index ee46166e6..011ca716f 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -165,6 +165,10 @@ public:
 	void set_language (std::string l) {
 		_language = l;
 	}
+
+	void unset_language () {
+		_language = boost::none;
+	}
 	
 	void write () const;
 
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 593d0e760..2e4671251 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -271,7 +271,10 @@ dvdomatic_setup_i18n (string lang)
 	putenv (e.c_str());
 
 	bindtextdomain ("libdvdomatic", mo_path().string().c_str());
-#endif
+#else
+	/* Hack to silence warning */
+	lang.clear ();
+#endif	
 
 #ifdef DVDOMATIC_POSIX
 	bindtextdomain ("libdvdomatic", POSIX_LOCALE_PREFIX);
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index ea1a7319e..364336114 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -46,7 +46,8 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	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"));
@@ -149,6 +150,8 @@ 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") {
@@ -158,7 +161,10 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	} 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);
@@ -371,3 +377,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 ());
+}
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 8a3c81ec9..f6f3b3707 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -39,6 +39,7 @@ public:
 	ConfigDialog (wxWindow *);
 
 private:
+	void set_language_changed (wxCommandEvent &);
 	void language_changed (wxCommandEvent &);
 	void tms_ip_changed (wxCommandEvent &);
 	void tms_path_changed (wxCommandEvent &);
@@ -56,7 +57,9 @@ private:
 	void server_selection_changed (wxListEvent &);
 
 	void add_server_to_control (ServerDescription *);
+	void setup_language_sensitivity ();
 
+	wxCheckBox* _set_language;
 	wxChoice* _language;
 	wxTextCtrl* _tms_ip;
 	wxTextCtrl* _tms_path;