r17881 by fschmid - Fixed some incorrect suffix settings for spinboxes
scribus-commit
scribus-commit at lists.scribus.net
Sun Nov 18 09:41:03 UTC 2012
Author: fschmid
Date: Sun Nov 18 09:41:03 2012
New Revision: 17881
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17881
Log:
Fixed some incorrect suffix settings for spinboxes
Modified:
trunk/Scribus/scribus/ui/createrange.cpp
trunk/Scribus/scribus/ui/createrange.ui
trunk/Scribus/scribus/ui/polygonwidget.cpp
Modified: trunk/Scribus/scribus/ui/createrange.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17881&path=/trunk/Scribus/scribus/ui/createrange.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/createrange.cpp (original)
+++ trunk/Scribus/scribus/ui/createrange.cpp Sun Nov 18 09:41:03 2012
@@ -26,7 +26,9 @@
setupUi(this);
pageCountValueLabel->setText(QString("%1").arg(pageCount));
basicConsecutiveFromSpinBox->setMinimum(1);
+ basicConsecutiveFromSpinBox->setSuffix("");
basicConsecutiveToSpinBox->setMinimum(1);
+ basicConsecutiveToSpinBox->setSuffix("");
basicConsecutiveFromSpinBox->setDecimals(0);
basicConsecutiveToSpinBox->setDecimals(0);
basicConsecutiveFromSpinBox->setMaximum(pageCount);
@@ -34,6 +36,7 @@
basicSelectRangeType(m_BasicRangeType);
advPageGroupSizeSpinBox->setMaximum(pageCount);
advPageGroupSizeSpinBox->setDecimals(0);
+ advPageGroupSizeSpinBox->setSuffix("");
if (m_PageCount==1)
basicEvenRadioButton->setShown(false);
if (currText.length()>0)
Modified: trunk/Scribus/scribus/ui/createrange.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17881&path=/trunk/Scribus/scribus/ui/createrange.ui
==============================================================================
--- trunk/Scribus/scribus/ui/createrange.ui (original)
+++ trunk/Scribus/scribus/ui/createrange.ui Sun Nov 18 09:41:03 2012
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>CreateRange</class>
- <widget class="QDialog" name="CreateRange" >
- <property name="geometry" >
+ <widget class="QDialog" name="CreateRange">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,74 +10,53 @@
<height>437</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Create Range</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="0" column="0">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="leftMargin" >
+ <property name="margin">
<number>0</number>
</property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
- <widget class="QLabel" name="pageCountLabel" >
- <property name="text" >
+ <item>
+ <widget class="QLabel" name="pageCountLabel">
+ <property name="text">
<string>Number of Pages in Document:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="pageCountValueLabel" >
- <property name="text" >
+ <widget class="QLabel" name="pageCountValueLabel">
+ <property name="text">
<string>Doc Page Range</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>80</width>
<height>20</height>
@@ -86,13 +66,13 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>72</width>
<height>20</height>
@@ -102,77 +82,53 @@
</item>
</layout>
</item>
- <item row="1" column="0" >
- <widget class="QTabWidget" name="tabWidget" >
- <property name="currentIndex" >
- <number>1</number>
+ <item row="1" column="0">
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
</property>
- <widget class="QWidget" name="tabBasic" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabBasic">
+ <attribute name="title">
<string>Basic Range Selection</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="0" column="1" >
- <widget class="QGroupBox" name="groupBox1" >
- <property name="title" >
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="groupBox1">
+ <property name="title">
<string>Range of Pages</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="2" column="1" >
- <widget class="QPushButton" name="basicRangeDelButton" >
- <property name="text" >
+ <item row="2" column="1">
+ <widget class="QPushButton" name="basicRangeDelButton">
+ <property name="text">
<string>De&lete</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+L</string>
</property>
</widget>
</item>
- <item row="3" column="1" >
+ <item row="3" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -180,104 +136,92 @@
</property>
</spacer>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="basicRangeDownButton" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QPushButton" name="basicRangeDownButton">
+ <property name="text">
<string>Move &Down</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+D</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="basicRangeUpButton" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QPushButton" name="basicRangeUpButton">
+ <property name="text">
<string>Move &Up</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+U</string>
</property>
</widget>
</item>
- <item rowspan="4" row="0" column="0" >
- <widget class="QListWidget" name="basicRangeListBox" />
+ <item row="0" column="0" rowspan="4">
+ <widget class="QListWidget" name="basicRangeListBox"/>
</item>
</layout>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QGroupBox" name="basicAddARangeButtonGroup" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="basicAddARangeButtonGroup">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Add a Range of Pages</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" colspan="5" >
- <widget class="QRadioButton" name="basicConsecutiveRadioButton" >
- <property name="text" >
+ <item row="0" column="0" colspan="5">
+ <widget class="QRadioButton" name="basicConsecutiveRadioButton">
+ <property name="text">
<string>Consecutive Pages</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="5" >
- <widget class="QRadioButton" name="basicEvenRadioButton" >
- <property name="text" >
+ <item row="4" column="0" colspan="5">
+ <widget class="QRadioButton" name="basicEvenRadioButton">
+ <property name="text">
<string>Even Pages</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="basicConsecutiveFromLabel" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="basicConsecutiveFromLabel">
+ <property name="text">
<string>From:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="3" >
- <widget class="ScrSpinBox" name="basicConsecutiveToSpinBox" />
- </item>
- <item row="1" column="1" >
- <widget class="ScrSpinBox" name="basicConsecutiveFromSpinBox" />
- </item>
- <item row="1" column="4" >
+ <item row="1" column="3">
+ <widget class="ScrSpinBox" name="basicConsecutiveToSpinBox"/>
+ </item>
+ <item row="1" column="1">
+ <widget class="ScrSpinBox" name="basicConsecutiveFromSpinBox"/>
+ </item>
+ <item row="1" column="4">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -285,42 +229,33 @@
</property>
</spacer>
</item>
- <item row="1" column="2" >
- <widget class="QLabel" name="basicConsecutiveToLabel" >
- <property name="text" >
+ <item row="1" column="2">
+ <widget class="QLabel" name="basicConsecutiveToLabel">
+ <property name="text">
<string>To:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="6" column="0" colspan="5" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="6" column="0" colspan="5">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>38</width>
<height>20</height>
@@ -329,24 +264,24 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="basicRangeAddButton" >
- <property name="text" >
+ <widget class="QPushButton" name="basicRangeAddButton">
+ <property name="text">
<string>&Add To Range</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+A</string>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>38</width>
<height>20</height>
@@ -356,19 +291,19 @@
</item>
</layout>
</item>
- <item row="5" column="0" colspan="5" >
- <widget class="QRadioButton" name="basicOddRadioButton" >
- <property name="text" >
+ <item row="5" column="0" colspan="5">
+ <widget class="QRadioButton" name="basicOddRadioButton">
+ <property name="text">
<string>Odd Pages</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="5" >
- <widget class="QLineEdit" name="basicCommaSepLineEdit" />
- </item>
- <item row="2" column="0" colspan="5" >
- <widget class="QRadioButton" name="basicCommaSepRadioButton" >
- <property name="text" >
+ <item row="3" column="0" colspan="5">
+ <widget class="QLineEdit" name="basicCommaSepLineEdit"/>
+ </item>
+ <item row="2" column="0" colspan="5">
+ <widget class="QRadioButton" name="basicCommaSepRadioButton">
+ <property name="text">
<string>Comma Separated List</string>
</property>
</widget>
@@ -378,38 +313,26 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabAdvanced" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabAdvanced">
+ <attribute name="title">
<string>Advanced Reordering</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="2" column="0" colspan="5" >
+ <item row="2" column="0" colspan="5">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -417,15 +340,15 @@
</property>
</spacer>
</item>
- <item row="1" column="4" >
+ <item row="1" column="4">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -433,35 +356,35 @@
</property>
</spacer>
</item>
- <item row="1" column="2" colspan="2" >
- <widget class="QLabel" name="advSampleOrderExampleLabel" >
- <property name="text" >
+ <item row="1" column="2" colspan="2">
+ <widget class="QLabel" name="advSampleOrderExampleLabel">
+ <property name="text">
<string>Page Order</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QLabel" name="advSampleOrderLabel" >
- <property name="text" >
+ <item row="1" column="0" colspan="2">
+ <widget class="QLabel" name="advSampleOrderLabel">
+ <property name="text">
<string>Sample Page Order:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="0" column="3" colspan="2" >
+ <item row="0" column="3" colspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -469,15 +392,15 @@
</property>
</spacer>
</item>
- <item row="0" column="1" colspan="2" >
- <widget class="ScrSpinBox" name="advPageGroupSizeSpinBox" />
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="advPageGroupSizeLabel" >
- <property name="text" >
+ <item row="0" column="1" colspan="2">
+ <widget class="ScrSpinBox" name="advPageGroupSizeSpinBox"/>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="advPageGroupSizeLabel">
+ <property name="text">
<string>Page Group Size:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
@@ -486,32 +409,23 @@
</widget>
</widget>
</item>
- <item row="2" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="2" column="0">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="leftMargin" >
+ <property name="margin">
<number>0</number>
</property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -520,21 +434,21 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="okButton" >
- <property name="text" >
+ <widget class="QPushButton" name="okButton">
+ <property name="text">
<string>&OK</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+O</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="cancelButton" >
- <property name="text" >
+ <widget class="QPushButton" name="cancelButton">
+ <property name="text">
<string>&Cancel</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+C</string>
</property>
</widget>
@@ -543,7 +457,7 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>ScrSpinBox</class>
Modified: trunk/Scribus/scribus/ui/polygonwidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17881&path=/trunk/Scribus/scribus/ui/polygonwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/polygonwidget.cpp (original)
+++ trunk/Scribus/scribus/ui/polygonwidget.cpp Sun Nov 18 09:41:03 2012
@@ -25,10 +25,12 @@
{
setupUi(this);
factorSpinBox->setDecimals(0);
+ rotationSpinBox->setNewUnit(6);
rotationSpinBox->setDecimals(0);
cornersSpinBox->setDecimals(0);
cornersSpinBox->setDecimals(0);
curvatureSpinBox->setDecimals(0);
+ innerRotationspinBox->setNewUnit(6);
innerRotationspinBox->setDecimals(0);
OuterCurvatureSpinBox->setDecimals(0);
editMode = false;
@@ -37,6 +39,15 @@
PolygonWidget::PolygonWidget(QWidget* parent, int polyCorners, double polyF, bool polyUseConvexFactor, double polyRotation, double polyCurvature, double polyInnerRot, double polyOuterCurvature, bool forEditMode) : QWidget( parent )
{
setupUi(this);
+ factorSpinBox->setDecimals(0);
+ rotationSpinBox->setNewUnit(6);
+ rotationSpinBox->setDecimals(0);
+ cornersSpinBox->setDecimals(0);
+ cornersSpinBox->setDecimals(0);
+ curvatureSpinBox->setDecimals(0);
+ innerRotationspinBox->setNewUnit(6);
+ innerRotationspinBox->setDecimals(0);
+ OuterCurvatureSpinBox->setDecimals(0);
editMode = forEditMode;
if (editMode)
Preview->hide();
More information about the scribus-commit
mailing list