r19439 by jghali - #12620: Typo in source code (alignement > alignment)
scribus-commit
scribus-commit at lists.scribus.net
Tue Aug 19 14:47:34 UTC 2014
Author: jghali
Date: Tue Aug 19 14:47:34 2014
New Revision: 19439
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19439
Log:
#12620: Typo in source code (alignement > alignment)
Modified:
trunk/Scribus/scribus/ui/propertiespalette_text.cpp
trunk/Scribus/scribus/ui/propertiespalette_text.h
trunk/Scribus/scribus/ui/smpstylewidget.cpp
trunk/Scribus/scribus/ui/smpstylewidget.ui
trunk/Scribus/scribus/ui/smtextstyles.cpp
Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19439&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Tue Aug 19 14:47:34 2014
@@ -103,7 +103,7 @@
connect(lineSpacing , SIGNAL(valueChanged(double)), this, SLOT(handleLineSpacing()));
connect(fonts , SIGNAL(fontSelected(QString )), this, SLOT(handleTextFont(QString)));
connect(fontSize , SIGNAL(valueChanged(double)), this, SLOT(handleFontSize()));
- connect(textAlignment , SIGNAL(State(int)) , this, SLOT(handleAlignement(int)));
+ connect(textAlignment , SIGNAL(State(int)) , this, SLOT(handleAlignment(int)));
connect(charStyleClear, SIGNAL(clicked()), this, SLOT(doClearCStyle()));
connect(paraStyleClear, SIGNAL(clicked()), this, SLOT(doClearPStyle()));
@@ -570,7 +570,7 @@
m_doc->itemSelection_SetFontSize(qRound(fontSize->value()*10.0), &tempSelection);
}
-void PropertiesPalette_Text::handleAlignement(int a)
+void PropertiesPalette_Text::handleAlignment(int a)
{
if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning())
return;
Modified: trunk/Scribus/scribus/ui/propertiespalette_text.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19439&path=/trunk/Scribus/scribus/ui/propertiespalette_text.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.h Tue Aug 19 14:47:34 2014
@@ -104,7 +104,7 @@
void handleTextFont(QString);
private slots:
- void handleAlignement(int a);
+ void handleAlignment(int a);
void handleFirstLinePolicy(int);
void handleFontSize();
void handleLineSpacing();
Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19439&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp Tue Aug 19 14:47:34 2014
@@ -97,7 +97,7 @@
/***********************************/
// These are for the paragraph style
- parentCombo->setToolTip( tr("Parent Style"));
+ parentCombo->setToolTip( tr("Parent Style"));
lineSpacingMode->setToolTip( tr("Line Spacing Mode"));
lineSpacing->setToolTip( tr("Line Spacing"));
spaceAbove->setToolTip( tr("Space Above"));
@@ -114,7 +114,7 @@
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"));
+ alignment->setToolTip( tr("Alignment"));
tabList->first_->setToolTip( tr("First Line Indent"));
tabList->left_->setToolTip( tr("Left Indent"));
tabList->right_->setToolTip( tr("Right Indent"));
@@ -333,8 +333,8 @@
spaceBelow->setParentValue(parent->gapAfter());
- 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;
@@ -476,7 +476,7 @@
numRestartOtherBox->setChecked(pstyle->numOther());
numRestartHigherBox->setChecked(pstyle->numHigher());
- alignement->setStyle(pstyle->alignment());
+ alignment->setStyle(pstyle->alignment());
tabList->setTabs(pstyle->tabValues(), unitIndex);
tabList->setLeftIndentValue(pstyle->leftMargin() * unitRatio);
tabList->setFirstLineValue(pstyle->firstIndent() * unitRatio);
@@ -752,16 +752,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: trunk/Scribus/scribus/ui/smpstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19439&path=/trunk/Scribus/scribus/ui/smpstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.ui Tue Aug 19 14:47:34 2014
@@ -65,7 +65,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: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19439&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp (original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp Tue Aug 19 14:47:34 2014
@@ -497,12 +497,12 @@
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->alignment->TextL, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+ connect(m_pwidget->alignment->TextR, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+ connect(m_pwidget->alignment->TextC, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+ connect(m_pwidget->alignment->TextB, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+ connect(m_pwidget->alignment->TextF, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+ connect(m_pwidget->alignment->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()));
@@ -582,12 +582,12 @@
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->alignment->TextL, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+ disconnect(m_pwidget->alignment->TextR, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+ disconnect(m_pwidget->alignment->TextC, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+ disconnect(m_pwidget->alignment->TextB, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+ disconnect(m_pwidget->alignment->TextF, SIGNAL(clicked()), this, SLOT(slotAlignment()));
+ disconnect(m_pwidget->alignment->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()));
@@ -741,8 +741,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->alignment->getStyle());
+ if (m_pwidget->alignment->useParentValue())
for (int i = 0; i < m_selection.count(); ++i)
m_selection[i]->resetAlignment();
else
More information about the scribus-commit
mailing list