-rw-r--r-- | noncore/settings/networksettings/ppp/edit.cpp | 54 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdargs.cpp | 26 |
2 files changed, 42 insertions, 38 deletions
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp index 6132b80..eee643d 100644 --- a/noncore/settings/networksettings/ppp/edit.cpp +++ b/noncore/settings/networksettings/ppp/edit.cpp @@ -72,5 +72,5 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name ) tl->addLayout(lpn, 1, 1); numbers = new QListBox(this); - numbers->setMinimumSize(120, 70); +// numbers->setMinimumSize(120, 70); lpn->addWidget(numbers); QVBoxLayout *lpn1 = new QVBoxLayout; @@ -827,5 +827,6 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name : QWidget(parent, name) { - QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint()); + + QVBoxLayout *tl = new QVBoxLayout(this, 0 ); se = new ScriptEdit(this); connect(se, SIGNAL(returnPressed()), SLOT(addButton())); @@ -833,30 +834,27 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name // insert equal-sized buttons - QButtonGroup *bbox = new QButtonGroup(this); - add = new QPushButton( bbox, i18n("Add") ); - bbox->insert(add); + QHBoxLayout *hl = new QHBoxLayout( this ); + tl->addLayout( hl ); + add = new QPushButton( i18n("Add"), this ); + hl->addWidget( add ); connect(add, SIGNAL(clicked()), SLOT(addButton())); -// bbox->addStretch(1); - insert = new QPushButton( bbox, i18n("Insert") ); - bbox->insert(insert); + insert = new QPushButton( i18n("Insert"), this ); + hl->addWidget( insert ); connect(insert, SIGNAL(clicked()), SLOT(insertButton())); -// bbox->addStretch(1); - remove = new QPushButton( bbox, i18n("Remove") ); - bbox->insert(remove); + remove = new QPushButton( i18n("Remove"), this ); + hl->addWidget( remove ); connect(remove, SIGNAL(clicked()), SLOT(removeButton())); - bbox->layout(); - tl->addWidget(bbox); QHBoxLayout *l12 = new QHBoxLayout(0); tl->addLayout(l12); stl = new QListBox(this); - stl->setVScrollBarMode( QScrollView::AlwaysOff ); +// stl->setVScrollBarMode( QScrollView::AlwaysOff ); connect(stl, SIGNAL(highlighted(int)), SLOT(stlhighlighted(int))); - stl->setMinimumSize(QSize(70, 140)); +// stl->setMinimumSize(QSize(70, 140)); sl = new QListBox(this); - sl->setVScrollBarMode( QScrollView::AlwaysOff ); +// sl->setVScrollBarMode( QScrollView::AlwaysOff ); connect(sl, SIGNAL(highlighted(int)), SLOT(slhighlighted(int))); - sl->setMinimumSize(QSize(150, 140)); +// sl->setMinimumSize(QSize(150, 140)); slb = new QScrollBar(this); @@ -1155,17 +1153,23 @@ void ScriptWidget::removeButton() { ///////////////////////////////////////////////////////////////////////////// PhoneNumberDialog::PhoneNumberDialog(QWidget *parent) - : QDialog(parent,"PhoneNumberDialog",true) { + : QDialog(parent,"PhoneNumberDialog",true) +{ setCaption( i18n("Add Phone Number") ); -// KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); - QHBox *hbox = new QHBox(this); + + QVBoxLayout *layout = new QVBoxLayout( this ); + layout->setSpacing( 3 ); + layout->setMargin( 3 ); + +// QHBox *hbox = new QHBox(this); // setMainWidget(hbox); - hbox->setSpacing( 2 );//KDialog::spacingHint()); +// hbox->setSpacing( 2 );//KDialog::spacingHint()); - new QLabel(i18n("Enter a phone number:"), hbox); + QLabel *label = new QLabel(this, tr("Enter a phone number:")); + layout->addWidget( label ); - le = new QLineEdit(hbox); -// le->setMinimumWidth(125); + le = new QLineEdit(this, "lineEdit"); + layout->addWidget( le ); connect(le, SIGNAL(textChanged(const QString &)), @@ -1175,5 +1179,5 @@ PhoneNumberDialog::PhoneNumberDialog(QWidget *parent) textChanged(""); -// enableButtonSeparator(true); + } diff --git a/noncore/settings/networksettings/ppp/pppdargs.cpp b/noncore/settings/networksettings/ppp/pppdargs.cpp index b7fca3f..4039939 100644 --- a/noncore/settings/networksettings/ppp/pppdargs.cpp +++ b/noncore/settings/networksettings/ppp/pppdargs.cpp @@ -82,17 +82,17 @@ PPPdArguments::PPPdArguments(QWidget *parent, const char *name) l->addSpacing(5); - QButtonGroup *bbox = new QButtonGroup(this); -// bbox->addStretch(1); - closebtn = new QPushButton( bbox, i18n("OK")); - bbox->insert(closebtn); - connect(closebtn, SIGNAL(clicked()), SLOT(closebutton())); - QPushButton *cancel = new QPushButton( bbox, i18n("Cancel")); - bbox->insert(cancel); - connect(cancel, SIGNAL(clicked()), - this, SLOT(reject())); - bbox->layout(); - l->addWidget(bbox); - - setFixedSize(sizeHint()); +// QButtonGroup *bbox = new QButtonGroup(this); +// // bbox->addStretch(1); +// closebtn = new QPushButton( bbox, i18n("OK")); +// bbox->insert(closebtn); +// connect(closebtn, SIGNAL(clicked()), SLOT(closebutton())); +// QPushButton *cancel = new QPushButton( bbox, i18n("Cancel")); +// bbox->insert(cancel); +// connect(cancel, SIGNAL(clicked()), +// this, SLOT(reject())); +// bbox->layout(); +// l->addWidget(bbox); + +// setFixedSize(sizeHint()); //load info from gpppdata |