r20971 by craig -

[scribus-commit]

Author: craig
Date: Wed Feb 10 22:20:26 2016
New Revision: 20971

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20971
Log:
Fix font option column titles prior to 1.5.1 release without affecting translations

Modified:
    trunk/Scribus/scribus/fontlistmodel.cpp

Modified: trunk/Scribus/scribus/fontlistmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20971&path=/trunk/Scribus/scribus/fontlistmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/fontlistmodel.cpp	(original)
+++ trunk/Scribus/scribus/fontlistmodel.cpp	Wed Feb 10 22:20:26 2016
@@ -82,19 +82,26 @@
 //			case FontListModel::FontVariant:
 //				return tr("Variant");
 			case FontListModel::FontType:
-				return isDisplayRole? QString("a") : tr("Type");
+				return tr("Type");
+//				return isDisplayRole? QString("a") : tr("Type");
 			case FontListModel::FontFormat:
-				return isDisplayRole? QString("b") : tr("Format");
+				return tr("Format");
+//				return isDisplayRole? QString("b") : tr("Format");
 			case FontListModel::FontEmbed:
-				return isDisplayRole? QString("c") : tr("Embed in PostScript");
+				return tr("Embed in PostScript");
+//				return isDisplayRole? QString("c") : tr("Embed in PostScript");
 			case FontListModel::FontSubset:
-				return isDisplayRole? QString("d") : tr("Subset");
+				return tr("Subset");
+//				return isDisplayRole? QString("d") : tr("Subset");
 			case FontListModel::FontOutline:
-				return isDisplayRole? QString("e") : tr("Outline");
+				return tr("Outline");
+//				return isDisplayRole? QString("e") : tr("Outline");
 			case FontListModel::FontAccess:
-				return isDisplayRole? QString("f") : tr("Access");
+				return tr("Access");
+//				return isDisplayRole? QString("f") : tr("Access");
 			case FontListModel::FontInDoc:
-				return isDisplayRole? QString("g") : tr("Used in Doc");
+				return tr("Used in Doc");
+//				return isDisplayRole? QString("g") : tr("Used in Doc");
 			case FontListModel::FontFile:
 				return tr("Path to Font File");
 			default: