5 files changed, 242 insertions, 358 deletions

diff --git a/noncore/settings/networksettings/ppp/TODO b/noncore/settings/networksettings/ppp/TODO
index 1136c2d..9425628 100644
--- a/noncore/settings/networksettings/ppp/TODO
+++ b/noncore/settings/networksettings/ppp/TODO
@@ -5,3 +5,4 @@
 - save pppd arguments in edit account
 - 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/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp
index 3fa2f84..f704c84 100644
--- a/noncore/settings/networksettings/ppp/accounts.cpp
+++ b/noncore/settings/networksettings/ppp/accounts.cpp
@@ -35,17 +35,10 @@
 #include <qapplication.h>
 #include <qbuttongroup.h>
 #include <qmessagebox.h>
-//#include <klocale.h>
-#define i18n QObject::tr
-//#include <kglobal.h>
-//#include <kwin.h>
-//#include <kdialogbase.h>
 #include <qvgroupbox.h>
 
 #include "pppdata.h"
 #include "accounts.h"
-//#include "accounting.h"
-//#include "providerdb.h"
 #include "edit.h"
 
 void parseargs(char* buf, char** args);
@@ -62,95 +55,37 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name )
           this, SLOT(editaccount()));
   l1->addWidget(accountlist_l, 10);
 
-  edit_b = new QPushButton(i18n("&Edit..."), this);
+  edit_b = new QPushButton(tr("&Edit..."), this);
   connect(edit_b, SIGNAL(clicked()), SLOT(editaccount()));
-  QWhatsThis::add(edit_b, i18n("Allows you to modify the selected account"));
+  QWhatsThis::add(edit_b, tr("Allows you to modify the selected account"));
   l1->addWidget(edit_b);
 
-  new_b = new QPushButton(i18n("&New..."), this);
+  new_b = new QPushButton(tr("&New..."), this);
   connect(new_b, SIGNAL(clicked()), SLOT(newaccount()));
   l1->addWidget(new_b);
-  QWhatsThis::add(new_b, i18n("Create a new dialup connection\n"
+  QWhatsThis::add(new_b, tr("Create a new dialup connection\n"
                               "to the Internet"));
 
-  copy_b = new QPushButton(i18n("Co&py"), this);
+  copy_b = new QPushButton(tr("Co&py"), this);
   connect(copy_b, SIGNAL(clicked()), SLOT(copyaccount()));
   l1->addWidget(copy_b);
   QWhatsThis::add(copy_b,
-                  i18n("Makes a copy of the selected account. All\n"
+                  tr("Makes a copy of the selected account. All\n"
                        "settings of the selected account are copied\n"
                        "to a new account, that you can modify to fit your\n"
                        "needs"));
 
-  delete_b = new QPushButton(i18n("De&lete"), this);
+  delete_b = new QPushButton(tr("De&lete"), this);
   connect(delete_b, SIGNAL(clicked()), SLOT(deleteaccount()));
   l1->addWidget(delete_b);
   QWhatsThis::add(delete_b,
-                  i18n("<p>Deletes the selected account\n\n"
+                  tr("<p>Deletes the selected account\n\n"
                        "<font color=\"red\"><b>Use with care!</b></font>"));
 
   QHBoxLayout *l12 = new QHBoxLayout;
   l1->addStretch(1);
   l1->addLayout(l12);
 
-//   QVBoxLayout *l121 = new QVBoxLayout;
-//   l12->addLayout(l121);
-//   l121->addStretch(1);
-  // costlabel = new QLabel(i18n("Phone costs:"), parent);
-//   costlabel->setEnabled(FALSE);
-//   l121->addWidget(costlabel);
-
-//   costedit = new QLineEdit(parent);
-//   costedit->setFocusPolicy(QWidget::NoFocus);
-//   costedit->setFixedHeight(costedit->sizeHint().height());
-//   costedit->setEnabled(FALSE);
-//   l121->addWidget(costedit);
-//   l121->addStretch(1);
-//   QString tmp = i18n("<p>This shows the accumulated phone costs\n"
-        //           "for the selected account.\n"
-        //           "\n"
-        //           "<b>Important</b>: If you have more than one \n"
-        //           "account - beware, this is <b>NOT</b> the sum \n"
-        //           "of the phone costs of all your accounts!");
-//   QWhatsThis::add(costlabel, tmp);
-//   QWhatsThis::add(costedit, tmp);
-
-//   vollabel = new QLabel(i18n("Volume:"), parent);
-//   vollabel->setEnabled(FALSE);
-//   l121->addWidget(vollabel);
-
-//   voledit = new QLineEdit(parent,"voledit");
-//   voledit->setFocusPolicy(QWidget::NoFocus);
-//   voledit->setFixedHeight(voledit->sizeHint().height());
-//   voledit->setEnabled(FALSE);
-//   l121->addWidget(voledit);
-//   tmp = i18n("<p>This shows the number of bytes transferred\n"
-        //      "for the selected account (not for all of your\n"
-        //      "accounts. You can select what to display in\n"
-        //      "the accounting dialog.\n"
-        //      "\n"
-        //      "<a href=\"#volaccounting\">More on volume accounting</a>");
-
-//   QWhatsThis::add(vollabel,tmp);
-//   QWhatsThis::add(voledit, tmp);
-
-//   QVBoxLayout *l122 = new QVBoxLayout;
-//   l12->addStretch(1);
-//   l12->addLayout(l122);
-
-//   l122->addStretch(1);
-//   reset = new QPushButton(i18n("&Reset..."), parent);
-//   reset->setEnabled(FALSE);
-//   connect(reset, SIGNAL(clicked()),
-        //   this, SLOT(resetClicked()));
-//   l122->addWidget(reset);
-
-//   log = new QPushButton(i18n("&View Logs"), this);
-//   connect(log, SIGNAL(clicked()),
-        //   this, SLOT(viewLogClicked()));
-//   l122->addWidget(log);
-//   l122->addStretch(1);
-
   //load up account list from gppdata to the list box
   if(_pppdata->count() > 0) {
     for(int i=0; i <= _pppdata->count()-1; i++) {
@@ -159,10 +94,10 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name )
     }
   }
 
-//  slotListBoxSelect(accountlist_l->currentItem());
+
   qDebug("setting listview index to %i",_pppdata->currentAccountID() );
   accountlist_l->setCurrentItem( _pppdata->currentAccountID() );
-//  slotListBoxSelect( _pppdata->currentAccountID());
+  slotListBoxSelect( _pppdata->currentAccountID());
 
   l1->activate();
 }
@@ -227,60 +162,38 @@ void AccountWidget::editaccount() {
 
 
 void AccountWidget::newaccount() {
-  if(accountlist_l->count() == MAX_ACCOUNTS) {
-      QMessageBox::information(this, "sorry", i18n("Maximum number of accounts reached."));
-    return;
-  }
 
-  int result;
-//   int query = QMessageBox::information(this,
-//    i18n("Do you want to use the wizard to create the new account or the "
-        // "standard, dialog-based setup?\n"
-        // "The wizard is easier and sufficient in most cases. If you need "
-        // "very special settings, you might want to try the standard, "
-        //      "dialog-based setup."),
-        //      i18n("Create New Account"),
-        //      i18n("Wizard"), i18n("Dialog Setup"), i18n("Cancel"));
-
-//   switch(query) {
-//   case QMessageBox::Yes:
-//     {
-//       if (_pppdata->newaccount() == -1)
-        // return;
-// //       ProviderDB pdb(this);
-// //       result = pdb.exec();
-//       break;
-//     }
-//   case QMessageBox::No:
-  if (_pppdata->newaccount() == -1){
-      qDebug("_pppdata->newaccount() == -1");
-      return;
-  }
+    if(accountlist_l->count() == MAX_ACCOUNTS) {
+        QMessageBox::information(this, "sorry",
+                                 tr("Maximum number of accounts reached."));
+        return;
+    }
+
+    int result;
+    if (_pppdata->newaccount() == -1){
+        qDebug("_pppdata->newaccount() == -1");
+        return;
+    }
     result = doTab();
-//     break;
-//   default:
-//     return;
-//   }
 
-  if(result == QDialog::Accepted) {
-    accountlist_l->insertItem(_pppdata->accname());
-    accountlist_l->setSelected(accountlist_l->findItem(_pppdata->accname()),
-                               true);
-//    emit resetaccounts();
-    _pppdata->save();
-  } else
-    _pppdata->deleteAccount();
+    if(result == QDialog::Accepted) {
+        accountlist_l->insertItem(_pppdata->accname());
+        accountlist_l->setSelected(accountlist_l->findItem(_pppdata->accname()),true);
+
+        _pppdata->save();
+    } else
+        _pppdata->deleteAccount();
 }
 
 
 void AccountWidget::copyaccount() {
   if(accountlist_l->count() == MAX_ACCOUNTS) {
-    QMessageBox::information(this, "sorry", i18n("Maximum number of accounts reached."));
+    QMessageBox::information(this, "sorry", tr("Maximum number of accounts reached."));
     return;
   }
 
   if(accountlist_l->currentItem()<0) {
-    QMessageBox::information(this, "sorry", i18n("No account selected."));
+    QMessageBox::information(this, "sorry", tr("No account selected."));
     return;
   }
 
@@ -294,10 +207,10 @@ void AccountWidget::copyaccount() {
 
 void AccountWidget::deleteaccount() {
 
-  QString s = i18n("Are you sure you want to delete\nthe account \"%1\"?")
+  QString s = tr("Are you sure you want to delete\nthe account \"%1\"?")
     .arg(accountlist_l->text(accountlist_l->currentItem()));
 
-  if(QMessageBox::warning(this, s, i18n("Confirm")) != QMessageBox::Yes)
+  if(QMessageBox::warning(this, s, tr("Confirm")) != QMessageBox::Yes)
     return;
 
   if(_pppdata->deleteAccount(accountlist_l->text(accountlist_l->currentItem())))
@@ -312,81 +225,85 @@ void AccountWidget::deleteaccount() {
 
 
 int AccountWidget::doTab(){
-    QDialog *dlg = new QDialog( this, "newAccount", true );
+    QDialog *dlg = new QDialog( 0, "newAccount", true );
     QVBoxLayout *layout = new QVBoxLayout( dlg );
     layout->setSpacing( 0 );
     layout->setMargin( 1 );
 
     tabWindow = new QTabWidget( dlg, "tabWindow" );
-  layout->addWidget( tabWindow );
+    layout->addWidget( tabWindow );
 
     bool isnewaccount;
 
-  if(_pppdata->accname().isEmpty()) {
-      dlg->setCaption(i18n("New Account"));
-      isnewaccount = true;
-  } else {
-      QString tit = i18n("Edit Account: ");
-      tit += _pppdata->accname();
-      dlg->setCaption(tit);
-      isnewaccount = false;
-  }
-
-  dial_w = new DialWidget( _pppdata, tabWindow, isnewaccount, "Dial Setup");
-  tabWindow->addTab( dial_w, i18n("Dial") );
-  ip_w = new IPWidget( _pppdata, tabWindow, isnewaccount, i18n("IP Setup"));
-  tabWindow->addTab( ip_w, i18n("IP") );
-  gateway_w = new GatewayWidget( _pppdata, tabWindow, isnewaccount, i18n("Gateway Setup"));
-  tabWindow->addTab( gateway_w, i18n("Gateway") );
-  dns_w = new DNSWidget( _pppdata, tabWindow, isnewaccount, i18n("DNS Servers") );
-  tabWindow->addTab( dns_w, i18n("DNS") );
-  script_w = new ScriptWidget( _pppdata, tabWindow, isnewaccount, i18n("Edit Login Script"));
-  tabWindow->addTab( script_w, i18n("Login Script") );
-  ExecWidget *exec_w = new ExecWidget( _pppdata, tabWindow, isnewaccount, i18n("Execute Programs"));
-  tabWindow->addTab( exec_w, i18n("Execute") );
-//   acct = new AccountingSelector( tabWindow, isnewaccount );
-//   tabWindow->addTab( acct, i18n("Accounting"));
-
-  int result = 0;
-  bool ok = false;
-  qDebug("AccountWidget::doTab dlg->showMinimized");
-  dlg->showMinimized();
-  while (!ok){
-
-    result = dlg->exec();
-    ok = true;
+    if(_pppdata->accname().isEmpty()) {
+        dlg->setCaption(tr("New Account"));
+        isnewaccount = true;
+    } else {
+        QString tit = tr("Edit Account: ");
+        tit += _pppdata->accname();
+        dlg->setCaption(tit);
+        isnewaccount = false;
+    }
 
-    if(result == QDialog::Accepted) {
-      if (script_w->check()) {
-          if(dial_w->save()) {
-                ip_w->save();
-                dns_w->save();
-                gateway_w->save();
-                script_w->save();
-                exec_w->save();
-        //      acct->save();
-         } else {
-             QMessageBox::critical(this, "error", i18n( "You must enter a unique\n"
-                                            "account name"));
-                ok = false;
-         }
-      } else {
-              QMessageBox::critical(this, "error", i18n("Login script has unbalanced "
-                                            "loop Start/End"));
-              ok = false;
-      }
+//   // DIAL WIDGET
+    dial_w = new DialWidget( _pppdata, tabWindow, isnewaccount, "Dial Setup");
+    tabWindow->addTab( dial_w, tr("Dial") );
+
+//   // IP WIDGET
+    ip_w = new IPWidget( _pppdata, tabWindow, isnewaccount, tr("IP Setup"));
+    tabWindow->addTab( ip_w, tr("IP") );
+
+//   // GATEWAY WIDGET
+    gateway_w = new GatewayWidget( _pppdata, tabWindow, isnewaccount, tr("Gateway Setup"));
+    tabWindow->addTab( gateway_w, tr("Gateway") );
+
+//   // DNS WIDGET
+    dns_w = new DNSWidget( _pppdata, tabWindow, isnewaccount, tr("DNS Servers") );
+    tabWindow->addTab( dns_w, tr("DNS") );
+
+//   // SCRIPT WIDGET
+   script_w = new ScriptWidget( _pppdata, tabWindow, isnewaccount, tr("Edit Login Script"));
+   tabWindow->addTab( script_w, tr("Login Script") );
+
+//   // EXECUTE WIDGET
+   ExecWidget *exec_w = new ExecWidget( _pppdata, tabWindow, isnewaccount, tr("Execute Programs"));
+   tabWindow->addTab( exec_w, tr("Execute") );
+
+    int result = 0;
+    bool ok = false;
+
+    while (!ok){
+        // dlg->showMinimized();
+        result = dlg->exec();
+        ok = true;
+
+        if(result == QDialog::Accepted) {
+            if (!script_w->check()){
+                QMessageBox::critical(this, "error", tr("<qt>Login script has unbalanced loop Start/End<qt>"));
+                ok = false;
+            } else if(!dial_w->save()) {
+                QMessageBox::critical(this, "error", tr( "You must enter a unique account name"));
+                ok = false;
+            }else{
+                ip_w->save();
+                dns_w->save();
+                gateway_w->save();
+                script_w->save();
+                exec_w->save();
+            }
+        }
     }
-  }
 
- delete tabWindow;
- return result;
+    delete dlg;
+
+    return result;
 }
 
 
 QString AccountWidget::prettyPrintVolume(unsigned int n) {
   int idx = 0;
-  const QString quant[] = {i18n("Byte"), i18n("KB"),
-                   i18n("MB"), i18n("GB"), QString::null};
+  const QString quant[] = {tr("Byte"), tr("KB"),
+                   tr("MB"), tr("GB"), QString::null};
 
   float n1 = n;
   while(n >= 1024 && quant[idx] != QString::null) {
@@ -409,61 +326,59 @@ QString AccountWidget::prettyPrintVolume(unsigned int n) {
 // Queries the user what to reset: costs, volume or both
 //
 /////////////////////////////////////////////////////////////////////////////
-QueryReset::QueryReset(QWidget *parent) : QDialog(parent, 0, true) {
-//  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
-  setCaption(i18n("Reset Accounting"));
-
-  QVBoxLayout *tl = new QVBoxLayout(this, 10, 10);
-  QVGroupBox *f = new QVGroupBox(i18n("What to Reset"), this);
-
-  QVBoxLayout *l1 = new QVBoxLayout(this, 10, 10);
-//   costs = new QCheckBox(i18n("Reset the accumulated phone costs"), f);
-//   costs->setChecked(true);
-//   l1->addWidget(costs);
-//   QWhatsThis::add(costs, i18n("Check this to set the phone costs\n"
-        //                    "to zero. Typically you'll want to\n"
-        //                    "do this once a month."));
-
-//   volume = new QCheckBox(i18n("Reset volume accounting"), f);
-//   volume->setChecked(true);
-//   l1->addWidget(volume);
-//   QWhatsThis::add(volume, i18n("Check this to set the volume accounting\n"
-        //                     "to zero. Typically you'll want to do this\n"
-        //                     "once a month."));
-
-  l1->activate();
+// QueryReset::QueryReset(QWidget *parent) : QDialog(parent, 0, true) {
+// //  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+//   setCaption(tr("Reset Accounting"));
+
+//   QVBoxLayout *tl = new QVBoxLayout(this, 10, 10);
+//   QVGroupBox *f = new QVGroupBox(tr("What to Reset"), this);
+
+//   QVBoxLayout *l1 = new QVBoxLayout(this, 10, 10);
+// //   costs = new QCheckBox(tr("Reset the accumulated phone costs"), f);
+// //   costs->setChecked(true);
+// //   l1->addWidget(costs);
+// //   QWhatsThis::add(costs, tr("Check this to set the phone costs\n"
+        // //                 "to zero. Typically you'll want to\n"
+        // //                 "do this once a month."));
+
+// //   volume = new QCheckBox(tr("Reset volume accounting"), f);
+// //   volume->setChecked(true);
+// //   l1->addWidget(volume);
+// //   QWhatsThis::add(volume, tr("Check this to set the volume accounting\n"
+        // //                  "to zero. Typically you'll want to do this\n"
+        // //                  "once a month."));
+
+//   l1->activate();
+
+//   // this activates the f-layout and sets minimumSize()
+//   f->show();
+
+//   tl->addWidget(f);
+
+//   QButtonGroup *bbox = new QButtonGroup(this);
+// //  bbox->addStretch(1);
+//   QPushButton *ok = new QPushButton( bbox, tr("OK") );
+//   bbox->insert(ok);
+//   ok->setDefault(true);
+//   QPushButton *cancel = new QPushButton( bbox, tr("Cancel") );
+//   bbox->insert(cancel);
+
+//   connect(ok, SIGNAL(clicked()),
+        //   this, SLOT(accepted()));
+//   connect(cancel, SIGNAL(clicked()),
+        //   this, SLOT(reject()));
+
+//   bbox->layout();
+//   tl->addWidget(bbox);
 
-  // this activates the f-layout and sets minimumSize()
-  f->show();
-
-  tl->addWidget(f);
-
-  QButtonGroup *bbox = new QButtonGroup(this);
-//  bbox->addStretch(1);
-  QPushButton *ok = new QPushButton( bbox, i18n("OK") );
-  bbox->insert(ok);
-  ok->setDefault(true);
-  QPushButton *cancel = new QPushButton( bbox, i18n("Cancel") );
-  bbox->insert(cancel);
-
-  connect(ok, SIGNAL(clicked()),
-          this, SLOT(accepted()));
-  connect(cancel, SIGNAL(clicked()),
-          this, SLOT(reject()));
-
-  bbox->layout();
-  tl->addWidget(bbox);
-
-  // TODO: activate if KGroupBox is fixed
-  //  setFixedSize(sizeHint());
-}
+// }
 
 
-void QueryReset::accepted() {
-  int result = costs->isChecked() ? COSTS : 0;
-  result += volume->isChecked() ? VOLUME : 0;
+// void QueryReset::accepted() {
+//   int result = costs->isChecked() ? COSTS : 0;
+//   result += volume->isChecked() ? VOLUME : 0;
 
-  done(result);
-}
+//   done(result);
+// }
 
 
diff --git a/noncore/settings/networksettings/ppp/accounts.h b/noncore/settings/networksettings/ppp/accounts.h
index 5e8509d..eae3922 100644
--- a/noncore/settings/networksettings/ppp/accounts.h
+++ b/noncore/settings/networksettings/ppp/accounts.h
@@ -56,57 +56,45 @@ private slots:
   void newaccount();
   void deleteaccount();
   void slotListBoxSelect(int);
-//  void resetClicked();
-//  void viewLogClicked();
 
 private:
   int doTab();
 
 signals:
   void resetaccounts();
-//   void resetCosts(const QString &);
-//   void resetVolume(const QString &);
 
 private:
-  QString prettyPrintVolume(unsigned int);
+    QString prettyPrintVolume(unsigned int);
 
     PPPData *_pppdata;
-  QTabWidget *tabWindow;
-  DialWidget *dial_w;
-//  AccountingSelector *acct;
-  IPWidget *ip_w;
-  DNSWidget *dns_w;
-  GatewayWidget *gateway_w;
-  ScriptWidget *script_w;
-
-//  QPushButton *reset;
-//  QPushButton *log;
-//   QLabel *costlabel;
-//   QLineEdit *costedit;
-//   QLabel *vollabel;
-//   QLineEdit *voledit;
-
-  QListBox *accountlist_l;
-  QPushButton *edit_b;
-  QPushButton *copy_b;
-  QPushButton *new_b;
-  QPushButton *delete_b;
+    QTabWidget *tabWindow;
+    DialWidget *dial_w;
+    IPWidget *ip_w;
+    DNSWidget *dns_w;
+    GatewayWidget *gateway_w;
+    ScriptWidget *script_w;
+
+    QListBox *accountlist_l;
+    QPushButton *edit_b;
+    QPushButton *copy_b;
+    QPushButton *new_b;
+    QPushButton *delete_b;
 };
 
 
-class QueryReset : public QDialog {
-  Q_OBJECT
-public:
-  QueryReset(QWidget *parent);
+// class QueryReset : public QDialog {
+//   Q_OBJECT
+// public:
+//   QueryReset(QWidget *parent);
 
-  enum {COSTS=1, VOLUME=2};
+//   enum {COSTS=1, VOLUME=2};
 
-private slots:
-  void accepted();
+// private slots:
+//   void accepted();
 
-private:
-  QCheckBox *costs, *volume;
-};
+// private:
+//   QCheckBox *costs, *volume;
+// };
 
 #endif
 
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp
index 8ae714e..10bc25c 100644
--- a/noncore/settings/networksettings/ppp/edit.cpp
+++ b/noncore/settings/networksettings/ppp/edit.cpp
@@ -30,18 +30,13 @@
 #include <qwhatsthis.h>
 #include <qregexp.h>
 #include <qapplication.h>
-//#include <kiconloader.h>
 #include <qbuttongroup.h>
-//#include <klocale.h>
-#define i18n QObject::tr
 #include <qvgroupbox.h>
 #include <qhbox.h>
 #include <qdialog.h>
-//#include <kwin.h>
 
 #include "edit.h"
 #include "pppdata.h"
-//#include "newwidget.h"
 #include "iplined.h"
 #include "auth.h"
 
@@ -53,19 +48,19 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
 
   QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );//, KDialog::spacingHint());
 
-  connect_label = new QLabel(i18n("Connection name:"), this);
+  connect_label = new QLabel(tr("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");
+  QString tmp = tr("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 = new QLabel(tr("Phone number:"), this);
   number_label->setAlignment(AlignTop|AlignLeft);
   tl->addWidget(number_label, 1, 0);
 
@@ -76,8 +71,8 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
   lpn->addWidget(numbers);
   QVBoxLayout *lpn1 = new QVBoxLayout;
   lpn->addLayout(lpn1);
-  add = new QPushButton(i18n("&Add..."), this);
-  del = new QPushButton(i18n("&Remove"), this);
+  add = new QPushButton(tr("&Add..."), this);
+  del = new QPushButton(tr("&Remove"), this);
 
   up = new QPushButton(this);
 //FIXME:  QPixmap pm = BarIcon("up");
@@ -102,7 +97,7 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
           this, SLOT(selectionChanged(int)));
   numbersChanged();
 
-  tmp = i18n("<p>Specifies the phone numbers to dial. You\n"
+  tmp = tr("<p>Specifies the phone numbers to dial. You\n"
              "can supply multiple numbers here, simply\n"
              "click on \"Add\". You can arrange the\n"
              "order the numbers are tried by using the\n"
@@ -113,17 +108,17 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
   QWhatsThis::add(number_label,tmp);
   QWhatsThis::add(numbers,tmp);
 
-  auth_l = new QLabel(i18n("Authentication:"), this);
+  auth_l = new QLabel(tr("Authentication:"), this);
   tl->addWidget(auth_l, 3, 0);
 
   auth = new QComboBox(this);
-  auth->insertItem(i18n("Script-based"));
-  auth->insertItem(i18n("PAP"));
-  auth->insertItem(i18n("Terminal-based"));
-  auth->insertItem(i18n("CHAP"));
-  auth->insertItem(i18n("PAP/CHAP"));
+  auth->insertItem(tr("Script-based"));
+  auth->insertItem(tr("PAP"));
+  auth->insertItem(tr("Terminal-based"));
+  auth->insertItem(tr("CHAP"));
+  auth->insertItem(tr("PAP/CHAP"));
   tl->addWidget(auth, 3, 1);
-  tmp = i18n("<p>Specifies the method used to identify yourself to\n"
+  tmp = tr("<p>Specifies the method used to identify yourself to\n"
              "the PPP server. Most universities still use\n"
              "<b>Terminal</b>- or <b>Script</b>-based authentication,\n"
              "while most ISP use <b>PAP</b> and/or <b>CHAP</b>. If\n"
@@ -136,11 +131,11 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
   QWhatsThis::add(auth_l,tmp);
   QWhatsThis::add(auth,tmp);
 
-  store_password = new QCheckBox(i18n("Store password"), this);
+  store_password = new QCheckBox(tr("Store password"), this);
   store_password->setChecked(true);
   tl->addMultiCellWidget(store_password, 4, 4, 0, 1, AlignRight);
   QWhatsThis::add(store_password,
-                  i18n("<p>When this is turned on, your ISP password\n"
+                  tr("<p>When this is turned on, your ISP password\n"
                        "will be saved in <i>kppp</i>'s config file, so\n"
                        "you do not need to type it in every time.\n"
                        "\n"
@@ -149,7 +144,7 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
                        "readable only to you. Make sure nobody\n"
                        "gains access to this file!"));
 
-  pppdargs = new QPushButton(i18n("Customize pppd Arguments..."), this);
+  pppdargs = new QPushButton(tr("Customize pppd Arguments..."), this);
   connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton()));
   tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter);
 
@@ -278,14 +273,8 @@ ExecWidget::ExecWidget(PPPData *pd, QWidget *parent, bool isnewaccount, const ch
 {
     QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
 
-  QLabel *l = new QLabel(\
-i18n("Here you can select commands to run at certain stages of the\n"
-     "connection. The commands are run with your real user id, so\n"
-     "you cannot run any commands here requiring root permissions\n"
-     "(unless, of course, you are root).\n\n"
-     "Be sure to supply the whole path to the program otherwise\n"
-     "kppp might be unable to find it."), this);
-//  l->setMinimumHeight(l->sizeHint().height());
+  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);
 
@@ -294,13 +283,13 @@ i18n("Here you can select commands to run at certain stages of the\n"
   l1->setColStretch(0, 0);
   l1->setColStretch(1, 1);
 
-  before_connect_l = new QLabel(i18n("Before connect:"), this);
+  before_connect_l = new QLabel(tr("Before connect:"), this);
   before_connect_l->setAlignment(AlignVCenter);
   l1->addWidget(before_connect_l, 0, 0);
   before_connect = new QLineEdit(this);
 //  before_connect->setMaxLength(COMMAND_SIZE);
   l1->addWidget(before_connect, 0, 1);
-  QString tmp = i18n("Allows you to run a program <b>before</b> a connection\n"
+  QString tmp = tr("Allows you to run a program <b>before</b> a connection\n"
              "is established. It is called immediately before\n"
              "dialing has begun.\n\n"
              "This might be useful, e.g. to stop HylaFAX blocking the\n"
@@ -309,13 +298,13 @@ i18n("Here you can select commands to run at certain stages of the\n"
   QWhatsThis::add(before_connect_l,tmp);
   QWhatsThis::add(before_connect,tmp);
 
-  command_label = new QLabel(i18n("Upon connect:"), this);
+  command_label = new QLabel(tr("Upon connect:"), this);
   command_label->setAlignment(AlignVCenter);
   l1->addWidget(command_label, 1, 0);
   command = new QLineEdit(this);
 //  command->setMaxLength(COMMAND_SIZE);
   l1->addWidget(command, 1, 1);
-  tmp = i18n("Allows you to run a program <b>after</b> a connection\n"
+  tmp = tr("Allows you to run a program <b>after</b> a connection\n"
              "is established. When your program is called, all\n"
              "preparations for an Internet connection are finished.\n"
              "\n"
@@ -324,21 +313,21 @@ i18n("Here you can select commands to run at certain stages of the\n"
   QWhatsThis::add(command_label,tmp);
   QWhatsThis::add(command,tmp);
 
-  predisconnect_label = new QLabel(i18n("Before disconnect:"),
+  predisconnect_label = new QLabel(tr("Before disconnect:"),
                                  this);
   predisconnect_label->setAlignment(AlignVCenter);
   l1->addWidget(predisconnect_label, 2, 0);
   predisconnect = new QLineEdit(this);
 //  predisconnect->setMaxLength(COMMAND_SIZE);
   l1->addWidget(predisconnect, 2, 1);
-  tmp = i18n("Allows you to run a program <b>before</b> a connection\n"
+  tmp = tr("Allows you to run a program <b>before</b> a connection\n"
              "is closed. The connection will stay open until\n"
              "the program exits.");
 
   QWhatsThis::add(predisconnect_label,tmp);
   QWhatsThis::add(predisconnect,tmp);
 
-  discommand_label = new QLabel(i18n("Upon disconnect:"),
+  discommand_label = new QLabel(tr("Upon disconnect:"),
                               this);
   discommand_label->setAlignment(AlignVCenter);
   l1->addWidget(discommand_label, 3, 0);
@@ -346,7 +335,7 @@ i18n("Here you can select commands to run at certain stages of the\n"
   discommand = new QLineEdit(this);
 //  discommand->setMaxLength(COMMAND_SIZE);
   l1->addWidget(discommand, 3, 1);
-  tmp = i18n("Allows you to run a program <b>after</b> a connection\n"
+  tmp = tr("Allows you to run a program <b>after</b> a connection\n"
              "has been closed.");
 
   QWhatsThis::add(discommand_label,tmp);
@@ -390,7 +379,7 @@ IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char
   QVBoxLayout *topLayout = new QVBoxLayout(this);
   topLayout->setSpacing( 3 );//KDialog::spacingHint());
 
-  box = new QVGroupBox(i18n("Configuration"), this);
+  box = new QVGroupBox(tr("Configuration"), this);
 //  box->setInsideSpacing( 1 );//KDialog::spacingHint());
 
   rb = new QButtonGroup(this);
@@ -399,9 +388,9 @@ IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char
           SLOT(hitIPSelect(int)));
 
   dynamicadd_rb = new QRadioButton(box);
-  dynamicadd_rb->setText(i18n("Dynamic IP address"));
+  dynamicadd_rb->setText(tr("Dynamic IP address"));
   QWhatsThis::add(dynamicadd_rb,
-                  i18n("Select this option when your computer gets an\n"
+                  tr("Select this option when your computer gets an\n"
                        "internet address (IP) every time a\n"
                        "connection is made.\n"
                        "\n"
@@ -409,11 +398,11 @@ IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char
                        "this method, so this should be turned on."));
 
   staticadd_rb = new QRadioButton(box);
-  staticadd_rb->setText(i18n("Static IP address"));
+  staticadd_rb->setText(tr("Static IP address"));
   rb->insert(dynamicadd_rb, 0);
   rb->insert(staticadd_rb, 1);
   QWhatsThis::add(staticadd_rb,
-                  i18n("Select this option when your computer has a\n"
+                  tr("Select this option when your computer has a\n"
                        "fixed internet address (IP). Most computers\n"
                        "don't have this, so you should probably select\n"
                        "dynamic IP addressing unless you know what you\n"
@@ -423,8 +412,8 @@ IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char
   QGridLayout *ipLayout = new QGridLayout(ipWidget, 2, 2);
   ipLayout->setSpacing( 2 );//KDialog::spacingHint());
 
-  ipaddress_label = new QLabel(i18n("IP address:"), ipWidget);
-  QString tmp = i18n("If your computer has a permanent internet\n"
+  ipaddress_label = new QLabel(tr("IP address:"), ipWidget);
+  QString tmp = tr("If your computer has a permanent internet\n"
              "address, you must supply your IP address here.");
   ipLayout->addWidget(ipaddress_label, 0, 0);
 
@@ -434,8 +423,8 @@ IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char
   QWhatsThis::add(ipaddress_label,tmp);
   QWhatsThis::add(ipaddress_l,tmp);
 
-  sub_label = new QLabel(i18n("Subnet mask:"), ipWidget);
-  tmp = i18n("<p>If your computer has a static Internet address,\n"
+  sub_label = new QLabel(tr("Subnet mask:"), ipWidget);
+  tmp = tr("<p>If your computer has a static Internet address,\n"
              "you must supply a network mask here. In almost\n"
              "all cases this netmask will be <b>255.255.255.0</b>,\n"
              "but your mileage may vary.\n"
@@ -449,13 +438,13 @@ IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char
   QWhatsThis::add(sub_label,tmp);
   QWhatsThis::add(subnetmask_l,tmp);
 
-  autoname = new QCheckBox(i18n("Auto-configure hostname from this IP"), this);
+  autoname = new QCheckBox(tr("Auto-configure hostname from this IP"), this);
   autoname->setChecked(_pppdata->autoname());
   connect(autoname,SIGNAL(toggled(bool)),
           this,SLOT(autoname_t(bool)));
 
   QWhatsThis::add(autoname,
-                  i18n("<p>Whenever you connect, this reconfigures\n"
+                  tr("<p>Whenever you connect, this reconfigures\n"
                        "your hostname to match the IP address you\n"
                        "got from the PPP server. This may be useful\n"
                        "if you need to use a protocol which depends\n"
@@ -496,14 +485,14 @@ void IPWidget::autoname_t(bool on) {
   // big-fat warning when selecting the auto configure hostname option
   if(on && !was_warned) {
     QMessageBox::information(this,
-                         i18n("Selecting this option might cause some weird "
+                         tr("Selecting this option might cause some weird "
                               "problems with the X-server and applications "
                               "while kppp is connected. Don't use it until "
                               "you know what you are doing!\n"
                               "For more information take a look at the "
                               "handbook (or help) in the section \"Frequently "
                               "asked questions\"."),
-                         i18n("Warning"));
+                         tr("Warning"));
     was_warned = true;
   }
 }
@@ -541,16 +530,15 @@ void IPWidget::hitIPSelect( int i ) {
 DNSWidget::DNSWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
     : QWidget(parent, name), _pppdata(pd)
 {
-  //  box = new QGroupBox(this);
-    QGridLayout *tl = new QGridLayout(this, 7, 2, 0 );//, KDialog::spacingHint());
+    QGridLayout *tl = new QGridLayout(this, 7, 2, 0 );
 
-  dnsdomain_label = new QLabel(i18n("Domain name:"), this);
+  dnsdomain_label = new QLabel(tr("Domain name:"), this);
   tl->addWidget(dnsdomain_label, 0, 0);
 
   dnsdomain = new QLineEdit(this);
-//  dnsdomain->setMaxLength(DOMAIN_SIZE);
+
   tl->addWidget(dnsdomain, 0, 1);
-  QString tmp = i18n("If you enter a domain name here, this domain\n"
+  QString tmp = tr("If you enter a domain name here, this domain\n"
                      "name is used for your computer while you are\n"
                      "connected. When the connection is closed, the\n"
                      "original domain name of your computer is\n"
@@ -562,25 +550,24 @@ DNSWidget::DNSWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const cha
   QWhatsThis::add(dnsdomain_label,tmp);
   QWhatsThis::add(dnsdomain,tmp);
 
-  conf_label = new QLabel(i18n("Configuration:"), this);
+  conf_label = new QLabel(tr("Configuration:"), this);
   tl->addWidget(conf_label, 1, 0);
 
   bg = new QButtonGroup("Group", this);
   connect(bg, SIGNAL(clicked(int)), SLOT(DNS_Mode_Selected(int)));
   bg->hide();
 
-  autodns = new QRadioButton(i18n("Automatic"), this);
+  autodns = new QRadioButton(tr("Automatic"), this);
   bg->insert(autodns, 0);
   tl->addWidget(autodns, 1, 1);
-  // no automatic DNS detection for pppd < 2.3.7
   if(!_pppdata->pppdVersionMin(2, 3, 7))
     autodns->setEnabled(false);
 
-  mandns = new QRadioButton(i18n("Manual"), this);
+  mandns = new QRadioButton(tr("Manual"), this);
   bg->insert(mandns, 1);
   tl->addWidget(mandns, 2, 1);
 
-  dns_label = new QLabel(i18n("DNS IP address:"), this);
+  dns_label = new QLabel(tr("DNS IP address:"), this);
   tl->addWidget(dns_label, 3, 0);
 
   QHBoxLayout *l2 = new QHBoxLayout;
@@ -592,7 +579,7 @@ DNSWidget::DNSWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const cha
           SLOT(DNS_Edit_Changed(const QString &)));
   l2->addWidget(dnsipaddr, 1);
   l2->addStretch(1);
-  tmp = i18n("<p>Allows you to specify a new DNS server to be\n"
+  tmp = tr("<p>Allows you to specify a new DNS server to be\n"
              "used while you are connected. When the\n"
              "connection is closed, this DNS entry will be\n"
              "removed again.\n"
@@ -605,29 +592,23 @@ DNSWidget::DNSWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const cha
 
   QHBoxLayout *l1 = new QHBoxLayout;
   tl->addLayout(l1, 4, 1);
-  add = new QPushButton(i18n("Add"), this);
+  add = new QPushButton(tr("Add"), this);
   connect(add, SIGNAL(clicked()), SLOT(adddns()));
-//   int width = add->sizeHint().width();
-//   width = QMAX(width,60);
-//   add->setMinimumWidth(width);
   l1->addWidget(add);
-  l1->addStretch(1);
+//  l1->addStretch(1);
   QWhatsThis::add(add,
-                  i18n("Click this button to add the DNS server\n"
+                  tr("Click this button to add the DNS server\n"
                        "specified in the field above. The entry\n"
                        "will then be added to the list below"));
 
-  remove = new QPushButton(i18n("Remove"), this);
+  remove = new QPushButton(tr("Remove"), this);
   connect(remove, SIGNAL(clicked()), SLOT(removedns()));
-//   width = remove->sizeHint().width();
-//   width = QMAX(width,60);
-//   remove->setMinimumWidth(width);
   l1->addWidget(remove);
   QWhatsThis::add(remove,
-                  i18n("Click this button to remove the selected DNS\n"
+                  tr("Click this button to remove the selected DNS\n"
                        "server entry from the list below"));
 
-  servers_label = new QLabel(i18n("DNS address list:"), this);
+  servers_label = new QLabel(tr("DNS address list:"), this);
   servers_label->setAlignment(AlignTop|AlignLeft);
   tl->addWidget(servers_label, 5, 0);
 
@@ -636,20 +617,19 @@ DNSWidget::DNSWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const cha
   connect(dnsservers, SIGNAL(highlighted(int)),
           SLOT(DNS_Entry_Selected(int)));
   tl->addWidget(dnsservers, 5, 1);
-  tmp = i18n("<p>This shows all defined DNS servers to use\n"
+  tmp = tr("<p>This shows all defined DNS servers to use\n"
              "while you are connected. Use the <b>Add</b> and\n"
              "<b>Remove</b> buttons to modify the list");
 
   QWhatsThis::add(servers_label,tmp);
   QWhatsThis::add(dnsservers,tmp);
 
-  exdnsdisabled_toggle = new QCheckBox(i18n( \
-"Disable existing DNS servers during connection"),
-                                     this);
+  exdnsdisabled_toggle = new QCheckBox(tr("Disable DNS servers during connection"), this);
+  // exdnsdisabled_toggle = new QCheckBox(tr("Disable existing DNS servers during connection"), this);
   exdnsdisabled_toggle->setChecked(_pppdata->exDNSDisabled());
   tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter);
   QWhatsThis::add(exdnsdisabled_toggle,
-                  i18n("<p>When this option is selected, all DNS\n"
+                  tr("<p>When this option is selected, all DNS\n"
                        "servers specified in <tt>/etc/resolv.conf</tt> are\n"
                        "temporary disabled while the dialup connection\n"
                        "is established. After the connection is\n"
@@ -737,20 +717,20 @@ GatewayWidget::GatewayWidget( PPPData *pd, QWidget *parent, bool isnewaccount, c
     : QWidget(parent, name), _pppdata(pd)
 {
   QVBoxLayout *topLayout = new QVBoxLayout(this);
-  topLayout->setSpacing( 2 );//KDialog::spacingHint());
+  topLayout->setSpacing( 2 );
+  topLayout->setMargin( 0 );
 
-  box = new QVGroupBox(i18n("Configuration"), this);
-//  box->setInsideSpacing( 2 );//KDialog::spacingHint());
+  box = new QVGroupBox(tr("Configuration"), this);
 
   rb = new QButtonGroup(this);
   rb->hide();
   connect(rb, SIGNAL(clicked(int)), SLOT(hitGatewaySelect(int)));
 
   defaultgateway = new QRadioButton(box);
-  defaultgateway->setText(i18n("Default gateway"));
+  defaultgateway->setText(tr("Default gateway"));
   rb->insert(defaultgateway, 0);
   QWhatsThis::add(defaultgateway,
-                  i18n("This makes the PPP peer computer (the computer\n"
+                  tr("This makes the PPP peer computer (the computer\n"
                        "you are connected to with your modem) to act as\n"
                        "a gateway. Your computer will send all packets not\n"
                        "going to a computer inside your local net to this\n"
@@ -761,20 +741,20 @@ GatewayWidget::GatewayWidget( PPPData *pd, QWidget *parent, bool isnewaccount, c
 
 
   staticgateway = new QRadioButton(box);
-  staticgateway->setText(i18n("Static gateway"));
+  staticgateway->setText(tr("Static gateway"));
   rb->insert(staticgateway, 1);
   QWhatsThis::add(staticgateway,
-                  i18n("<p>Allows you to specify which computer you want\n"
+                  tr("<p>Allows you to specify which computer you want\n"
                        "to use as gateway (see <i>Default Gateway</i> above)"));
 
   QHBox *gateBox = new QHBox(box);
-  gate_label = new QLabel(i18n("Gateway IP address:"), gateBox);
+  gate_label = new QLabel(tr("Gateway IP address:"), gateBox);
   gatewayaddr = new IPLineEdit(gateBox);
 
-  defaultroute = new QCheckBox(i18n("Assign the default route to this gateway"),
+  defaultroute = new QCheckBox(tr("Assign the default route to this gateway"),
                              this);
   QWhatsThis::add(defaultroute,
-                  i18n("If this option is enabled, all packets not\n"
+                  tr("If this option is enabled, all packets not\n"
                        "going to the local net are routed through\n"
                        "the PPP connection.\n"
                        "\n"
@@ -836,13 +816,13 @@ ScriptWidget::ScriptWidget( PPPData *pd, QWidget *parent, bool isnewaccount, con
   // insert equal-sized buttons
   QHBoxLayout *hl = new QHBoxLayout( this );
   tl->addLayout( hl );
-  add = new QPushButton( i18n("Add"), this );
+  add = new QPushButton( tr("Add"), this );
   hl->addWidget( add );
   connect(add, SIGNAL(clicked()), SLOT(addButton()));
-  insert = new QPushButton( i18n("Insert"), this );
+  insert = new QPushButton( tr("Insert"), this );
   hl->addWidget( insert );
   connect(insert, SIGNAL(clicked()), SLOT(insertButton()));
-  remove = new QPushButton( i18n("Remove"), this );
+  remove = new QPushButton( tr("Remove"), this );
   hl->addWidget( remove );
   connect(remove, SIGNAL(clicked()), SLOT(removeButton()));
 
@@ -1155,7 +1135,7 @@ void ScriptWidget::removeButton() {
 PhoneNumberDialog::PhoneNumberDialog(QWidget *parent)
     : QDialog(parent,"PhoneNumberDialog",true)
 {
-    setCaption( i18n("Add Phone Number") );
+    setCaption( tr("Add Phone Number") );
 
 
   QVBoxLayout *layout = new QVBoxLayout( this );
diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp
index 7a6524f..517dd8b 100644
--- a/noncore/settings/networksettings/ppp/pppdata.cpp
+++ b/noncore/settings/networksettings/ppp/pppdata.cpp
@@ -130,7 +130,7 @@ void PPPData::cancel() {
 QString PPPData::readConfig(const QString &group, const QString &key,
                             const QString &defvalue = "")
 {
-    qDebug("PPPData::readConfig key >%s< group >%s<",key.latin1(), group.latin1());
+//    qDebug("PPPData::readConfig key >%s< group >%s<",key.latin1(), group.latin1());
     QString idx = SEP.arg(group).arg(key);
     if (stringEntries.find(idx) != stringEntries.end())
         return stringEntries[idx];