improve support for BigScreen

2 files changed, 945 insertions, 863 deletions

diff --git a/noncore/settings/networksettings/ppp/devices.cpp b/noncore/settings/networksettings/ppp/devices.cpp
index e94904b..9da090d 100644
--- a/noncore/settings/networksettings/ppp/devices.cpp
+++ b/noncore/settings/networksettings/ppp/devices.cpp
@@ -24,25 +24,31 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "interfaceppp.h"
+#include "devices.h"
+#include "authwidget.h"
+#include "pppdata.h"
+#include "edit.h"
+#include "general.h"
+
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qdir.h>
-#include <stdlib.h>
 #include <qlayout.h>
 #include <qtabwidget.h>
 #include <qtabdialog.h>
 #include <qwhatsthis.h>
 #include <qmessagebox.h>
-
 #include <qapplication.h>
 #include <qbuttongroup.h>
 #include <qmessagebox.h>
 #include <qvgroupbox.h>
 
-#include "interfaceppp.h"
-#include "devices.h"
-#include "authwidget.h"
-#include "pppdata.h"
-#include "edit.h"
-#include "general.h"
+/* STD */
+#include <stdlib.h>
+
 
 void parseargs(char* buf, char** args);
 
@@ -191,8 +197,7 @@ int DevicesWidget::doTab(){
     bool ok = false;
 
     while (!ok){
-        dlg->showMaximized();
-        result = dlg->exec();
+        result = QPEApplication::execDialog( dlg );
         ok = true;
 
         if(result == QDialog::Accepted) {
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp
index ceac90c..7d21605 100644
--- a/noncore/settings/networksettings/ppp/edit.cpp
+++ b/noncore/settings/networksettings/ppp/edit.cpp
@@ -23,8 +23,16 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <string.h>
-#include <termios.h>
+#include "edit.h"
+#include "pppdata.h"
+#include "iplined.h"
+#include "auth.h"
+
+/* OPIE */
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qwhatsthis.h>
@@ -34,189 +42,207 @@
 #include <qvgroupbox.h>
 #include <qhbox.h>
 #include <qdialog.h>
-#include <qpe/resource.h>
 
-#include "edit.h"
-#include "pppdata.h"
-#include "iplined.h"
-#include "auth.h"
+/* STD */
+
+#include <string.h>
+#include <termios.h>
 
 DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
                         , const char *name )
-    : QWidget(parent, name), _pppdata(pd)
+        : QWidget(parent, name), _pppdata(pd)
 {
-  const int GRIDROWS = 6;
-
-  QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );
-
-  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 = tr("Type in a unique name for this connection");
-
-  QWhatsThis::add(connect_label,tmp);
-  QWhatsThis::add(connectname_l,tmp);
-
-
-  number_label = new QLabel(tr("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);
-  lpn->addWidget(numbers);
-  QVBoxLayout *lpn1 = new QVBoxLayout;
-  lpn->addLayout(lpn1);
-  add = new QPushButton(tr("&Add..."), this);
-  del = new QPushButton(tr("&Remove"), this);
-
-  up = new QPushButton(this);
-  up->setPixmap( Resource::loadPixmap("up") );
-  down = new QPushButton(this);
-  down->setPixmap( Resource::loadPixmap("down") );
-  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 = 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"
-	     "arrow buttons.\n\n"
-	     "When a number is busy or fails, <i>kppp</i> will \n"
-	     "try the next number and so on");
-
-  QWhatsThis::add(number_label,tmp);
-  QWhatsThis::add(numbers,tmp);
-
-  pppdargs = new QPushButton(tr("Customize pppd Arguments..."), this);
-  connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton()));
-  tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter);
-
-  // Set defaults if editing an existing connection
-  if(!isnewaccount) {
-    connectname_l->setText(_pppdata->accname());
-
-    // insert the phone numbers into the listbox
-    QString n = _pppdata->phonenumber();
-    QString tmp = "";
-    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);
+    const int GRIDROWS = 6;
+
+    QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );
+
+    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 = tr("Type in a unique name for this connection");
+
+    QWhatsThis::add(connect_label,tmp);
+    QWhatsThis::add(connectname_l,tmp);
+
+
+    number_label = new QLabel(tr("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);
+    lpn->addWidget(numbers);
+    QVBoxLayout *lpn1 = new QVBoxLayout;
+    lpn->addLayout(lpn1);
+    add = new QPushButton(tr("&Add..."), this);
+    del = new QPushButton(tr("&Remove"), this);
+
+    up = new QPushButton(this);
+    up->setPixmap( Resource::loadPixmap("up") );
+    down = new QPushButton(this);
+    down->setPixmap( Resource::loadPixmap("down") );
+    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 = 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"
+             "arrow buttons.\n\n"
+             "When a number is busy or fails, <i>kppp</i> will \n"
+             "try the next number and so on");
 
-  }
+    QWhatsThis::add(number_label,tmp);
+    QWhatsThis::add(numbers,tmp);
+
+    pppdargs = new QPushButton(tr("Customize pppd Arguments..."), this);
+    connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton()));
+    tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter);
+
+    // Set defaults if editing an existing connection
+    if(!isnewaccount)
+    {
+        connectname_l->setText(_pppdata->accname());
+
+        // insert the phone numbers into the listbox
+        QString n = _pppdata->phonenumber();
+        QString tmp = "";
+        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);
 
-  numbersChanged();
-  tl->activate();
+    }
+
+    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);
+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);
-    return true;
-  }
+        _pppdata->setPhonenumber(number);
+        return true;
+    }
 }
 
 
-void DialWidget::numbersChanged() {
-  int sel = numbers->currentItem();
+void DialWidget::numbersChanged()
+{
+    int sel = numbers->currentItem();
 
-  del->setEnabled(sel != -1);
-  up->setEnabled(sel != -1 && sel != 0);
-  down->setEnabled(sel != -1 && sel != (int)numbers->count()-1);
+    del->setEnabled(sel != -1);
+    up->setEnabled(sel != -1 && sel != 0);
+    down->setEnabled(sel != -1 && sel != (int)numbers->count()-1);
 }
 
 
-void DialWidget::selectionChanged(int) {
-  numbersChanged();
+void DialWidget::selectionChanged(int)
+{
+    numbersChanged();
 }
 
 
-void DialWidget::addNumber() {
+void DialWidget::addNumber()
+{
     PhoneNumberDialog dlg(this);
-   if(dlg.exec()) {
-     numbers->insertItem(dlg.phoneNumber());
-     numbersChanged();
-   }
+    if(dlg.exec())
+    {
+        numbers->insertItem(dlg.phoneNumber());
+        numbersChanged();
+    }
 }
 
 
-void DialWidget::delNumber() {
-  if(numbers->currentItem() != -1) {
-    numbers->removeItem(numbers->currentItem());
-    numbersChanged();
-  }
+void DialWidget::delNumber()
+{
+    if(numbers->currentItem() != -1)
+    {
+        numbers->removeItem(numbers->currentItem());
+        numbersChanged();
+    }
 }
 
 
-void DialWidget::upNumber() {
-  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::upNumber()
+{
+    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::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::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() {
+void DialWidget::pppdargsbutton()
+{
     PPPdArguments pa(_pppdata, this);
-    pa.showMaximized();
-    pa.exec();
+    QPEApplication::execDialog( &pa );
 }
 
 
@@ -225,101 +251,103 @@ void DialWidget::pppdargsbutton() {
 // ExecWidget
 /////////////////////////////////////////////////////////////////////////////
 ExecWidget::ExecWidget(PPPData *pd, QWidget *parent, bool isnewaccount, const char *name) :
-    QWidget(parent, name), _pppdata(pd)
+        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);
-  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 = 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"
-	     "modem.");
-
-  QWhatsThis::add(before_connect_l,tmp);
-  QWhatsThis::add(before_connect,tmp);
-
-  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 = 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"
-	     "Very useful for fetching mail and news");
-
-  QWhatsThis::add(command_label,tmp);
-  QWhatsThis::add(command,tmp);
-
-  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 = 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(tr("Upon disconnect:"),
-			      this);
-  discommand_label->setAlignment(AlignVCenter);
-  l1->addWidget(discommand_label, 3, 0);
-
-  discommand = new QLineEdit(this);
-//  discommand->setMaxLength(COMMAND_SIZE);
-  l1->addWidget(discommand, 3, 1);
-  tmp = tr("Allows you to run a program <b>after</b> a connection\n"
-	     "has been closed.");
-
-  QWhatsThis::add(discommand_label,tmp);
-  QWhatsThis::add(discommand,tmp);
-
-  // extra space between entries
-  l1->addRowSpacing(1, 5);
-  l1->addRowSpacing(3, 5);
-
-  tl->addStretch(1);
-  tl->activate();
-
-  // Set defaults if editing an existing connection
-  if(!isnewaccount) {
-    before_connect->setText(_pppdata->command_before_connect());
-    command->setText(_pppdata->command_on_connect());
-    discommand->setText(_pppdata->command_on_disconnect());
-    predisconnect->setText(_pppdata->command_before_disconnect());
-  }
+    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);
+    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 = 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"
+                     "modem.");
+
+    QWhatsThis::add(before_connect_l,tmp);
+    QWhatsThis::add(before_connect,tmp);
+
+    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 = 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"
+             "Very useful for fetching mail and news");
+
+    QWhatsThis::add(command_label,tmp);
+    QWhatsThis::add(command,tmp);
+
+    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 = 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(tr("Upon disconnect:"),
+                                  this);
+    discommand_label->setAlignment(AlignVCenter);
+    l1->addWidget(discommand_label, 3, 0);
+
+    discommand = new QLineEdit(this);
+    //  discommand->setMaxLength(COMMAND_SIZE);
+    l1->addWidget(discommand, 3, 1);
+    tmp = tr("Allows you to run a program <b>after</b> a connection\n"
+             "has been closed.");
+
+    QWhatsThis::add(discommand_label,tmp);
+    QWhatsThis::add(discommand,tmp);
+
+    // extra space between entries
+    l1->addRowSpacing(1, 5);
+    l1->addRowSpacing(3, 5);
+
+    tl->addStretch(1);
+    tl->activate();
+
+    // Set defaults if editing an existing connection
+    if(!isnewaccount)
+    {
+        before_connect->setText(_pppdata->command_before_connect());
+        command->setText(_pppdata->command_on_connect());
+        discommand->setText(_pppdata->command_on_disconnect());
+        predisconnect->setText(_pppdata->command_before_disconnect());
+    }
 }
 
 
-bool ExecWidget::save() {
-  _pppdata->setCommand_before_connect(before_connect->text());
-  _pppdata->setCommand_on_connect(command->text());
-  _pppdata->setCommand_before_disconnect(predisconnect->text());
-  _pppdata->setCommand_on_disconnect(discommand->text());
-  return true;
+bool ExecWidget::save()
+{
+    _pppdata->setCommand_before_connect(before_connect->text());
+    _pppdata->setCommand_on_connect(command->text());
+    _pppdata->setCommand_before_disconnect(predisconnect->text());
+    _pppdata->setCommand_on_disconnect(discommand->text());
+    return true;
 }
 
 
@@ -330,339 +358,360 @@ bool ExecWidget::save() {
 //
 /////////////////////////////////////////////////////////////////////////////
 IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
-    : QWidget(parent, name), _pppdata(pd)
+        : QWidget(parent, name), _pppdata(pd)
 {
-  QVBoxLayout *topLayout = new QVBoxLayout(this);
-  topLayout->setSpacing( 3 );//KDialog::spacingHint());
-
-  box = new QVGroupBox(tr("Configuration"), this);
-//  box->setInsideSpacing( 1 );//KDialog::spacingHint());
-
-  rb = new QButtonGroup(this);
-  rb->hide();
-  connect(rb, SIGNAL(clicked(int)),
-	  SLOT(hitIPSelect(int)));
-
-  dynamicadd_rb = new QRadioButton(box);
-  dynamicadd_rb->setText(tr("Dynamic IP address"));
-  QWhatsThis::add(dynamicadd_rb,
-		  tr("Select this option when your computer gets an\n"
-		       "internet address (IP) every time a\n"
-		       "connection is made.\n"
-		       "\n"
-		       "Almost every Internet Service Provider uses\n"
-		       "this method, so this should be turned on."));
-
-  staticadd_rb = new QRadioButton(box);
-  staticadd_rb->setText(tr("Static IP address"));
-  rb->insert(dynamicadd_rb, 0);
-  rb->insert(staticadd_rb, 1);
-  QWhatsThis::add(staticadd_rb,
-		  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"
-		       "are doing."));
-
-  QWidget *ipWidget = new QWidget(box);
-  QGridLayout *ipLayout = new QGridLayout(ipWidget, 2, 2);
-  ipLayout->setSpacing( 2 );//KDialog::spacingHint());
-
-  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);
-
-  ipaddress_l = new IPLineEdit(ipWidget);
-  ipLayout->addWidget(ipaddress_l, 0, 1);
-
-  QWhatsThis::add(ipaddress_label,tmp);
-  QWhatsThis::add(ipaddress_l,tmp);
-
-  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"
-	     "\n"
-	     "If unsure, contact your Internet Service Provider");
-  ipLayout->addWidget(sub_label, 1, 0);
-
-  subnetmask_l = new IPLineEdit(ipWidget);
-  ipLayout->addWidget(subnetmask_l, 1, 1);
-
-  QWhatsThis::add(sub_label,tmp);
-  QWhatsThis::add(subnetmask_l,tmp);
-
-  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,
-		  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"
-		       "on this information, but it can also cause several\n"
-		       "<a href=\"kppp-7.html#autohostname\">problems</a>.\n"
-		       "\n"
-		       "Don't enable this unless you really need it."));
-
-  topLayout->addWidget(box);
-  topLayout->addWidget(autoname);
-  topLayout->addStretch();
-
-  //load info from gpppdata
-  if(!isnewaccount) {
-    if(_pppdata->ipaddr() == "0.0.0.0" &&
-       _pppdata->subnetmask() == "0.0.0.0") {
-      dynamicadd_rb->setChecked(true);
-      hitIPSelect(0);
-      autoname->setChecked(_pppdata->autoname());
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
+    topLayout->setSpacing( 3 );//KDialog::spacingHint());
+
+    box = new QVGroupBox(tr("Configuration"), this);
+    //  box->setInsideSpacing( 1 );//KDialog::spacingHint());
+
+    rb = new QButtonGroup(this);
+    rb->hide();
+    connect(rb, SIGNAL(clicked(int)),
+            SLOT(hitIPSelect(int)));
+
+    dynamicadd_rb = new QRadioButton(box);
+    dynamicadd_rb->setText(tr("Dynamic IP address"));
+    QWhatsThis::add(dynamicadd_rb,
+                        tr("Select this option when your computer gets an\n"
+                           "internet address (IP) every time a\n"
+                           "connection is made.\n"
+                           "\n"
+                           "Almost every Internet Service Provider uses\n"
+                           "this method, so this should be turned on."));
+
+    staticadd_rb = new QRadioButton(box);
+    staticadd_rb->setText(tr("Static IP address"));
+    rb->insert(dynamicadd_rb, 0);
+    rb->insert(staticadd_rb, 1);
+    QWhatsThis::add(staticadd_rb,
+                        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"
+                           "are doing."));
+
+    QWidget *ipWidget = new QWidget(box);
+    QGridLayout *ipLayout = new QGridLayout(ipWidget, 2, 2);
+    ipLayout->setSpacing( 2 );//KDialog::spacingHint());
+
+    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);
+
+    ipaddress_l = new IPLineEdit(ipWidget);
+    ipLayout->addWidget(ipaddress_l, 0, 1);
+
+    QWhatsThis::add(ipaddress_label,tmp);
+    QWhatsThis::add(ipaddress_l,tmp);
+
+    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"
+             "\n"
+             "If unsure, contact your Internet Service Provider");
+    ipLayout->addWidget(sub_label, 1, 0);
+
+    subnetmask_l = new IPLineEdit(ipWidget);
+    ipLayout->addWidget(subnetmask_l, 1, 1);
+
+    QWhatsThis::add(sub_label,tmp);
+    QWhatsThis::add(subnetmask_l,tmp);
+
+    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,
+                        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"
+                           "on this information, but it can also cause several\n"
+                           "<a href=\"kppp-7.html#autohostname\">problems</a>.\n"
+                           "\n"
+                           "Don't enable this unless you really need it."));
+
+    topLayout->addWidget(box);
+    topLayout->addWidget(autoname);
+    topLayout->addStretch();
+
+    //load info from gpppdata
+    if(!isnewaccount)
+    {
+        if(_pppdata->ipaddr() == "0.0.0.0" &&
+                _pppdata->subnetmask() == "0.0.0.0")
+        {
+            dynamicadd_rb->setChecked(true);
+            hitIPSelect(0);
+            autoname->setChecked(_pppdata->autoname());
+        }
+        else
+        {
+            ipaddress_l->setText(_pppdata->ipaddr());
+            subnetmask_l->setText(_pppdata->subnetmask());
+            staticadd_rb->setChecked(true);
+            autoname->setChecked(false);
+        }
     }
-    else {
-      ipaddress_l->setText(_pppdata->ipaddr());
-      subnetmask_l->setText(_pppdata->subnetmask());
-      staticadd_rb->setChecked(true);
-      autoname->setChecked(false);
+    else
+    {
+        dynamicadd_rb->setChecked(true);
+        hitIPSelect(0);
     }
-  }
-  else {
-    dynamicadd_rb->setChecked(true);
-    hitIPSelect(0);
-  }
 
 }
 
-void IPWidget::autoname_t(bool on) {
-  static bool was_warned = false;
-
-  // big-fat warning when selecting the auto configure hostname option
-  if(on && !was_warned) {
-    QMessageBox::information(this,
-			 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\"."),
-			 tr("Warning"));
-    was_warned = true;
-  }
+void IPWidget::autoname_t(bool on)
+{
+    static bool was_warned = false;
+
+    // big-fat warning when selecting the auto configure hostname option
+    if(on && !was_warned)
+    {
+        QMessageBox::information(this,
+                                 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\"."),
+                                 tr("Warning"));
+        was_warned = true;
+    }
 }
 
 
-void IPWidget::save() {
-  if(dynamicadd_rb->isChecked()) {
-    _pppdata->setIpaddr("0.0.0.0");
-    _pppdata->setSubnetmask("0.0.0.0");
-  } else {
-    _pppdata->setIpaddr(ipaddress_l->text());
-    _pppdata->setSubnetmask(subnetmask_l->text());
-  }
-  _pppdata->setAutoname(autoname->isChecked());
+void IPWidget::save()
+{
+    if(dynamicadd_rb->isChecked())
+    {
+        _pppdata->setIpaddr("0.0.0.0");
+        _pppdata->setSubnetmask("0.0.0.0");
+    }
+    else
+    {
+        _pppdata->setIpaddr(ipaddress_l->text());
+        _pppdata->setSubnetmask(subnetmask_l->text());
+    }
+    _pppdata->setAutoname(autoname->isChecked());
 }
 
 
-void IPWidget::hitIPSelect( int i ) {
-  if(i == 0) {
-    ipaddress_label->setEnabled(false);
-    sub_label->setEnabled(false);
-    ipaddress_l->setEnabled(false);
-    subnetmask_l->setEnabled(false);
-  }
-  else {
-    ipaddress_label->setEnabled(true);
-    sub_label->setEnabled(true);
-    ipaddress_l->setEnabled(true);
-    subnetmask_l->setEnabled(true);
-  }
+void IPWidget::hitIPSelect( int i )
+{
+    if(i == 0)
+    {
+        ipaddress_label->setEnabled(false);
+        sub_label->setEnabled(false);
+        ipaddress_l->setEnabled(false);
+        subnetmask_l->setEnabled(false);
+    }
+    else
+    {
+        ipaddress_label->setEnabled(true);
+        sub_label->setEnabled(true);
+        ipaddress_l->setEnabled(true);
+        subnetmask_l->setEnabled(true);
+    }
 }
 
 
 
 DNSWidget::DNSWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
-    : QWidget(parent, name), _pppdata(pd)
+        : QWidget(parent, name), _pppdata(pd)
 {
     QGridLayout *tl = new QGridLayout(this, 7, 2, 0 );
 
-  dnsdomain_label = new QLabel(tr("Domain name:"), this);
-  tl->addWidget(dnsdomain_label, 0, 0);
-
-  dnsdomain = new QLineEdit(this);
-
-  tl->addWidget(dnsdomain, 0, 1);
-  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"
-		     "restored.\n"
-		     "\n"
-		     "If you leave this field blank, no changes are\n"
-		     "made to the domain name.");
-
-  QWhatsThis::add(dnsdomain_label,tmp);
-  QWhatsThis::add(dnsdomain,tmp);
-
-  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(tr("Automatic"), this);
-  bg->insert(autodns, 0);
-  tl->addWidget(autodns, 1, 1);
-  if(!_pppdata->pppdVersionMin(2, 3, 7))
-    autodns->setEnabled(false);
-
-  mandns = new QRadioButton(tr("Manual"), this);
-  bg->insert(mandns, 1);
-  tl->addWidget(mandns, 2, 1);
-
-  dns_label = new QLabel(tr("DNS IP address:"), this);
-  tl->addWidget(dns_label, 3, 0);
-
-  QHBoxLayout *l2 = new QHBoxLayout;
-  tl->addLayout(l2, 3, 1);
-  dnsipaddr = new IPLineEdit(this);
-  connect(dnsipaddr, SIGNAL(returnPressed()),
-	  SLOT(adddns()));
-  connect(dnsipaddr, SIGNAL(textChanged(const QString &)),
-	  SLOT(DNS_Edit_Changed(const QString &)));
-  l2->addWidget(dnsipaddr, 1);
-  l2->addStretch(1);
-  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"
-	     "\n"
-	     "To add a DNS server, type in the IP address of\n"
-	     "the DNS server here and click on <b>Add</b>");
-
-  QWhatsThis::add(dns_label, tmp);
-  QWhatsThis::add(dnsipaddr, tmp);
-
-  QHBoxLayout *l1 = new QHBoxLayout;
-  tl->addLayout(l1, 4, 1);
-  add = new QPushButton(tr("Add"), this);
-  connect(add, SIGNAL(clicked()), SLOT(adddns()));
-  l1->addWidget(add);
-//  l1->addStretch(1);
-  QWhatsThis::add(add,
-		  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(tr("Remove"), this);
-  connect(remove, SIGNAL(clicked()), SLOT(removedns()));
-  l1->addWidget(remove);
-  QWhatsThis::add(remove,
-		  tr("Click this button to remove the selected DNS\n"
-		       "server entry from the list below"));
-
-  servers_label = new QLabel(tr("DNS address list:"), this);
-  servers_label->setAlignment(AlignTop|AlignLeft);
-  tl->addWidget(servers_label, 5, 0);
-
-  dnsservers = new QListBox(this);
-  dnsservers->setMinimumSize(150, 80);
-  connect(dnsservers, SIGNAL(highlighted(int)),
-	  SLOT(DNS_Entry_Selected(int)));
-  tl->addWidget(dnsservers, 5, 1);
-  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(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,
-		  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"
-		       "closed, the servers will be re-enabled\n"
-		       "\n"
-		       "Typically, there is no reason to use this\n"
-		       "option, but it may become useful under \n"
-		       "some circumstances."));
-
-
-  // restore data if editing
-  if(!isnewaccount) {
-    dnsservers->insertStringList(_pppdata->dns());
-    dnsdomain->setText(_pppdata->domain());
-  }
-
-  int mode = _pppdata->autoDNS() ? 0 : 1;
-  bg->setButton(mode);
-  DNS_Mode_Selected(mode);
-
-  tl->activate();
+    dnsdomain_label = new QLabel(tr("Domain name:"), this);
+    tl->addWidget(dnsdomain_label, 0, 0);
+
+    dnsdomain = new QLineEdit(this);
+
+    tl->addWidget(dnsdomain, 0, 1);
+    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"
+                     "restored.\n"
+                     "\n"
+                     "If you leave this field blank, no changes are\n"
+                     "made to the domain name.");
+
+    QWhatsThis::add(dnsdomain_label,tmp);
+    QWhatsThis::add(dnsdomain,tmp);
+
+    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(tr("Automatic"), this);
+    bg->insert(autodns, 0);
+    tl->addWidget(autodns, 1, 1);
+    if(!_pppdata->pppdVersionMin(2, 3, 7))
+        autodns->setEnabled(false);
+
+    mandns = new QRadioButton(tr("Manual"), this);
+    bg->insert(mandns, 1);
+    tl->addWidget(mandns, 2, 1);
+
+    dns_label = new QLabel(tr("DNS IP address:"), this);
+    tl->addWidget(dns_label, 3, 0);
+
+    QHBoxLayout *l2 = new QHBoxLayout;
+    tl->addLayout(l2, 3, 1);
+    dnsipaddr = new IPLineEdit(this);
+    connect(dnsipaddr, SIGNAL(returnPressed()),
+            SLOT(adddns()));
+    connect(dnsipaddr, SIGNAL(textChanged(const QString &)),
+            SLOT(DNS_Edit_Changed(const QString &)));
+    l2->addWidget(dnsipaddr, 1);
+    l2->addStretch(1);
+    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"
+             "\n"
+             "To add a DNS server, type in the IP address of\n"
+             "the DNS server here and click on <b>Add</b>");
+
+    QWhatsThis::add(dns_label, tmp);
+    QWhatsThis::add(dnsipaddr, tmp);
+
+    QHBoxLayout *l1 = new QHBoxLayout;
+    tl->addLayout(l1, 4, 1);
+    add = new QPushButton(tr("Add"), this);
+    connect(add, SIGNAL(clicked()), SLOT(adddns()));
+    l1->addWidget(add);
+    //  l1->addStretch(1);
+    QWhatsThis::add(add,
+                        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(tr("Remove"), this);
+    connect(remove, SIGNAL(clicked()), SLOT(removedns()));
+    l1->addWidget(remove);
+    QWhatsThis::add(remove,
+                        tr("Click this button to remove the selected DNS\n"
+                           "server entry from the list below"));
+
+    servers_label = new QLabel(tr("DNS address list:"), this);
+    servers_label->setAlignment(AlignTop|AlignLeft);
+    tl->addWidget(servers_label, 5, 0);
+
+    dnsservers = new QListBox(this);
+    dnsservers->setMinimumSize(150, 80);
+    connect(dnsservers, SIGNAL(highlighted(int)),
+            SLOT(DNS_Entry_Selected(int)));
+    tl->addWidget(dnsservers, 5, 1);
+    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(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,
+                        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"
+                           "closed, the servers will be re-enabled\n"
+                           "\n"
+                           "Typically, there is no reason to use this\n"
+                           "option, but it may become useful under \n"
+                           "some circumstances."));
+
+
+    // restore data if editing
+    if(!isnewaccount)
+    {
+        dnsservers->insertStringList(_pppdata->dns());
+        dnsdomain->setText(_pppdata->domain());
+    }
+
+    int mode = _pppdata->autoDNS() ? 0 : 1;
+    bg->setButton(mode);
+    DNS_Mode_Selected(mode);
+
+    tl->activate();
 }
 
-void DNSWidget::DNS_Edit_Changed(const QString &text) {
-  QRegExp r("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+");
-  add->setEnabled(text.find(r) != -1);
+void DNSWidget::DNS_Edit_Changed(const QString &text)
+{
+    QRegExp r("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+");
+    add->setEnabled(text.find(r) != -1);
 }
 
-void DNSWidget::DNS_Entry_Selected(int) {
-  remove->setEnabled(true);
+void DNSWidget::DNS_Entry_Selected(int)
+{
+    remove->setEnabled(true);
 }
 
-void DNSWidget::DNS_Mode_Selected(int mode) {
-  bool on = (mode == 1);
-  dns_label->setEnabled(on);
-  servers_label->setEnabled(on);
-  dnsipaddr->setText("");
-  dnsipaddr->setEnabled(on);
-  add->setEnabled(false);
-  remove->setEnabled(dnsservers->count()>0 && on);
-  dnsservers->clearSelection();
-  dnsservers->setEnabled(on);
-  dnsservers->triggerUpdate(false);
+void DNSWidget::DNS_Mode_Selected(int mode)
+{
+    bool on = (mode == 1);
+    dns_label->setEnabled(on);
+    servers_label->setEnabled(on);
+    dnsipaddr->setText("");
+    dnsipaddr->setEnabled(on);
+    add->setEnabled(false);
+    remove->setEnabled(dnsservers->count()>0 && on);
+    dnsservers->clearSelection();
+    dnsservers->setEnabled(on);
+    dnsservers->triggerUpdate(false);
 }
 
-void DNSWidget::save() {
-  _pppdata->setAutoDNS(bg->id(bg->selected()) == 0);
-  QStringList serverlist;
-  for(uint i=0; i < dnsservers->count(); i++)
-    serverlist.append(dnsservers->text(i));
-  _pppdata->setDns(serverlist);
-
-  // strip leading dot
-  QString s(dnsdomain->text());
-  if(s.left(1) == ".")
-    _pppdata->setDomain(s.mid(1));
-  else
-    _pppdata->setDomain(dnsdomain->text());
-
-  _pppdata->setExDNSDisabled(exdnsdisabled_toggle->isChecked());
+void DNSWidget::save()
+{
+    _pppdata->setAutoDNS(bg->id(bg->selected()) == 0);
+    QStringList serverlist;
+    for(uint i=0; i < dnsservers->count(); i++)
+        serverlist.append(dnsservers->text(i));
+    _pppdata->setDns(serverlist);
+
+    // strip leading dot
+    QString s(dnsdomain->text());
+    if(s.left(1) == ".")
+        _pppdata->setDomain(s.mid(1));
+    else
+        _pppdata->setDomain(dnsdomain->text());
+
+    _pppdata->setExDNSDisabled(exdnsdisabled_toggle->isChecked());
 }
 
 
-void DNSWidget::adddns() {
-  if(dnsservers->count() < MAX_DNS_ENTRIES) {
-    dnsservers->insertItem(dnsipaddr->text());
-    dnsipaddr->setText("");
-  }
+void DNSWidget::adddns()
+{
+    if(dnsservers->count() < MAX_DNS_ENTRIES)
+    {
+        dnsservers->insertItem(dnsipaddr->text());
+        dnsipaddr->setText("");
+    }
 }
 
 
-void DNSWidget::removedns() {
-  int i;
-  i = dnsservers->currentItem();
-  if(i != -1)
-    dnsservers->removeItem(i);
-  remove->setEnabled(dnsservers->count()>0);
+void DNSWidget::removedns()
+{
+    int i;
+    i = dnsservers->currentItem();
+    if(i != -1)
+        dnsservers->removeItem(i);
+    remove->setEnabled(dnsservers->count()>0);
 }
 
 
@@ -670,415 +719,441 @@ void DNSWidget::removedns() {
 // GatewayWidget
 //
 GatewayWidget::GatewayWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
-    : QWidget(parent, name), _pppdata(pd)
+        : QWidget(parent, name), _pppdata(pd)
 {
-  QVBoxLayout *topLayout = new QVBoxLayout(this);
-  topLayout->setSpacing( 2 );
-  topLayout->setMargin( 0 );
-
-  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(tr("Default gateway"));
-  rb->insert(defaultgateway, 0);
-  QWhatsThis::add(defaultgateway,
-		  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"
-		       "computer, which will route these packets.\n"
-		       "\n"
-		       "This is the default for most ISPs, so you should\n"
-		       "probably leave this option on."));
-
-
-  staticgateway = new QRadioButton(box);
-  staticgateway->setText(tr("Static gateway"));
-  rb->insert(staticgateway, 1);
-  QWhatsThis::add(staticgateway,
-		  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(tr("Gateway IP address:"), gateBox);
-  gatewayaddr = new IPLineEdit(gateBox);
-
-  defaultroute = new QCheckBox(tr("Assign the default route to this gateway"),
-			     this);
-  QWhatsThis::add(defaultroute,
-		  tr("If this option is enabled, all packets not\n"
-		       "going to the local net are routed through\n"
-		       "the PPP connection.\n"
-		       "\n"
-		       "Normally, you should turn this on"));
-
-  topLayout->addWidget(box);
-  topLayout->addWidget(defaultroute);
-  topLayout->addStretch();
-
-  //load info from gpppdata
-  if(!isnewaccount) {
-    if(_pppdata->gateway() == "0.0.0.0") {
-      defaultgateway->setChecked(true);
-      hitGatewaySelect(0);
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
+    topLayout->setSpacing( 2 );
+    topLayout->setMargin( 0 );
+
+    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(tr("Default gateway"));
+    rb->insert(defaultgateway, 0);
+    QWhatsThis::add(defaultgateway,
+                        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"
+                           "computer, which will route these packets.\n"
+                           "\n"
+                           "This is the default for most ISPs, so you should\n"
+                           "probably leave this option on."));
+
+
+    staticgateway = new QRadioButton(box);
+    staticgateway->setText(tr("Static gateway"));
+    rb->insert(staticgateway, 1);
+    QWhatsThis::add(staticgateway,
+                        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(tr("Gateway IP address:"), gateBox);
+    gatewayaddr = new IPLineEdit(gateBox);
+
+    defaultroute = new QCheckBox(tr("Assign the default route to this gateway"),
+                                 this);
+    QWhatsThis::add(defaultroute,
+                        tr("If this option is enabled, all packets not\n"
+                           "going to the local net are routed through\n"
+                           "the PPP connection.\n"
+                           "\n"
+                           "Normally, you should turn this on"));
+
+    topLayout->addWidget(box);
+    topLayout->addWidget(defaultroute);
+    topLayout->addStretch();
+
+    //load info from gpppdata
+    if(!isnewaccount)
+    {
+        if(_pppdata->gateway() == "0.0.0.0")
+        {
+            defaultgateway->setChecked(true);
+            hitGatewaySelect(0);
+        }
+        else
+        {
+            gatewayaddr->setText(_pppdata->gateway());
+            staticgateway->setChecked(true);
+        }
+        defaultroute->setChecked(_pppdata->defaultroute());
     }
-    else {
-      gatewayaddr->setText(_pppdata->gateway());
-      staticgateway->setChecked(true);
+    else
+    {
+        defaultgateway->setChecked(true);
+        hitGatewaySelect(0);
+        defaultroute->setChecked(true);
     }
-    defaultroute->setChecked(_pppdata->defaultroute());
-  }
-  else {
-    defaultgateway->setChecked(true);
-    hitGatewaySelect(0);
-    defaultroute->setChecked(true);
-  }
 }
 
-void GatewayWidget::save() {
-  _pppdata->setGateway(gatewayaddr->text());
-  _pppdata->setDefaultroute(defaultroute->isChecked());
+void GatewayWidget::save()
+{
+    _pppdata->setGateway(gatewayaddr->text());
+    _pppdata->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);
-  }
+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( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
-    : QWidget(parent, name),_pppdata(pd)
+        : QWidget(parent, name),_pppdata(pd)
 {
 
-  QVBoxLayout *tl = new QVBoxLayout(this, 0 );
-  se = new ScriptEdit(this);
-  connect(se, SIGNAL(returnPressed()), SLOT(addButton()));
-  tl->addWidget(se);
-
-  // insert equal-sized buttons
-  QHBoxLayout *hl = new QHBoxLayout( this );
-  tl->addLayout( hl );
-  add = new QPushButton( tr("Add"), this );
-  hl->addWidget( add );
-  connect(add, SIGNAL(clicked()), SLOT(addButton()));
-  insert = new QPushButton( tr("Insert"), this );
-  hl->addWidget( insert );
-  connect(insert, SIGNAL(clicked()), SLOT(insertButton()));
-  remove = new QPushButton( tr("Remove"), this );
-  hl->addWidget( remove );
-  connect(remove, SIGNAL(clicked()), SLOT(removeButton()));
-
-  QHBoxLayout *l12 = new QHBoxLayout(0);
-  tl->addLayout(l12);
-  stl = new QListBox(this);
-//  stl->setVScrollBarMode( QScrollView::AlwaysOff );
-  connect(stl, SIGNAL(highlighted(int)), SLOT(stlhighlighted(int)));
-//  stl->setMinimumSize(QSize(70, 140));
-
-  sl = new QListBox(this);
-//  sl->setVScrollBarMode( QScrollView::AlwaysOff );
-  connect(sl, SIGNAL(highlighted(int)), SLOT(slhighlighted(int)));
-//  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->scriptType();
-    QStringList &arglist = _pppdata->script();
-    QStringList::Iterator itcom = comlist.begin();
-    QStringList::Iterator itarg = arglist.begin();
-
-    for ( ;
-          itcom != comlist.end() && itarg != arglist.end();
-          ++itcom, ++itarg )
+    QVBoxLayout *tl = new QVBoxLayout(this, 0 );
+    se = new ScriptEdit(this);
+    connect(se, SIGNAL(returnPressed()), SLOT(addButton()));
+    tl->addWidget(se);
+
+    // insert equal-sized buttons
+    QHBoxLayout *hl = new QHBoxLayout( this );
+    tl->addLayout( hl );
+    add = new QPushButton( tr("Add"), this );
+    hl->addWidget( add );
+    connect(add, SIGNAL(clicked()), SLOT(addButton()));
+    insert = new QPushButton( tr("Insert"), this );
+    hl->addWidget( insert );
+    connect(insert, SIGNAL(clicked()), SLOT(insertButton()));
+    remove = new QPushButton( tr("Remove"), this );
+    hl->addWidget( remove );
+    connect(remove, SIGNAL(clicked()), SLOT(removeButton()));
+
+    QHBoxLayout *l12 = new QHBoxLayout(0);
+    tl->addLayout(l12);
+    stl = new QListBox(this);
+    //  stl->setVScrollBarMode( QScrollView::AlwaysOff );
+    connect(stl, SIGNAL(highlighted(int)), SLOT(stlhighlighted(int)));
+    //  stl->setMinimumSize(QSize(70, 140));
+
+    sl = new QListBox(this);
+    //  sl->setVScrollBarMode( QScrollView::AlwaysOff );
+    connect(sl, SIGNAL(highlighted(int)), SLOT(slhighlighted(int)));
+    //  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)
     {
-      stl->insertItem(*itcom);
-      sl->insertItem(*itarg);
+        QStringList &comlist = _pppdata->scriptType();
+        QStringList &arglist = _pppdata->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();
+    insert->setEnabled(false);
+    remove->setEnabled(false);
+    adjustScrollBar();
+    tl->activate();
 }
 
-bool ScriptWidget::check() {
-  uint lstart = 0;
-  uint lend  = 0;
-  uint errcnt = 0;
+bool ScriptWidget::check()
+{
+    uint lstart = 0;
+    uint lend  = 0;
+    uint errcnt = 0;
 
-  if(sl->count() > 0)   {
-    for( uint i=0; i <= sl->count()-1; i++) {
-	if(stl->text(i) == "LoopStart") {
-		lstart++;
-        }
-	if (stl->text(i) == "LoopEnd") {
-		lend++;
+    if(sl->count() > 0)
+    {
+        for( uint i=0; i <= sl->count()-1; i++)
+        {
+            if(stl->text(i) == "LoopStart")
+            {
+                lstart++;
+            }
+            if (stl->text(i) == "LoopEnd")
+            {
+                lend++;
+            }
+            if ( lend > lstart ) errcnt++;
         }
-	if ( lend > lstart ) errcnt++;
+        return ( (errcnt == 0 ) && (lstart == lend) );
     }
-    return ( (errcnt == 0 ) && (lstart == lend) );
-  }
-  return true;
+    return true;
 }
 
 
-void ScriptWidget::save() {
-  QStringList typelist, arglist;
-  for(uint i=0; i < sl->count(); i++) {
-    typelist.append(stl->text(i));
-    arglist.append(sl->text(i));
-  }
-  _pppdata->setScriptType(typelist);
-  _pppdata->setScript(arglist);
+void ScriptWidget::save()
+{
+    QStringList typelist, arglist;
+    for(uint i=0; i < sl->count(); i++)
+    {
+        typelist.append(stl->text(i));
+        arglist.append(sl->text(i));
+    }
+    _pppdata->setScriptType(typelist);
+    _pppdata->setScript(arglist);
 }
 
 
 
-void ScriptWidget::adjustScrollBar() {
-  if((int)sl->count() <= sl->numItemsVisible())
-    slb->setRange(0, 0);
-  else
-    slb->setRange(0, (sl->count() - sl->numItemsVisible())+1);
+void ScriptWidget::adjustScrollBar()
+{
+    if((int)sl->count() <= sl->numItemsVisible())
+        slb->setRange(0, 0);
+    else
+        slb->setRange(0, (sl->count() - sl->numItemsVisible())+1);
 }
 
 
-void ScriptWidget::scrolling(int i) {
-  sl->setTopItem(i);
-  stl->setTopItem(i);
+void ScriptWidget::scrolling(int i)
+{
+    sl->setTopItem(i);
+    stl->setTopItem(i);
 }
 
 
-void ScriptWidget::slhighlighted(int i) {
-  insert->setEnabled(true);
-  remove->setEnabled(true);
-  stl->setCurrentItem(i);
+void ScriptWidget::slhighlighted(int i)
+{
+    insert->setEnabled(true);
+    remove->setEnabled(true);
+    stl->setCurrentItem(i);
 }
 
 
-void ScriptWidget::stlhighlighted(int i) {
-  insert->setEnabled(true);
-  remove->setEnabled(true);
-  sl->setCurrentItem(i);
+void ScriptWidget::stlhighlighted(int i)
+{
+    insert->setEnabled(true);
+    remove->setEnabled(true);
+    sl->setCurrentItem(i);
 }
 
 
-void ScriptWidget::addButton() {
-  //don't allow more than the maximum script entries
-  if(sl->count() == MAX_SCRIPT_ENTRIES-1)
-    return;
+void ScriptWidget::addButton()
+{
+    //don't allow more than the maximum script entries
+    if(sl->count() == MAX_SCRIPT_ENTRIES-1)
+        return;
 
-  switch(se->type()) {
+    switch(se->type())
+    {
     case ScriptEdit::Expect:
-      stl->insertItem("Expect");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("Expect");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::Send:
-      stl->insertItem("Send");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("Send");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::SendNoEcho:
-      stl->insertItem("SendNoEcho");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("SendNoEcho");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::Pause:
-      stl->insertItem("Pause");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("Pause");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::Hangup:
-      stl->insertItem("Hangup");
-      sl->insertItem("");
-      break;
+        stl->insertItem("Hangup");
+        sl->insertItem("");
+        break;
 
     case ScriptEdit::Answer:
-      stl->insertItem("Answer");
-      sl->insertItem("");
-      break;
+        stl->insertItem("Answer");
+        sl->insertItem("");
+        break;
 
     case ScriptEdit::Timeout:
-      stl->insertItem("Timeout");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("Timeout");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::Password:
-      stl->insertItem("Password");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("Password");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::ID:
-      stl->insertItem("ID");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("ID");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::Prompt:
-      stl->insertItem("Prompt");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("Prompt");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::PWPrompt:
-      stl->insertItem("PWPrompt");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("PWPrompt");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::LoopStart:
-      stl->insertItem("LoopStart");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("LoopStart");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::LoopEnd:
-      stl->insertItem("LoopEnd");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("LoopEnd");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::Scan:
-      stl->insertItem("Scan");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("Scan");
+        sl->insertItem(se->text());
+        break;
 
     case ScriptEdit::Save:
-      stl->insertItem("Save");
-      sl->insertItem(se->text());
-      break;
+        stl->insertItem("Save");
+        sl->insertItem(se->text());
+        break;
 
     default:
-      break;
-  }
+        break;
+    }
 
-  //get the scrollbar adjusted, and scroll the list so we can see what
-  //we're adding to
-  adjustScrollBar();
-  slb->setValue(slb->maxValue());
+    //get the scrollbar adjusted, and scroll the list so we can see what
+    //we're adding to
+    adjustScrollBar();
+    slb->setValue(slb->maxValue());
 
-  //clear the text in the entry box
-  se->setText("");
+    //clear the text in the entry box
+    se->setText("");
 }
 
 
-void ScriptWidget::insertButton() {
-  //exit if there is no highlighted item, or we've reached the
-  //maximum entries in the script list
-  if(sl->currentItem() < 0 || (sl->count() == MAX_SCRIPT_ENTRIES-1))
-    return;
+void ScriptWidget::insertButton()
+{
+    //exit if there is no highlighted item, or we've reached the
+    //maximum entries in the script list
+    if(sl->currentItem() < 0 || (sl->count() == MAX_SCRIPT_ENTRIES-1))
+        return;
 
-  switch(se->type()) {
+    switch(se->type())
+    {
     case ScriptEdit::Expect:
-      stl->insertItem("Expect", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("Expect", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::Send:
-      stl->insertItem("Send", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("Send", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::SendNoEcho:
-      stl->insertItem("SendNoEcho", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("SendNoEcho", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::Pause:
-      stl->insertItem("Pause", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("Pause", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::Hangup:
-      stl->insertItem("Hangup", stl->currentItem());
-      sl->insertItem("", sl->currentItem());
-      break;
+        stl->insertItem("Hangup", stl->currentItem());
+        sl->insertItem("", sl->currentItem());
+        break;
 
     case ScriptEdit::Answer:
-      stl->insertItem("Answer", stl->currentItem());
-      sl->insertItem("", sl->currentItem());
-      break;
+        stl->insertItem("Answer", stl->currentItem());
+        sl->insertItem("", sl->currentItem());
+        break;
 
     case ScriptEdit::Timeout:
-      stl->insertItem("Timeout", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("Timeout", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::Password:
-      stl->insertItem("Password", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("Password", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::ID:
-      stl->insertItem("ID", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("ID", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::Prompt:
-      stl->insertItem("Prompt", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("Prompt", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::PWPrompt:
-      stl->insertItem("PWPrompt", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("PWPrompt", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::LoopStart:
-      stl->insertItem("LoopStart", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("LoopStart", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::LoopEnd:
-      stl->insertItem("LoopEnd", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("LoopEnd", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::Scan:
-      stl->insertItem("Scan", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("Scan", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     case ScriptEdit::Save:
-      stl->insertItem("Save", stl->currentItem());
-      sl->insertItem(se->text(), sl->currentItem());
-      break;
+        stl->insertItem("Save", stl->currentItem());
+        sl->insertItem(se->text(), sl->currentItem());
+        break;
 
     default:
-      break;
-  }
-  adjustScrollBar();
-  se->setText("");
+        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);
- }
+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);
+    }
 }
 
 
@@ -1089,45 +1164,47 @@ void ScriptWidget::removeButton() {
 //
 /////////////////////////////////////////////////////////////////////////////
 PhoneNumberDialog::PhoneNumberDialog(QWidget *parent)
-    : QDialog(parent,"PhoneNumberDialog",true)
+        : QDialog(parent,"PhoneNumberDialog",true)
 {
     setCaption( tr("Add Phone Number") );
 
 
-  QVBoxLayout *layout = new QVBoxLayout( this );
-  layout->setSpacing( 3 );
-  layout->setMargin( 3 );
+    QVBoxLayout *layout = new QVBoxLayout( this );
+    layout->setSpacing( 3 );
+    layout->setMargin( 3 );
 
-//    QHBox *hbox = new QHBox(this);
-//  setMainWidget(hbox);
+    //    QHBox *hbox = new QHBox(this);
+    //  setMainWidget(hbox);
 
-//  hbox->setSpacing( 2 );//KDialog::spacingHint());
+    //  hbox->setSpacing( 2 );//KDialog::spacingHint());
 
-  QLabel *label = new QLabel(this, tr("Enter a phone number:"));
-  layout->addWidget( label );
+    QLabel *label = new QLabel(this, tr("Enter a phone number:"));
+    layout->addWidget( label );
 
-  le = new QLineEdit(this, "lineEdit");
-  layout->addWidget( le );
+    le = new QLineEdit(this, "lineEdit");
+    layout->addWidget( le );
 
-  connect(le, SIGNAL(textChanged(const QString &)),
-	  this, SLOT(textChanged(const QString &)));
+    connect(le, SIGNAL(textChanged(const QString &)),
+            this, SLOT(textChanged(const QString &)));
 
-  le->setFocus();
-  textChanged("");
+    le->setFocus();
+    textChanged("");
 
 
 }
 
 
-QString PhoneNumberDialog::phoneNumber() {
-  QString s = le->text();
+QString PhoneNumberDialog::phoneNumber()
+{
+    QString s = le->text();
 
-  return s;
+    return s;
 }
 
 
-void PhoneNumberDialog::textChanged(const QString &s) {
-//  enableButtonOK(s.length() > 0);
+void PhoneNumberDialog::textChanged(const QString &s)
+{
+    //  enableButtonOK(s.length() > 0);
 }