r17613 by jghali - #10776: Page numbers shown with 'pt' suffix in the Properties window
scribus-commit
scribus-commit at lists.scribus.net
Sat Jun 23 15:37:43 UTC 2012
Author: jghali
Date: Sat Jun 23 15:37:43 2012
New Revision: 17613
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17613
Log:
#10776: Page numbers shown with 'pt' suffix in the Properties window
Modified:
trunk/Scribus/scribus/ui/delpages.cpp
trunk/Scribus/scribus/ui/propertiespalette_image.cpp
Modified: trunk/Scribus/scribus/ui/delpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17613&path=/trunk/Scribus/scribus/ui/delpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/delpages.cpp (original)
+++ trunk/Scribus/scribus/ui/delpages.cpp Sat Jun 23 15:37:43 2012
@@ -25,19 +25,21 @@
fromToLayout->setMargin( 5 );
fromLabel = new QLabel( tr( "Delete From:" ), this );
fromToLayout->addWidget( fromLabel );
- fromPageData = new ScrSpinBox(this );
+ fromPageData = new ScrSpinBox(this);
fromPageData->setDecimals(0);
fromPageData->setMinimum(1);
fromPageData->setMaximum(maxPage);
+ fromPageData->setSuffix("");
fromPageData->setValue( currentPage );
fromToLayout->addWidget( fromPageData );
toLabel = new QLabel( this );
toLabel->setText( tr( "to:" ) );
fromToLayout->addWidget( toLabel );
- toPageData = new ScrSpinBox( this );
+ toPageData = new ScrSpinBox(this);
toPageData->setDecimals(0);
toPageData->setMinimum(1);
toPageData->setMaximum(maxPage);
+ toPageData->setSuffix("");
toPageData->setValue( currentPage );
fromToLayout->addWidget( toPageData );
dialogLayout->addLayout( fromToLayout );
Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17613&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp Sat Jun 23 15:37:43 2012
@@ -47,6 +47,7 @@
imagePageNumber->setMinimum(0);
imagePageNumber->setSpecialValueText(tr( "Auto" ));
imagePageNumber->setDecimals(0);
+ imagePageNumber->setSuffix("");
imagePageNumberLabel->setBuddy(imagePageNumber);
installSniffer(imagePageNumber);
@@ -72,9 +73,11 @@
keepImageWHRatioButton->setCheckable( true );
keepImageWHRatioButton->setAutoRaise( true );
+ imgDpiX->setSuffix("");
installSniffer(imgDpiX);
imgDPIXLabel->setBuddy(imgDpiX);
+ imgDpiY->setSuffix("");
installSniffer(imgDpiY);
imgDPIYLabel->setBuddy(imgDpiY);
@@ -798,8 +801,6 @@
QString pctSuffix = tr(" %");
imageXScaleSpinBox->setSuffix(pctSuffix);
imageYScaleSpinBox->setSuffix(pctSuffix);
- imgDpiX->setSuffix("");
- imgDpiY->setSuffix("");
QString ptSuffix = tr(" pt");
QString suffix = (m_haveDoc) ? unitGetSuffixFromIndex(m_doc->unitIndex()) : ptSuffix;
More information about the scribus-commit
mailing list