[PC-BSD Commits] r2160 - pcbsd/trunk/NetworkManager

svn at pcbsd.org svn at pcbsd.org
Mon Jun 23 17:50:22 PDT 2008


Author: kris
Date: 2008-06-23 17:50:18 -0700 (Mon, 23 Jun 2008)
New Revision: 2160

Modified:
   pcbsd/trunk/NetworkManager/kcm.cpp
   pcbsd/trunk/NetworkManager/networkman.cpp
   pcbsd/trunk/NetworkManager/networkman.h
   pcbsd/trunk/NetworkManager/networkman.ui
Log:

Updated the network manager kcm module, now it is primarly an information
device, all actual changes take place in other tools which run as root.



Modified: pcbsd/trunk/NetworkManager/kcm.cpp
===================================================================
--- pcbsd/trunk/NetworkManager/kcm.cpp	2008-06-24 00:43:46 UTC (rev 2159)
+++ pcbsd/trunk/NetworkManager/kcm.cpp	2008-06-24 00:50:18 UTC (rev 2160)
@@ -1,12 +1,12 @@
 #include <qlayout.h>
-
+#include <Q3GridLayout>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kgenericfactory.h>
-#include <networkman.h>
-#include <kcm.h>
+#include "networkman.h"
 #include <kcmodule.h>
-#include <stdlib.h>
+#include <kcm.h>
+#include <qtranslator.h>
 
 K_PLUGIN_FACTORY(PCBSDNETFactory,
                  registerPlugin<PCBSDKCModule>();
@@ -66,7 +66,6 @@
 
 void    PCBSDKCModule::save() {
     
-   netproc->save();
    emit changed(FALSE);
 }
 

Modified: pcbsd/trunk/NetworkManager/networkman.cpp
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.cpp	2008-06-24 00:43:46 UTC (rev 2159)
+++ pcbsd/trunk/NetworkManager/networkman.cpp	2008-06-24 00:50:18 UTC (rev 2160)
@@ -39,21 +39,11 @@
         
     connect(listNetDev, SIGNAL(selectionChanged()), this, SLOT(DevSelectionChanged()) );
     connect(pushConfigure, SIGNAL(clicked()), this, SLOT(PropertiesSlot()) );
+    connect(pushAdminConfig, SIGNAL(clicked()), this, SLOT(slotOpenAdminDlg()) );
     connect(checkSysTray, SIGNAL(clicked()), this, SLOT(slotSysTray()) );
-    connect(checkPPPOE, SIGNAL(clicked()), this, SLOT(slotCheckGlobalText()) );    
     connect(listNetDev, SIGNAL(doubleClicked( Q3ListBoxItem *) ), this, SLOT(slotDoubleClick(Q3ListBoxItem *) ) );
          
-    // Connect the slots to determine if we need to enable the apply button
-    connect( lineHostname, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText() ) );
-    connect( lineGateway, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText() ) );
-    connect( lineDNS1, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText() ) );
-    connect( lineDNS2, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText() ) );
-    connect( linePPPUsername, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText() ) );
-    connect( linePPPPassword, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText() ) );
     
-    connect( lineIPv6Gateway, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText() ) );
-    
-    
     // Load any global settings
     loadGlobals();
     
@@ -455,14 +445,6 @@
 
     // Check for IPv6 settings
     tmp = getValue("/etc/rc.conf", "ipv6_enable=", 1) ;
-    if ( tmp == "YES" ) {
-	checkIPv6Enable->setChecked(TRUE);
-	lineIPv6Gateway->setEnabled(TRUE);
-    } else {
-	checkIPv6Enable->setChecked(FALSE);
-	lineIPv6Gateway->setEnabled(FALSE);
-    }
-    
     lineIPv6Gateway->setText(getValue("/etc/rc.conf", "ipv6_defaultrouter=", 1) );
     
     
@@ -474,9 +456,6 @@
        loadPPPOEConfig();
    }
 	
-    // See if we need to enable the PPPOE group box
-    slotPPPOECheckBox();
-    
 }
 
 
@@ -548,13 +527,6 @@
 	runCommand("route add default " + lineGateway->text() );
    }
 
-   //runCommand("/etc/rc.d/routing restart &");
-   if ( checkPPPOE->isChecked() ) {
-      runCommand("/etc/rc.d/ppp restart &");
-   } else {
-      runCommand("/etc/rc.d/ppp stop &");
-   }
-
 }
 
 
@@ -719,105 +691,6 @@
 }
 
 
-void NetworkMan::save()
-{
-    
-    if ( ! Changed )
-    {
-	return;
-    }
-    
-    saveValue("/etc/rc.conf", "hostname=", "hostname=\"" + lineHostname->text() + "\"", -1);
-    saveValue("/etc/hosts", "::1", "::1\t\t\tlocalhost localhost.localdomain " + lineHostname->text() + ".localhost " + lineHostname->text(), -1);
-    saveValue("/etc/hosts", "127.0.0.1", "127.0.0.1\t\tlocalhost localhost.localdomain " + lineHostname->text() + ".localhost " + lineHostname->text(), -1);
-    
-    
-    if ( lineGateway->text() == "..." ) {
-     saveValue("/etc/rc.conf", "defaultrouter=", "", -1);
-   } else {
-     saveValue("/etc/rc.conf", "defaultrouter=", "defaultrouter=\"" + lineGateway->text() + "\"", -1);  
-   }
-   
-   int DNSline = 1;
-   
-   
-    if ( lineDNS1->text() == "..." ) {
-     saveValue("/etc/resolv.conf", "nameserver", "", DNSline);
-   } else {
-     saveValue("/etc/resolv.conf", "nameserver", "nameserver " + lineDNS1->text(), DNSline);  
-     DNSline++;
-   }   
-    if ( lineDNS2->text() == "..." ) {
-     saveValue("/etc/resolv.conf", "nameserver", "", DNSline);
-   } else {
-     saveValue("/etc/resolv.conf", "nameserver", "nameserver " + lineDNS2->text(), DNSline);  
-   }   
-   
-    if (checkPPPOE->isChecked())
-   {
-	savePPPOEConfig();
-   } else {
-	disablePPPOEConfig();
-   }
-   
-   // Save the IPv6 stuff
-    if ( checkIPv6Enable->isChecked() ) {
-	
-	saveValue("/etc/rc.conf", "ipv6_enable=", "ipv6_enable=\"YES\"", -1);
-	saveValue("/etc/rc.conf", "ipv6_defaultrouter=", "ipv6_defaultrouter=\"" + lineIPv6Gateway->text() + "\"", -1);
-    } else {
-	saveValue("/etc/rc.conf", "ipv6_enable=", "", -1);
-	saveValue("/etc/rc.conf", "ipv6_defaultrouter=", "", -1);
-    }
-   
-    loadGlobals();
-    restartNetwork();
-}
-
-
-void NetworkMan::slotCheckGlobalText()
-{
-   QRegExp hostnameRegExp("^(([a-z0-9][a-z0-9-]*[a-z0-9])|([a-z0-9]+))$");
-   textGlobalError->setText("");
-   lineHostname->setBackgroundColor(colourWhite);
-  
-     if ( lineDNS1->text() != "..."  && ! checkRange(lineDNS1->text() ) ) {
-	 QMessageBox::warning( this, tr("Warning"),
-	  tr("DNS #1 is out of range! (") + lineDNS1->text() + tr(") Fields must be between 0-255.") );
-	 return;
-     }
-    
-    if ( lineDNS2->text() != "..."  && ! checkRange(lineDNS2->text() ) ) {
-	 QMessageBox::warning( this, tr("Warning"),
-	  tr("DNS #2 is out of range! (") + lineDNS2->text() + tr(") Fields must be between 0-255.") );
-	 return;
-     }
-    
-    
-     if ( lineGateway->text() != "..."  && ! checkRange(lineGateway->text() ) ) {
-	 QMessageBox::warning( this, tr("Warning"),
-	  tr("Gateway is out of range! (") + lineGateway->text() + tr(") Fields must be between 0-255.") );
-	 return;
-     }
-     
-     /**
-     Hostnames must:
-     - Contain only a-z, 0-9, and hyphens (-)
-     - Not have a hyphen as the first or last character
-     **/
-     lineHostname->setText(lineHostname->text().lower());
-     if (lineHostname->text().isEmpty()) textGlobalError->setText(tr("Please enter a hostname"));
-     else if (hostnameRegExp.search(lineHostname->text()) == -1)
-     {
-        textGlobalError->setText(tr("Hostname may only contain letters and numbers"));
-        lineHostname->setBackgroundColor(colourRed);
-     }
-     
-     Changed=TRUE;
-     emit changed(TRUE);
-}
-
-
 void NetworkMan::slotDoubleClick( Q3ListBoxItem *item )
 {
     // Start the configuration dialog
@@ -825,17 +698,6 @@
 }
 
 
-void NetworkMan::slotPPPOECheckBox()
-{
-   // Check if we need to enable the PPPOE groupbox or not
-   if ( ! checkPPPOE->isChecked() ) {
-       groupBoxPPPOE->setEnabled(FALSE);
-   } else {
-       groupBoxPPPOE->setEnabled(TRUE);
-   }
-}
-
-
 void NetworkMan::loadPPPOEConfig()
 {
     
@@ -847,9 +709,6 @@
      
      // Check to see if PPPoE is enabled
      tmp = getValue( "/etc/rc.conf", "ppp_enable=", 1 );
-     if ( tmp == "YES" ) {
-     checkPPPOE->setChecked(TRUE); 
-     }
 
 
 
@@ -926,87 +785,12 @@
 }
 
 
-void NetworkMan::savePPPOEConfig()
-{
-        // Make or update the entry in the /etc/ppp.conf file
-        updatePPPconf();
-
-        saveValue( "/etc/rc.conf", "ppp_enable", "ppp_enable=\"YES\"", -1);
-        if ( checkPPPAlwaysOn->isChecked() ) {
-		saveValue( "/etc/rc.conf", "ppp_mode", "ppp_mode=\"ddial\"", -1);
-	} else {
-		saveValue( "/etc/rc.conf", "ppp_mode", "ppp_mode=\"background\"", -1);
-	}
-        if ( checkPPPNat->isChecked() ) {
-		saveValue( "/etc/rc.conf", "ppp_nat", "ppp_nat=\"YES\"", -1);
-	} else {
-		saveValue( "/etc/rc.conf", "ppp_nat", "ppp_nat=\"NO\"", -1);
-	}
-	
-	saveValue( "/etc/rc.conf", "ppp_profile", "ppp_profile=\"" + linePPPService->text() + "\"", -1);
-}
-
-
-void NetworkMan::updatePPPconf()
-{
-    
-     QString DeviceName = comboPPPOEDev->currentText();
-    
-     QFile filein( "/etc/ppp/ppp.conf" );
-     QFile fileout( "/etc/ppp/ppp.conf" );
-     QString SavedFile;
-     QString ProfileName = linePPPService->text();
-
-
-     SavedFile = "default:\n set timeout 180\n enable dns\n\n" + ProfileName + ":\n  set device PPPoE:" + DeviceName + ":" + ProfileName + "\n  set authname " + linePPPUsername->text() + "\n  set authkey " + linePPPPassword->text() + "\n  set dial\n  set login\n  set ifaddr 0 0\n  add default HISADDR";
-
-    if ( fileout.open( IO_WriteOnly ) ) {
-        QTextStream streamout( &fileout );
-                    streamout << SavedFile;
-        fileout.close();
-    }
-
-
-    runCommand("chmod 755 /etc/ppp/ppp.conf");
-    
-}
-
-
-void NetworkMan::disablePPPOEConfig()
-{
-	// Update the ppp.conf file to remove any old profile information
-	updatePPPconf();
-	saveValue( "/etc/rc.conf", "ppp_enable", "", -1);
-	saveValue( "/etc/rc.conf", "ppp_mode", "", -1);
-	saveValue( "/etc/rc.conf", "ppp_nat", "", -1);
-	saveValue( "/etc/rc.conf", "ppp_profile", "", -1);
-}
-
-
-void NetworkMan::slotPPPOEChanged()
-{
-    // Run the check to see if we need to enable the apply button
-    slotCheckGlobalText();
-}
-
-
 void NetworkMan::slotTimerRefresh()
 {
     QTimer::singleShot( 1000, this, SLOT(refreshDevices()) );
 }
 
 
-void NetworkMan::slotIPv6Checked()
-{
-    
-    if ( checkIPv6Enable->isChecked() ) {
-	lineIPv6Gateway->setEnabled(TRUE);
-    } else {
-	lineIPv6Gateway->setEnabled(FALSE);
-    }
-    Changed=TRUE;
-    emit changed(TRUE);
-}
 
 
 void NetworkMan::slotListRightClick( Q3ListBoxItem *item, const QPoint &pos )
@@ -1113,13 +897,10 @@
     pushConfigure->setEnabled(FALSE);
     lineDNS1->setEnabled(FALSE);
     lineDNS2->setEnabled(FALSE);
-    checkIPv6Enable->setEnabled(FALSE);
     lineHostname->setEnabled(FALSE);
     lineGateway->setEnabled(FALSE);
     lineIPv6Gateway->setEnabled(FALSE);
-    //tabNetMan->setEnabled(FALSE);
     
-    checkPPPOE->setEnabled(FALSE);
     linePPPUsername->setEnabled(FALSE);
     linePPPPassword->setEnabled(FALSE);
     linePPPService->setEnabled(FALSE);
@@ -1127,10 +908,6 @@
     checkPPPAlwaysOn->setEnabled(FALSE);
     checkPPPNat->setEnabled(FALSE);
     
-    
-    
-    
-    
 }
 
 
@@ -1140,3 +917,21 @@
    if (ifr.isUp()) return "UP";
    return "DOWN";
 }
+
+void NetworkMan::slotOpenAdminDlg()
+{
+     ConfigSys = new Q3Process( this );
+     // If we are running as root
+     if ( getuid() != 0 )
+     {
+         ConfigSys->addArgument( "kdesu");
+         ConfigSys->addArgument( "-d");
+         ConfigSys->addArgument( "--noignorebutton");
+      }
+      ConfigSys->addArgument( "/PCBSD/networkmanager/bin/NetworkManAdmin-bin" );
+    
+      connect( ConfigSys, SIGNAL(processExited()), this, SLOT(loadGlobals() ) );
+       
+     if ( ConfigSys->start() ) {
+     }
+}

Modified: pcbsd/trunk/NetworkManager/networkman.h
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.h	2008-06-24 00:43:46 UTC (rev 2159)
+++ pcbsd/trunk/NetworkManager/networkman.h	2008-06-24 00:50:18 UTC (rev 2160)
@@ -23,9 +23,6 @@
 
 public slots:
     void Init();
-    void save();
-    void slotCheckGlobalText();
-    void slotPPPOECheckBox();
 
 private slots:
     void detectDev();
@@ -34,14 +31,14 @@
     void restartNetwork();
     void refreshDevices();
     void slotSysTray();
-    void slotPPPOEChanged();
     void slotTimerRefresh();
-    void slotIPv6Checked();
     void slotListRightClick( Q3ListBoxItem * item, const QPoint &pos );
     void slotDisableDevice();
     void slotEnableDevice();
     void slotShowInfoConfig();
     void slotDoubleClick( Q3ListBoxItem * item );
+    void slotOpenAdminDlg();
+    void loadGlobals();
 
 
 private:
@@ -59,6 +56,7 @@
     restartPopup *restartDialog;
     QString DevsType[100];
     Q3Process *ConfigDevice;
+    Q3Process *ConfigSys;
     QString username;
     int firstUpdate;
     KMenu *popup;
@@ -75,15 +73,11 @@
     void runCommand( QString command );
     QString getValue( QString File, QString Key, int occur );
     void saveValue( QString File, QString oldKey, QString newKey, int occur );
-    void loadGlobals();
     QString getNetmaskForIdent( QString ident );
     bool checkRange( QString IP );
     QString getTypeForIdent( QString ident );
-    void loadPPPOEConfig();
-    void savePPPOEConfig();
-    void updatePPPconf();
-    void disablePPPOEConfig();
     QString getUpStatusForIdent( QString ident );
+    void loadPPPOEConfig();
 
 signals:
 	void changed(bool);

Modified: pcbsd/trunk/NetworkManager/networkman.ui
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui	2008-06-24 00:43:46 UTC (rev 2159)
+++ pcbsd/trunk/NetworkManager/networkman.ui	2008-06-24 00:50:18 UTC (rev 2160)
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>700</width>
-    <height>571</height>
+    <height>411</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -37,14 +37,14 @@
         <x>0</x>
         <y>0</y>
         <width>666</width>
-        <height>510</height>
+        <height>350</height>
        </rect>
       </property>
       <attribute name="title" >
        <string>Devices</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" colspan="7" >
+      <layout class="QGridLayout" name="gridLayout_3" >
+       <item row="0" column="0" colspan="3" >
         <widget class="QLabel" name="textLabel1" >
          <property name="text" >
           <string>Local Network Adapters</string>
@@ -57,7 +57,7 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="9" >
+       <item row="1" column="0" colspan="4" >
         <widget class="Q3ListBox" name="listNetDev" >
          <property name="sizePolicy" >
           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@@ -78,111 +78,50 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="4" >
+       <item row="2" column="0" colspan="2" >
         <widget class="QCheckBox" name="checkSysTray" >
          <property name="text" >
           <string>Display system tray icon</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0" colspan="9" >
-        <widget class="Line" name="line1" >
-         <property name="frameShape" >
-          <enum>QFrame::HLine</enum>
+       <item row="2" column="2" >
+        <spacer name="spacer3" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
          </property>
-         <property name="frameShadow" >
-          <enum>QFrame::Sunken</enum>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
          </property>
-        </widget>
-       </item>
-       <item row="10" column="3" colspan="2" >
-        <widget class="QLineEdit" name="lineDNS1" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>230</width>
+           <height>20</height>
+          </size>
          </property>
-         <property name="inputMask" >
-          <string>999\.999\.999\.999; </string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignHCenter</set>
-         </property>
-        </widget>
+        </spacer>
        </item>
-       <item row="10" column="1" colspan="2" >
-        <widget class="QLabel" name="textLabel11_2_2" >
+       <item row="2" column="3" >
+        <widget class="QPushButton" name="pushConfigure" >
          <property name="text" >
-          <string>DNS 1:</string>
+          <string>&amp;Configure</string>
          </property>
-         <property name="alignment" >
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <property name="shortcut" >
+          <string>Alt+C</string>
          </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
         </widget>
        </item>
-       <item row="11" column="1" colspan="2" >
-        <widget class="QLabel" name="textLabel11_2_3" >
-         <property name="text" >
-          <string>DNS 2:</string>
+       <item row="3" column="0" colspan="4" >
+        <widget class="Line" name="line1" >
+         <property name="frameShape" >
+          <enum>QFrame::HLine</enum>
          </property>
-         <property name="alignment" >
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <property name="frameShadow" >
+          <enum>QFrame::Sunken</enum>
          </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
         </widget>
        </item>
-       <item row="11" column="3" colspan="2" >
-        <widget class="QLineEdit" name="lineDNS2" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="inputMask" >
-          <string>999\.999\.999\.999; </string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignHCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="5" >
-        <widget class="QLabel" name="textLabel11" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text" >
-          <string>Hostname:</string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="6" colspan="2" >
-        <widget class="QLineEdit" name="lineHostname" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0" colspan="9" >
+       <item row="4" column="0" colspan="4" >
         <widget class="QLabel" name="textLabel2" >
          <property name="text" >
           <string>Device Status</string>
@@ -195,17 +134,20 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="2" colspan="7" >
-        <widget class="QLabel" name="textStatus3" >
+       <item row="5" column="0" >
+        <widget class="QLabel" name="textStatusLabel1" >
          <property name="text" >
-          <string/>
+          <string>Link Status:</string>
          </property>
+         <property name="alignment" >
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
          <property name="wordWrap" >
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="5" column="2" colspan="7" >
+       <item row="5" column="1" colspan="3" >
         <widget class="QLabel" name="textStatus1" >
          <property name="text" >
           <string/>
@@ -215,21 +157,11 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="2" colspan="7" >
-        <widget class="QLabel" name="textStatus2" >
+       <item row="6" column="0" >
+        <widget class="QLabel" name="textStatusLabel2" >
          <property name="text" >
-          <string/>
+          <string>IP Address:</string>
          </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0" colspan="2" >
-        <widget class="QLabel" name="textStatusLabel1" >
-         <property name="text" >
-          <string>Link Status:</string>
-         </property>
          <property name="alignment" >
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
@@ -238,20 +170,17 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0" colspan="2" >
-        <widget class="QLabel" name="textStatusLabel2" >
+       <item row="6" column="1" colspan="3" >
+        <widget class="QLabel" name="textStatus2" >
          <property name="text" >
-          <string>IP Address:</string>
+          <string/>
          </property>
-         <property name="alignment" >
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
          <property name="wordWrap" >
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="7" column="0" colspan="2" >
+       <item row="7" column="0" >
         <widget class="QLabel" name="textStatusLabel3" >
          <property name="text" >
           <string>MAC Address:</string>
@@ -264,62 +193,17 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="4" colspan="3" >
-        <spacer name="spacer3" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>230</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="7" colspan="2" >
-        <widget class="QPushButton" name="pushConfigure" >
+       <item row="7" column="1" colspan="3" >
+        <widget class="QLabel" name="textStatus3" >
          <property name="text" >
-          <string>&amp;Configure</string>
+          <string/>
          </property>
-         <property name="shortcut" >
-          <string>Alt+C</string>
-         </property>
-        </widget>
-       </item>
-       <item row="14" column="0" colspan="9" >
-        <spacer name="spacer23" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>620</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="9" column="0" colspan="9" >
-        <widget class="QLabel" name="textLabel1_2" >
-         <property name="text" >
-          <string>System-wide configuration settings</string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignCenter</set>
-         </property>
          <property name="wordWrap" >
-          <bool>true</bool>
+          <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="8" column="0" colspan="9" >
+       <item row="8" column="0" colspan="4" >
         <widget class="Line" name="line1_2" >
          <property name="frameShape" >
           <enum>QFrame::HLine</enum>
@@ -329,131 +213,35 @@
          </property>
         </widget>
        </item>
-       <item rowspan="3" row="10" column="0" >
-        <spacer name="spacer21" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>87</width>
-           <height>100</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="11" column="5" >
-        <widget class="QLabel" name="textLabel11_2" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
+       <item row="9" column="0" colspan="4" >
+        <widget class="QLabel" name="textGlobalError" >
          <property name="text" >
-          <string>Gateway:</string>
+          <string/>
          </property>
          <property name="alignment" >
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          <set>Qt::AlignCenter</set>
          </property>
          <property name="wordWrap" >
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="11" column="6" colspan="2" >
-        <widget class="QLineEdit" name="lineGateway" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="inputMask" >
-          <string>999\.999\.999\.999; </string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignHCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item rowspan="3" row="10" column="8" >
-        <spacer name="spacer21_2" >
+       <item row="10" column="0" colspan="4" >
+        <spacer name="spacer23" >
          <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
+          <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0" >
           <size>
-           <width>86</width>
-           <height>100</height>
+           <width>620</width>
+           <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="12" column="5" >
-        <widget class="QLabel" name="textLabel11_2_4" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text" >
-          <string>IPv6 gateway:</string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="12" column="6" colspan="2" >
-        <widget class="QLineEdit" name="lineIPv6Gateway" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="inputMask" >
-          <string/>
-         </property>
-         <property name="text" >
-          <string/>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignHCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="12" column="2" colspan="3" >
-        <widget class="QCheckBox" name="checkIPv6Enable" >
-         <property name="text" >
-          <string>Enable IPv6 on this system</string>
-         </property>
-        </widget>
-       </item>
-       <item row="13" column="0" colspan="9" >
-        <widget class="QLabel" name="textGlobalError" >
-         <property name="text" >
-          <string/>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignCenter</set>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="TabPage" >
@@ -462,15 +250,15 @@
         <x>0</x>
         <y>0</y>
         <width>666</width>
-        <height>510</height>
+        <height>350</height>
        </rect>
       </property>
       <attribute name="title" >
-       <string>DSL / PPPoE </string>
+       <string>Network Configuration (Advanced)</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="3" colspan="2" >
-        <spacer name="spacer26" >
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item rowspan="2" row="0" column="0" >
+        <spacer name="spacer35" >
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
          </property>
@@ -479,39 +267,359 @@
          </property>
          <property name="sizeHint" stdset="0" >
           <size>
-           <width>181</width>
-           <height>20</height>
+           <width>50</width>
+           <height>31</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="0" column="0" colspan="2" >
-        <spacer name="spacer27" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>191</width>
-           <height>21</height>
-          </size>
-         </property>
-        </spacer>
+       <item row="0" column="1" >
+        <layout class="QVBoxLayout" name="verticalLayout_5" >
+         <item>
+          <widget class="QGroupBox" name="groupBox" >
+           <property name="title" >
+            <string>System configuration settings</string>
+           </property>
+           <layout class="QGridLayout" name="gridLayout" >
+            <item row="0" column="0" >
+             <layout class="QHBoxLayout" name="horizontalLayout_2" >
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_4" >
+                <item>
+                 <widget class="QLabel" name="textLabel11_2_2" >
+                  <property name="text" >
+                   <string>DNS 1:</string>
+                  </property>
+                  <property name="alignment" >
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  </property>
+                  <property name="wordWrap" >
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="textLabel11_2_3" >
+                  <property name="text" >
+                   <string>DNS 2:</string>
+                  </property>
+                  <property name="alignment" >
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  </property>
+                  <property name="wordWrap" >
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_3" >
+                <item>
+                 <widget class="QLineEdit" name="lineDNS1" >
+                  <property name="sizePolicy" >
+                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="inputMask" >
+                   <string>999\.999\.999\.999; </string>
+                  </property>
+                  <property name="alignment" >
+                   <set>Qt::AlignHCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLineEdit" name="lineDNS2" >
+                  <property name="sizePolicy" >
+                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="inputMask" >
+                   <string>999\.999\.999\.999; </string>
+                  </property>
+                  <property name="alignment" >
+                   <set>Qt::AlignHCenter</set>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </item>
+            <item row="0" column="1" >
+             <layout class="QHBoxLayout" name="horizontalLayout" >
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_2" >
+                <item>
+                 <widget class="QLabel" name="textLabel11" >
+                  <property name="sizePolicy" >
+                   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="text" >
+                   <string>Hostname:</string>
+                  </property>
+                  <property name="alignment" >
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  </property>
+                  <property name="wordWrap" >
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="textLabel11_2" >
+                  <property name="sizePolicy" >
+                   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="text" >
+                   <string>Gateway:</string>
+                  </property>
+                  <property name="alignment" >
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  </property>
+                  <property name="wordWrap" >
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="textLabel11_2_4" >
+                  <property name="sizePolicy" >
+                   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="text" >
+                   <string>IPv6 gateway:</string>
+                  </property>
+                  <property name="alignment" >
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  </property>
+                  <property name="wordWrap" >
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout" >
+                <item>
+                 <widget class="QLineEdit" name="lineHostname" >
+                  <property name="sizePolicy" >
+                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLineEdit" name="lineGateway" >
+                  <property name="sizePolicy" >
+                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="inputMask" >
+                   <string>999\.999\.999\.999; </string>
+                  </property>
+                  <property name="alignment" >
+                   <set>Qt::AlignHCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLineEdit" name="lineIPv6Gateway" >
+                  <property name="sizePolicy" >
+                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="inputMask" >
+                   <string/>
+                  </property>
+                  <property name="text" >
+                   <string/>
+                  </property>
+                  <property name="alignment" >
+                   <set>Qt::AlignHCenter</set>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="Q3GroupBox" name="groupBoxPPPOE" >
+           <property name="title" >
+            <string>PPPoE configuration</string>
+           </property>
+           <layout class="QGridLayout" >
+            <item row="0" column="0" >
+             <widget class="QLabel" name="textLabel3" >
+              <property name="text" >
+               <string>Username:</string>
+              </property>
+              <property name="alignment" >
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+              <property name="wordWrap" >
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0" >
+             <widget class="QLabel" name="textLabel4" >
+              <property name="text" >
+               <string>Password:</string>
+              </property>
+              <property name="alignment" >
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+              <property name="wordWrap" >
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="3" colspan="3" >
+             <widget class="QCheckBox" name="checkPPPNat" >
+              <property name="text" >
+               <string>Internet Connection Sharing</string>
+              </property>
+              <property name="shortcut" >
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="3" colspan="3" >
+             <widget class="QCheckBox" name="checkPPPAlwaysOn" >
+              <property name="text" >
+               <string>Alwa&amp;ys on connection</string>
+              </property>
+              <property name="shortcut" >
+               <string>Alt+Y</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="5" >
+             <spacer name="spacer31" >
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType" >
+               <enum>QSizePolicy::Expanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>16</width>
+                <height>21</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="0" column="4" >
+             <widget class="QLabel" name="textLabel1_3" >
+              <property name="text" >
+               <string>PPPoE Device</string>
+              </property>
+              <property name="wordWrap" >
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="3" >
+             <widget class="QComboBox" name="comboPPPOEDev" />
+            </item>
+            <item rowspan="3" row="0" column="2" >
+             <spacer name="spacer32" >
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType" >
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>16</width>
+                <height>80</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="2" column="1" >
+             <widget class="QLineEdit" name="linePPPService" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="echoMode" >
+               <enum>QLineEdit::Normal</enum>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1" >
+             <widget class="QLineEdit" name="linePPPPassword" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="echoMode" >
+               <enum>QLineEdit::Password</enum>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1" >
+             <widget class="QLineEdit" name="linePPPUsername" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0" >
+             <widget class="QLabel" name="textLabel4_2" >
+              <property name="text" >
+               <string>Service name (optional):</string>
+              </property>
+              <property name="alignment" >
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+              <property name="wordWrap" >
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
        </item>
-       <item row="0" column="2" >
-        <widget class="QCheckBox" name="checkPPPOE" >
-         <property name="text" >
-          <string>Enable PPPoE on this system</string>
-         </property>
-         <property name="shortcut" >
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="4" >
+       <item rowspan="2" row="0" column="2" >
         <spacer name="spacer34" >
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
@@ -527,7 +635,44 @@
          </property>
         </spacer>
        </item>
-       <item row="2" column="2" >
+       <item row="1" column="1" >
+        <layout class="QHBoxLayout" name="horizontalLayout_3" >
+         <item>
+          <spacer name="horizontalSpacer" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pushAdminConfig" >
+           <property name="text" >
+            <string>Change Configuration</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="1" colspan="2" >
         <spacer name="spacer33" >
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
@@ -543,171 +688,6 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="0" >
-        <spacer name="spacer35" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>50</width>
-           <height>31</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="1" column="1" colspan="3" >
-        <widget class="Q3GroupBox" name="groupBoxPPPOE" >
-         <property name="title" >
-          <string>PPPoE configuration</string>
-         </property>
-         <layout class="QGridLayout" >
-          <item row="0" column="0" >
-           <widget class="QLabel" name="textLabel3" >
-            <property name="text" >
-             <string>Username:</string>
-            </property>
-            <property name="alignment" >
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="wordWrap" >
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="textLabel4" >
-            <property name="text" >
-             <string>Password:</string>
-            </property>
-            <property name="alignment" >
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="wordWrap" >
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="3" colspan="3" >
-           <widget class="QCheckBox" name="checkPPPNat" >
-            <property name="text" >
-             <string>Internet Connection Sharing</string>
-            </property>
-            <property name="shortcut" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="3" colspan="3" >
-           <widget class="QCheckBox" name="checkPPPAlwaysOn" >
-            <property name="text" >
-             <string>Alwa&amp;ys on connection</string>
-            </property>
-            <property name="shortcut" >
-             <string>Alt+Y</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="5" >
-           <spacer name="spacer31" >
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType" >
-             <enum>QSizePolicy::Expanding</enum>
-            </property>
-            <property name="sizeHint" stdset="0" >
-             <size>
-              <width>16</width>
-              <height>21</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="0" column="4" >
-           <widget class="QLabel" name="textLabel1_3" >
-            <property name="text" >
-             <string>PPPoE Device</string>
-            </property>
-            <property name="wordWrap" >
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="3" >
-           <widget class="QComboBox" name="comboPPPOEDev" />
-          </item>
-          <item rowspan="3" row="0" column="2" >
-           <spacer name="spacer32" >
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType" >
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0" >
-             <size>
-              <width>16</width>
-              <height>80</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="2" column="1" >
-           <widget class="QLineEdit" name="linePPPService" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="echoMode" >
-             <enum>QLineEdit::Normal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1" >
-           <widget class="QLineEdit" name="linePPPPassword" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="echoMode" >
-             <enum>QLineEdit::Password</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" >
-           <widget class="QLineEdit" name="linePPPUsername" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="textLabel4_2" >
-            <property name="text" >
-             <string>Service name (optional):</string>
-            </property>
-            <property name="alignment" >
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="wordWrap" >
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
       </layout>
      </widget>
     </widget>
@@ -729,17 +709,9 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>tabNetMan</tabstop>
   <tabstop>listNetDev</tabstop>
   <tabstop>checkSysTray</tabstop>
   <tabstop>pushConfigure</tabstop>
-  <tabstop>lineDNS1</tabstop>
-  <tabstop>lineDNS2</tabstop>
-  <tabstop>checkIPv6Enable</tabstop>
-  <tabstop>lineHostname</tabstop>
-  <tabstop>lineGateway</tabstop>
-  <tabstop>lineIPv6Gateway</tabstop>
-  <tabstop>checkPPPOE</tabstop>
   <tabstop>linePPPUsername</tabstop>
   <tabstop>linePPPPassword</tabstop>
   <tabstop>linePPPService</tabstop>
@@ -765,38 +737,6 @@
  </resources>
  <connections>
   <connection>
-   <sender>checkPPPOE</sender>
-   <signal>clicked()</signal>
-   <receiver>NetworkMan</receiver>
-   <slot>slotPPPOECheckBox()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkPPPOE</sender>
-   <signal>clicked()</signal>
-   <receiver>NetworkMan</receiver>
-   <slot>slotPPPOEChanged()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
    <sender>checkPPPAlwaysOn</sender>
    <signal>clicked()</signal>
    <receiver>NetworkMan</receiver>
@@ -829,22 +769,6 @@
    </hints>
   </connection>
   <connection>
-   <sender>checkIPv6Enable</sender>
-   <signal>clicked()</signal>
-   <receiver>NetworkMan</receiver>
-   <slot>slotIPv6Checked()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
    <sender>listNetDev</sender>
    <signal>rightButtonClicked(Q3ListBoxItem*,QPoint)</signal>
    <receiver>NetworkMan</receiver>



More information about the Commits mailing list