r21045 by jghali -

[scribus-commit]

Author: jghali
Date: Tue Mar  1 22:26:50 2016
New Revision: 21045

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21045
Log:
handle None color translated string directly in ColorCombo currentColor()

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

Modified: trunk/Scribus/scribus/ui/colorcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21045&path=/trunk/Scribus/scribus/ui/colorcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorcombo.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorcombo.cpp	Tue Mar  1 22:26:50 2016
@@ -44,7 +44,10 @@
 
 QString ColorCombo::currentColor() const
 {
-	return currentText();
+	QString  colorName = currentText();
+	if (colorName == CommonStrings::tr_NoneColor)
+		colorName = CommonStrings::None;
+	return colorName;
 }
 
 void ColorCombo::updateBox(ColorList& list, ColorCombo::PixmapType pixType , bool insertNone)