r20172 by jghali - fix incorrect display of color name in style manager when a color is set to the "None" color

[scribus-commit]

Author: jghali
Date: Thu Jun 18 20:20:34 2015
New Revision: 20172

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20172
Log:
fix incorrect display of color name in style manager when a color is set to the "None" color

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

Modified: trunk/Scribus/scribus/ui/smcolorcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20172&path=/trunk/Scribus/scribus/ui/smcolorcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcolorcombo.cpp (original)
+++ trunk/Scribus/scribus/ui/smcolorcombo.cpp Thu Jun 18 20:20:34 2015
@@ -56,7 +56,7 @@
 	m_hasParent = false;
 	m_pItem = -1;
 	m_pText = s;
-	setCurrentComboItem(this, s);
+	setCurrentComboItem(this, (s == CommonStrings::None) ? CommonStrings::tr_NoneColor : s);
 	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 }
 
@@ -66,7 +66,7 @@
 	m_hasParent = true;
 	m_pItem = -1;
 	m_pText = s;
-	setCurrentComboItem(this, s);
+	setCurrentComboItem(this, (s == CommonStrings::None) ? CommonStrings::tr_NoneColor : s);
 	setFont(!isParentValue);
 	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 }