r18535 by jghali - some refactoring

scribus-commit scribus-commit at lists.scribus.net
Tue Oct 8 22:36:54 UTC 2013


Author: jghali
Date: Tue Oct  8 22:36:54 2013
New Revision: 18535

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18535
Log:
some refactoring

Modified:
    trunk/Scribus/scribus/ui/smpstylewidget.cpp
    trunk/Scribus/scribus/ui/smpstylewidget.h
    trunk/Scribus/scribus/ui/smpstylewidget.ui
    trunk/Scribus/scribus/ui/smtextstyles.cpp

Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18535&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp Tue Oct  8 22:36:54 2013
@@ -34,14 +34,14 @@
 	spaceAboveLabel->setPixmap( loadIcon("above.png") );
 	spaceBelowLabel->setPixmap( loadIcon("below.png") );
 
-	lineSpacingMode_->addItem( tr("Fixed Linespacing"));
-	lineSpacingMode_->addItem( tr("Automatic Linespacing"));
-	lineSpacingMode_->addItem( tr("Align to Baseline Grid"));
-	connect(lineSpacingMode_, SIGNAL(highlighted(int)), this, SLOT(slotLineSpacingModeChanged(int)));
-
-	lineSpacing_->setSuffix(unitGetSuffixFromIndex(0));
-	spaceAbove_->setSuffix(unitGetSuffixFromIndex(0));
-	spaceBelow_->setSuffix(unitGetSuffixFromIndex(0));
+	lineSpacingMode->addItem( tr("Fixed Linespacing"));
+	lineSpacingMode->addItem( tr("Automatic Linespacing"));
+	lineSpacingMode->addItem( tr("Align to Baseline Grid"));
+	connect(lineSpacingMode, SIGNAL(highlighted(int)), this, SLOT(slotLineSpacingModeChanged(int)));
+
+	lineSpacing->setSuffix(unitGetSuffixFromIndex(0));
+	spaceAbove->setSuffix(unitGetSuffixFromIndex(0));
+	spaceBelow->setSuffix(unitGetSuffixFromIndex(0));
 
 //	optMarginCombo->addItem(tr("None"), ParagraphStyle::OM_None);
 //	optMarginCombo->addItem(tr("Left Protruding"), ParagraphStyle::OM_LeftProtruding);
@@ -50,18 +50,18 @@
 //	optMarginCombo->addItem(tr("Right Hanging Punctuation"), ParagraphStyle::OM_RightHangingPunct);
 //	optMarginCombo->addItem(tr("Default"), ParagraphStyle::OM_Default);
 
-	parEffectOffset_->setSuffix(unitGetSuffixFromIndex(0));
+	parEffectOffset->setSuffix(unitGetSuffixFromIndex(0));
 	
 	fillBulletStrEditCombo();
-	bulletCharTableButton_->setIcon(loadIcon("22/insert-table.png"));
+	bulletCharTableButton->setIcon(loadIcon("22/insert-table.png"));
 	fillNumFormatCombo();
 	numStartSpin->setMinimum(1);
 	numStartSpin->setMaximum(9999);
 	numLevelSpin->setMinimum(1);
 	numLevelSpin->setMaximum(1);
 	fillNumRestartCombo();
-	dropCapLines_->setMinimum(2);
-	dropCapLines_->setMaximum(99);
+	dropCapLines->setMinimum(2);
+	dropCapLines->setMaximum(99);
 
 	minSpaceSpin->setSuffix(unitGetSuffixFromIndex(SC_PERCENT));
 	minGlyphExtSpin->setSuffix(unitGetSuffixFromIndex(SC_PERCENT));
@@ -75,7 +75,7 @@
 
 void SMPStyleWidget::slotLineSpacingModeChanged(int i)
 {
-	lineSpacing_->setEnabled(i == 0);
+	lineSpacing->setEnabled(i == 0);
 }
 
 void SMPStyleWidget::changeEvent(QEvent *e)
@@ -96,28 +96,28 @@
 // These are for the paragraph style
 
 	parentCombo->setToolTip(      tr("Parent Style"));
-	lineSpacingMode_->setToolTip( tr("Line Spacing Mode"));
-	lineSpacing_->setToolTip(     tr("Line Spacing"));
-	spaceAbove_->setToolTip(      tr("Space Above"));
-	spaceBelow_->setToolTip(      tr("Space Below"));
-	lineSpacingLabel->setToolTip(lineSpacing_->toolTip());
-	spaceAboveLabel->setToolTip(spaceAbove_->toolTip());
-	spaceBelowLabel->setToolTip(spaceBelow_->toolTip());
+	lineSpacingMode->setToolTip( tr("Line Spacing Mode"));
+	lineSpacing->setToolTip(     tr("Line Spacing"));
+	spaceAbove->setToolTip(      tr("Space Above"));
+	spaceBelow->setToolTip(      tr("Space Below"));
+	lineSpacingLabel->setToolTip(lineSpacing->toolTip());
+	spaceAboveLabel->setToolTip(spaceAbove->toolTip());
+	spaceBelowLabel->setToolTip(spaceBelow->toolTip());
 //	optMarginCombo->setToolTip(tr("Activate an optical margins layout"));
 //	optMarginLabel->setToolTip(optMarginCombo->toolTip());
 	//CB Unneeded, gets in the way of single widget tooltips
 	//dropCapsBox->setToolTip(      tr("Enable or disable drop cap"));
-	dropCapLines_->setToolTip(    tr("Drop Cap Lines"));
-	bulletCharTableButton_->setToolTip(tr("Enhanced Char Table for inserting customs chars as bullets"));
-	parEffectOffset_->setToolTip(   tr("Paragraph Effects Chars Offset"));
+	dropCapLines->setToolTip(    tr("Drop Cap Lines"));
+	bulletCharTableButton->setToolTip(tr("Enhanced Char Table for inserting customs chars as bullets"));
+	parEffectOffset->setToolTip(   tr("Paragraph Effects Chars Offset"));
 	parEffectIndentBox->setToolTip(   tr("Hang Paragraph Effect before paragraph indent"));
 	parEffectCharStyleCombo->setToolTip("<qt>" + tr("Choose chracter style or leave blank for use default paragraph style"));
-	alignement_->setToolTip(      tr("Alignment"));
-	tabList_->first_->setToolTip( tr("First Line Indent"));
-	tabList_->left_->setToolTip(  tr("Left Indent"));
-	tabList_->right_->setToolTip( tr("Right Indent"));
+	alignement->setToolTip(      tr("Alignment"));
+	tabList->first_->setToolTip( tr("First Line Indent"));
+	tabList->left_->setToolTip(  tr("Left Indent"));
+	tabList->right_->setToolTip( tr("Right Indent"));
 	//CB Unneeded, gets in the way of single widget tooltips
-	//tabList_->setToolTip(         tr("Tabulators"));
+	//tabList->setToolTip(         tr("Tabulators"));
 	
 	minSpaceSpin->setToolTip(tr("Maximum white space compression allowed.\nExpressed as a percentage of the current white space value."));
 	minSpaceLabel->setToolTip(minSpaceSpin->toolTip());
@@ -137,10 +137,10 @@
 /*      End Tooltips               */
 /***********************************/
 
-	lineSpacingMode_->clear();
-	lineSpacingMode_->addItem( tr("Fixed Linespacing"));
-	lineSpacingMode_->addItem( tr("Automatic Linespacing"));
-	lineSpacingMode_->addItem( tr("Align to Baseline Grid"));
+	lineSpacingMode->clear();
+	lineSpacingMode->addItem( tr("Fixed Linespacing"));
+	lineSpacingMode->addItem( tr("Automatic Linespacing"));
+	lineSpacingMode->addItem( tr("Align to Baseline Grid"));
 	
 //	optMarginCombo->clear();
 //	optMarginCombo->addItem(tr("None"), ParagraphStyle::OM_None);
@@ -152,9 +152,9 @@
 //
 //	optMarginLabel->setText(tr("Optical Margins:"));
 
-	lineSpacing_->setSuffix(unitGetSuffixFromIndex(0));
-	spaceAbove_->setSuffix(unitGetSuffixFromIndex(0));
-	spaceBelow_->setSuffix(unitGetSuffixFromIndex(0));
+	lineSpacing->setSuffix(unitGetSuffixFromIndex(0));
+	spaceAbove->setSuffix(unitGetSuffixFromIndex(0));
+	spaceBelow->setSuffix(unitGetSuffixFromIndex(0));
 	parentLabel->setText( tr("Based On:"));
 	distancesBox->setTitle( tr("Distances and Alignment"));
 
@@ -164,7 +164,7 @@
 	numBox->setTitle(tr("Numeration"));
 	dropCapsLineLabel->setText( tr("Lines:"));
 	bulletCharLabel->setText(tr("Bullet Char/String"));
-	bulletCharTableButton_->setText(tr("Char Table"));
+	bulletCharTableButton->setText(tr("Char Table"));
 	numFormatLabel->setText(tr("Numbering Style"));
 	numLevelLabel->setText(tr("Level"));
 	numPrefixLabel->setText(tr("Prefix"));
@@ -182,8 +182,8 @@
 		font1.setPointSize(font1.pointSize() *2);
 	else if (font1.pixelSize())
 		font1.setPixelSize(font1.pixelSize() *2);
-	((QComboBox*) bulletStrEdit_)->setFont(font1);
-	(bulletStrEdit_->lineEdit())->setFont(font1);
+	((QComboBox*) bulletStrEdit)->setFont(font1);
+	(bulletStrEdit->lineEdit())->setFont(font1);
 
 	tabsBox->setTitle( tr("Tabulators and Indentation"));
 	tabWidget->setTabText(0, tr("Properties"));
@@ -207,8 +207,8 @@
 
 void SMPStyleWidget::unitChange(double oldRatio, double newRatio, int unitIndex)
 {
-	parEffectOffset_->setNewUnit(unitIndex);
-	tabList_->unitChange(unitIndex);
+	parEffectOffset->setNewUnit(unitIndex);
+	tabList->unitChange(unitIndex);
 }
 
 void SMPStyleWidget::setDoc(ScribusDoc *doc)
@@ -225,13 +225,13 @@
 
 void SMPStyleWidget::fillBulletStrEditCombo()
 {
-	bulletStrEdit_->clear();
-	bulletStrEdit_->addItem(QChar(0x2022));
-	bulletStrEdit_->addItem("*");
-	bulletStrEdit_->addItem(QChar(0x2013));
-	bulletStrEdit_->setMinimumWidth(50);
-	if (bulletStrEdit_->currentText().isEmpty())
-		bulletStrEdit_->setEditText(QChar(0x2022));
+	bulletStrEdit->clear();
+	bulletStrEdit->addItem(QChar(0x2022));
+	bulletStrEdit->addItem("*");
+	bulletStrEdit->addItem(QChar(0x2013));
+	bulletStrEdit->setMinimumWidth(50);
+	if (bulletStrEdit->currentText().isEmpty())
+		bulletStrEdit->setEditText(QChar(0x2022));
 }
 
 void SMPStyleWidget::fillNumFormatCombo()
@@ -268,7 +268,7 @@
 		enable = true;
 
 	parEffectCharStyleCombo->setEnabled(enable);
-	parEffectOffset_->setEnabled(enable);
+	parEffectOffset->setEnabled(enable);
 	parEffectIndentBox->setEnabled(enable);
 }
 
@@ -280,10 +280,10 @@
 	const ParagraphStyle *parent = dynamic_cast<const ParagraphStyle*>(pstyle->parentStyle());
 	hasParent_ = pstyle->hasParent() && parent != NULL && parent->hasName() && pstyle->parent() != "";
 
-	lineSpacingMode_->clear();
-	lineSpacingMode_->addItem( tr("Fixed Linespacing"));
-	lineSpacingMode_->addItem( tr("Automatic Linespacing"));
-	lineSpacingMode_->addItem( tr("Align to Baseline Grid"));
+	lineSpacingMode->clear();
+	lineSpacingMode->addItem( tr("Fixed Linespacing"));
+	lineSpacingMode->addItem( tr("Automatic Linespacing"));
+	lineSpacingMode->addItem( tr("Align to Baseline Grid"));
 	
 //	optMarginCombo->clear();
 //	optMarginCombo->addItem(tr("None"), ParagraphStyle::OM_None);
@@ -305,8 +305,8 @@
 
 	if (hasParent_)
 	{
-		lineSpacingMode_->setCurrentItem(pstyle->lineSpacingMode(), pstyle->isInhLineSpacingMode());
-		lineSpacingMode_->setParentItem(parent->lineSpacingMode());
+		lineSpacingMode->setCurrentItem(pstyle->lineSpacingMode(), pstyle->isInhLineSpacingMode());
+		lineSpacingMode->setParentItem(parent->lineSpacingMode());
 		
 //		optMarginCombo->setCurrentItemByData( pstyle->opticalMargins(),  pstyle->isInhOpticalMargins() );
 //		optMarginCombo->setParentItem(optMarginCombo->getItemIndexForData( parent->opticalMargins()));
@@ -320,18 +320,18 @@
 		maxGlyphExtSpin->setValue(pstyle->maxGlyphExtension() * 100.0,  pstyle->isInhMaxGlyphExtension());
 		maxGlyphExtSpin->setParentValue(parent->maxGlyphExtension());
 
-		lineSpacing_->setValue(pstyle->lineSpacing(), pstyle->isInhLineSpacing());
-		lineSpacing_->setParentValue(parent->lineSpacing());
-
-		spaceAbove_->setValue(pstyle->gapBefore(), pstyle->isInhGapBefore());
-		spaceAbove_->setParentValue(parent->gapBefore());
-
-		spaceBelow_->setValue(pstyle->gapAfter(), pstyle->isInhGapAfter());
-		spaceBelow_->setParentValue(parent->gapAfter());
-
-
-		alignement_->setStyle(pstyle->alignment(), pstyle->isInhAlignment());
-		alignement_->setParentItem(parent->alignment());
+		lineSpacing->setValue(pstyle->lineSpacing(), pstyle->isInhLineSpacing());
+		lineSpacing->setParentValue(parent->lineSpacing());
+
+		spaceAbove->setValue(pstyle->gapBefore(), pstyle->isInhGapBefore());
+		spaceAbove->setParentValue(parent->gapBefore());
+
+		spaceBelow->setValue(pstyle->gapAfter(), pstyle->isInhGapAfter());
+		spaceBelow->setParentValue(parent->gapAfter());
+
+
+		alignement->setStyle(pstyle->alignment(), pstyle->isInhAlignment());
+		alignement->setParentItem(parent->alignment());
 
 		bool hasParentTabs = pstyle->isInhTabValues();
 		QList<ParagraphStyle::TabRecord> tabs;
@@ -340,17 +340,17 @@
 		else
 			tabs = pstyle->tabValues();
 
-		tabList_->setTabs(tabs, unitIndex, hasParentTabs);
-		tabList_->setParentTabs(parent->tabValues());
-
-		tabList_->setLeftIndentValue(pstyle->leftMargin() * unitRatio,pstyle->isInhLeftMargin());
-		tabList_->setParentLeftIndent(parent->leftMargin() * unitRatio);
-
-		tabList_->setFirstLineValue(pstyle->firstIndent() * unitRatio, pstyle->isInhFirstIndent());
-		tabList_->setParentFirstLine(parent->firstIndent() * unitRatio);
-
-		tabList_->setRightIndentValue(pstyle->rightMargin() * unitRatio, pstyle->isInhRightMargin());
-		tabList_->setParentRightIndent(parent->rightMargin() * unitRatio);
+		tabList->setTabs(tabs, unitIndex, hasParentTabs);
+		tabList->setParentTabs(parent->tabValues());
+
+		tabList->setLeftIndentValue(pstyle->leftMargin() * unitRatio,pstyle->isInhLeftMargin());
+		tabList->setParentLeftIndent(parent->leftMargin() * unitRatio);
+
+		tabList->setFirstLineValue(pstyle->firstIndent() * unitRatio, pstyle->isInhFirstIndent());
+		tabList->setParentFirstLine(parent->firstIndent() * unitRatio);
+
+		tabList->setRightIndentValue(pstyle->rightMargin() * unitRatio, pstyle->isInhRightMargin());
+		tabList->setParentRightIndent(parent->rightMargin() * unitRatio);
 
 		keepLinesStart->setValue (pstyle->keepLinesStart(), pstyle->isInhKeepLinesStart());
 		keepLinesEnd->setValue (pstyle->keepLinesEnd(), pstyle->isInhKeepLinesEnd());
@@ -382,17 +382,17 @@
 
 		dropCapsBox->setChecked(pstyle->hasDropCap());
 		setWidgetBoldFont(dropCapsBox, !pstyle->isInhHasDropCap());
-		dropCapLines_->setValue(pstyle->dropCapLines(), pstyle->isInhDropCapLines());
-		dropCapLines_->setParentValue(parent->dropCapLines());
-
-		parEffectOffset_->setValue(pstyle->parEffectOffset() * unitRatio, pstyle->isInhParEffectOffset());
-		parEffectOffset_->setParentValue(parent->parEffectOffset() * unitRatio);
+		dropCapLines->setValue(pstyle->dropCapLines(), pstyle->isInhDropCapLines());
+		dropCapLines->setParentValue(parent->dropCapLines());
+
+		parEffectOffset->setValue(pstyle->parEffectOffset() * unitRatio, pstyle->isInhParEffectOffset());
+		parEffectOffset->setParentValue(parent->parEffectOffset() * unitRatio);
 		parEffectIndentBox->setChecked(pstyle->parEffectIndent(),pstyle->isInhParEffectIndent());
 		parEffectIndentBox->setParentValue(parent->parEffectIndent());
 
 		bulletBox->setChecked(pstyle->hasBullet());
 		setWidgetBoldFont(bulletBox, !pstyle->isInhHasBullet());
-		bulletStrEdit_->setEditText(pstyle->bulletStr());
+		bulletStrEdit->setEditText(pstyle->bulletStr());
 		setWidgetBoldFont(bulletCharLabel, !pstyle->isInhBulletStr());
 		numBox->setChecked(pstyle->hasNum());
 		setWidgetBoldFont(numBox, !pstyle->isInhHasNum());
@@ -428,10 +428,10 @@
 	}
 	else
 	{
-		lineSpacingMode_->setCurrentIndex(pstyle->lineSpacingMode());
-		lineSpacing_->setValue(pstyle->lineSpacing());
-		spaceAbove_->setValue(pstyle->gapBefore());
-		spaceBelow_->setValue(pstyle->gapAfter());
+		lineSpacingMode->setCurrentIndex(pstyle->lineSpacingMode());
+		lineSpacing->setValue(pstyle->lineSpacing());
+		spaceAbove->setValue(pstyle->gapBefore());
+		spaceBelow->setValue(pstyle->gapAfter());
 //		optMarginCombo->setCurrentItemByData( pstyle->opticalMargins() );
 		setOpticalMargins(pstyle->opticalMargins());
 		optMarginParentButton->hide();
@@ -439,16 +439,16 @@
 		minGlyphExtSpin->setValue(pstyle->minGlyphExtension() * 100.0);
 		maxGlyphExtSpin->setValue(pstyle->maxGlyphExtension() * 100.0);
 
-		parEffectOffset_->setValue(pstyle->parEffectOffset() * unitRatio);
+		parEffectOffset->setValue(pstyle->parEffectOffset() * unitRatio);
 		parEffectIndentBox->setChecked(pstyle->parEffectIndent());
 		parentParEffectsButton->hide();
 		disconnect(parentParEffectsButton, SIGNAL(clicked()), this, SLOT(slotParentParEffects()));
 		dropCapsBox->setChecked(pstyle->hasDropCap());
 		setWidgetBoldFont(dropCapsBox, false);
-		dropCapLines_->setValue(pstyle->dropCapLines());
+		dropCapLines->setValue(pstyle->dropCapLines());
 		bulletBox->setChecked(pstyle->hasBullet());
 		setWidgetBoldFont(bulletBox, false);
-		bulletStrEdit_->setEditText(pstyle->bulletStr());
+		bulletStrEdit->setEditText(pstyle->bulletStr());
 		setWidgetBoldFont(bulletCharLabel, false);
 		numBox->setChecked(pstyle->hasNum());
 		setWidgetBoldFont(numBox, false);
@@ -473,11 +473,11 @@
 		numRestartOtherBox->setChecked(pstyle->numOther());
 		numRestartHigherBox->setChecked(pstyle->numHigher());
 
-		alignement_->setStyle(pstyle->alignment());
-		tabList_->setTabs(pstyle->tabValues(), unitIndex);
-		tabList_->setLeftIndentValue(pstyle->leftMargin() * unitRatio);
-		tabList_->setFirstLineValue(pstyle->firstIndent() * unitRatio);
-		tabList_->setRightIndentValue(pstyle->rightMargin() * unitRatio);
+		alignement->setStyle(pstyle->alignment());
+		tabList->setTabs(pstyle->tabValues(), unitIndex);
+		tabList->setLeftIndentValue(pstyle->leftMargin() * unitRatio);
+		tabList->setFirstLineValue(pstyle->firstIndent() * unitRatio);
+		tabList->setRightIndentValue(pstyle->rightMargin() * unitRatio);
 
 		keepLinesStart->setValue (pstyle->keepLinesStart());
 		keepLinesEnd->setValue (pstyle->keepLinesEnd());
@@ -485,8 +485,8 @@
 		keepWithNext->setChecked (pstyle->keepWithNext());
 	}
 
-	lineSpacing_->setEnabled(pstyle->lineSpacingMode() == ParagraphStyle::FixedLineSpacing);
-	dropCapLines_->setEnabled(pstyle->hasDropCap());
+	lineSpacing->setEnabled(pstyle->lineSpacingMode() == ParagraphStyle::FixedLineSpacing);
+	dropCapLines->setEnabled(pstyle->hasDropCap());
 
 	checkParEffectState();
 	parEffectCharStyleCombo->clear();
@@ -555,10 +555,10 @@
 
 void SMPStyleWidget::showLineSpacing(QList<ParagraphStyle*> &pstyles)
 {
-	lineSpacingMode_->clear();
-	lineSpacingMode_->addItem( tr("Fixed Linespacing"));
-	lineSpacingMode_->addItem( tr("Automatic Linespacing"));
-	lineSpacingMode_->addItem( tr("Align to Baseline Grid"));
+	lineSpacingMode->clear();
+	lineSpacingMode->addItem( tr("Fixed Linespacing"));
+	lineSpacingMode->addItem( tr("Automatic Linespacing"));
+	lineSpacingMode->addItem( tr("Align to Baseline Grid"));
 
 	int tmpLP = -1;
 	for (int i = 0; i < pstyles.count(); ++i)
@@ -574,12 +574,12 @@
 
 	if (tmpLP == -1)
 	{
-		if (lineSpacingMode_->itemText(lineSpacingMode_->count() - 1) != "")
-			lineSpacingMode_->addItem("");
-		lineSpacingMode_->setCurrentIndex(lineSpacingMode_->count() - 1);
-	}
-	else
-		lineSpacingMode_->setCurrentIndex(tmpLP);
+		if (lineSpacingMode->itemText(lineSpacingMode->count() - 1) != "")
+			lineSpacingMode->addItem("");
+		lineSpacingMode->setCurrentIndex(lineSpacingMode->count() - 1);
+	}
+	else
+		lineSpacingMode->setCurrentIndex(tmpLP);
 
 	double tmpLS = -1.0;
 	for (int i = 0; i < pstyles.count(); ++i)
@@ -592,11 +592,11 @@
 		else
 			tmpLS = pstyles[i]->lineSpacing();
 	}
-	lineSpacing_->setEnabled(true);
+	lineSpacing->setEnabled(true);
 	if (tmpLS < 0)
-		lineSpacing_->clear();
-	else
-		lineSpacing_->setValue(tmpLS);
+		lineSpacing->clear();
+	else
+		lineSpacing->setValue(tmpLS);
 }
 
 void SMPStyleWidget::showSpaceAB(QList<ParagraphStyle*> &pstyles, int unitIndex)
@@ -615,9 +615,9 @@
 	}
 
 	if (tmpA < 0)
-		spaceAbove_->clear();
-	else
-		spaceAbove_->setValue(tmpA);
+		spaceAbove->clear();
+	else
+		spaceAbove->setValue(tmpA);
 
 	tmpA = -1.2;
 	for (int i = 0; i < pstyles.count(); ++i)
@@ -630,9 +630,9 @@
 	}
 
 	if (tmpA < 0)
-		spaceBelow_->clear();
-	else
-		spaceBelow_->setValue(tmpA);
+		spaceBelow->clear();
+	else
+		spaceBelow->setValue(tmpA);
 }
 
 void SMPStyleWidget::showDropCap(QList<ParagraphStyle*> &pstyles, QList<CharStyle> &cstyles, int unitIndex)
@@ -661,12 +661,12 @@
 			lines = pstyles[i]->dropCapLines();
 	}
 	if (lines == -1)
-		dropCapLines_->clear();
-	else
-		dropCapLines_->setValue(lines);
+		dropCapLines->clear();
+	else
+		dropCapLines->setValue(lines);
 
 	dropCapsBox->setEnabled(true);
-	dropCapLines_->setEnabled(true);
+	dropCapLines->setEnabled(true);
 	connectPESignals();
 }
 
@@ -697,10 +697,10 @@
 		else
 			chStr = pstyles[i]->bulletStr();
 	}
-	bulletStrEdit_->setEditText(chStr);
+	bulletStrEdit->setEditText(chStr);
 
 	connectPESignals();
-	bulletCharTableButton_->setEnabled(true);
+	bulletCharTableButton->setEnabled(true);
 }
 
 void SMPStyleWidget::showNumeration(QList<ParagraphStyle *> &pstyles, QList<CharStyle> &cstyles, int unitIndex)
@@ -749,16 +749,16 @@
 	{
 		if (a != pstyles[i]->alignment())
 		{
-			if (alignement_->selectedId() > -1 && alignement_->selectedId() < 5)
+			if (alignement->selectedId() > -1 && alignement->selectedId() < 5)
 			{
-				alignement_->buttonGroup->setExclusive(false);
-				alignement_->buttonGroup->button(alignement_->selectedId())->toggle();
-				alignement_->buttonGroup->setExclusive(true);
+				alignement->buttonGroup->setExclusive(false);
+				alignement->buttonGroup->button(alignement->selectedId())->toggle();
+				alignement->buttonGroup->setExclusive(true);
 			}
 			return;
 		}
 	}
-	alignement_->setStyle(a);
+	alignement->setStyle(a);
 }
 
 void SMPStyleWidget::showOpticalMargin(QList< ParagraphStyle * > & pstyles)
@@ -864,7 +864,7 @@
 			break;
 		}
 	}
-	tabList_->setTabs(t, unitIndex);
+	tabList->setTabs(t, unitIndex);
 
 	double l = -4000.0;
 	for (int i = 0; i < pstyles.count(); ++i)
@@ -879,11 +879,11 @@
 	}
 	if (l < -3800.0)
 	{
-		tabList_->setLeftIndentValue(0.0);
-		tabList_->left_->clear();
-	}
-	else
-		tabList_->setLeftIndentValue(l * unitRatio);
+		tabList->setLeftIndentValue(0.0);
+		tabList->left_->clear();
+	}
+	else
+		tabList->setLeftIndentValue(l * unitRatio);
 
 	l = -4000.0;
 	for (int i = 0; i < pstyles.count(); ++i)
@@ -898,11 +898,11 @@
 	}
 	if (l < -3800.0)
 	{
-		tabList_->setFirstLineValue(0.0);
-		tabList_->first_->clear();
-	}
-	else
-		tabList_->setFirstLineValue(l * unitRatio);
+		tabList->setFirstLineValue(0.0);
+		tabList->first_->clear();
+	}
+	else
+		tabList->setFirstLineValue(l * unitRatio);
 
 	l = -4000.0;
 	for (int i = 0; i < pstyles.count(); ++i)
@@ -917,11 +917,11 @@
 	}
 	if (l < -3800.0)
 	{
-		tabList_->setRightIndentData(0.0);
-		tabList_->right_->clear();
-	}
-	else
-		tabList_->setRightIndentValue(l * unitRatio);
+		tabList->setRightIndentData(0.0);
+		tabList->right_->clear();
+	}
+	else
+		tabList->setRightIndentValue(l * unitRatio);
 
 }
 
@@ -1030,11 +1030,11 @@
 	disconnectPESignals();
 	if (isOn)
 	{
-		dropCapLines_->setEnabled(true);
+		dropCapLines->setEnabled(true);
 
 		bulletBox->setChecked(false);
-		bulletStrEdit_->setEnabled(false);
-		bulletCharTableButton_->setEnabled(false);
+		bulletStrEdit->setEnabled(false);
+		bulletCharTableButton->setEnabled(false);
 
 		numBox->setChecked(false);
 		numFormatCombo->setEnabled(false);
@@ -1044,7 +1044,7 @@
 		numNewLineEdit->setEnabled(false);
 	}
 	else
-		dropCapLines_->setEnabled(false);
+		dropCapLines->setEnabled(false);
 	if (hasParent_)
 		parentParEffectsButton->show();
 	checkParEffectState();
@@ -1056,10 +1056,10 @@
 	disconnectPESignals();
 	if (isOn)
 	{
-		bulletStrEdit_->setEnabled(true);
-		if (bulletStrEdit_->currentText().isEmpty())
-			bulletStrEdit_->setEditText(bulletStrEdit_->itemText(0));
-		bulletCharTableButton_->setEnabled(true);
+		bulletStrEdit->setEnabled(true);
+		if (bulletStrEdit->currentText().isEmpty())
+			bulletStrEdit->setEditText(bulletStrEdit->itemText(0));
+		bulletCharTableButton->setEnabled(true);
 
 		numBox->setChecked(false);
 		numFormatCombo->setEnabled(false);
@@ -1069,12 +1069,12 @@
 		numNewLineEdit->setEnabled(false);
 
 		dropCapsBox->setChecked(false);
-		dropCapLines_->setEnabled(false);
-	}
-	else
-	{
-		bulletStrEdit_->setEnabled(false);
-		bulletCharTableButton_->setEnabled(false);
+		dropCapLines->setEnabled(false);
+	}
+	else
+	{
+		bulletStrEdit->setEnabled(false);
+		bulletCharTableButton->setEnabled(false);
 	}
 	if (hasParent_)
 		parentParEffectsButton->show();
@@ -1084,7 +1084,7 @@
 
 void SMPStyleWidget::insertSpecialChars(const QString &chars)
 {
-	bulletStrEdit_->lineEdit()->setText(chars);
+	bulletStrEdit->lineEdit()->setText(chars);
 }
 
 void SMPStyleWidget::slotNumbering(bool isOn)
@@ -1101,11 +1101,11 @@
 		numNewLineEdit->setEnabled(true);
 
 		bulletBox->setChecked(false);
-		bulletStrEdit_->setEnabled(false);
-		bulletCharTableButton_->setEnabled(false);
+		bulletStrEdit->setEnabled(false);
+		bulletCharTableButton->setEnabled(false);
 
 		dropCapsBox->setChecked(false);
-		dropCapLines_->setEnabled(false);
+		dropCapLines->setEnabled(false);
 	}
 	else
 	{
@@ -1143,7 +1143,7 @@
 	m_enhanced = new CharSelectEnhanced(this);
 	m_enhanced->setModal(true);
 	connect(m_enhanced, SIGNAL(insertSpecialChars(const QString &)), this, SLOT(insertSpecialChars(const QString &)));
-	connect(m_enhanced, SIGNAL(paletteShown(bool)), bulletCharTableButton_, SLOT(setChecked(bool)));
+	connect(m_enhanced, SIGNAL(paletteShown(bool)), bulletCharTableButton, SLOT(setChecked(bool)));
 	m_enhanced->setDoc(m_Doc);
 	m_enhanced->setEnabled(true);
 	QString styleName = parEffectCharStyleCombo->currentText();
@@ -1164,7 +1164,7 @@
 	if (!m_enhanced || show)
 		return;
 	disconnect(m_enhanced, SIGNAL(insertSpecialChars(const QString &)), this, SLOT(insertSpecialChars(const QString &)));
-	disconnect(m_enhanced, SIGNAL(paletteShown(bool)), bulletCharTableButton_, SLOT(setChecked(bool)));
+	disconnect(m_enhanced, SIGNAL(paletteShown(bool)), bulletCharTableButton, SLOT(setChecked(bool)));
 	m_enhanced->close();
 	delete m_enhanced;
 	m_enhanced = NULL;
@@ -1186,7 +1186,7 @@
 	disconnect(dropCapsBox, SIGNAL(toggled(bool)), this, SLOT(slotDropCap(bool)));
 }
 
-void SMPStyleWidget::on_bulletCharTableButton__toggled(bool checked)
+void SMPStyleWidget::on_bulletCharTableButton_toggled(bool checked)
 {
 	if (m_enhanced && !checked)
 		closeEnhanced();

Modified: trunk/Scribus/scribus/ui/smpstylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18535&path=/trunk/Scribus/scribus/ui/smpstylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.h Tue Oct  8 22:36:54 2013
@@ -78,7 +78,7 @@
 	void slotDefaultOpticalMargins();
 	void slotParentOpticalMargins();
 //	void slotUpdateOpticalMarginsFromCheckBoxes(int);
-	void on_bulletCharTableButton__toggled(bool checked);
+	void on_bulletCharTableButton_toggled(bool checked);
 	void handleUpdateRequest(int);
 
 signals:

Modified: trunk/Scribus/scribus/ui/smpstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18535&path=/trunk/Scribus/scribus/ui/smpstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.ui Tue Oct  8 22:36:54 2013
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>798</width>
+    <width>878</width>
     <height>755</height>
    </rect>
   </property>
@@ -84,12 +84,12 @@
                    <string>TextLabel</string>
                   </property>
                   <property name="buddy">
-                   <cstring>lineSpacingMode_</cstring>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="SMScComboBox" name="lineSpacingMode_">
+                   <cstring>lineSpacingMode</cstring>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="SMScComboBox" name="lineSpacingMode">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                     <horstretch>0</horstretch>
@@ -99,7 +99,7 @@
                  </widget>
                 </item>
                 <item>
-                 <widget class="SMScrSpinBox" name="lineSpacing_">
+                 <widget class="SMScrSpinBox" name="lineSpacing">
                   <property name="minimum">
                    <number>1</number>
                   </property>
@@ -137,12 +137,12 @@
                    <string>TextLabel</string>
                   </property>
                   <property name="buddy">
-                   <cstring>spaceAbove_</cstring>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="SMScrSpinBox" name="spaceAbove_">
+                   <cstring>spaceAbove</cstring>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="SMScrSpinBox" name="spaceAbove">
                   <property name="maximum">
                    <number>300</number>
                   </property>
@@ -177,12 +177,12 @@
                    <string>TextLabel</string>
                   </property>
                   <property name="buddy">
-                   <cstring>spaceBelow_</cstring>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="SMScrSpinBox" name="spaceBelow_">
+                   <cstring>spaceBelow</cstring>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="SMScrSpinBox" name="spaceBelow">
                   <property name="maximum">
                    <number>300</number>
                   </property>
@@ -206,7 +206,7 @@
               <item>
                <layout class="QHBoxLayout">
                 <item>
-                 <widget class="SMAlignSelect" name="alignement_" native="true">
+                 <widget class="SMAlignSelect" name="alignement" native="true">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
                     <horstretch>0</horstretch>
@@ -270,12 +270,12 @@
                    <string>Distance from Text:</string>
                   </property>
                   <property name="buddy">
-                   <cstring>parEffectOffset_</cstring>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="SMScrSpinBox" name="parEffectOffset_">
+                   <cstring>parEffectOffset</cstring>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="SMScrSpinBox" name="parEffectOffset">
                   <property name="minimum">
                    <number>-3000</number>
                   </property>
@@ -361,7 +361,7 @@
                     </widget>
                    </item>
                    <item>
-                    <widget class="SMScComboBox" name="bulletStrEdit_">
+                    <widget class="SMScComboBox" name="bulletStrEdit">
                      <property name="sizePolicy">
                       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                        <horstretch>0</horstretch>
@@ -393,7 +393,7 @@
                     </spacer>
                    </item>
                    <item>
-                    <widget class="QPushButton" name="bulletCharTableButton_">
+                    <widget class="QPushButton" name="bulletCharTableButton">
                      <property name="sizePolicy">
                       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                        <horstretch>0</horstretch>
@@ -629,12 +629,12 @@
                       <string>&Lines:</string>
                      </property>
                      <property name="buddy">
-                      <cstring>dropCapLines_</cstring>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="SMSpinBox" name="dropCapLines_">
+                      <cstring>dropCapLines</cstring>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="SMSpinBox" name="dropCapLines">
                      <property name="minimum">
                       <number>2</number>
                      </property>
@@ -994,7 +994,7 @@
           <item>
            <layout class="QHBoxLayout">
             <item>
-             <widget class="SMTabruler" name="tabList_" native="true">
+             <widget class="SMTabruler" name="tabList" native="true">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
                 <horstretch>0</horstretch>

Modified: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18535&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp (original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp Tue Oct  8 22:36:54 2013
@@ -493,16 +493,16 @@
 		return;
 
 	// paragraph attributes
-	connect(m_pwidget->lineSpacingMode_, SIGNAL(activated(int)), this, SLOT(slotLineSpacingMode(int)));
-	connect(m_pwidget->lineSpacing_, SIGNAL(valueChanged(double)), this, SLOT(slotLineSpacing()));
-	connect(m_pwidget->spaceAbove_, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceAbove()));
-	connect(m_pwidget->spaceBelow_, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceBelow()));
-	connect(m_pwidget->alignement_->TextL, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	connect(m_pwidget->alignement_->TextR, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	connect(m_pwidget->alignement_->TextC, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	connect(m_pwidget->alignement_->TextB, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	connect(m_pwidget->alignement_->TextF, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	connect(m_pwidget->alignement_->parentButton, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(m_pwidget->lineSpacingMode, SIGNAL(activated(int)), this, SLOT(slotLineSpacingMode(int)));
+	connect(m_pwidget->lineSpacing, SIGNAL(valueChanged(double)), this, SLOT(slotLineSpacing()));
+	connect(m_pwidget->spaceAbove, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceAbove()));
+	connect(m_pwidget->spaceBelow, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceBelow()));
+	connect(m_pwidget->alignement->TextL, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(m_pwidget->alignement->TextR, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(m_pwidget->alignement->TextC, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(m_pwidget->alignement->TextB, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(m_pwidget->alignement->TextF, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(m_pwidget->alignement->parentButton, SIGNAL(clicked()), this, SLOT(slotAlignment()));
 //	connect(m_pwidget->optMarginCombo, SIGNAL(activated(int)), this, SLOT(slotOpticalMargin(int)));
 	connect(m_pwidget->optMarginRadioNone, SIGNAL(clicked()), this, SLOT(slotOpticalMarginSelector()));
 	connect(m_pwidget->optMarginRadioLeft, SIGNAL(clicked()), this, SLOT(slotOpticalMarginSelector()));
@@ -516,13 +516,13 @@
 
 	connect(m_pwidget, SIGNAL(useParentParaEffects()), this, SLOT(slotParentParaEffects()));
 	connect(m_pwidget->dropCapsBox, SIGNAL(toggled(bool)), this, SLOT(slotDropCap(bool)));
-	connect(m_pwidget->dropCapLines_, SIGNAL(valueChanged(int)), this, SLOT(slotDropCapLines(int)));
-	connect(m_pwidget->parEffectOffset_, SIGNAL(valueChanged(double)), this, SLOT(slotParEffectOffset()));
+	connect(m_pwidget->dropCapLines, SIGNAL(valueChanged(int)), this, SLOT(slotDropCapLines(int)));
+	connect(m_pwidget->parEffectOffset, SIGNAL(valueChanged(double)), this, SLOT(slotParEffectOffset()));
 	connect(m_pwidget->parEffectIndentBox, SIGNAL(toggled(bool)), this, SLOT(slotParEffectIndent(bool)));
 	connect(m_pwidget->parEffectCharStyleCombo, SIGNAL(activated(const QString&)), this, SLOT(slotParEffectCharStyle(const QString&)));
 
 	connect(m_pwidget->bulletBox, SIGNAL(toggled(bool)), this, SLOT(slotBullet(bool)));
-	connect(m_pwidget->bulletStrEdit_, SIGNAL(editTextChanged(QString)), this, SLOT(slotBulletStr(QString)));
+	connect(m_pwidget->bulletStrEdit, SIGNAL(editTextChanged(QString)), this, SLOT(slotBulletStr(QString)));
 	connect(m_pwidget->numBox, SIGNAL(toggled(bool)), this, SLOT(slotNumeration(bool)));
 	connect(m_pwidget->numComboBox, SIGNAL(activated(QString)), this, SLOT(slotNumName(QString)));
 	connect(m_pwidget->numLevelSpin, SIGNAL(valueChanged(int)), this, SLOT(slotNumLevel(int)));
@@ -541,11 +541,11 @@
 	connect(m_pwidget->keepTogether, SIGNAL(stateChanged(int)), this, SLOT(handleKeepTogether()));
 	connect(m_pwidget->keepWithNext, SIGNAL(stateChanged(int)), this, SLOT(handleKeepWithNext()));
 
-	connect(m_pwidget->tabList_, SIGNAL(tabsChanged()), this, SLOT(slotTabRuler()));
-	connect(m_pwidget->tabList_, SIGNAL(mouseReleased()), this, SLOT(slotTabRuler()));
-	connect(m_pwidget->tabList_->left_, SIGNAL(valueChanged(double)), this, SLOT(slotLeftIndent()));
-	connect(m_pwidget->tabList_->right_, SIGNAL(valueChanged(double)), this, SLOT(slotRightIndent()));
-	connect(m_pwidget->tabList_->first_, SIGNAL(valueChanged(double)), this, SLOT(slotFirstLine()));
+	connect(m_pwidget->tabList, SIGNAL(tabsChanged()), this, SLOT(slotTabRuler()));
+	connect(m_pwidget->tabList, SIGNAL(mouseReleased()), this, SLOT(slotTabRuler()));
+	connect(m_pwidget->tabList->left_, SIGNAL(valueChanged(double)), this, SLOT(slotLeftIndent()));
+	connect(m_pwidget->tabList->right_, SIGNAL(valueChanged(double)), this, SLOT(slotRightIndent()));
+	connect(m_pwidget->tabList->first_, SIGNAL(valueChanged(double)), this, SLOT(slotFirstLine()));
 
 	connect(m_pwidget->parentCombo, SIGNAL(activated(const QString&)), this, SLOT(slotParentChanged(const QString&)));
 
@@ -579,16 +579,16 @@
 	if (!m_pwidget)
 		return;
 
-	disconnect(m_pwidget->lineSpacingMode_, SIGNAL(activated(int)), this, SLOT(slotLineSpacingMode(int)));
-	disconnect(m_pwidget->lineSpacing_, SIGNAL(valueChanged(double)), this, SLOT(slotLineSpacing()));
-	disconnect(m_pwidget->spaceAbove_, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceAbove()));
-	disconnect(m_pwidget->spaceBelow_, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceBelow()));
-	disconnect(m_pwidget->alignement_->TextL, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	disconnect(m_pwidget->alignement_->TextR, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	disconnect(m_pwidget->alignement_->TextC, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	disconnect(m_pwidget->alignement_->TextB, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	disconnect(m_pwidget->alignement_->TextF, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	disconnect(m_pwidget->alignement_->parentButton, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(m_pwidget->lineSpacingMode, SIGNAL(activated(int)), this, SLOT(slotLineSpacingMode(int)));
+	disconnect(m_pwidget->lineSpacing, SIGNAL(valueChanged(double)), this, SLOT(slotLineSpacing()));
+	disconnect(m_pwidget->spaceAbove, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceAbove()));
+	disconnect(m_pwidget->spaceBelow, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceBelow()));
+	disconnect(m_pwidget->alignement->TextL, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(m_pwidget->alignement->TextR, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(m_pwidget->alignement->TextC, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(m_pwidget->alignement->TextB, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(m_pwidget->alignement->TextF, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(m_pwidget->alignement->parentButton, SIGNAL(clicked()), this, SLOT(slotAlignment()));
 //	disconnect(m_pwidget->optMarginCombo, SIGNAL(activated(int)), this, SLOT(slotOpticalMargin(int)));
 	disconnect(m_pwidget->optMarginRadioNone, SIGNAL(clicked()), this, SLOT(slotOpticalMarginSelector()));
 	disconnect(m_pwidget->optMarginRadioLeft, SIGNAL(clicked()), this, SLOT(slotOpticalMarginSelector()));
@@ -601,13 +601,13 @@
 	
 	disconnect(m_pwidget, SIGNAL(useParentParaEffects()), this, SLOT(slotParentParaEffects()));
 	disconnect(m_pwidget->dropCapsBox, SIGNAL(toggled(bool)), this, SLOT(slotDropCap(bool)));
-	disconnect(m_pwidget->dropCapLines_, SIGNAL(valueChanged(int)), this, SLOT(slotDropCapLines(int)));
-	disconnect(m_pwidget->parEffectOffset_, SIGNAL(valueChanged(double)), this, SLOT(slotParEffectOffset()));
+	disconnect(m_pwidget->dropCapLines, SIGNAL(valueChanged(int)), this, SLOT(slotDropCapLines(int)));
+	disconnect(m_pwidget->parEffectOffset, SIGNAL(valueChanged(double)), this, SLOT(slotParEffectOffset()));
 	disconnect(m_pwidget->parEffectIndentBox, SIGNAL(toggled(bool)), this, SLOT(slotParEffectIndent(bool)));
 	disconnect(m_pwidget->parEffectCharStyleCombo, SIGNAL(activated(const QString&)), this, SLOT(slotParEffectCharStyle(const QString&)));
 
 	disconnect(m_pwidget->bulletBox, SIGNAL(toggled(bool)), this, SLOT(slotBullet(bool)));
-	disconnect(m_pwidget->bulletStrEdit_, SIGNAL(editTextChanged(QString)), this, SLOT(slotBulletStr(QString)));
+	disconnect(m_pwidget->bulletStrEdit, SIGNAL(editTextChanged(QString)), this, SLOT(slotBulletStr(QString)));
 	disconnect(m_pwidget->numBox, SIGNAL(toggled(bool)), this, SLOT(slotNumeration(bool)));
 	disconnect(m_pwidget->numComboBox, SIGNAL(activated(QString)), this, SLOT(slotNumName(QString)));
 	disconnect(m_pwidget->numFormatCombo, SIGNAL(activated(int)), this, SLOT(slotNumFormat(int)));
@@ -628,10 +628,10 @@
 	disconnect(m_pwidget->keepTogether, SIGNAL(stateChanged(int)), this, SLOT(handleKeepTogether()));
 	disconnect(m_pwidget->keepWithNext, SIGNAL(stateChanged(int)), this, SLOT(handleKeepWithNext()));
 
-	disconnect(m_pwidget->tabList_, SIGNAL(tabsChanged()), this, SLOT(slotTabRuler()));
-	disconnect(m_pwidget->tabList_->left_, SIGNAL(valueChanged(double)), this, SLOT(slotLeftIndent()));
-	disconnect(m_pwidget->tabList_->right_, SIGNAL(valueChanged(double)), this, SLOT(slotRightIndent()));
-	disconnect(m_pwidget->tabList_->first_, SIGNAL(valueChanged(double)), this, SLOT(slotFirstLine()));
+	disconnect(m_pwidget->tabList, SIGNAL(tabsChanged()), this, SLOT(slotTabRuler()));
+	disconnect(m_pwidget->tabList->left_, SIGNAL(valueChanged(double)), this, SLOT(slotLeftIndent()));
+	disconnect(m_pwidget->tabList->right_, SIGNAL(valueChanged(double)), this, SLOT(slotRightIndent()));
+	disconnect(m_pwidget->tabList->first_, SIGNAL(valueChanged(double)), this, SLOT(slotFirstLine()));
 
 	disconnect(m_pwidget->cpage->fontFace_, SIGNAL(fontSelected(QString)), this, SLOT(slotFont(QString)));
 	disconnect(m_pwidget->cpage->effects_, SIGNAL(State(int)), this, SLOT(slotEffects(int)));
@@ -661,7 +661,7 @@
 {
 	ParagraphStyle::LineSpacingMode lsm = static_cast<ParagraphStyle::LineSpacingMode>(mode);
 
-	if (m_pwidget->lineSpacingMode_->useParentValue())
+	if (m_pwidget->lineSpacingMode->useParentValue())
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetLineSpacingMode();
 	else
@@ -677,7 +677,7 @@
 
 void SMParagraphStyle::slotLineSpacing()
 {
-	if (m_pwidget->lineSpacing_->useParentValue())
+	if (m_pwidget->lineSpacing->useParentValue())
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetLineSpacing();
 	else 
@@ -685,7 +685,7 @@
 		double a, b, value;
 		int c;
 
-		m_pwidget->lineSpacing_->getValues(&a, &b, &c, &value);
+		m_pwidget->lineSpacing->getValues(&a, &b, &c, &value);
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->setLineSpacing(value);
 	}
@@ -699,7 +699,7 @@
 
 void SMParagraphStyle::slotSpaceAbove()
 {
-	if (m_pwidget->spaceAbove_->useParentValue())
+	if (m_pwidget->spaceAbove->useParentValue())
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetGapBefore();
 	else 
@@ -707,7 +707,7 @@
 		double a, b, value;
 		int c;
 
-		m_pwidget->spaceAbove_->getValues(&a, &b, &c, &value);
+		m_pwidget->spaceAbove->getValues(&a, &b, &c, &value);
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->setGapBefore(value);
 	}
@@ -721,7 +721,7 @@
 
 void SMParagraphStyle::slotSpaceBelow()
 {
-	if (m_pwidget->spaceBelow_->useParentValue())
+	if (m_pwidget->spaceBelow->useParentValue())
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetGapAfter();
 	else 
@@ -729,7 +729,7 @@
 		double a, b, value;
 		int c;
 		
-		m_pwidget->spaceBelow_->getValues(&a, &b, &c, &value);
+		m_pwidget->spaceBelow->getValues(&a, &b, &c, &value);
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->setGapAfter(value);
 	}
@@ -743,8 +743,8 @@
 
 void SMParagraphStyle::slotAlignment()
 {
-	ParagraphStyle::AlignmentType style = static_cast<ParagraphStyle::AlignmentType>(m_pwidget->alignement_->getStyle());
-	if (m_pwidget->alignement_->useParentValue())
+	ParagraphStyle::AlignmentType style = static_cast<ParagraphStyle::AlignmentType>(m_pwidget->alignement->getStyle());
+	if (m_pwidget->alignement->useParentValue())
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetAlignment();
 	else 
@@ -904,7 +904,7 @@
 
 void SMParagraphStyle::slotDropCapLines(int lines)
 {
-	if (m_pwidget->dropCapLines_->useParentValue())
+	if (m_pwidget->dropCapLines->useParentValue())
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetDropCapLines();
 	else		
@@ -920,7 +920,7 @@
 
 void SMParagraphStyle::slotParEffectOffset()
 {
-	if (m_pwidget->parEffectOffset_->useParentValue())
+	if (m_pwidget->parEffectOffset->useParentValue())
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetParEffectOffset();
 	else 
@@ -928,7 +928,7 @@
 		double a, b, value;
 		int c;
 
-		m_pwidget->parEffectOffset_->getValues(&a, &b, &c, &value);
+		m_pwidget->parEffectOffset->getValues(&a, &b, &c, &value);
 		value = value / m_unitRatio;
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->setParEffectOffset(value);
@@ -982,7 +982,7 @@
 		m_selection[i]->setHasBullet(isOn);
 		if (isOn)
 		{
-			m_selection[i]->setBulletStr(m_pwidget->bulletStrEdit_->currentText());
+			m_selection[i]->setBulletStr(m_pwidget->bulletStrEdit->currentText());
 			m_selection[i]->setHasDropCap(false);
 			m_selection[i]->setHasNum(false);
 		}
@@ -1000,8 +1000,8 @@
 	QString bstr(str);
 	if (bstr.isEmpty())
 	{
-		bstr = m_pwidget->bulletStrEdit_->itemText(0);
-		m_pwidget->bulletStrEdit_->setEditText(bstr);
+		bstr = m_pwidget->bulletStrEdit->itemText(0);
+		m_pwidget->bulletStrEdit->setEditText(bstr);
 	}
 	for (int i = 0; i < m_selection.count(); ++i)
 		m_selection[i]->setBulletStr(bstr);
@@ -1289,14 +1289,14 @@
 
 void SMParagraphStyle::slotTabRuler()
 {
-	if (m_pwidget->tabList_->useParentTabs())
+	if (m_pwidget->tabList->useParentTabs())
 	{
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetTabValues();
 	}
 	else
 	{
-		QList<ParagraphStyle::TabRecord> newTabs = m_pwidget->tabList_->getTabVals();
+		QList<ParagraphStyle::TabRecord> newTabs = m_pwidget->tabList->getTabVals();
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->setTabValues(newTabs);
 	}
@@ -1310,7 +1310,7 @@
 
 void SMParagraphStyle::slotLeftIndent()
 {
-	if (m_pwidget->tabList_->useParentLeftIndent())
+	if (m_pwidget->tabList->useParentLeftIndent())
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetLeftMargin();
 	else 
@@ -1318,7 +1318,7 @@
 		double a, b, value;
 		int c;
 
-		m_pwidget->tabList_->left_->getValues(&a, &b, &c, &value);
+		m_pwidget->tabList->left_->getValues(&a, &b, &c, &value);
 		value = value / m_unitRatio;
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->setLeftMargin(value);
@@ -1333,7 +1333,7 @@
 
 void SMParagraphStyle::slotRightIndent()
 {
-	if (m_pwidget->tabList_->useParentRightIndent())
+	if (m_pwidget->tabList->useParentRightIndent())
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetRightMargin();
 	else 
@@ -1341,7 +1341,7 @@
 		double a, b, value;
 		int c;
 
-		m_pwidget->tabList_->right_->getValues(&a, &b, &c, &value);
+		m_pwidget->tabList->right_->getValues(&a, &b, &c, &value);
 		value = value / m_unitRatio;
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->setRightMargin(value);
@@ -1356,7 +1356,7 @@
 
 void SMParagraphStyle::slotFirstLine()
 {
-	if (m_pwidget->tabList_->useParentFirstLine())
+	if (m_pwidget->tabList->useParentFirstLine())
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->resetFirstIndent();
 	else 
@@ -1364,7 +1364,7 @@
 		double a, b, value;
 		int c;
 		
-		m_pwidget->tabList_->first_->getValues(&a, &b, &c, &value);
+		m_pwidget->tabList->first_->getValues(&a, &b, &c, &value);
 		value = value / m_unitRatio;
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->setFirstIndent(value);




More information about the scribus-commit mailing list