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

List:       koffice
Subject:    patch for kchart
From:       montel laurent <montell () club-internet ! fr>
Date:       2000-08-29 20:26:42
[Download RAW message or body]

Hi,

I modified a little kchartParameter3dConfigPage.cc

I replace QLineEdit by KIntNumInput

Could you test it please.

thanks 
bye
["patch_kchart1.diff" (text/x-c)]

cvs diff: warning: directory CVS specified in argument
cvs diff: but CVS uses CVS for its own purposes; skipping CVS directory
? kchartGridConfigPage.h
? fonts.dir
? kchartGridConfigPage.cc
? titi.chrt
? maindoc.xml
? tutu.chrt
? gdchart/gd1.3/gddemo
? gdchart/gd1.3/giftogd
? gdchart/gd1.3/webgif
? gdchart/gd1.3/demoout.gif
? pics/.xvpics
cvs server: Diffing .
Index: kchartParameter3dConfigPage.cc
===================================================================
RCS file: /home/kde/koffice/kchart/kchartParameter3dConfigPage.cc,v
retrieving revision 1.2
diff -u -p -r1.2 kchartParameter3dConfigPage.cc
--- kchartParameter3dConfigPage.cc	2000/08/11 08:26:22	1.2
+++ kchartParameter3dConfigPage.cc	2000/08/29 20:23:59
@@ -12,8 +12,8 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qbuttongroup.h>
-#include <knumvalidator.h>
 
+
 KChartParameter3dConfigPage::KChartParameter3dConfigPage(KChartParameters* params,QWidget* parent ) :
     QWidget( parent ),_params( params )
 {
@@ -22,51 +22,40 @@ KChartParameter3dConfigPage::KChartParam
   QGridLayout* layout = new QGridLayout(this, 2, 2,15,7 );
   //toplevel->addLayout( layout );
   QButtonGroup* gb = new QButtonGroup( i18n("3D Parameters"), this );
-  QGridLayout *grid1 = new QGridLayout(gb,7,1,15,7);
+  QGridLayout *grid1 = new QGridLayout(gb,3,2,15,7);
   layout->addWidget(gb,0,0);
 
   QLabel *tmpLabel = new QLabel( i18n( "Angle" ), gb );
   tmpLabel->resize( tmpLabel->sizeHint() );
   tmpLabel->setAlignment(Qt::AlignCenter);
   grid1->addWidget(tmpLabel,0,0);
+
+  angle3d=new KIntNumInput(0, gb, 10);
+  grid1->addWidget(angle3d,0,1);
+  angle3d->setRange(0, 90, 1);
 
-  angle3d=new QLineEdit(gb);
-  angle3d->resize( 100,angle3d->sizeHint().height() );
-  //angle3d->setMaximumWidth(100);
-  grid1->addWidget(angle3d,1,0);
-  KIntValidator *validate=new KIntValidator( angle3d );
-  validate->setRange( 0,90 );
-  angle3d->setValidator(validate);
 
 
   tmpLabel = new QLabel( i18n( "Depth" ), gb );
   tmpLabel->resize( tmpLabel->sizeHint() );
   tmpLabel->setAlignment(Qt::AlignCenter);
-  grid1->addWidget(tmpLabel,2,0);
+  grid1->addWidget(tmpLabel,1,0);
 
-  depth=new QLineEdit(gb);
+  depth=new KDoubleNumInput(0, gb);
   depth->resize(100,depth->sizeHint().height());
-  //depth->setMaximumWidth(100);
-  grid1->addWidget(depth,3,0);
-  KFloatValidator *validate2=new KFloatValidator( depth );
-  validate2->setRange( 0,10 );
-  //depth->setValidator( new KFloatValidator( depth ) );
-  depth->setValidator(validate2);
+  grid1->addWidget(depth,1,1);
+  depth->setRange(0, 10, 0.1);
+
 
   tmpLabel = new QLabel( i18n( "Bar width" ), gb );
   tmpLabel->resize( tmpLabel->sizeHint() );
   tmpLabel->setAlignment(Qt::AlignCenter);
-  grid1->addWidget(tmpLabel,4,0);
+  grid1->addWidget(tmpLabel,2,0);
 
-  bar_width=new QLineEdit(gb);
+  bar_width=new KIntNumInput(0, gb, 10);
   bar_width->resize( 100,bar_width->sizeHint().height() );
-  //bar_width->setMaximumWidth(100);
-  bar_width->setAlignment(Qt::AlignLeft);
-  grid1->addWidget(bar_width,5,0);
-  validate=new KIntValidator( bar_width );
-  validate->setRange( 0,100 );
-  //bar_width->setValidator( new KIntValidator( bar_width ) );
-  bar_width->setValidator( validate);
+  grid1->addWidget(bar_width,2,1);
+  bar_width->setRange( 0,100,1 );
 
   if(_params->do_bar())
         bar_width->setEnabled(true);
@@ -86,32 +75,23 @@ KChartParameter3dConfigPage::KChartParam
 
 void KChartParameter3dConfigPage::init()
 {
-QString tmp;
-tmp=tmp.setNum(_params->_3d_angle);
-angle3d->setText(tmp);
+
+angle3d->setValue(_params->_3d_angle);
+
+
 
-tmp=tmp.setNum(_params->_3d_depth);
-depth->setText(tmp);
+depth->setValue( _params->_3d_depth);
 
 if(_params->do_bar())
-        {
-        tmp=tmp.setNum(_params->bar_width);
-        bar_width->setText(tmp);
-        }
+        bar_width->setValue( _params->bar_width);
 }
 
 void KChartParameter3dConfigPage::apply()
 {
-QString tmp;
-tmp=angle3d->text();
-_params->_3d_angle=tmp.toInt();
+_params->_3d_angle=angle3d->value();
 
-tmp=depth->text();
-_params->_3d_depth=tmp.toDouble();
+_params->_3d_depth=depth->value();
 
 if(_params->do_bar())
-        {
-        tmp=bar_width->text();
-        _params->bar_width=tmp.toInt();
-        }
+        _params->bar_width=bar_width->value();
 }
Index: kchartParameter3dConfigPage.h
===================================================================
RCS file: /home/kde/koffice/kchart/kchartParameter3dConfigPage.h,v
retrieving revision 1.1
diff -u -p -r1.1 kchartParameter3dConfigPage.h
--- kchartParameter3dConfigPage.h	2000/04/01 20:02:45	1.1
+++ kchartParameter3dConfigPage.h	2000/08/29 20:23:59
@@ -9,7 +9,8 @@
 
 #include <qwidget.h>
 #include <qcheckbox.h>
-#include <qlineedit.h>
+//#include <qlineedit.h>
+#include <knuminput.h>
 
 #include "kchartparams.h"
 
@@ -24,9 +25,9 @@ public:
 
 private:
     KChartParameters* _params;
-    QLineEdit* angle3d;
-    QLineEdit* depth;
-    QLineEdit* bar_width;
+    KIntNumInput* angle3d;
+    KDoubleNumInput* depth;
+    KIntNumInput* bar_width;
 };
 
 #endif
cvs server: cannot find kchartPieConfigPage.cc
cvs server: Diffing core
cvs server: Diffing gdchart
cvs server: Diffing gdchart/gd1.3
cvs server: Diffing pics
cvs server: Diffing toolbar
cvs server: Diffing toolbar/hicolor
cvs server: Diffing toolbar/locolor
cvs server: Diffing ui


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