Merge lp:~cardinot/stellarium/languageList into lp:stellarium

[Marcos Cardinot]

This fix is actually an improvement for the list of languages​​.
The list of languages ​​is very large and the task of searching for the language can be exhausting. So with this commit, the user can type the name of the language and the field is filled simultaneously. If you type a nonexistent language, the field just redisplays the current language.

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2013-12-14 18:41:34 +0000
+++ src/gui/ConfigurationDialog.cpp	2013-12-17 00:41:46 +0000
@@ -134,21 +134,12 @@
 
 	// Main tab
 	// Fill the language list widget from the available list
-	QString appLang = StelApp::getInstance().getLocaleMgr().getAppLanguage();
-	QComboBox* cb = ui->programLanguageComboBox;	
+	QComboBox* cb = ui->programLanguageComboBox;
 	cb->clear();
 	cb->addItems(StelTranslator::globalTranslator->getAvailableLanguagesNamesNative(StelFileMgr::getLocaleDir()));
 	cb->model()->sort(0);
-	QString l2 = StelTranslator::iso639_1CodeToNativeName(appLang);
-	int lt = cb->findText(l2, Qt::MatchExactly);
-	if (lt == -1 && appLang.contains('_'))
-	{
-		l2 = appLang.left(appLang.indexOf('_'));
-		l2=StelTranslator::iso639_1CodeToNativeName(l2);
-		lt = cb->findText(l2, Qt::MatchExactly);
-	}
-	if (lt!=-1)
-		cb->setCurrentIndex(lt);
+	updateCurrentLanguage();
+	connect(cb->lineEdit(), SIGNAL(editingFinished()), this, SLOT(updateCurrentLanguage()));
 	connect(cb, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(selectLanguage(const QString&)));
 
 	connect(ui->getStarsButton, SIGNAL(clicked()), this, SLOT(downloadStars()));
@@ -285,6 +276,26 @@
 	updateTabBarListWidgetWidth();
 }
 
+void ConfigurationDialog::updateCurrentLanguage()
+{
+	QComboBox* cb = ui->programLanguageComboBox;
+	QString appLang = StelApp::getInstance().getLocaleMgr().getAppLanguage();
+	QString l2 = StelTranslator::iso639_1CodeToNativeName(appLang);
+
+	if (cb->currentText() == l2)
+		return;
+
+	int lt = cb->findText(l2, Qt::MatchExactly);
+	if (lt == -1 && appLang.contains('_'))
+	{
+		l2 = appLang.left(appLang.indexOf('_'));
+		l2=StelTranslator::iso639_1CodeToNativeName(l2);
+		lt = cb->findText(l2, Qt::MatchExactly);
+	}
+	if (lt!=-1)
+		cb->setCurrentIndex(lt);
+}
+
 void ConfigurationDialog::selectLanguage(const QString& langName)
 {
 	QString code = StelTranslator::nativeNameToIso639_1Code(langName);

=== modified file 'src/gui/ConfigurationDialog.hpp'
--- src/gui/ConfigurationDialog.hpp	2013-10-14 09:33:41 +0000
+++ src/gui/ConfigurationDialog.hpp	2013-12-17 00:41:46 +0000
@@ -80,7 +80,8 @@
 	//! Called when any of the boxes has been clicked. Sets the
 	//! "selected info" mode to "Custom".
 	void setSelectedInfoFromCheckBoxes();
-	
+
+	void updateCurrentLanguage();
 	void selectLanguage(const QString& languageCode);
 	void setStartupTimeMode();
 	//! Show/bring to foreground the shortcut editor window.

=== modified file 'src/gui/configurationDialog.ui'
--- src/gui/configurationDialog.ui	2013-12-15 09:54:44 +0000
+++ src/gui/configurationDialog.ui	2013-12-17 00:41:46 +0000
@@ -206,7 +206,7 @@
                 </size>
                </property>
                <property name="editable">
-                <bool>false</bool>
+                <bool>true</bool>
                </property>
                <property name="insertPolicy">
                 <enum>QComboBox::NoInsert</enum>