Diffstat (limited to 'noncore/settings/networksettings/ppp/general.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/general.cpp | 53 |
1 files changed, 35 insertions, 18 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 @@ -27,9 +27,16 @@ #include <termios.h> #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" //#include "version.h" @@ -51,4 +58,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) QGridLayout *tl = new QGridLayout(this, 8, 2, 0 );//, KDialog::spacingHint()); + QLabel *label1; label1 = new QLabel(i18n("Modem de&vice:"), this); tl->addWidget(label1, 0, 0); @@ -75,9 +83,9 @@ 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]")); flowcontrol->insertItem(i18n("Software [XON/XOFF]")); @@ -93,8 +101,8 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) "<b>Default</b>: CRTSCTS"); - 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); @@ -117,5 +125,5 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name) QWhatsThis::add(enter, tmp); - 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); baud_c = new QComboBox(this); @@ -191,12 +199,16 @@ 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")); connect(modemtimeout, SIGNAL(valueChanged(int)), SLOT(modemtimeoutchanged(int))); - tl->addMultiCellWidget(modemtimeout, 6, 6, 0, 1); + timeoutLayout->addWidget(timeoutlabel); + timeoutLayout->addWidget(modemtimeout); + tl->addMultiCellLayout(timeoutLayout, 6, 6, 0, 1); QWhatsThis::add(modemtimeout, @@ -279,10 +291,15 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name) "<b>Default:</b>: On")); - busywait = new KIntNumInput(PPPData::data()->busyWait(), this); - busywait->setLabel(i18n("B&usy wait:")); - busywait->setRange(0, 300, 5, true); + 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 ); QWhatsThis::add(busywait, |