r20526 by craig -

[scribus-commit]

Author: craig
Date: Tue Nov  3 17:13:43 2015
New Revision: 20526

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20526
Log:
Fix Numbered lists in Paragraph Styles not using correct texts

Modified:
    trunk/Scribus/scribus/numeration.cpp
    trunk/Scribus/scribus/numeration.h
    trunk/Scribus/scribus/ui/prefs_documentsections.cpp
    trunk/Scribus/scribus/ui/propertywidget_pareffect.h
    trunk/Scribus/scribus/ui/smpstylewidget.cpp

Modified: trunk/Scribus/scribus/numeration.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20526&path=/trunk/Scribus/scribus/numeration.cpp
==============================================================================
--- trunk/Scribus/scribus/numeration.cpp	(original)
+++ trunk/Scribus/scribus/numeration.cpp	Tue Nov  3 17:13:43 2015
@@ -45,6 +45,13 @@
 	return list;
 }
 
+QStringList getFormatListTr()
+{
+	QStringList list;
+	list << QObject::tr("1, 2, 3, ...") << QObject::tr("i, ii, iii, ...") << QObject::tr("I, II, III, ...") << QObject::tr("a, b, c, ...") << QObject::tr("A, B, C, ...") << QObject::tr("*") << QObject::tr("CJK");
+	return list;
+}
+
 QString Numeration::numString(int num) const
 {
 	if (numFormat == Type_asterix)

Modified: trunk/Scribus/scribus/numeration.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20526&path=/trunk/Scribus/scribus/numeration.h
==============================================================================
--- trunk/Scribus/scribus/numeration.h	(original)
+++ trunk/Scribus/scribus/numeration.h	Tue Nov  3 17:13:43 2015
@@ -60,5 +60,6 @@
 //return numeration name from type
 QString getFormatName(int format);
 QStringList getFormatList();
+QStringList getFormatListTr();
 
 #endif // NUMERATION_H

Modified: trunk/Scribus/scribus/ui/prefs_documentsections.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20526&path=/trunk/Scribus/scribus/ui/prefs_documentsections.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsections.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentsections.cpp	Tue Nov  3 17:13:43 2015
@@ -39,7 +39,9 @@
 	localSections=prefsData->docSectionMap;
 	m_maxpageindex=m_doc->DocPages.count()-1;
 	styles.clear();
-	styles << tr("1, 2, 3, ...") << tr("i, ii, iii, ...") << tr("I, II, III, ...") << tr("a, b, c, ...") << tr("A, B, C, ...") << tr("*") << tr("CJK") << CommonStrings::tr_None;
+	styles=getFormatListTr();
+	styles << CommonStrings::tr_None;
+//	styles << tr("1, 2, 3, ...") << tr("i, ii, iii, ...") << tr("I, II, III, ...") << tr("a, b, c, ...") << tr("A, B, C, ...") << tr("*") << tr("CJK") << CommonStrings::tr_None;
 
 	updateTable();
 }

Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20526&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.h	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.h	Tue Nov  3 17:13:43 2015
@@ -89,7 +89,7 @@
 	void fillNumFormatCombo()
 	{
 		numFormatCombo->clear();
-		numFormatCombo->addItems(getFormatList());
+		numFormatCombo->addItems(getFormatListTr());
 	}
 
 	void fillPECombo()

Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20526&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp	Tue Nov  3 17:13:43 2015
@@ -264,7 +264,7 @@
 void SMPStyleWidget::fillNumFormatCombo()
 {
 	numFormatCombo->clear();
-	numFormatCombo->addItems(getFormatList());
+	numFormatCombo->addItems(getFormatListTr());
 }
 
 void SMPStyleWidget::fillNumerationsCombo()