r21186 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Sun Apr 10 19:39:40 UTC 2016


Author: jghali
Date: Sun Apr 10 19:39:40 2016
New Revision: 21186

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21186
Log:
#13941: Various naming fixes to polygonWidget

Modified:
    trunk/Scribus/scribus/ui/polygonwidget.cpp
    trunk/Scribus/scribus/ui/polygonwidgetbase.ui

Modified: trunk/Scribus/scribus/ui/polygonwidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21186&path=/trunk/Scribus/scribus/ui/polygonwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/polygonwidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/polygonwidget.cpp	Sun Apr 10 19:39:40 2016
@@ -30,9 +30,9 @@
 	cornersSpinBox->setDecimals(0);
 	cornersSpinBox->setDecimals(0);
 	curvatureSpinBox->setDecimals(0);
-	innerRotationspinBox->setNewUnit(6);
-	innerRotationspinBox->setDecimals(0);
-	OuterCurvatureSpinBox->setDecimals(0);
+	innerRotationSpinBox->setNewUnit(6);
+	innerRotationSpinBox->setDecimals(0);
+	outerCurvatureSpinBox->setDecimals(0);
 	editMode = false;
 }
 
@@ -45,9 +45,9 @@
 	cornersSpinBox->setDecimals(0);
 	cornersSpinBox->setDecimals(0);
 	curvatureSpinBox->setDecimals(0);
-	innerRotationspinBox->setNewUnit(6);
-	innerRotationspinBox->setDecimals(0);
-	OuterCurvatureSpinBox->setDecimals(0);
+	innerRotationSpinBox->setNewUnit(6);
+	innerRotationSpinBox->setDecimals(0);
+	outerCurvatureSpinBox->setDecimals(0);
 	editMode = forEditMode;
 	if (editMode)
 		Preview->hide();
@@ -72,12 +72,12 @@
 		connect(curvatureSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setCurvatureSlider(double)));
 		connect(curvatureSlider, SIGNAL(valueChanged(int)), curvatureSpinBox, SLOT(setValue(int)));
 		connect(curvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(updatePreview()));
-		connect(innerRotationSlider, SIGNAL(valueChanged(int)), innerRotationspinBox, SLOT(setValue(int)));
+		connect(innerRotationSlider, SIGNAL(valueChanged(int)), innerRotationSpinBox, SLOT(setValue(int)));
 		connect(innerRotationSlider, SIGNAL(valueChanged(int)), this, SLOT(updatePreview()));
-		connect(innerRotationspinBox, SIGNAL(valueChanged(double)), this, SLOT(setInnerRotationSlider(double)));
-		connect(OuterCurvatureSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setOuterCurvatureSlider(double)));
-		connect(OuterCurvatureSlider, SIGNAL(valueChanged(int)), OuterCurvatureSpinBox, SLOT(setValue(int)));
-		connect(OuterCurvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(updatePreview()));
+		connect(innerRotationSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setInnerRotationSlider(double)));
+		connect(outerCurvatureSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setOuterCurvatureSlider(double)));
+		connect(outerCurvatureSlider, SIGNAL(valueChanged(int)), outerCurvatureSpinBox, SLOT(setValue(int)));
+		connect(outerCurvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(updatePreview()));
 	}
 	else
 	{
@@ -92,12 +92,12 @@
 		disconnect(curvatureSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setCurvatureSlider(double)));
 		disconnect(curvatureSlider, SIGNAL(valueChanged(int)), curvatureSpinBox, SLOT(setValue(int)));
 		disconnect(curvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(updatePreview()));
-		disconnect(innerRotationSlider, SIGNAL(valueChanged(int)), innerRotationspinBox, SLOT(setValue(int)));
+		disconnect(innerRotationSlider, SIGNAL(valueChanged(int)), innerRotationSpinBox, SLOT(setValue(int)));
 		disconnect(innerRotationSlider, SIGNAL(valueChanged(int)), this, SLOT(updatePreview()));
-		disconnect(innerRotationspinBox, SIGNAL(valueChanged(double)), this, SLOT(setInnerRotationSlider(double)));
-		disconnect(OuterCurvatureSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setOuterCurvatureSlider(double)));
-		disconnect(OuterCurvatureSlider, SIGNAL(valueChanged(int)), OuterCurvatureSpinBox, SLOT(setValue(int)));
-		disconnect(OuterCurvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(updatePreview()));
+		disconnect(innerRotationSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setInnerRotationSlider(double)));
+		disconnect(outerCurvatureSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setOuterCurvatureSlider(double)));
+		disconnect(outerCurvatureSlider, SIGNAL(valueChanged(int)), outerCurvatureSpinBox, SLOT(setValue(int)));
+		disconnect(outerCurvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(updatePreview()));
 	}
 }
 
@@ -116,9 +116,9 @@
 	applyConvexGroupBox->setChecked(prefsData->polyUseFactor);
 	curvatureSpinBox->setValue(qRound(prefsData->polyCurvature * 100));
 	curvatureSlider->setValue(qRound(prefsData->polyCurvature * 100));
-	OuterCurvatureSpinBox->setValue(qRound(prefsData->polyOuterCurvature * 100));
-	OuterCurvatureSlider->setValue(qRound(prefsData->polyOuterCurvature * 100));
-	innerRotationspinBox->setValue(static_cast<int>(prefsData->polyInnerRot));
+	outerCurvatureSpinBox->setValue(qRound(prefsData->polyOuterCurvature * 100));
+	outerCurvatureSlider->setValue(qRound(prefsData->polyOuterCurvature * 100));
+	innerRotationSpinBox->setValue(static_cast<int>(prefsData->polyInnerRot));
 	innerRotationSlider->setValue(static_cast<int>(prefsData->polyInnerRot));
 	updatePreview();
 	connectSignals(true);
@@ -130,9 +130,9 @@
 	prefsData->polyFactor = PFactor;
 	prefsData->polyUseFactor = applyConvexGroupBox->isChecked();
 	prefsData->polyRotation = rotationSpinBox->value();
-	prefsData->polyInnerRot = innerRotationspinBox->value();
+	prefsData->polyInnerRot = innerRotationSpinBox->value();
 	prefsData->polyCurvature = curvatureSpinBox->value() / 100.0;
-	prefsData->polyOuterCurvature = OuterCurvatureSpinBox->value() / 100.0;
+	prefsData->polyOuterCurvature = outerCurvatureSpinBox->value() / 100.0;
 }
 
 void PolygonWidget::setValues(int polyCorners, double polyF, bool polyUseConvexFactor, double polyRotation, double polyCurvature, double polyInnerRot, double polyOuterCurvature)
@@ -142,7 +142,7 @@
 	int fGui = qRound(getUserValFromFactor(polyF));
 	rotationSpinBox->setValue(static_cast<int>(polyRotation));
 	rotationSlider->setValue(static_cast<int>(polyRotation));
-	innerRotationspinBox->setValue(static_cast<int>(polyInnerRot));
+	innerRotationSpinBox->setValue(static_cast<int>(polyInnerRot));
 	innerRotationSlider->setValue(static_cast<int>(polyInnerRot));
 	applyConvexGroupBox->setChecked(polyUseConvexFactor);
 	factorSpinBox->setValue(fGui);
@@ -150,8 +150,8 @@
 	applyConvexGroupBox->setChecked(polyUseConvexFactor);
 	curvatureSpinBox->setValue(qRound(polyCurvature * 100));
 	curvatureSlider->setValue(qRound(polyCurvature * 100));
-	OuterCurvatureSpinBox->setValue(qRound(polyOuterCurvature * 100));
-	OuterCurvatureSlider->setValue(qRound(polyOuterCurvature * 100));
+	outerCurvatureSpinBox->setValue(qRound(polyOuterCurvature * 100));
+	outerCurvatureSlider->setValue(qRound(polyOuterCurvature * 100));
 }
 
 void PolygonWidget::getValues(int* polyCorners, double* polyF, bool* polyUseConvexFactor, double* polyRotation, double* polyCurvature, double* polyInnerRot, double* polyOuterCurvature)
@@ -160,9 +160,9 @@
 	*polyF = PFactor;
 	*polyUseConvexFactor = applyConvexGroupBox->isChecked();
 	*polyRotation = rotationSpinBox->value();
-	*polyInnerRot = innerRotationspinBox->value();
+	*polyInnerRot = innerRotationSpinBox->value();
 	*polyCurvature = curvatureSpinBox->value() / 100.0;
-	*polyOuterCurvature = OuterCurvatureSpinBox->value() / 100.0;
+	*polyOuterCurvature = outerCurvatureSpinBox->value() / 100.0;
 }
 
 void PolygonWidget::setFactorSlider(double a)
@@ -181,9 +181,9 @@
 
 void PolygonWidget::setInnerRotationSlider(double a)
 {
-	disconnect(innerRotationSlider, SIGNAL(valueChanged(int)), innerRotationspinBox, SLOT(setValue(int)));
+	disconnect(innerRotationSlider, SIGNAL(valueChanged(int)), innerRotationSpinBox, SLOT(setValue(int)));
 	innerRotationSlider->setValue(static_cast<int>(a));
-	connect(innerRotationSlider, SIGNAL(valueChanged(int)), innerRotationspinBox, SLOT(setValue(int)));
+	connect(innerRotationSlider, SIGNAL(valueChanged(int)), innerRotationSpinBox, SLOT(setValue(int)));
 }
 
 void PolygonWidget::setCurvatureSlider(double a)
@@ -195,27 +195,27 @@
 
 void PolygonWidget::setOuterCurvatureSlider(double a)
 {
-	disconnect(OuterCurvatureSlider, SIGNAL(valueChanged(int)), OuterCurvatureSpinBox, SLOT(setValue(int)));
-	OuterCurvatureSlider->setValue(static_cast<int>(a));
-	connect(OuterCurvatureSlider, SIGNAL(valueChanged(int)), OuterCurvatureSpinBox, SLOT(setValue(int)));
+	disconnect(outerCurvatureSlider, SIGNAL(valueChanged(int)), outerCurvatureSpinBox, SLOT(setValue(int)));
+	outerCurvatureSlider->setValue(static_cast<int>(a));
+	connect(outerCurvatureSlider, SIGNAL(valueChanged(int)), outerCurvatureSpinBox, SLOT(setValue(int)));
 }
 
 void PolygonWidget::updatePreview()
 {
 	if (editMode)
 	{
-		emit NewVectors(cornersSpinBox->value(), GetFactor(), applyConvexGroupBox->isChecked(), rotationSpinBox->value(), curvatureSpinBox->value() / 100.0, innerRotationspinBox->value(), OuterCurvatureSpinBox->value() / 100.0);
+		emit NewVectors(cornersSpinBox->value(), GetFactor(), applyConvexGroupBox->isChecked(), rotationSpinBox->value(), curvatureSpinBox->value() / 100.0, innerRotationSpinBox->value(), outerCurvatureSpinBox->value() / 100.0);
 		return;
 	}
 	double roundness = curvatureSpinBox->value() / 100.0;
-	double innerround = OuterCurvatureSpinBox->value() / 100.0;
+	double innerround = outerCurvatureSpinBox->value() / 100.0;
 	QPixmap pm = QPixmap(Preview->width() - 5, Preview->height() - 5);
 	pm.fill(Qt::white);
 	QPainter p;
 	p.begin(&pm);
 	p.setBrush(Qt::NoBrush);
 	p.setPen(Qt::black);
-	QPainterPath pp = RegularPolygonPath(Preview->width() - 6, Preview->height() - 6, cornersSpinBox->value(), applyConvexGroupBox->isChecked(), GetFactor(), rotationSlider->value(), roundness, innerRotationspinBox->value(), innerround);
+	QPainterPath pp = RegularPolygonPath(Preview->width() - 6, Preview->height() - 6, cornersSpinBox->value(), applyConvexGroupBox->isChecked(), GetFactor(), rotationSlider->value(), roundness, innerRotationSpinBox->value(), innerround);
 	QRectF br = pp.boundingRect();
 	if (br.x() < 0)
 	{

Modified: trunk/Scribus/scribus/ui/polygonwidgetbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21186&path=/trunk/Scribus/scribus/ui/polygonwidgetbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/polygonwidgetbase.ui	(original)
+++ trunk/Scribus/scribus/ui/polygonwidgetbase.ui	Sun Apr 10 19:39:40 2016
@@ -1,337 +1,351 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PolygonWidgetBase</class>
- <widget class="QWidget" name="PolygonWidgetBase">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>558</width>
-    <height>560</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="0" column="0">
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Corn&ers:</string>
-       </property>
-       <property name="buddy">
-        <cstring>cornersSpinBox</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="ScrSpinBox" name="cornersSpinBox">
-       <property name="toolTip">
-        <string>Number of corners for polygons</string>
-       </property>
-       <property name="suffix">
-        <string notr="true"/>
-       </property>
-       <property name="minimum">
-        <number>3</number>
-       </property>
-       <property name="maximum">
-        <number>999</number>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>&Rotation:</string>
-       </property>
-       <property name="buddy">
-        <cstring>rotationSpinBox</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="ScrSpinBox" name="rotationSpinBox">
-       <property name="toolTip">
-        <string>Degrees of rotation for polygons</string>
-       </property>
-       <property name="minimum">
-        <number>-180</number>
-       </property>
-       <property name="maximum">
-        <number>180</number>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0" colspan="2">
-      <widget class="QSlider" name="rotationSlider">
-       <property name="toolTip">
-        <string>Degrees of rotation for polygons</string>
-       </property>
-       <property name="minimum">
-        <number>-180</number>
-       </property>
-       <property name="maximum">
-        <number>180</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="tickPosition">
-        <enum>QSlider::TicksBelow</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="1" rowspan="2">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <item>
-      <widget class="QLabel" name="Preview">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>280</width>
-         <height>280</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>280</width>
-         <height>280</height>
-        </size>
-       </property>
-       <property name="sizeIncrement">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Sample Polygon</string>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::Panel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Sunken</enum>
-       </property>
-       <property name="lineWidth">
-        <number>2</number>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="applyConvexGroupBox">
-     <property name="toolTip">
-      <string>Apply Convex/Concave Factor to change shape of Polygons</string>
-     </property>
-     <property name="title">
-      <string>Apply &Factor</string>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>&Factor:</string>
-        </property>
-        <property name="buddy">
-         <cstring>factorSpinBox</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="ScrSpinBox" name="factorSpinBox">
-        <property name="toolTip">
-         <string>A negative value will make the polygon concave (or star shaped), a positive value will make it convex</string>
-        </property>
-        <property name="suffix">
-         <string> %</string>
-        </property>
-        <property name="minimum">
-         <number>-100</number>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="QSlider" name="factorSlider">
-        <property name="toolTip">
-         <string>A negative value will make the polygon concave (or star shaped), a positive value will make it convex</string>
-        </property>
-        <property name="minimum">
-         <number>-100</number>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="tickPosition">
-         <enum>QSlider::TicksBelow</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Inner Rotation:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="ScrSpinBox" name="innerRotationspinBox">
-        <property name="minimum">
-         <number>-180</number>
-        </property>
-        <property name="maximum">
-         <number>180</number>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2">
-       <widget class="QSlider" name="innerRotationSlider">
-        <property name="minimum">
-         <number>-180</number>
-        </property>
-        <property name="maximum">
-         <number>180</number>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="tickPosition">
-         <enum>QSlider::TicksBelow</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Inner C&urvature:</string>
-        </property>
-        <property name="buddy">
-         <cstring>curvatureSpinBox</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="ScrSpinBox" name="curvatureSpinBox">
-        <property name="suffix">
-         <string> %</string>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0" colspan="2">
-       <widget class="QSlider" name="curvatureSlider">
-        <property name="maximum">
-         <number>100</number>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="tickPosition">
-         <enum>QSlider::TicksBelow</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Outer Curvature:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1">
-       <widget class="ScrSpinBox" name="OuterCurvatureSpinBox">
-        <property name="suffix">
-         <string> %</string>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0" colspan="2">
-       <widget class="QSlider" name="OuterCurvatureSlider">
-        <property name="maximum">
-         <number>100</number>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="tickPosition">
-         <enum>QSlider::TicksBelow</enum>
-        </property>
-       </widget>
-      </item>
-     </layout>
-     <zorder>label_3</zorder>
-     <zorder>factorSpinBox</zorder>
-     <zorder>factorSlider</zorder>
-     <zorder>label_5</zorder>
-     <zorder>curvatureSpinBox</zorder>
-     <zorder>curvatureSlider</zorder>
-     <zorder>label_6</zorder>
-     <zorder>OuterCurvatureSpinBox</zorder>
-     <zorder>OuterCurvatureSlider</zorder>
-     <zorder>innerRotationSlider</zorder>
-     <zorder>innerRotationspinBox</zorder>
-     <zorder>label_4</zorder>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ScrSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header location="global">ui/scrspinbox.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PolygonWidgetBase</class>
+ <widget class="QWidget" name="PolygonWidgetBase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>495</width>
+    <height>359</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string notr="true"/>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="0" column="0">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="cornersSpinBoxLabel">
+       <property name="text">
+        <string>Corn&ers:</string>
+       </property>
+       <property name="buddy">
+        <cstring>cornersSpinBox</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="ScrSpinBox" name="cornersSpinBox">
+       <property name="toolTip">
+        <string>Number of corners for polygons</string>
+       </property>
+       <property name="suffix">
+        <string notr="true"/>
+       </property>
+       <property name="minimum">
+        <number>3</number>
+       </property>
+       <property name="maximum">
+        <number>999</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="rotationSpinBoxLabel">
+       <property name="text">
+        <string>&Rotation:</string>
+       </property>
+       <property name="buddy">
+        <cstring>rotationSpinBox</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="ScrSpinBox" name="rotationSpinBox">
+       <property name="toolTip">
+        <string>Degrees of rotation for polygons</string>
+       </property>
+       <property name="minimum">
+        <number>-180</number>
+       </property>
+       <property name="maximum">
+        <number>180</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" colspan="2">
+      <widget class="QSlider" name="rotationSlider">
+       <property name="toolTip">
+        <string>Degrees of rotation for polygons</string>
+       </property>
+       <property name="minimum">
+        <number>-180</number>
+       </property>
+       <property name="maximum">
+        <number>180</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="tickPosition">
+        <enum>QSlider::TicksBelow</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="1" rowspan="2">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
+      <widget class="QLabel" name="Preview">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>280</width>
+         <height>280</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>280</width>
+         <height>280</height>
+        </size>
+       </property>
+       <property name="sizeIncrement">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Sample Polygon</string>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::Panel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Sunken</enum>
+       </property>
+       <property name="lineWidth">
+        <number>2</number>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="applyConvexGroupBox">
+     <property name="toolTip">
+      <string>Apply Convex/Concave Factor to change shape of Polygons</string>
+     </property>
+     <property name="title">
+      <string>Apply &Factor</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="factorSpinBoxLabel">
+        <property name="text">
+         <string>&Factor:</string>
+        </property>
+        <property name="buddy">
+         <cstring>factorSpinBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="ScrSpinBox" name="factorSpinBox">
+        <property name="toolTip">
+         <string>A negative value will make the polygon concave (or star shaped), a positive value will make it convex</string>
+        </property>
+        <property name="suffix">
+         <string> %</string>
+        </property>
+        <property name="minimum">
+         <number>-100</number>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <widget class="QSlider" name="factorSlider">
+        <property name="toolTip">
+         <string>A negative value will make the polygon concave (or star shaped), a positive value will make it convex</string>
+        </property>
+        <property name="minimum">
+         <number>-100</number>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition">
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="innerRotationSpinBoxLabel">
+        <property name="text">
+         <string>Inner Rotation:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="ScrSpinBox" name="innerRotationSpinBox">
+        <property name="minimum">
+         <number>-180</number>
+        </property>
+        <property name="maximum">
+         <number>180</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="2">
+       <widget class="QSlider" name="innerRotationSlider">
+        <property name="minimum">
+         <number>-180</number>
+        </property>
+        <property name="maximum">
+         <number>180</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition">
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="curvatureSpinBoxLabel">
+        <property name="text">
+         <string>Inner C&urvature:</string>
+        </property>
+        <property name="buddy">
+         <cstring>curvatureSpinBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="ScrSpinBox" name="curvatureSpinBox">
+        <property name="suffix">
+         <string> %</string>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" colspan="2">
+       <widget class="QSlider" name="curvatureSlider">
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition">
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="outerCurvatureSpinBoxLabel">
+        <property name="text">
+         <string>Outer Curvature:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1">
+       <widget class="ScrSpinBox" name="outerCurvatureSpinBox">
+        <property name="suffix">
+         <string> %</string>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="2">
+       <widget class="QSlider" name="outerCurvatureSlider">
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="tickPosition">
+         <enum>QSlider::TicksBelow</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+     <zorder>factorSpinBoxLabel</zorder>
+     <zorder>factorSpinBox</zorder>
+     <zorder>factorSlider</zorder>
+     <zorder>curvatureSpinBoxLabel</zorder>
+     <zorder>curvatureSpinBox</zorder>
+     <zorder>curvatureSlider</zorder>
+     <zorder>outerCurvatureSpinBoxLabel</zorder>
+     <zorder>outerCurvatureSpinBox</zorder>
+     <zorder>outerCurvatureSlider</zorder>
+     <zorder>innerRotationSlider</zorder>
+     <zorder>innerRotationSpinBox</zorder>
+     <zorder>innerRotationSpinBoxLabel</zorder>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ScrSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header location="global">ui/scrspinbox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>cornersSpinBox</tabstop>
+  <tabstop>rotationSpinBox</tabstop>
+  <tabstop>rotationSlider</tabstop>
+  <tabstop>applyConvexGroupBox</tabstop>
+  <tabstop>factorSpinBox</tabstop>
+  <tabstop>factorSlider</tabstop>
+  <tabstop>innerRotationSpinBox</tabstop>
+  <tabstop>innerRotationSlider</tabstop>
+  <tabstop>curvatureSpinBox</tabstop>
+  <tabstop>curvatureSlider</tabstop>
+  <tabstop>outerCurvatureSpinBox</tabstop>
+  <tabstop>outerCurvatureSlider</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>




More information about the scribus-commit mailing list