r21627 by jghali - fix incorrect display of language in text properties

scribus-commit scribus-commit at lists.scribus.net
Sat Dec 10 14:47:00 UTC 2016


Author: jghali
Date: Sat Dec 10 14:47:00 2016
New Revision: 21627

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21627
Log:
fix incorrect display of language in text properties

Modified:
    trunk/Scribus/scribus/ui/propertiespalette_text.cpp

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21627&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp	Sat Dec 10 14:47:00 2016
@@ -477,17 +477,13 @@
 {
 	if (!m_ScMW || m_ScMW->scriptIsRunning())
 		return;
-	bool tmp = m_haveItem;
-	m_haveItem = false;
-	if (tmp)
-	{
-		QStringList lang;
-		LanguageManager::instance()->fillInstalledStringList(&lang, true);
-		QString langName = LanguageManager::instance()->getLangFromAbbrev(w, false);
-		langCombo->setCurrentIndex(lang.indexOf(langName));
-	}
-	m_haveItem = tmp;
-
+	QStringList lang;
+	LanguageManager::instance()->fillInstalledStringList(&lang, true);
+	QString langName = LanguageManager::instance()->getLangFromAbbrev(w, true);
+
+	bool sigBlocked  = langCombo->blockSignals(true);
+	langCombo->setCurrentIndex(lang.indexOf(langName));
+	langCombo->blockSignals(sigBlocked);
 }
 
 void PropertiesPalette_Text::showFirstLinePolicy( FirstLineOffsetPolicy f )




More information about the scribus-commit mailing list