r14393 by cbradney - Rename cryptic polyong widget variables

scribus-commit scribus-commit at lists.scribus.net
Thu Dec 10 21:15:21 CET 2009


Revision: 14393
Author: cbradney
Date: 2009-12-10T09:28:53.865432Z
Commit message: Rename cryptic polyong widget variables

Changeset: 
M  /trunk/Scribus/scribus/ui/polygonwidget.cpp
M  /trunk/Scribus/scribus/ui/polygonwidget.h
M  /trunk/Scribus/scribus/ui/polygonwidgetbase.ui

Diffs:
Index: scribus/ui/polygonwidget.h
===================================================================
--- scribus/ui/polygonwidget.h	(revision 14392)
+++ scribus/ui/polygonwidget.h	(revision 14393)
@@ -15,21 +15,24 @@
 {
 	Q_OBJECT
 
-public:
-	PolygonWidget(QWidget* parent, int polyC, int polyFd, double polyF, bool polyS, double polyR, double polyCurvature);
-	~PolygonWidget() {};
-	double GetZeroFaktor();
-	double GetMaxFaktor();
-	void getValues(int* polyC, int* polyFd, double* polyF, bool* polyS, double* polyR, double* polyCurvature);
-	void restoreDefaults(struct ItemToolPrefs *prefsData);
-	double PFactor;
+	public:
+		PolygonWidget(QWidget* parent, int polyCorners, int polyFd, double polyF, bool polyUseConvexFactor, double polyRotation, double polyCurvature);
+		~PolygonWidget() {};
 
-public slots:
-	void UpdatePreView();
-	double GetFaktor();
-	void ValFromSpin(int a);
-	void ValFromSpin2(int a);
-	void ValFromSpin3(int a);
+		void getValues(int* polyCorners, int* polyFd, double* polyF, bool* polyUseConvexFactor, double* polyRotation, double* polyCurvature);
+		void restoreDefaults(struct ItemToolPrefs *prefsData);
+
+	protected slots:
+		void setFactorSlider(int a);
+		void setRotationSlider(int a);
+		void setCurvatureSlider(int a);
+		void UpdatePreview();
+		double GetZeroFactor();
+		double GetMaxFactor();
+		double GetFactor();
+
+	protected:
+		double PFactor;
 };
 
 #endif
Index: scribus/ui/polygonwidget.cpp
===================================================================
--- scribus/ui/polygonwidget.cpp	(revision 14392)
+++ scribus/ui/polygonwidget.cpp	(revision 14393)
@@ -22,113 +22,113 @@
 
 using namespace std;
 
-PolygonWidget::PolygonWidget(QWidget* parent, int polyC, int polyFd, double polyF, bool polyS, double polyR, double polyCurvature) : QWidget( parent )
+PolygonWidget::PolygonWidget(QWidget* parent, int polyCorners, int polyFd, double polyF, bool polyUseConvexFactor, double polyRotation, double polyCurvature) : QWidget( parent )
 {
 	setupUi(this);
 	PFactor = polyF;
-	Ecken->setValue(polyC);
-	Faktor2->setValue(static_cast<int>(polyR));
-	Slider2->setValue(static_cast<int>(polyR));
-	Konvex->setChecked(polyS);
-	Faktor->setValue(polyFd);
-	Slider1->setValue(polyFd);
-	Konvex->setChecked(polyS);
-	CurvatureSpin->setValue(qRound(polyCurvature * 100));
-	CurvatureSlider->setValue(qRound(polyCurvature * 100));
+	cornersSpinBox->setValue(polyCorners);
+	rotationSpinBox->setValue(static_cast<int>(polyRotation));
+	rotationSlider->setValue(static_cast<int>(polyRotation));
+	applyConvexGroupBox->setChecked(polyUseConvexFactor);
+	factorSpinBox->setValue(polyFd);
+	factorSlider->setValue(polyFd);
+	applyConvexGroupBox->setChecked(polyUseConvexFactor);
+	curvatureSpinBox->setValue(qRound(polyCurvature * 100));
+	curvatureSlider->setValue(qRound(polyCurvature * 100));
 
-	UpdatePreView();
+	UpdatePreview();
 	// signals and slots connections
-	connect(Faktor, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin(int)));
-	connect(Faktor2, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin2(int)));
-	connect(Slider1, SIGNAL(valueChanged(int)), Faktor, SLOT(setValue(int)));
-	connect(Slider1, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
-	connect(Slider2, SIGNAL(valueChanged(int)), Faktor2, SLOT(setValue(int)));
-	connect(Slider2, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
-	connect(Ecken, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
-	connect(Konvex, SIGNAL(clicked()), this, SLOT(UpdatePreView()));
-	connect(CurvatureSpin, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin3(int)));
-	connect(CurvatureSlider, SIGNAL(valueChanged(int)), CurvatureSpin, SLOT(setValue(int)));
-	connect(CurvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
+	connect(factorSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setFactorSlider(int)));
+	connect(rotationSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setRotationSlider(int)));
+	connect(factorSlider, SIGNAL(valueChanged(int)), factorSpinBox, SLOT(setValue(int)));
+	connect(factorSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
+	connect(rotationSlider, SIGNAL(valueChanged(int)), rotationSpinBox, SLOT(setValue(int)));
+	connect(rotationSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
+	connect(cornersSpinBox, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
+	connect(applyConvexGroupBox, SIGNAL(clicked()), this, SLOT(UpdatePreview()));
+	connect(curvatureSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setCurvatureSlider(int)));
+	connect(curvatureSlider, SIGNAL(valueChanged(int)), curvatureSpinBox, SLOT(setValue(int)));
+	connect(curvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
 }
 
 void PolygonWidget::restoreDefaults(struct ItemToolPrefs *prefsData)
 {
-	disconnect(Faktor, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin(int)));
-	disconnect(Faktor2, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin2(int)));
-	disconnect(Slider1, SIGNAL(valueChanged(int)), Faktor, SLOT(setValue(int)));
-	disconnect(Slider1, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
-	disconnect(Slider2, SIGNAL(valueChanged(int)), Faktor2, SLOT(setValue(int)));
-	disconnect(Slider2, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
-	disconnect(Ecken, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
-	disconnect(Konvex, SIGNAL(clicked()), this, SLOT(UpdatePreView()));
-	disconnect(CurvatureSpin, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin3(int)));
-	disconnect(CurvatureSlider, SIGNAL(valueChanged(int)), CurvatureSpin, SLOT(setValue(int)));
-	disconnect(CurvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
+	disconnect(factorSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setFactorSlider(int)));
+	disconnect(rotationSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setRotationSlider(int)));
+	disconnect(factorSlider, SIGNAL(valueChanged(int)), factorSpinBox, SLOT(setValue(int)));
+	disconnect(factorSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
+	disconnect(rotationSlider, SIGNAL(valueChanged(int)), rotationSpinBox, SLOT(setValue(int)));
+	disconnect(rotationSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
+	disconnect(cornersSpinBox, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
+	disconnect(applyConvexGroupBox, SIGNAL(clicked()), this, SLOT(UpdatePreview()));
+	disconnect(curvatureSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setCurvatureSlider(int)));
+	disconnect(curvatureSlider, SIGNAL(valueChanged(int)), curvatureSpinBox, SLOT(setValue(int)));
+	disconnect(curvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
 	PFactor = prefsData->polyFactor;
-	Ecken->setValue(prefsData->polyCorners);
-	Faktor2->setValue(static_cast<int>(prefsData->polyRotation));
-	Slider2->setValue(static_cast<int>(prefsData->polyRotation));
-	Konvex->setChecked(prefsData->polyUseFactor);
-	Faktor->setValue(prefsData->polyFactorGuiVal);
-	Slider1->setValue(prefsData->polyFactorGuiVal);
-	Konvex->setChecked(prefsData->polyUseFactor);
-	CurvatureSpin->setValue(qRound(prefsData->polyCurvature * 100));
-	CurvatureSlider->setValue(qRound(prefsData->polyCurvature * 100));
-	UpdatePreView();
-	connect(Faktor, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin(int)));
-	connect(Faktor2, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin2(int)));
-	connect(Slider1, SIGNAL(valueChanged(int)), Faktor, SLOT(setValue(int)));
-	connect(Slider1, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
-	connect(Slider2, SIGNAL(valueChanged(int)), Faktor2, SLOT(setValue(int)));
-	connect(Slider2, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
-	connect(Ecken, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
-	connect(Konvex, SIGNAL(clicked()), this, SLOT(UpdatePreView()));
-	connect(CurvatureSpin, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin3(int)));
-	connect(CurvatureSlider, SIGNAL(valueChanged(int)), CurvatureSpin, SLOT(setValue(int)));
-	connect(CurvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
+	cornersSpinBox->setValue(prefsData->polyCorners);
+	rotationSpinBox->setValue(static_cast<int>(prefsData->polyRotation));
+	rotationSlider->setValue(static_cast<int>(prefsData->polyRotation));
+	applyConvexGroupBox->setChecked(prefsData->polyUseFactor);
+	factorSpinBox->setValue(prefsData->polyFactorGuiVal);
+	factorSlider->setValue(prefsData->polyFactorGuiVal);
+	applyConvexGroupBox->setChecked(prefsData->polyUseFactor);
+	curvatureSpinBox->setValue(qRound(prefsData->polyCurvature * 100));
+	curvatureSlider->setValue(qRound(prefsData->polyCurvature * 100));
+	UpdatePreview();
+	connect(factorSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setFactorSlider(int)));
+	connect(rotationSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setRotationSlider(int)));
+	connect(factorSlider, SIGNAL(valueChanged(int)), factorSpinBox, SLOT(setValue(int)));
+	connect(factorSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
+	connect(rotationSlider, SIGNAL(valueChanged(int)), rotationSpinBox, SLOT(setValue(int)));
+	connect(rotationSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
+	connect(cornersSpinBox, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
+	connect(applyConvexGroupBox, SIGNAL(clicked()), this, SLOT(UpdatePreview()));
+	connect(curvatureSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setCurvatureSlider(int)));
+	connect(curvatureSlider, SIGNAL(valueChanged(int)), curvatureSpinBox, SLOT(setValue(int)));
+	connect(curvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreview()));
 }
 
-void PolygonWidget::getValues(int* polyC, int* polyFd, double* polyF, bool* polyS, double* polyR, double* polyCurvature)
+void PolygonWidget::getValues(int* polyCorners, int* polyFd, double* polyF, bool* polyUseConvexFactor, double* polyRotation, double* polyCurvature)
 {
-	*polyC = Ecken->value();
+	*polyCorners = cornersSpinBox->value();
 	*polyF = PFactor;
-	*polyS = Konvex->isChecked();
-	*polyFd = Slider1->value();
-	*polyR = Faktor2->value();
-	*polyCurvature = CurvatureSpin->value() / 100.0;
+	*polyUseConvexFactor = applyConvexGroupBox->isChecked();
+	*polyFd = factorSlider->value();
+	*polyRotation = rotationSpinBox->value();
+	*polyCurvature = curvatureSpinBox->value() / 100.0;
 }
 
-void PolygonWidget::ValFromSpin(int a)
+void PolygonWidget::setFactorSlider(int a)
 {
-	disconnect(Slider1, SIGNAL(valueChanged(int)), Faktor, SLOT(setValue(int)));
-	Slider1->setValue(a);
-	connect(Slider1, SIGNAL(valueChanged(int)), Faktor, SLOT(setValue(int)));
+	disconnect(factorSlider, SIGNAL(valueChanged(int)), factorSpinBox, SLOT(setValue(int)));
+	factorSlider->setValue(a);
+	connect(factorSlider, SIGNAL(valueChanged(int)), factorSpinBox, SLOT(setValue(int)));
 }
 
-void PolygonWidget::ValFromSpin2(int a)
+void PolygonWidget::setRotationSlider(int a)
 {
-	disconnect(Slider2, SIGNAL(valueChanged(int)), Faktor2, SLOT(setValue(int)));
-	Slider2->setValue(a);
-	connect(Slider2, SIGNAL(valueChanged(int)), Faktor2, SLOT(setValue(int)));
+	disconnect(rotationSlider, SIGNAL(valueChanged(int)), rotationSpinBox, SLOT(setValue(int)));
+	rotationSlider->setValue(a);
+	connect(rotationSlider, SIGNAL(valueChanged(int)), rotationSpinBox, SLOT(setValue(int)));
 }
 
-void PolygonWidget::ValFromSpin3(int a)
+void PolygonWidget::setCurvatureSlider(int a)
 {
-	disconnect(CurvatureSlider, SIGNAL(valueChanged(int)), CurvatureSpin, SLOT(setValue(int)));
-	CurvatureSlider->setValue(a);
-	connect(CurvatureSlider, SIGNAL(valueChanged(int)), CurvatureSpin, SLOT(setValue(int)));
+	disconnect(curvatureSlider, SIGNAL(valueChanged(int)), curvatureSpinBox, SLOT(setValue(int)));
+	curvatureSlider->setValue(a);
+	connect(curvatureSlider, SIGNAL(valueChanged(int)), curvatureSpinBox, SLOT(setValue(int)));
 }
 
-void PolygonWidget::UpdatePreView()
+void PolygonWidget::UpdatePreview()
 {
-	double roundness = CurvatureSpin->value() / 100.0;
+	double roundness = curvatureSpinBox->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 = RegularPolygon(Preview->width() - 6, Preview->height() - 6, Ecken->value(), Konvex->isChecked(), GetFaktor(), Slider2->value(), roundness);
+	QPainterPath pp = RegularPolygon(Preview->width() - 6, Preview->height() - 6, cornersSpinBox->value(), applyConvexGroupBox->isChecked(), GetFactor(), rotationSlider->value(), roundness);
 	QRectF br = pp.boundingRect();
 	if (br.x() < 0)
 	{
@@ -155,31 +155,31 @@
 	Preview->setPixmap(pm);
 }
 
-double PolygonWidget::GetZeroFaktor()
+double PolygonWidget::GetZeroFactor()
 {
-	return sqrt(pow(1.0,2.0)-pow(((sin((360.0/(Ecken->value()*2))/180* M_PI)* 2.0)/2.0),2.0));
+	return sqrt(pow(1.0,2.0)-pow(((sin((360.0/(cornersSpinBox->value()*2))/180* M_PI)* 2.0)/2.0),2.0));
 }
 
-double PolygonWidget::GetMaxFaktor()
+double PolygonWidget::GetMaxFactor()
 {
-	double win = (360.0/(Ecken->value()*2)) / 180.0 * M_PI;
+	double win = (360.0/(cornersSpinBox->value()*2)) / 180.0 * M_PI;
 	double ret;
-	if ((360.0/(Ecken->value()*2)) > 45)
+	if ((360.0/(cornersSpinBox->value()*2)) > 45)
 		ret = 1/sin(win);
 	else
 		ret = 1/cos(win);
 	return ret;
 }
 
-double PolygonWidget::GetFaktor()
+double PolygonWidget::GetFactor()
 {
-	int val = Slider1->value();
+	int val = factorSlider->value();
 	if (val < 0)
-		PFactor = GetZeroFaktor() * (100.0 + val) / 100.0;
+		PFactor = GetZeroFactor() * (100.0 + val) / 100.0;
 	else
 	{
-		double ma = GetMaxFaktor();
-		double mi = GetZeroFaktor();
+		double ma = GetMaxFactor();
+		double mi = GetZeroFactor();
 		PFactor = ((ma - mi) * val / 100.0) + mi;
 	}
 	return PFactor;
Index: scribus/ui/polygonwidgetbase.ui
===================================================================
--- scribus/ui/polygonwidgetbase.ui	(revision 14392)
+++ scribus/ui/polygonwidgetbase.ui	(revision 14393)
@@ -1,234 +1,235 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>PolygonWidgetBase</class>
- <widget class="QWidget" name="PolygonWidgetBase" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PolygonWidgetBase">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>443</width>
-    <height>278</height>
+    <width>472</width>
+    <height>284</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="Maximum" hsizetype="Maximum" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3" >
-   <item row="0" column="0" >
-    <layout class="QGridLayout" name="gridLayout" >
-     <property name="spacing" >
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="0" column="0">
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="spacing">
       <number>5</number>
      </property>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
         <string>Corn&amp;ers:</string>
        </property>
-       <property name="buddy" >
-        <cstring>Ecken</cstring>
+       <property name="buddy">
+        <cstring>cornersSpinBox</cstring>
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="QSpinBox" name="Ecken" >
-       <property name="toolTip" >
+     <item row="0" column="1">
+      <widget class="QSpinBox" name="cornersSpinBox">
+       <property name="toolTip">
         <string>Number of corners for polygons</string>
        </property>
-       <property name="minimum" >
+       <property name="minimum">
         <number>3</number>
        </property>
-       <property name="maximum" >
+       <property name="maximum">
         <number>999</number>
        </property>
       </widget>
      </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
         <string>&amp;Rotation:</string>
        </property>
-       <property name="buddy" >
-        <cstring>Faktor2</cstring>
+       <property name="buddy">
+        <cstring>rotationSpinBox</cstring>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" >
-      <widget class="QSpinBox" name="Faktor2" >
-       <property name="toolTip" >
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="rotationSpinBox">
+       <property name="toolTip">
         <string>Degrees of rotation for polygons</string>
        </property>
-       <property name="minimum" >
+       <property name="minimum">
         <number>-180</number>
        </property>
-       <property name="maximum" >
+       <property name="maximum">
         <number>180</number>
        </property>
       </widget>
      </item>
-     <item row="2" column="0" colspan="2" >
-      <widget class="QSlider" name="Slider2" >
-       <property name="toolTip" >
+     <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" >
+       <property name="minimum">
         <number>-180</number>
        </property>
-       <property name="maximum" >
+       <property name="maximum">
         <number>180</number>
        </property>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="tickPosition" >
+       <property name="tickPosition">
         <enum>QSlider::TicksBelow</enum>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item rowspan="2" row="0" column="1" >
-    <widget class="QLabel" name="Preview" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+   <item row="0" column="1" rowspan="2">
+    <widget class="QLabel" name="Preview">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize" >
+     <property name="minimumSize">
       <size>
        <width>260</width>
        <height>260</height>
       </size>
      </property>
-     <property name="maximumSize" >
+     <property name="maximumSize">
       <size>
        <width>260</width>
        <height>260</height>
       </size>
      </property>
-     <property name="sizeIncrement" >
+     <property name="sizeIncrement">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Sample Polygon</string>
      </property>
-     <property name="frameShape" >
+     <property name="frameShape">
       <enum>QFrame::Panel</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Sunken</enum>
      </property>
-     <property name="lineWidth" >
+     <property name="lineWidth">
       <number>2</number>
      </property>
-     <property name="text" >
+     <property name="text">
       <string/>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QGroupBox" name="Konvex" >
-     <property name="toolTip" >
+   <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" >
+     <property name="title">
       <string>Apply &amp;Factor</string>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2" >
-      <property name="margin" >
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="margin">
        <number>10</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>5</number>
       </property>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
          <string>&amp;Factor:</string>
         </property>
-        <property name="buddy" >
-         <cstring>Faktor</cstring>
+        <property name="buddy">
+         <cstring>factorSpinBox</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QSpinBox" name="Faktor" >
-        <property name="toolTip" >
+      <item row="0" column="1">
+       <widget class="QSpinBox" 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" >
+        <property name="suffix">
          <string> %</string>
         </property>
-        <property name="minimum" >
+        <property name="minimum">
          <number>-100</number>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>100</number>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QSlider" name="Slider1" >
-        <property name="toolTip" >
+      <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" >
+        <property name="minimum">
          <number>-100</number>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="tickPosition" >
+        <property name="tickPosition">
          <enum>QSlider::TicksBelow</enum>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label_5" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
          <string>C&amp;urvature:</string>
         </property>
-        <property name="buddy" >
-         <cstring>CurvatureSpin</cstring>
+        <property name="buddy">
+         <cstring>curvatureSpinBox</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QSpinBox" name="CurvatureSpin" >
-        <property name="suffix" >
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="curvatureSpinBox">
+        <property name="suffix">
          <string> %</string>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>100</number>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="2" >
-       <widget class="QSlider" name="CurvatureSlider" >
-        <property name="maximum" >
+      <item row="3" column="0" colspan="2">
+       <widget class="QSlider" name="curvatureSlider">
+        <property name="maximum">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="tickPosition" >
+        <property name="tickPosition">
          <enum>QSlider::TicksBelow</enum>
         </property>
        </widget>




More information about the scribus-commit mailing list