layout fixes

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
@@ -42,65 +42,65 @@
 #include "edit.h"
 #include "pppdata.h"
 //#include "newwidget.h"
 #include "iplined.h"
 #include "auth.h"
 
 DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
   : QWidget(parent, name)
 {
   const int GRIDROWS = 6;
 
   QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );//, KDialog::spacingHint());
 
   connect_label = new QLabel(i18n("Connection name:"), this);
   tl->addWidget(connect_label, 0, 0);
 
   connectname_l = new QLineEdit(this);
 //  connectname_l->setMaxLength(ACCNAME_SIZE);
   tl->addWidget(connectname_l, 0, 1);
   QString tmp = i18n("Type in a unique name for this connection");
 
   QWhatsThis::add(connect_label,tmp);
   QWhatsThis::add(connectname_l,tmp);
 
 
   number_label = new QLabel(i18n("Phone number:"), this);
   number_label->setAlignment(AlignTop|AlignLeft);
   tl->addWidget(number_label, 1, 0);
 
   QHBoxLayout *lpn = new QHBoxLayout(5);
   tl->addLayout(lpn, 1, 1);
   numbers = new QListBox(this);
-  numbers->setMinimumSize(120, 70);
+//  numbers->setMinimumSize(120, 70);
   lpn->addWidget(numbers);
   QVBoxLayout *lpn1 = new QVBoxLayout;
   lpn->addLayout(lpn1);
   add = new QPushButton(i18n("&Add..."), this);
   del = new QPushButton(i18n("&Remove"), this);
 
   up = new QPushButton(this);
 //FIXME:  QPixmap pm = BarIcon("up");
 //  up->setPixmap(pm);
   down = new QPushButton(this);
 //FIXME:  pm = BarIcon("down");
 //  down->setPixmap(pm);
   lpn1->addWidget(add);
   lpn1->addWidget(del);
   lpn1->addStretch(1);
   lpn1->addWidget(up);
   lpn1->addWidget(down);
   connect(add, SIGNAL(clicked()),
           this, SLOT(addNumber()));
   connect(del, SIGNAL(clicked()),
           this, SLOT(delNumber()));
   connect(up, SIGNAL(clicked()),
           this, SLOT(upNumber()));
   connect(down, SIGNAL(clicked()),
           this, SLOT(downNumber()));
   connect(numbers, SIGNAL(highlighted(int)),
           this, SLOT(selectionChanged(int)));
   numbersChanged();
 
   tmp = i18n("<p>Specifies the phone numbers to dial. You\n"
              "can supply multiple numbers here, simply\n"
              "click on \"Add\". You can arrange the\n"
@@ -797,96 +797,94 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
   }
   else {
     defaultgateway->setChecked(true);
     hitGatewaySelect(0);
     defaultroute->setChecked(true);
   }
 }
 
 void GatewayWidget::save() {
   PPPData::data()->setGateway(gatewayaddr->text());
   PPPData::data()->setDefaultroute(defaultroute->isChecked());
 }
 
 
 void GatewayWidget::hitGatewaySelect( int i ) {
   if(i == 0) {
     gatewayaddr->setText("0.0.0.0");
     gatewayaddr->setEnabled(false);
     gate_label->setEnabled(false);
   }
   else {
     gatewayaddr->setEnabled(true);
     gatewayaddr->setText("");
     gate_label->setEnabled(true);
   }
 }
 
 
 
 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()));
   tl->addWidget(se);
 
   // 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);
 //  slb->setFixedWidth(slb->sizeHint().width());
   connect(slb, SIGNAL(valueChanged(int)), SLOT(scrolling(int)));
 
   l12->addWidget(stl, 1);
   l12->addWidget(sl, 3);
   l12->addWidget(slb, 0);
 
   //load data from gpppdata
   if(!isnewaccount) {
     QStringList &comlist = PPPData::data()->scriptType();
     QStringList &arglist = PPPData::data()->script();
     QStringList::Iterator itcom = comlist.begin();
     QStringList::Iterator itarg = arglist.begin();
 
     for ( ;
           itcom != comlist.end() && itarg != arglist.end();
           ++itcom, ++itarg )
     {
       stl->insertItem(*itcom);
       sl->insertItem(*itarg);
     }
   }
 
   insert->setEnabled(false);
   remove->setEnabled(false);
   adjustScrollBar();
   tl->activate();
 }
 
 bool ScriptWidget::check() {
@@ -1125,69 +1123,75 @@ void ScriptWidget::insertButton() {
     case ScriptEdit::Save:
       stl->insertItem("Save", stl->currentItem());
       sl->insertItem(se->text(), sl->currentItem());
       break;
 
     default:
       break;
   }
   adjustScrollBar();
   se->setText("");
 }
 
 
 void ScriptWidget::removeButton() {
  if(sl->currentItem() >= 0) {
    int stlc = stl->currentItem();
    sl->removeItem(sl->currentItem());
    stl->removeItem(stlc);
    adjustScrollBar();
    insert->setEnabled(sl->currentItem() != -1);
    remove->setEnabled(sl->currentItem() != -1);
  }
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Used to specify a new phone number
 //
 /////////////////////////////////////////////////////////////////////////////
 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 &)),
           this, SLOT(textChanged(const QString &)));
 
   le->setFocus();
   textChanged("");
 
-//  enableButtonSeparator(true);
+
 }
 
 
 QString PhoneNumberDialog::phoneNumber() {
   QString s = le->text();
 
   return s;
 }
 
 
 void PhoneNumberDialog::textChanged(const QString &s) {
 //  enableButtonOK(s.length() > 0);
 }
 
 
 //#include "edit.moc"
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
@@ -52,77 +52,77 @@ PPPdArguments::PPPdArguments(QWidget *parent, const char *name)
 
   argument_label = new QLabel(i18n("Argument:"), this);
   l11->addWidget(argument_label);
 
   argument = new QLineEdit(this);
   connect(argument, SIGNAL(returnPressed()),
           SLOT(addbutton()));
   l11->addWidget(argument);
   connect(argument, SIGNAL(textChanged(const QString &)),
           this, SLOT(textChanged(const QString &)));
 
   arguments = new QListBox(this);
   arguments->setMinimumSize(1, fontMetrics().lineSpacing()*10);
   connect(arguments, SIGNAL(highlighted(int)),
           this, SLOT(itemSelected(int)));
   l1->addWidget(arguments, 1);
 
   add = new QPushButton(i18n("Add"), this);
   connect(add, SIGNAL(clicked()), SLOT(addbutton()));
   l2->addWidget(add);
   l2->addStretch(1);
 
   remove = new QPushButton(i18n("Remove"), this);
   connect(remove, SIGNAL(clicked()), SLOT(removebutton()));
   l2->addWidget(remove);
 
   defaults = new QPushButton(i18n("Defaults"), this);
   connect(defaults, SIGNAL(clicked()), SLOT(defaultsbutton()));
   l2->addWidget(defaults);
 
   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
   init();
 
   add->setEnabled(false);
   remove->setEnabled(false);
   argument->setFocus();
 }
 
 
 void PPPdArguments::addbutton() {
   if(!argument->text().isEmpty() && arguments->count() < MAX_PPPD_ARGUMENTS) {
     arguments->insertItem(argument->text());
     argument->setText("");
   }
 }
 
 
 void PPPdArguments::removebutton() {
   if(arguments->currentItem() >= 0)
     arguments->removeItem(arguments->currentItem());
 }
 
 
 void PPPdArguments::defaultsbutton() {
   // all of this is a hack
   // save current list
   QStringList arglist(PPPData::data()->pppdArgument());
 
   // get defaults
   PPPData::data()->setpppdArgumentDefaults();
   init();