save pppd arguments

4 files changed, 11 insertions, 28 deletions

diff --git a/noncore/settings/networksettings/ppp/TODO b/noncore/settings/networksettings/ppp/TODO
index 9425628..529d236 100644
--- a/noncore/settings/networksettings/ppp/TODO
+++ b/noncore/settings/networksettings/ppp/TODO
@@ -1,8 +1,7 @@
 - add possibility to input username and password ;)
 - impl. PPPData::copyaccount & PPPData::deleteAccount
 - update modem attribute inputs when modem has changed
-- fix layout of edit account
-- save pppd arguments in edit account
+- fix layout of edit account, i.e. get it shown maximised
 - popup configure modem with the correct account prselected
         not quite shure why it does not work... IMHO it should work
 - remove interfaces
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp
index 10bc25c..45d6e4f 100644
--- a/noncore/settings/networksettings/ppp/edit.cpp
+++ b/noncore/settings/networksettings/ppp/edit.cpp
@@ -158,49 +158,48 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
     uint idx = 0;
     while(idx != n.length()) {
       if(n[idx] == ':') {
         if(tmp.length() > 0)
           numbers->insertItem(tmp);
         tmp = "";
       } else
         tmp += n[idx];
       idx++;
     }
     if(tmp.length() > 0)
       numbers->insertItem(tmp);
 
     auth->setCurrentItem(_pppdata->authMethod());
     store_password->setChecked(_pppdata->storePassword());
   } else {
     // select PAP/CHAP as default
     auth->setCurrentItem(AUTH_PAPCHAP);
   }
 
   numbersChanged();
   tl->activate();
 }
 
-
 bool DialWidget::save() {
   //first check to make sure that the account name is unique!
   if(connectname_l->text().isEmpty() ||
      !_pppdata->isUniqueAccname(connectname_l->text())) {
     return false;
   } else {
     _pppdata->setAccname(connectname_l->text());
 
     QString number = "";
     for(uint i = 0; i < numbers->count(); i++) {
       if(i != 0)
         number += ":";
       number += numbers->text(i);
     }
 
     _pppdata->setPhonenumber(number);
     _pppdata->setAuthMethod(auth->currentItem());
     _pppdata->setStorePassword(store_password->isChecked());
     return true;
   }
 }
 
 
 void DialWidget::numbersChanged() {
@@ -239,49 +238,49 @@ void DialWidget::upNumber() {
   if(idx != -1) {
     QString item = numbers->text(idx);
     numbers->removeItem(idx);
     numbers->insertItem(item, idx-1);
     numbers->setCurrentItem(idx-1);
     numbersChanged();
   }
 }
 
 
 void DialWidget::downNumber() {
   int idx = numbers->currentItem();
   if(idx != -1) {
     QString item = numbers->text(idx);
     numbers->removeItem(idx);
     numbers->insertItem(item, idx+1);
     numbers->setCurrentItem(idx+1);
     numbersChanged();
   }
 }
 
 
 void DialWidget::pppdargsbutton() {
     PPPdArguments pa(_pppdata, this);
-  pa.exec();
+    pa.exec();
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
 // ExecWidget
 /////////////////////////////////////////////////////////////////////////////
 ExecWidget::ExecWidget(PPPData *pd, QWidget *parent, bool isnewaccount, const char *name) :
     QWidget(parent, name), _pppdata(pd)
 {
     QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
 
   QLabel *l = new QLabel( tr("Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).<br><br>Be sure to supply the whole path to the program otherwise we might be unable to find it."), this);
 
   tl->addWidget(l);
   tl->addStretch(1);
 
   QGridLayout *l1 = new QGridLayout(4, 2, 10);
   tl->addLayout(l1);
   l1->setColStretch(0, 0);
   l1->setColStretch(1, 1);
 
   before_connect_l = new QLabel(tr("Before connect:"), this);
   before_connect_l->setAlignment(AlignVCenter);
diff --git a/noncore/settings/networksettings/ppp/pppdargs.cpp b/noncore/settings/networksettings/ppp/pppdargs.cpp
index d1143cf..66a4d82 100644
--- a/noncore/settings/networksettings/ppp/pppdargs.cpp
+++ b/noncore/settings/networksettings/ppp/pppdargs.cpp
@@ -6,160 +6,145 @@
  *            Copyright (C) 1997 Bernd Johannes Wuebben
  *                   wuebben@math.cornell.edu
  *
  * based on EzPPP:
  * Copyright (C) 1997  Jay Painter
  *
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this program; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <qlayout.h>
 #include <qbuttongroup.h>
-//#include <kwin.h>
 #include <qapplication.h>
 #include "pppdargs.h"
 #include "pppdata.h"
-//#include <klocale.h>
-#define i18n QObject::tr
+
 
 PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name)
     : QDialog(parent, name, TRUE), _pppdata(pd)
 {
-  setCaption(i18n("Customize pppd Arguments"));
+  setCaption(tr("Customize pppd Arguments"));
 //  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
   QVBoxLayout *l = new QVBoxLayout(this, 10, 10);
   QHBoxLayout *tl = new QHBoxLayout(10);
   l->addLayout(tl);
   QVBoxLayout *l1 = new QVBoxLayout();
   QVBoxLayout *l2 = new QVBoxLayout();
   tl->addLayout(l1, 1);
   tl->addLayout(l2, 0);
 
   QHBoxLayout *l11 = new QHBoxLayout(10);
   l1->addLayout(l11);
 
-  argument_label = new QLabel(i18n("Argument:"), this);
+  argument_label = new QLabel(tr("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);
+  add = new QPushButton(tr("Add"), this);
   connect(add, SIGNAL(clicked()), SLOT(addbutton()));
   l2->addWidget(add);
   l2->addStretch(1);
 
-  remove = new QPushButton(i18n("Remove"), this);
+  remove = new QPushButton(tr("Remove"), this);
   connect(remove, SIGNAL(clicked()), SLOT(removebutton()));
   l2->addWidget(remove);
 
-  defaults = new QPushButton(i18n("Defaults"), this);
+  defaults = new QPushButton(tr("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());
 
   //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->pppdArgument());
 
   // get defaults
   _pppdata->setpppdArgumentDefaults();
   init();
 
   // restore old list
   _pppdata->setpppdArgument(arglist);
 }
 
 
-void PPPdArguments::closebutton() {
+void PPPdArguments::accept() {
   QStringList arglist;
   for(uint i=0; i < arguments->count(); i++)
     arglist.append(arguments->text(i));
   _pppdata->setpppdArgument(arglist);
 
-  done(0);
+  QDialog::accept();
 }
 
 
 void PPPdArguments::init() {
   while(arguments->count())
     arguments->removeItem(0);
 
   QStringList &arglist = _pppdata->pppdArgument();
   for ( QStringList::Iterator it = arglist.begin();
         it != arglist.end();
         ++it )
     arguments->insertItem(*it);
 }
 
 
 void PPPdArguments::textChanged(const QString &s) {
   add->setEnabled(s.length() > 0);
 }
 
 
 void PPPdArguments::itemSelected(int idx) {
   remove->setEnabled(idx != -1);
 }
 
diff --git a/noncore/settings/networksettings/ppp/pppdargs.h b/noncore/settings/networksettings/ppp/pppdargs.h
index 75f0c9d..065b03c 100644
--- a/noncore/settings/networksettings/ppp/pppdargs.h
+++ b/noncore/settings/networksettings/ppp/pppdargs.h
@@ -24,49 +24,49 @@
  * License along with this program; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef _PPPDARGS_H_
 #define _PPPDARGS_H_
 
 #include <qdialog.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qlabel.h>
 class PPPData;
 
 class PPPdArguments : public QDialog {
 Q_OBJECT
 public:
   PPPdArguments(PPPData*,QWidget *parent=0, const char *name=0);
   ~PPPdArguments() {}
 
 private slots:
   void addbutton();
   void removebutton();
   void defaultsbutton();
-  void closebutton();
+  virtual void accept();
   void textChanged(const QString &);
   void itemSelected(int);
 
 private:
   void init();
 
   QLabel *argument_label;
 
   QLineEdit *argument;
 
   QPushButton *add;
   QPushButton *remove;
   QPushButton *defaults;
 
   QListBox *arguments;
 
   QPushButton *closebtn;
   PPPData *_pppdata;
 };
 #endif