r19654 by jghali - #12840: Typo in source code (alignement > alignment) (backport from #12620)

scribus-commit scribus-commit at lists.scribus.net
Sun Nov 30 18:52:34 UTC 2014


Author: jghali
Date: Sun Nov 30 18:52:34 2014
New Revision: 19654

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19654
Log:
#12840: Typo in source code (alignement > alignment) (backport from #12620)

Modified:
    branches/Version14x/Scribus/scribus/propertiespalette.cpp
    branches/Version14x/Scribus/scribus/propertiespalette.h
    branches/Version14x/Scribus/scribus/smpstylewidget.cpp
    branches/Version14x/Scribus/scribus/smpstylewidget.ui
    branches/Version14x/Scribus/scribus/smtextstyles.cpp

Modified: branches/Version14x/Scribus/scribus/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19654&path=/branches/Version14x/Scribus/scribus/propertiespalette.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/propertiespalette.cpp (original)
+++ branches/Version14x/Scribus/scribus/propertiespalette.cpp Sun Nov 30 18:52:34 2014
@@ -1525,7 +1525,7 @@
 	connect(keepImageDPIRatioButton, SIGNAL(clicked()), this, SLOT(ToggleKetteD()));
 	connect(FlipH, SIGNAL(clicked()), this, SLOT(handleFlipH()));
 	connect(FlipV, SIGNAL(clicked()), this, SLOT(handleFlipV()));
-	connect(GroupAlign, SIGNAL(State(int)), this, SLOT(NewAlignement(int)));
+	connect(GroupAlign, SIGNAL(State(int)), this, SLOT(NewAlignment(int)));
 	connect(Revert, SIGNAL(clicked()), this, SLOT(DoRevert()));
 	connect(charStyleClear, SIGNAL(clicked()), this, SLOT(doClearCStyle()));
 	connect(paraStyleClear, SIGNAL(clicked()), this, SLOT(doClearPStyle()));
@@ -1664,7 +1664,7 @@
 
 	connect(this, SIGNAL(DocChanged()), m_ScMW, SLOT(slotDocCh()));
 //	connect(this, SIGNAL(NewParStyle(int)), m_ScMW, SLOT(setNewParStyle(int)));
-	connect(this, SIGNAL(NewAlignment(int)), m_ScMW, SLOT(setNewAlignment(int)));
+//	connect(this, SIGNAL(NewAlignment(int)), m_ScMW, SLOT(setNewAlignment(int)));
 	connect(this, SIGNAL(NewEffects(int)), m_ScMW, SLOT(setItemHoch(int)));
 //	connect(this, SIGNAL(ShapeEdit()), m_ScMW, SLOT(ToggleFrameEdit()));
 	connect(this, SIGNAL(NewFont(const QString&)), m_ScMW, SLOT(SetNewFont(const QString&)));
@@ -4279,7 +4279,7 @@
 	connect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
 }
 
-void PropertiesPalette::NewAlignement(int a)
+void PropertiesPalette::NewAlignment(int a)
 {
 	if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
 		return;

Modified: branches/Version14x/Scribus/scribus/propertiespalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19654&path=/branches/Version14x/Scribus/scribus/propertiespalette.h
==============================================================================
--- branches/Version14x/Scribus/scribus/propertiespalette.h (original)
+++ branches/Version14x/Scribus/scribus/propertiespalette.h Sun Nov 30 18:52:34 2014
@@ -277,7 +277,7 @@
 	void NewLineJoin();
 	void NewLineEnd();
 	void NewLineMode();
-	void NewAlignement(int a);
+	void NewAlignment(int a);
 	void setTypeStyle(int s);
 	void newShadowOffs();
 	void DoLower();
@@ -328,10 +328,7 @@
 
 signals:
 	void DocChanged();
-	void NewParStyle(int);
-	void NewAlignment(int);
 	void NewEffects(int);
-	void ShapeEdit();
 	void NewFont(const QString&);
 	void UpdtGui(int);
 

Modified: branches/Version14x/Scribus/scribus/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19654&path=/branches/Version14x/Scribus/scribus/smpstylewidget.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/smpstylewidget.cpp (original)
+++ branches/Version14x/Scribus/scribus/smpstylewidget.cpp Sun Nov 30 18:52:34 2014
@@ -93,7 +93,7 @@
 	//dropCapsBox->setToolTip(      tr("Enable or disable drop cap"));
 	dropCapLines_->setToolTip(    tr("Drop Cap Lines"));
 	dropCapOffset_->setToolTip(   tr("Drop Cap Offset"));
-	alignement_->setToolTip(      tr("Alignment"));
+	alignment_->setToolTip(       tr("Alignment"));
 	tabList_->first_->setToolTip( tr("First Line Indent"));
 	tabList_->left_->setToolTip(  tr("Left Indent"));
 	tabList_->right_->setToolTip( tr("Right Indent"));
@@ -229,8 +229,8 @@
 		dropCapOffset_->setValue(pstyle->dropCapOffset() * unitRatio, pstyle->isInhDropCapOffset());
 		dropCapOffset_->setParentValue(parent->dropCapOffset() * unitRatio);
 
-		alignement_->setStyle(pstyle->alignment(), pstyle->isInhAlignment());
-		alignement_->setParentItem(parent->alignment());
+		alignment_->setStyle(pstyle->alignment(), pstyle->isInhAlignment());
+		alignment_->setParentItem(parent->alignment());
 
 		bool hasParentTabs = pstyle->isInhTabValues();
 		QList<ParagraphStyle::TabRecord> tabs;
@@ -269,7 +269,7 @@
 		dropCapLines_->setValue(pstyle->dropCapLines());
 		dropCapOffset_->setValue(pstyle->dropCapOffset() * unitRatio);
 		parentDropCapButton->hide();
-		alignement_->setStyle(pstyle->alignment());
+		alignment_->setStyle(pstyle->alignment());
 		tabList_->setTabs(pstyle->tabValues(), unitIndex);
 		tabList_->setLeftIndentValue(pstyle->leftMargin() * unitRatio);
 		tabList_->setFirstLineValue(pstyle->firstIndent() * unitRatio);
@@ -488,16 +488,16 @@
 	{
 		if (a != pstyles[i]->alignment())
 		{
-			if (alignement_->selectedId() > -1 && alignement_->selectedId() < 5)
+			if (alignment_->selectedId() > -1 && alignment_->selectedId() < 5)
 			{
-				alignement_->buttonGroup->setExclusive(false);
-				alignement_->buttonGroup->button(alignement_->selectedId())->toggle();
-				alignement_->buttonGroup->setExclusive(true);
+				alignment_->buttonGroup->setExclusive(false);
+				alignment_->buttonGroup->button(alignment_->selectedId())->toggle();
+				alignment_->buttonGroup->setExclusive(true);
 			}
 			return;
 		}
 	}
-	alignement_->setStyle(a);
+	alignment_->setStyle(a);
 }
 
 void SMPStyleWidget::showOpticalMargin(QList< ParagraphStyle * > & pstyles)

Modified: branches/Version14x/Scribus/scribus/smpstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19654&path=/branches/Version14x/Scribus/scribus/smpstylewidget.ui
==============================================================================
--- branches/Version14x/Scribus/scribus/smpstylewidget.ui (original)
+++ branches/Version14x/Scribus/scribus/smpstylewidget.ui Sun Nov 30 18:52:34 2014
@@ -206,7 +206,7 @@
               <item>
                <layout class="QHBoxLayout">
                 <item>
-                 <widget class="SMAlignSelect" name="alignement_" native="true">
+                 <widget class="SMAlignSelect" name="alignment_" native="true">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
                     <horstretch>0</horstretch>

Modified: branches/Version14x/Scribus/scribus/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19654&path=/branches/Version14x/Scribus/scribus/smtextstyles.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/smtextstyles.cpp (original)
+++ branches/Version14x/Scribus/scribus/smtextstyles.cpp Sun Nov 30 18:52:34 2014
@@ -493,12 +493,12 @@
 	connect(pwidget_->lineSpacing_, SIGNAL(valueChanged(double)), this, SLOT(slotLineSpacing()));
 	connect(pwidget_->spaceAbove_, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceAbove()));
 	connect(pwidget_->spaceBelow_, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceBelow()));
-	connect(pwidget_->alignement_->TextL, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	connect(pwidget_->alignement_->TextR, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	connect(pwidget_->alignement_->TextC, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	connect(pwidget_->alignement_->TextB, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	connect(pwidget_->alignement_->TextF, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	connect(pwidget_->alignement_->parentButton, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(pwidget_->alignment_->TextL, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(pwidget_->alignment_->TextR, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(pwidget_->alignment_->TextC, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(pwidget_->alignment_->TextB, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(pwidget_->alignment_->TextF, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	connect(pwidget_->alignment_->parentButton, SIGNAL(clicked()), this, SLOT(slotAlignment()));
 //	connect(pwidget_->optMarginCombo, SIGNAL(activated(int)), this, SLOT(slotOpticalMargin(int)));
 	connect(pwidget_->optMarginRadioNone, SIGNAL(clicked()), this, SLOT(slotOpticalMarginSelector()));
 	connect(pwidget_->optMarginRadioLeft, SIGNAL(clicked()), this, SLOT(slotOpticalMarginSelector()));
@@ -565,12 +565,12 @@
 	disconnect(pwidget_->lineSpacing_, SIGNAL(valueChanged(double)), this, SLOT(slotLineSpacing()));
 	disconnect(pwidget_->spaceAbove_, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceAbove()));
 	disconnect(pwidget_->spaceBelow_, SIGNAL(valueChanged(double)), this, SLOT(slotSpaceBelow()));
-	disconnect(pwidget_->alignement_->TextL, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	disconnect(pwidget_->alignement_->TextR, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	disconnect(pwidget_->alignement_->TextC, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	disconnect(pwidget_->alignement_->TextB, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	disconnect(pwidget_->alignement_->TextF, SIGNAL(clicked()), this, SLOT(slotAlignment()));
-	disconnect(pwidget_->alignement_->parentButton, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(pwidget_->alignment_->TextL, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(pwidget_->alignment_->TextR, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(pwidget_->alignment_->TextC, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(pwidget_->alignment_->TextB, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(pwidget_->alignment_->TextF, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+	disconnect(pwidget_->alignment_->parentButton, SIGNAL(clicked()), this, SLOT(slotAlignment()));
 //	disconnect(pwidget_->optMarginCombo, SIGNAL(activated(int)), this, SLOT(slotOpticalMargin(int)));
 	disconnect(pwidget_->optMarginRadioNone, SIGNAL(clicked()), this, SLOT(slotOpticalMarginSelector()));
 	disconnect(pwidget_->optMarginRadioLeft, SIGNAL(clicked()), this, SLOT(slotOpticalMarginSelector()));
@@ -711,8 +711,8 @@
 
 void SMParagraphStyle::slotAlignment()
 {
-	ParagraphStyle::AlignmentType style = static_cast<ParagraphStyle::AlignmentType>(pwidget_->alignement_->getStyle());
-	if (pwidget_->alignement_->useParentValue())
+	ParagraphStyle::AlignmentType style = static_cast<ParagraphStyle::AlignmentType>(pwidget_->alignment_->getStyle());
+	if (pwidget_->alignment_->useParentValue())
 		for (int i = 0; i < selection_.count(); ++i)
 			selection_[i]->resetAlignment();
 	else 




More information about the scribus-commit mailing list