knuminput gone too

1 files changed, 36 insertions, 19 deletions

diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp
index a02ee35..98e035b 100644
--- a/noncore/settings/networksettings/ppp/general.cpp
+++ b/noncore/settings/networksettings/ppp/general.cpp
@@ -28,7 +28,14 @@
 #include <string.h>
-#include <qwhatsthis.h>
 
-#include "knuminput.h"
-#include <qslider.h>
+#include <qcheckbox.h>
+#include <qcombobox.h>
+#include <qlabel.h>
 #include <qlayout.h>
+#include <qpushbutton.h>
+#include <qslider.h>
+#include <qspinbox.h>
+#include <qwhatsthis.h>
+
+// #include <qgroupbox.h>
+
 #include "general.h"
@@ -52,2 +59,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
 
+  QLabel *label1;
   label1 = new QLabel(i18n("Modem de&vice:"), this);
@@ -76,7 +84,7 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
 
-  label2 = new QLabel(i18n("&Flow control:"), this);
-  tl->addWidget(label2, 1, 0);
+  label1 = new QLabel(i18n("&Flow control:"), this);
+  tl->addWidget(label1, 1, 0);
 
   flowcontrol = new QComboBox(false, this);
-  label2->setBuddy(flowcontrol);
+  label1->setBuddy(flowcontrol);
   flowcontrol->insertItem(i18n("Hardware [CRTSCTS]"));
@@ -94,6 +102,6 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
 
-  QWhatsThis::add(label2,tmp);
+  QWhatsThis::add(label1,tmp);
   QWhatsThis::add(flowcontrol,tmp);
 
-  labelenter = new QLabel(i18n("&Line termination:"), this);
+  QLabel *labelenter = new QLabel(i18n("&Line termination:"), this);
   tl->addWidget(labelenter, 2, 0);
@@ -118,3 +126,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
 
-  baud_label = new QLabel(i18n("Co&nnection speed:"), this);
+  QLabel *baud_label = new QLabel(i18n("Co&nnection speed:"), this);
   tl->addWidget(baud_label, 3, 0);
@@ -192,6 +200,8 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
   // Modem Timeout Line Edit Box
-
-  modemtimeout = new KIntNumInput(PPPData::data()->modemTimeout(), this);
-  modemtimeout->setLabel(i18n("Modem &timeout:"));
-  modemtimeout->setRange(1, 120, 1);
+  QHBoxLayout *timeoutLayout = new QHBoxLayout( this );
+  QLabel *timeoutlabel = new QLabel( tr("Modem timeout:") ,this, "timeout" );
+  modemtimeout = new QSpinBox( 1, 120, 1, this, "modemTimeout" );
+//   modemtimeout = new KIntNumInput(PPPData::data()->modemTimeout(), this);
+//   modemtimeout->setLabel(i18n("Modem &timeout:"));
+//  modemtimeout->setRange(1, 120, 1);
   modemtimeout->setSuffix(i18n(" sec"));
@@ -199,3 +209,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
           SLOT(modemtimeoutchanged(int)));
-  tl->addMultiCellWidget(modemtimeout, 6, 6, 0, 1);
+  timeoutLayout->addWidget(timeoutlabel);
+  timeoutLayout->addWidget(modemtimeout);
+  tl->addMultiCellLayout(timeoutLayout, 6, 6, 0, 1);
 
@@ -280,8 +292,13 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
 
-  busywait = new KIntNumInput(PPPData::data()->busyWait(), this);
-  busywait->setLabel(i18n("B&usy wait:"));
-  busywait->setRange(0, 300, 5, true);
-  busywait->setSuffix(i18n(" sec"));
+  QHBoxLayout *waitLayout = new QHBoxLayout( this );
+  QLabel *waitLabel = new QLabel( tr("Busy wait:"), this, "busyWait" );
+  busywait = new QSpinBox( 0, 300, 5, this, "busyWait" );
+//   busywait = new KIntNumInput(PPPData::data()->busyWait(), this);
+//   busywait->setLabel(i18n("B&usy wait:"));
+//   busywait->setRange(0, 300, 5, true);
+   busywait->setSuffix(i18n(" sec"));
   connect(busywait, SIGNAL(valueChanged(int)), SLOT(busywaitchanged(int)));
-  l1->addWidget(busywait);
+  waitLayout->addWidget(waitLabel);
+  waitLayout->addWidget(busywait);
+  l1->addLayout( waitLayout );