[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice
Subject:    patch: KIllustrator
From:       Werner Trobin <wtrobin () mandrakesoft ! com>
Date:       2000-08-31 7:49:26
[Download RAW message or body]

Hi!

1) As Dirk fixed K*NumInput I finally removed the slightly
   hacked version from KIllu.
2) Tiny layout fix.

-- 
Werner Trobin - wtrobin@mandrakesoft.com
["killu.diff" (text/plain)]

Index: share/Makefile.am
===================================================================
RCS file: /home/kde/koffice/killustrator/share/Makefile.am,v
retrieving revision 1.44
diff -b -u -p -r1.44 Makefile.am
--- share/Makefile.am	2000/08/12 10:50:55	1.44
+++ share/Makefile.am	2000/08/31 07:43:57
@@ -39,7 +39,7 @@ noinst_HEADERS = Handle.h GObject.h GPol
 		 BrushCells.h PathTextTool.h \
 		 EllipseConfigDialog.h HelplineDialog.h \
 		 GCurve.h ToCurveCmd.h BlendDialog.h BlendCmd.h \
-		 filter_utils.h kmynuminput.h
+		 filter_utils.h
 
 libkillu_la_SOURCES = Handle.cc GObject.cc GPolyline.cc GPolygon.cc \
 			  PathTextTool.cc GOval.cc GClipart.cc GBezier.cc GPixmap.cc \
@@ -80,6 +80,6 @@ libkillu_la_SOURCES = Handle.cc GObject.
 			  EllipseConfigDialog.cc \
 			  HelplineDialog.cc GCurve.cc ToCurveCmd.cc \
 			  BlendDialog.cc BlendCmd.cc \
-			  filter_utils.cc kmynuminput.cc
+			  filter_utils.cc
 
 METASOURCES =	AUTO
Index: share/TransformationDialog.cc
===================================================================
RCS file: /home/kde/koffice/killustrator/share/TransformationDialog.cc,v
retrieving revision 1.25
diff -b -u -p -r1.25 TransformationDialog.cc
--- share/TransformationDialog.cc	2000/08/12 10:50:55	1.25
+++ share/TransformationDialog.cc	2000/08/31 07:44:00
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kmynuminput.h>
+#include <knuminput.h>
 
 #include <qpushbutton.h>
 #include <qhbuttongroup.h>
@@ -158,36 +158,35 @@ void TransformationDialog::createRotatio
     layout->addMultiCellWidget(box, 0, 0, 0, 1);
     QBoxLayout *vboxlayout=new QVBoxLayout(box, KDialogBase::marginHint(), KDialogBase::spacingHint());
     vboxlayout->addSpacing(fontMetrics().height()/2);
+    QGridLayout *grid=new QGridLayout(vboxlayout, 3, 2);
 
-    QBoxLayout *hboxlayout=new QHBoxLayout(vboxlayout);
     QLabel *label = new QLabel(i18n("Horizontal:"), box);
-    hboxlayout->addWidget(label);
+    grid->addWidget(label, 0, 0);
 
     horizRotCenter = new UnitBox(box);
     horizRotCenter->setRange (-1000.0, 1000.0);
     horizRotCenter->setStep (0.1);
     horizRotCenter->setEditable (true);
-    hboxlayout->addWidget(horizRotCenter);
+    grid->addWidget(horizRotCenter, 0, 1);
 
-    hboxlayout=new QHBoxLayout(vboxlayout);
     label = new QLabel(i18n("Vertical:"), box);
-    hboxlayout->addWidget(label);
+    grid->addWidget(label, 1, 0);
 
     vertRotCenter = new UnitBox(box);
     vertRotCenter->setRange (-1000.0, 1000.0);
     vertRotCenter->setStep (0.1);
     vertRotCenter->setEditable (true);
-    hboxlayout->addWidget(vertRotCenter);
+    grid->addWidget(vertRotCenter, 1, 1);
 
     relativeRotCenter = new QCheckBox(i18n("Relative Position"), box);
     connect( relativeRotCenter, SIGNAL(clicked()),
              this, SLOT(relativeRotCenterSlot()) );
-    vboxlayout->addWidget(relativeRotCenter);
+    grid->addMultiCellWidget(relativeRotCenter, 2, 2, 0, 1);
 
     QHBox *hbox=new QHBox(parent);
     label = new QLabel(i18n("Angle:"), hbox);
 
-    rotAngle = new KMyDoubleNumInput(hbox);
+    rotAngle = new KDoubleNumInput(hbox);
     rotAngle->setRange(-360.0, 360.0, 0.1, false);
     horizPosition->setStep (0.1);
     layout->addMultiCellWidget(hbox, 1, 1, 0, 1);
@@ -399,7 +398,7 @@ void TransformationDialog::rotate (bool 
 
   xcenter = horizRotCenter->getValue ();
   ycenter = vertRotCenter->getValue ();
-  angle = rotAngle->value(true);
+  angle = rotAngle->value();
 
   if (relativeRotCenter->isChecked ()) {
     // the given values are relative to the current bounding box
Index: share/TransformationDialog.h
===================================================================
RCS file: /home/kde/koffice/killustrator/share/TransformationDialog.h,v
retrieving revision 1.11
diff -b -u -p -r1.11 TransformationDialog.h
--- share/TransformationDialog.h	2000/08/12 10:50:55	1.11
+++ share/TransformationDialog.h	2000/08/31 07:44:01
@@ -32,7 +32,7 @@ class QCheckBox;
 
 class GDocument;
 class CommandHistory;
-class KMyDoubleNumInput;
+class KDoubleNumInput;
 class UnitBox;
 
 class TransformationDialog : public KDialogBase {
@@ -77,7 +77,7 @@ private:
   UnitBox *vertPosition;
   QCheckBox *relativePosition;
 
-  KMyDoubleNumInput *rotAngle;
+  KDoubleNumInput *rotAngle;
   UnitBox *horizRotCenter;
   UnitBox *vertRotCenter;
   QCheckBox *relativeRotCenter;
Index: share/UnitBox.cc
===================================================================
RCS file: /home/kde/koffice/killustrator/share/UnitBox.cc,v
retrieving revision 1.15
diff -b -u -p -r1.15 UnitBox.cc
--- share/UnitBox.cc	2000/08/12 10:50:55	1.15
+++ share/UnitBox.cc	2000/08/31 07:44:01
@@ -26,13 +26,13 @@
 
 #include <qcombobox.h>
 #include <qlayout.h>
-#include <kmynuminput.h>
+#include <knuminput.h>
 
 MeasurementUnit UnitBox::defaultUnit = UnitPoint;
 
 UnitBox::UnitBox (QWidget* parent, const char* name) : QHBox(parent, name) {
 
-    valueBox = new KMyDoubleNumInput(this, "valueBox");
+    valueBox = new KDoubleNumInput(this, "valueBox");
     ptMinVal=1.0;
     ptMaxVal=10.0;
     m_step=1.0;
@@ -63,9 +63,9 @@ void UnitBox::setFormatString (const cha
 
 float UnitBox::getValue () {
     if(isUnitEnabled)
-        return cvtUnitToPt (unit, valueBox->value(true));
+        return cvtUnitToPt (unit, valueBox->value());
     else
-        return valueBox->value(true);
+        return valueBox->value();
 }
 
 void UnitBox::setValue (float value) {
Index: share/UnitBox.h
===================================================================
RCS file: /home/kde/koffice/killustrator/share/UnitBox.h,v
retrieving revision 1.8
diff -b -u -p -r1.8 UnitBox.h
--- share/UnitBox.h	2000/08/12 10:50:55	1.8
+++ share/UnitBox.h	2000/08/31 07:44:01
@@ -29,7 +29,7 @@
 #include <units.h>
 
 class QComboBox;
-class KMyDoubleNumInput;
+class KDoubleNumInput;
 
 class UnitBox : public QHBox {
   Q_OBJECT
@@ -61,7 +61,7 @@ protected slots:
   void slotValueChanged(double f);
 
 private:
-  KMyDoubleNumInput *valueBox;
+  KDoubleNumInput *valueBox;
   bool isUnitEnabled;
   QComboBox *unitCombo;
   MeasurementUnit unit;


[prev in list] [next in list] [prev in thread] [next in thread]