r21650 by craig - #14465: Fix TP Paragraph Effect combobox not working

[scribus-commit]

Author: craig
Date: Tue Dec 13 23:30:10 2016
New Revision: 21650

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21650
Log:
#14465: Fix TP Paragraph Effect combobox not working

Modified:
    trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
    trunk/Scribus/scribus/ui/propertywidget_pareffect.h

Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21650&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp	Tue Dec 13 23:30:10 2016
@@ -197,6 +197,35 @@
 		enableNum(false);
 		peCombo->setCurrentIndex(0);
 	}
+}
+
+void PropertyWidget_ParEffect::fillBulletStrEditCombo()
+{
+	bulletStrEdit->clear();
+	bulletStrEdit->addItem(QChar(0x2022));
+	bulletStrEdit->addItem("*");
+	bulletStrEdit->addItem(QChar(0x2013));
+	bulletStrEdit->setMinimumWidth(50);
+	if (bulletStrEdit->currentText().isEmpty())
+		bulletStrEdit->setEditText(QChar(0x2022));
+}
+
+void PropertyWidget_ParEffect::fillNumFormatCombo()
+{
+	numFormatCombo->clear();
+	numFormatCombo->addItems(getFormatListTr());
+}
+
+void PropertyWidget_ParEffect::fillPECombo()
+{
+	QSignalBlocker sb(peCombo);
+	int currIndex = peCombo->currentIndex();
+	peCombo->clear();
+	peCombo->addItem(tr("No Paragraph Effects"));
+	peCombo->addItem(tr("Drop Caps"));
+	peCombo->addItem(tr("Bulleted List"));
+	peCombo->addItem(tr("Numbered List"));
+	peCombo->setCurrentIndex(currIndex);
 }
 
 void PropertyWidget_ParEffect::updateStyle(const ParagraphStyle& newPStyle)

Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21650&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.h	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.h	Tue Dec 13 23:30:10 2016
@@ -75,31 +75,11 @@
 	void enableBullet(bool);
 	void enableNum(bool);
 	void enableParEffect(bool);
-	void fillBulletStrEditCombo()
-	{
-		bulletStrEdit->clear();
-		bulletStrEdit->addItem(QChar(0x2022));
-		bulletStrEdit->addItem("*");
-		bulletStrEdit->addItem(QChar(0x2013));
-		bulletStrEdit->setMinimumWidth(50);
-		if (bulletStrEdit->currentText().isEmpty())
-			bulletStrEdit->setEditText(QChar(0x2022));
-	}
+	void fillBulletStrEditCombo();
 
-	void fillNumFormatCombo()
-	{
-		numFormatCombo->clear();
-		numFormatCombo->addItems(getFormatListTr());
-	}
+	void fillNumFormatCombo();
 
-	void fillPECombo()
-	{
-		peCombo->clear();
-		peCombo->addItem(tr("No Paragraph Effects"));
-		peCombo->addItem(tr("Drop Caps"));
-		peCombo->addItem(tr("Bulleted List"));
-		peCombo->addItem(tr("Numbered List"));
-	}
+	void fillPECombo();
 
 //	void SMPStyleWidget::fillNumRestartCombo()
 //	{