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

svn at pcbsd.org svn at pcbsd.org
Mon Jun 23 09:16:50 PDT 2008


Author: kris
Date: 2008-06-23 09:16:50 -0700 (Mon, 23 Jun 2008)
New Revision: 2155

Added:
   pcbsd/trunk/NetworkManager/NetworkManager.qrc
   pcbsd/trunk/NetworkManager/networkman.cpp
   pcbsd/trunk/NetworkManager/networkman.h
   pcbsd/trunk/NetworkManager/restartpopup.cpp
   pcbsd/trunk/NetworkManager/restartpopup.h
Removed:
   pcbsd/trunk/NetworkManager/main.cpp
   pcbsd/trunk/NetworkManager/netproperties.ui
   pcbsd/trunk/NetworkManager/netproperties.ui.h
   pcbsd/trunk/NetworkManager/notroot.ui
Modified:
   pcbsd/trunk/NetworkManager/NetworkManager.pro
   pcbsd/trunk/NetworkManager/kcm.cpp
   pcbsd/trunk/NetworkManager/kcm.h
   pcbsd/trunk/NetworkManager/networkman.ui
   pcbsd/trunk/NetworkManager/restartpopup.ui
Log:


Added port of NetworkManager to QT4 / KDE4



Modified: pcbsd/trunk/NetworkManager/NetworkManager.pro
===================================================================
--- pcbsd/trunk/NetworkManager/NetworkManager.pro	2008-06-23 14:27:27 UTC (rev 2154)
+++ pcbsd/trunk/NetworkManager/NetworkManager.pro	2008-06-23 16:16:50 UTC (rev 2155)
@@ -3,34 +3,22 @@
 
 CONFIG	+= qt warn_on debug release
 
-LIBS	+= -lpcbsd
+INCLUDEPATH	+= /PCBSD/includes /usr/local/kde4/include
 
-INCLUDEPATH	+= /PCBSD/includes
+LIBS += -L/usr/local/kde4/lib -lpcbsd -lkdecore -lkio -lkdeui -Ikdelibs
 
-HEADERS	+= kcm.h
+HEADERS	+= kcm.h restartpopup.h networkman.h
 
-SOURCES	+= kcm.cpp
+SOURCES	+= kcm.cpp restartpopup.cpp networkman.cpp
 
-FORMS	= networkman.ui \
-	restartpopup.ui \
-	notroot.ui
+FORMS	= networkman.ui restartpopup.ui
 
-IMAGES	= connect_to_network.png \
-	network_local.png
+RESOURCES += NetworkManager.qrc
 
 TARGET  = kcm_pcbsdnetwork
-DESTDIR = /usr/local/lib/kde3/
 
+DESTDIR = /usr/local/kde4/lib/kde4/
 
-
-
-
 TRANSLATIONS = NetworkManager_en.ts
 
-unix {
-  UI_DIR = .ui
-  MOC_DIR = .moc
-  OBJECTS_DIR = .obj
-}
-
-
+QT += qt3support

Added: pcbsd/trunk/NetworkManager/NetworkManager.qrc

Modified: pcbsd/trunk/NetworkManager/kcm.cpp
===================================================================
--- pcbsd/trunk/NetworkManager/kcm.cpp	2008-06-23 14:27:27 UTC (rev 2154)
+++ pcbsd/trunk/NetworkManager/kcm.cpp	2008-06-23 16:16:50 UTC (rev 2155)
@@ -2,27 +2,32 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kparts/genericfactory.h>
+#include <kgenericfactory.h>
 #include <networkman.h>
-#include <notroot.h>
 #include <kcm.h>
 #include <kcmodule.h>
-#include <kaboutdata.h>
+#include <stdlib.h>
 
+K_PLUGIN_FACTORY(PCBSDNETFactory,
+                 registerPlugin<PCBSDKCModule>();
+                )
+K_EXPORT_PLUGIN(PCBSDNETFactory("kcmpcbsdnetwork"))
 
-PCBSDKCModule::PCBSDKCModule(QWidget  *parent, const char  *name, const QStringList &  list)
-   :    KCModule(parent, name)
+
+
+PCBSDKCModule::PCBSDKCModule(QWidget  *parent, const QVariantList &list)
+   :    KCModule(PCBSDNETFactory::componentData(), parent, list)
 {
   setButtons(KCModule::Apply);
 
   QGridLayout *layout = new QGridLayout(this);
   layout->setAutoAdd(true);
   QString LANG="NetworkManager";
-  KGlobal::locale()->insertCatalogue(LANG);
+  //KGlobal::locale()->insertCatalogue(LANG);
 
 
 
-  netproc = new NetworkMan(parent);
+  netproc = new NetworkMan();
   netproc->Init();
     if ( ! checkRoot() )
    {
@@ -69,33 +74,3 @@
 	emit changed(TRUE);
 }
 
-/*
-* Start the KFactory Creation  
-*
-*/
-
-
-
-typedef KGenericFactory<PCBSDNETWORK, QWidget> PCBSDNETWORKFactory;
-K_EXPORT_COMPONENT_FACTORY(kcm_PCBSDNETWORK, PCBSDNETWORKFactory("kcm_pcbsdnetwork"))
-
-extern "C" {
-      KCModule *create_pcbsdnetwork(QWidget  *parent, const char  *name) {
-      return new PCBSDNETWORK(parent, name);
-   }
-}
-
-PCBSDNETWORK::PCBSDNETWORK( QWidget  *parent,  const char *name,  const QStringList &  list ) : PCBSDKCModule( parent, name) 
-{
-}
-
-PCBSDNETWORK::~PCBSDNETWORK() {
-}
-
-int    PCBSDNETWORK::buttons() {
- return KCModule::Apply; 
-}
-
-QString  PCBSDNETWORK::kcmoduleName() {
-   return  "pcbsdnetwork";
-}

Modified: pcbsd/trunk/NetworkManager/kcm.h
===================================================================
--- pcbsd/trunk/NetworkManager/kcm.h	2008-06-23 14:27:27 UTC (rev 2154)
+++ pcbsd/trunk/NetworkManager/kcm.h	2008-06-23 16:16:50 UTC (rev 2155)
@@ -3,14 +3,16 @@
 #include <qdialog.h>
 #include <networkman.h>
 #include <kcmodule.h>
-#include <kaboutdata.h>
+#include <stdlib.h>
 
+class KConfigDialogManager;
 
+
 class  PCBSDKCModule : public KCModule {
    Q_OBJECT
 
 public:
-   PCBSDKCModule(QWidget * = NULL,  const char * = NULL,  const QStringList & = QStringList());
+   PCBSDKCModule(QWidget *parent=0,  const QVariantList &args=QVariantList());
    ~PCBSDKCModule();
    
    void load();
@@ -28,18 +30,3 @@
 
 };
 
-
-
-
-class PCBSDNETWORK: public PCBSDKCModule { 
-   Q_OBJECT
-   
-public:
-   PCBSDNETWORK(QWidget * = NULL,  const char * = NULL,  const QStringList & = QStringList() );
-   virtual  ~PCBSDNETWORK();
-void   getParent(QWidget * = NULL);
-virtual int buttons();
-   
-protected:
-   QString      kcmoduleName();
-};

Deleted: pcbsd/trunk/NetworkManager/main.cpp

Deleted: pcbsd/trunk/NetworkManager/netproperties.ui

Deleted: pcbsd/trunk/NetworkManager/netproperties.ui.h

Added: pcbsd/trunk/NetworkManager/networkman.cpp

Added: pcbsd/trunk/NetworkManager/networkman.h

Modified: pcbsd/trunk/NetworkManager/networkman.ui
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui	2008-06-23 14:27:27 UTC (rev 2154)
+++ pcbsd/trunk/NetworkManager/networkman.ui	2008-06-23 16:16:50 UTC (rev 2155)
@@ -1,900 +1,880 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>NetworkMan</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>NetworkMan</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>700</width>
-            <height>571</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>PC-BSD Network Manager</string>
-    </property>
-    <property name="icon">
-        <pixmap>image0</pixmap>
-    </property>
-    <property name="sizeGripEnabled">
-        <bool>true</bool>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>11</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabNetMan</cstring>
+<ui version="4.0" >
+ <class>NetworkMan</class>
+ <widget class="QDialog" name="NetworkMan" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>700</width>
+    <height>571</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>PC-BSD Network Manager</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="NetworkManager.qrc" >
+    <normaloff>:/connect_to_network.png</normaloff>:/connect_to_network.png</iconset>
+  </property>
+  <property name="sizeGripEnabled" >
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>11</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QTabWidget" name="tabNetMan" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="Widget8" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>666</width>
+        <height>510</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Devices</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" colspan="7" >
+        <widget class="QLabel" name="textLabel1" >
+         <property name="text" >
+          <string>Local Network Adapters</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="9" >
+        <widget class="Q3ListBox" name="listNetDev" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>140</height>
+          </size>
+         </property>
+         <property name="font" >
+          <font>
+           <pointsize>9</pointsize>
+          </font>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="4" >
+        <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>
+         </property>
+         <property name="frameShadow" >
+          <enum>QFrame::Sunken</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>
+         <property name="inputMask" >
+          <string>999\.999\.999\.999; </string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignHCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="1" colspan="2" >
+        <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 row="11" column="1" colspan="2" >
+        <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>
+       <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" >
+        <widget class="QLabel" name="textLabel2" >
+         <property name="text" >
+          <string>Device Status</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="2" colspan="7" >
+        <widget class="QLabel" name="textStatus3" >
+         <property name="text" >
+          <string/>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="2" colspan="7" >
+        <widget class="QLabel" name="textStatus1" >
+         <property name="text" >
+          <string/>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="2" colspan="7" >
+        <widget class="QLabel" name="textStatus2" >
+         <property name="text" >
+          <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>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="2" >
+        <widget class="QLabel" name="textStatusLabel2" >
+         <property name="text" >
+          <string>IP Address:</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" >
+        <widget class="QLabel" name="textStatusLabel3" >
+         <property name="text" >
+          <string>MAC Address:</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="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" >
+         <property name="text" >
+          <string>&amp;Configure</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>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0" colspan="9" >
+        <widget class="Line" name="line1_2" >
+         <property name="frameShape" >
+          <enum>QFrame::HLine</enum>
+         </property>
+         <property name="frameShadow" >
+          <enum>QFrame::Sunken</enum>
+         </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>
+         <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 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" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>86</width>
+           <height>100</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" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>666</width>
+        <height>510</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>DSL / PPPoE </string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="3" colspan="2" >
+        <spacer name="spacer26" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>181</width>
+           <height>20</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>
+       <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" >
+        <spacer name="spacer34" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>51</width>
+           <height>31</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="2" >
+        <spacer name="spacer33" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>21</width>
+           <height>270</height>
+          </size>
+         </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>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>Widget8</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Devices</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="7">
-                        <property name="name">
-                            <cstring>textLabel1</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Local Network Adapters</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignTop|AlignLeft</set>
-                        </property>
-                    </widget>
-                    <widget class="QListBox" row="1" column="0" rowspan="1" colspan="9">
-                        <property name="name">
-                            <cstring>listNetDev</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>7</hsizetype>
-                                <vsizetype>7</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>0</width>
-                                <height>140</height>
-                            </size>
-                        </property>
-                        <property name="font">
-                            <font>
-                                <pointsize>9</pointsize>
-                            </font>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="4">
-                        <property name="name">
-                            <cstring>checkSysTray</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Display system tray icon</string>
-                        </property>
-                    </widget>
-                    <widget class="Line" row="3" column="0" rowspan="1" colspan="9">
-                        <property name="name">
-                            <cstring>line1</cstring>
-                        </property>
-                        <property name="frameShape">
-                            <enum>HLine</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Sunken</enum>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                    </widget>
-                    <widget class="QLineEdit" row="10" column="3" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>lineDNS1</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignHCenter</set>
-                        </property>
-                        <property name="inputMask">
-                            <string>999\.999\.999\.999; </string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="10" column="1" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textLabel11_2_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>DNS 1:</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="11" column="1" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textLabel11_2_3</cstring>
-                        </property>
-                        <property name="text">
-                            <string>DNS 2:</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
-                        </property>
-                    </widget>
-                    <widget class="QLineEdit" row="11" column="3" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>lineDNS2</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignHCenter</set>
-                        </property>
-                        <property name="inputMask">
-                            <string>999\.999\.999\.999; </string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="10" column="5">
-                        <property name="name">
-                            <cstring>textLabel11</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>5</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="text">
-                            <string>Hostname:</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
-                        </property>
-                    </widget>
-                    <widget class="QLineEdit" row="10" column="6" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>lineHostname</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="9">
-                        <property name="name">
-                            <cstring>textLabel2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Device Status</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignCenter</set>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="7" column="2" rowspan="1" colspan="7">
-                        <property name="name">
-                            <cstring>textStatus3</cstring>
-                        </property>
-                        <property name="text">
-                            <string></string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="5" column="2" rowspan="1" colspan="7">
-                        <property name="name">
-                            <cstring>textStatus1</cstring>
-                        </property>
-                        <property name="text">
-                            <string></string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="6" column="2" rowspan="1" colspan="7">
-                        <property name="name">
-                            <cstring>textStatus2</cstring>
-                        </property>
-                        <property name="text">
-                            <string></string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textStatusLabel1</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Link Status:</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textStatusLabel2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>IP Address:</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textStatusLabel3</cstring>
-                        </property>
-                        <property name="text">
-                            <string>MAC Address:</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
-                        </property>
-                    </widget>
-                    <spacer row="2" column="4" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>spacer3</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>230</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QPushButton" row="2" column="7" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>pushConfigure</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Configure</string>
-                        </property>
-                        <property name="accel">
-                            <string>Alt+C</string>
-                        </property>
-                    </widget>
-                    <spacer row="14" column="0" rowspan="1" colspan="9">
-                        <property name="name">
-                            <cstring>spacer23</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Fixed</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>620</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="9" column="0" rowspan="1" colspan="9">
-                        <property name="name">
-                            <cstring>textLabel1_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>System-wide configuration settings</string>
-                        </property>
-                        <property name="alignment">
-                            <set>WordBreak|AlignCenter</set>
-                        </property>
-                    </widget>
-                    <widget class="Line" row="8" column="0" rowspan="1" colspan="9">
-                        <property name="name">
-                            <cstring>line1_2</cstring>
-                        </property>
-                        <property name="frameShape">
-                            <enum>HLine</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Sunken</enum>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                    </widget>
-                    <spacer row="10" column="0" rowspan="3" colspan="1">
-                        <property name="name">
-                            <cstring>spacer21</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>87</width>
-                                <height>100</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="11" column="5">
-                        <property name="name">
-                            <cstring>textLabel11_2</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>5</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="text">
-                            <string>Gateway:</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
-                        </property>
-                    </widget>
-                    <widget class="QLineEdit" row="11" column="6" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>lineGateway</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignHCenter</set>
-                        </property>
-                        <property name="inputMask">
-                            <string>999\.999\.999\.999; </string>
-                        </property>
-                    </widget>
-                    <spacer row="10" column="8" rowspan="3" colspan="1">
-                        <property name="name">
-                            <cstring>spacer21_2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>86</width>
-                                <height>100</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="12" column="5">
-                        <property name="name">
-                            <cstring>textLabel11_2_4</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>5</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="text">
-                            <string>IPv6 gateway:</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
-                        </property>
-                    </widget>
-                    <widget class="QLineEdit" row="12" column="6" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>lineIPv6Gateway</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="text">
-                            <string></string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignHCenter</set>
-                        </property>
-                        <property name="inputMask">
-                            <string></string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="12" column="2" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>checkIPv6Enable</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Enable IPv6 on this system</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="13" column="0" rowspan="1" colspan="9">
-                        <property name="name">
-                            <cstring>textGlobalError</cstring>
-                        </property>
-                        <property name="paletteForegroundColor">
-                            <color>
-                                <red>255</red>
-                                <green>0</green>
-                                <blue>0</blue>
-                            </color>
-                        </property>
-                        <property name="text">
-                            <string></string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignCenter</set>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>TabPage</cstring>
-                </property>
-                <attribute name="title">
-                    <string>DSL / PPPoE </string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="0" column="3" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>spacer26</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>181</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="0" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>spacer27</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>191</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QCheckBox" row="0" column="2">
-                        <property name="name">
-                            <cstring>checkPPPOE</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Enable PPPoE on this system</string>
-                        </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
-                    </widget>
-                    <spacer row="1" column="4">
-                        <property name="name">
-                            <cstring>spacer34</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>51</width>
-                                <height>31</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="2" column="2">
-                        <property name="name">
-                            <cstring>spacer33</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>21</width>
-                                <height>270</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="1" column="0">
-                        <property name="name">
-                            <cstring>spacer35</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>50</width>
-                                <height>31</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QGroupBox" row="1" column="1" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>groupBoxPPPOE</cstring>
-                        </property>
-                        <property name="title">
-                            <string>PPPoE configuration</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QLabel" row="0" column="0">
-                                <property name="name">
-                                    <cstring>textLabel3</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Username:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="1" column="0">
-                                <property name="name">
-                                    <cstring>textLabel4</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Password:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QCheckBox" row="2" column="3" rowspan="1" colspan="3">
-                                <property name="name">
-                                    <cstring>checkPPPNat</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Internet Connection Sharing</string>
-                                </property>
-                                <property name="accel">
-                                    <string></string>
-                                </property>
-                            </widget>
-                            <widget class="QCheckBox" row="1" column="3" rowspan="1" colspan="3">
-                                <property name="name">
-                                    <cstring>checkPPPAlwaysOn</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Alwa&amp;ys on connection</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+Y</string>
-                                </property>
-                            </widget>
-                            <spacer row="0" column="5">
-                                <property name="name">
-                                    <cstring>spacer31</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>16</width>
-                                        <height>21</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QLabel" row="0" column="4">
-                                <property name="name">
-                                    <cstring>textLabel1_3</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>PPPoE Device</string>
-                                </property>
-                            </widget>
-                            <widget class="QComboBox" row="0" column="3">
-                                <property name="name">
-                                    <cstring>comboPPPOEDev</cstring>
-                                </property>
-                            </widget>
-                            <spacer row="0" column="2" rowspan="3" colspan="1">
-                                <property name="name">
-                                    <cstring>spacer32</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Fixed</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>16</width>
-                                        <height>80</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QLineEdit" row="2" column="1">
-                                <property name="name">
-                                    <cstring>linePPPService</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="echoMode">
-                                    <enum>Normal</enum>
-                                </property>
-                            </widget>
-                            <widget class="QLineEdit" row="1" column="1">
-                                <property name="name">
-                                    <cstring>linePPPPassword</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="echoMode">
-                                    <enum>Password</enum>
-                                </property>
-                            </widget>
-                            <widget class="QLineEdit" row="0" column="1">
-                                <property name="name">
-                                    <cstring>linePPPUsername</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="2" column="0">
-                                <property name="name">
-                                    <cstring>textLabel4_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Service name (optional):</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                </grid>
-            </widget>
+            <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>
-    </grid>
-</widget>
-<images>
-    <image name="image0">
-        <data format="PNG" length="4696">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000121f49444154789ced5b7f505cd775feb09fec47833a8f14a5bb8d94b04d640b759d2e042782c82950a59141492944892dacc88628894494441549aaeeaab56657936a16d2a865db2a651313efdaad0c6406ede28e5a56292eab0c329b5412e0913ca0412eabc11a9662b2bc482ff9fac7bd6f5956c8061249ce346766e770f6c77def3be7bcf3eb5e80ffe79475bb2fa03adc792a5c5b74c3b55985ba4987fe5e55f1e4e9860baaa2423774a8f05cd5e17a5555d441ddd07fa8c3f31fb890357bbbefedb692e6e056cdee0ce597f146fdd73a48923cc7c56946b05084e40459b2bd754e73f05f54bb73f3ddc6b16c52edce32cdeefe49cdbe004932999420af2fce93b7787fe8e214d942e66f769fd61ccee2bb8deb2dc962678e6a773ec308c9980463829716e65406d8a95bf09985dcddc21bf99bd88c7cb77ab7712e4a9a9d1b2cc5ee57d94e4e4d0ad4264f4a101313539227df54367f3791b14effc028cb1fe759d57e60edddc6bb80343b375b8add6f902427a5e5266e61d9d125f2c95bc817c9f21ec655bb73c3ddc60d4080d71cce37165a72710b4e8c0b3e786ee24df9e8f8d482df67ae33786e8225d56f0325680ee6ab7!
 6679c4992e3d24226373dc0b4dcb06043927340b0fe815bc8a6e52732b8b97e84b46ce225f5fdeebcbb83be8c8a6a77be5cb347466b92a3a3195c5adc947bfb04aa50c4e4438bcabd5121a73cc95c677ce1fa7b0f7550b33b4fde15fcaaddf9f4c416b2a32bc33217332cd8275847cf90e44b93531697d964c85c5772d3932cc56e6a0e3e79a7c1e76b0ef7dcde832181557ac0d039c9a56c5ab6edc4e0b2b8e929377b8e50527acca8ff1aa9da9daf6b0eb776c714a0d9f94cf9f6367294ec8f6658ca7cc6a5e55bdbfbc9eb646b3b255f824ccec78e71d343040f9dca58df3fc8d13252b33bff7aa578ee5dce972dc56ecbac71ea9f3fb0be49397f39825d4fd8103d13c7ba87572372660c1f2acc45f46c1cebceaf46f3600486f151447f12c5578d7568be108571bd745efe49c6e752b6be3381dc776763ec4a02b9ebb231762981d20f6723763e8e3f2a592dd697bc76f2017ce946272e8d7fc9aedf67fc3d665e3256aa882591667737690eb2706b2b394a867ad22c3d49ba5b84ec6ee99d9727a53c9321677e3e297b01723e068c667896ec257a4d0f382ebcc4b2c94dcdcec756826959dda066e77fe9707d44555468392ac69e6a42c43686e8880d302270a915e85c378cda4737c2f5ad083c7a059a100650052d2702d7ac948d2a4009a31955a9cf6d96281aeb4b117!
 f7d0ed635d9181b4bc066cbc5f0a50436aecf45ec7c1c450f59113d1b47e9c!
 356047f308cba2b1be19a8d207aa10267cebb3af40b47b6af44094b03efa0a6d99dd41ca46677537390055bbc0b9ecdd6f641729c6c0b0ad9ebef2793e4de83217298dc7b304046c9fa7d5e2977482e026aaa62ccf000b38e48d5097d2493a4f3482f394ed6ef0f517330b1125c4bf600d5eedca62aea49ddd0a12a1e98fd7ce14356443634c0a544e0f97a053cff10c5d8e552a83961e8b355003a01d42257f521311d878e02a86a1d74230855a9836e7442556a51ea88a1614711e2f13958ad691e3092c0c682dc94e5232f8da1e2111b7cdf89217aa108b6b5518cbd568aaed32ec0c043fa2b472eac44116f499a835f352d9fee099662b2727780ec233bbad33c81f2999e219d87bd641f59b32770338f4a3e9c66f18cba62d0ec2e65d6099c182267c803878437e46ff6527390aadd5dbb5c5c4bcf0279c6638af2f426dd70415154e8c62928cad398bdee42627a163daf5ec2ab978b702d1143e3678b10fbb188dabee33efc45ce57d174318cab93b5f0bfec47d62f76c1ffb21fd9f7edc2d9c93054a516df8d04f1996b1fc0585e02b9b66c0c5f4a60cdfa6cc47e1c4751e16a916d4a568b67ffa71bd1fc720c4fab56b82e4771fee2154c277ba0e2e9017df2f099e52a6149a4d9f94c660cc8f484c26dadc27aa6a5da03a2a797cf70e5ee00935d64c9f63696779335b!
 b03e438b9639f8c058744acd8b1af833c45a62649f2d94f79985f7896fb583f39b0e07e965d0f2cdd03de65542b8aea302dbf9827ccce1a503405a5d5eb103e19c6d86bb548dc88e1810f5b11bf32872f3c5184833f08e3f56b9fc1f44bcdd0af7f11be933eac5ab50bfe881f3fbffe191cfd810f46d62eb4c7fcf8d9f53aa8f70c6363f91a749e1c46ed27d6c0ffdc30be60ac41732c8af3174bf1b9632e60fe7e7ea85f3dfd9fcb55c292487880d4b4c37d4b4f6092ec38d12b2ce513161c346781e97dff30995fe6654199e013db8447146e9bf78092ea3632365f6f044e981e30484ea6df8773c51e70cf52bfa8c3750d8a4b447f15d00d174c198a9a92ab1afda8dd5e81e0734134aab5889c89a3e82120763e01d880e14b82373edb095d6f4262d6035dd7519bed078c3aa88a1fd3b3b5a87a3688dcdc06947ed38faa47219efded80effb3134a2089ee7a3005c5055cffcf5e1995eae02964c9a9d5f32359d5fe6bdc9f2a69ceca2a8e527c9b6f6de05d1dbf4848e6eb2a45a5494135b656519212b7706c81eb2fc71c12b7706c8013220bbceb6e090e8198e8b9ac1b2c9cba9eaf42ce0fcd3e5e25a8e075c30359dab36dd6479537ee2c566600de07bc18f0654207c7a0c288188e60f01c32309d48e01bae103944654293ed86c8da83bd9098ba50e75273b91add4a1e!
 2593f803a349e0ca3eecf00ff73c3683036c2f7bd181a0da0d11b862daf09be47a2c8cd!
 91f7030c2d57014b268b9d399add79437390055bbdb46cba450c30eb76926d7e59c165748d35bb039caa1659a3bc8bacdfdf41c632789ff4843e99f7d3a37f4b3f2dc564cd5381f458105f09aee5f602ffaec3b5c592a7215b01e2d79ab0608747f1a0a2b0199ddf6d423c1e87d56a45f8f418aaca6d889c89a3a2c48aba2f0731325607c007a011800fb6758dd0d44e40a94d5586aad2099f528b4604e1db50872022a843057cbaa8fc7c2fb8b0e3631ee846277a5e1a816ee801fdc2919d2b51c29249b53b3fa739c424a6bc7bf16c30b1753eda0f9d93632fd92b388ff632d94d9654b78a1850ddcaa96ab2fcf136f222e96ee9107b06665768ce05cc7d04739f6158bcb7f75080f99be5f5edac5a09a6e57980c3ade9867e45553c39b67c1f603462e4b26b416f00e848ecf7009f15bf191b1b83cd6643e70b119c19a90010c4dc6c1da0fa61cb6b80d51a46ddf62a8c5d1a836dbd0d9803900de0068055f37c6e6e0ed9d9d937dd53f0b9307ccf57bd7626546a03cedcde79805002bfadd99d1cdd222c57509651116e222b777ab9804c0b66ee176452a6a5c7177a52aa8e98e1021a1c18bc41f2532bc1b3ecdd61d5e1cc530df512146885eb5dd0e1433c3e87abd3d350150fb41c0fac56176a3607d1f4e5bad4ef12af2790bb2637c553242d9c8827906bcd45f8641855!
 57aad0f45a33e2d79a30ad7b000380a123fc7e0f82f64ed4eda845fc4a1cd675d6d432d13351a3b4a4f413595959ffb612452c8b34bbf38b663d90ec169e905f466ac56e4e6c25cb77b69153a4fba8a8f13bba44bfdfdf27677e322b749ce81051fd88a8f876ec6b25fbc8caa7da643dd0c664b7a813ccebb147ce13d23d42527f5fffeb2497b557b0e2f301aaddf9a2aaa85b6d6b73a1ad6e04143ff4371aa0eb22aa9714c7d0a414a1e2a40bbaee81aa3621375b051400f040559ba11b4d80e207d000c8ba40d7457698336496307c989e6b04d00c6d751374c8ebccba30fc9407638f881863c688f0c970dbb64f6edbbd525c4b26ad98799add79c9522ca3784476775172c73e919fddc784b52b1f7793d56479b593ec96720f59b3d34b9e226b9e32792b798aacdc99c62364cdee36f294f0ac92ae54f6397b60bff3c9053141cc0fe642dda1257bc12f754244b3730314cf694d532d1b6db9d0d4064009c26aa91333c09c0a345e1633c0e9593ff4e906e8ba0baa2a77b9151780e6d47aaad294aa1055d50f4d6d80ae04317dad0ebae1c79cde80914b1ee8065ed1f5e972fd9596ab6dc7dbce377cbec16eae117e318caa47abbe98959575fc97c1b664cadfcc0df99bbd570ab7c9c94e4cf6f593a4fb989c061f2339493a5b7ac98b64fdfe36e129bbc5a4a87e4f2b3920!
 df3f471e381490f301d10bd4ec1631217fb39bf99b38a26e705bcceb739cdfcecc0e1d2!
 73a9e5feafdff4ace08156ca6156af30b5a4ed347acd6202c7975c8ce09c392530528513429a5f0218a46a5143ec4d0a814c16788aecea747d18852341b110015d08d085ca880cb0843d7ab90b816c4d56b75188b37030642f1abfae3d3af1c4a9d1ff21ef1fe4dd35f367dc394c32f865195a87a39ab2eebe15f053693b2e4eb5e00f701f82d001a807701580be07daaaa3d5458e6fc4e79378d9a3d0151d91d1339dd9c119ad36273ae6ff6f76d41f1b9b943e43d2ef619f61e0c9111b2a4baf5a7a3653c02e0bd002c00de096035009549fe285531cafa22d01e18bbddc02d00de03e001001f00f021008f00f89825bff0f3e5dbbd03357b02a46f1e5ce894286632cf11a4f612e5e7a6bcf7508835bb69946c73f76a9682c70094032805502cafb961ef9ebd4f847a420b5261a82744b6f3979e0b9ac0ef91e0ef85284c5500efc0bcf5df03e0fd00ec003e2895f07100d5f91bcabf52b9d31d668c33cea3c2b2812e59d145167a82d92b788ff793a364fdbec014bb18b2ac2dfc0a804f01f824804701fcb1bcc6874b8a4bb604fc81ff49076f568c8160a07d3940df4a09e97f9b72ba5214f95a05e125ef90af6c00f74151d5924d350f5ad717fc81cde25aafaa9deff2e4d4ae761961a84a1574230c8f5ef5bf0dd3fec9e9ab63a323e7a3af8c5c383d0e80f25a867cdd0!
 0701dc0f5427b614ee3fec6630df50def352b49b3328c9e8ea2f44ae96359bbb2ba00fc1cc02f56aa8074ca1c9c98de91f93295a0a6bdb201dc2fff5e95a6bc7be56fd215fb567483d57cb07347e79fd76eaf9dafa75f07b006c059000fe372ee9adc92e96bd333100afb05de4409ca122fbcd802e67ba672b2e40575003fc53c583376a89857c47d69dc54c69b2ac1b2d69213df13df152d8ffe496dc9fcfe4722217a8bd8d9188a1e2e82ebaf5c87a6af4dff7c89b8ee08994174158437ac8688e21600f900364004b5620025003e0a600b80ad003ea169daa70fec3ff03d928954376952c64992b6e36dff0891293408659b1ef6b6a27bb0782ab501781022a0165ad65acadc87dc7f17ea0e4d9164d23c722a5be6d15151fd0cc6648af5b7bd0891957e57ae6d3e626f0f1a9de2daca209f24f98c33c23027f800801ccc7bc33a003676736b6b4bebf748cea4f6089319dc9c3b4acbb7fa5a83000a00fc1e8487adc2e2d6bf73dea0b5502bf4b1ba32c8562739d2216f3a24373c7b47f906c926006b0a1d850fb80fbbbfce207f3438202c9a9c492ee05393e659a4a174cbebeec36eb704ff6e00bf0de15d6650cea4dba8808b54b516964dccd053dece1f91bce135fb7ed3629907a745edfe6ae814f534f9669e3a2922eb08b1ee484d754d0dc4636385b0fcadc067a6f15!
 f2d692dccab6ce71b3b48d67793f524eb7b4827c950da987c319a924a1992e701935366!
 a5284f8e5e1c5d003ed41d9ae1617e4b55d50f02781f440cc9c19bbbfded030f0096a3fc1c4976c85ddc41f9ec06e44ed06066f43629f37d7306685ada3c1728dcfe67de16efbf166c282807b0112266bc1322b3284b007ffb1450d3ce50478f78769d9185961dcd18809aca181c5e5c2b13d2edfba3fd298b7b8f78bf5f585cf82844bafc7d8848bf1a22d5a517548b81368bb6db439609ae7676738ec364eb91bde2a62f2e0465ca6de6490ff3f3eb0bbf67caad419293fcef03fb0eb8354d7b048003a2e77837805c2cb4fa5d016f16378ae548f24992dcbbff00c91a06827bc96364474cb840af0c60bdf224e94da025f54fa4949428dc54fe49000f0328842894d601f81d881ee33e2c74f937037fdb280b22e8dccf244fb6b6874484ef739324bd27bce438d92a4f74f4dfea7f8526177a88e41d00fe50027f0f803c09fcfe5b00bfe3e0cd0bde0be0fe8296a97d9547d937d4e79e26c9a90127492f433d4ed25749e72131c236fb7cf37f84529e91c16b0e063e0d5122e74144f774e0b76a9eee18f07432bbbffb01bc83e46bbc28620063c21306bbdce404e93d2e871619e7fe4dd06931621422ad99016eb1e7fc6d45a947a1f560e11ab2e6799eabd7497222ea26e9a6fbb09b3c46f60e4c2c0ada2c925aa31c38403e8a9bd3dadb12783a999156c404f2b31cde7183!
 943161986ceb923b4219e003e7788364a8de3ff4719803945b97b1bf36944556da92b19ad364fddc81a36d0992ec1d4ea65b7cce1be5dfd6930fe2d7ccda4b26b23c87c7cbf348fe9379ceaf75807192dfa8efe69dfb0787bb4d3bba984ff2d903a7b8abfc30973a81fa0dfd86ee10fd1f73e792d98d155beb0000000049454e44ae426082</data>
-    </image>
-</images>
-<connections>
-    <connection>
-        <sender>checkPPPOE</sender>
-        <signal>clicked()</signal>
-        <receiver>NetworkMan</receiver>
-        <slot>slotPPPOECheckBox()</slot>
-    </connection>
-    <connection>
-        <sender>checkPPPOE</sender>
-        <signal>clicked()</signal>
-        <receiver>NetworkMan</receiver>
-        <slot>slotPPPOEChanged()</slot>
-    </connection>
-    <connection>
-        <sender>checkPPPAlwaysOn</sender>
-        <signal>clicked()</signal>
-        <receiver>NetworkMan</receiver>
-        <slot>slotPPPOEChanged()</slot>
-    </connection>
-    <connection>
-        <sender>checkPPPNat</sender>
-        <signal>clicked()</signal>
-        <receiver>NetworkMan</receiver>
-        <slot>slotPPPOEChanged()</slot>
-    </connection>
-    <connection>
-        <sender>checkIPv6Enable</sender>
-        <signal>clicked()</signal>
-        <receiver>NetworkMan</receiver>
-        <slot>slotIPv6Checked()</slot>
-    </connection>
-    <connection>
-        <sender>listNetDev</sender>
-        <signal>rightButtonClicked(QListBoxItem*,const QPoint&amp;)</signal>
-        <receiver>NetworkMan</receiver>
-        <slot>slotListRightClick(QListBoxItem*,const QPoint&amp;)</slot>
-    </connection>
-    <connection>
-        <sender>comboPPPOEDev</sender>
-        <signal>highlighted(const QString&amp;)</signal>
-        <receiver>NetworkMan</receiver>
-        <slot>slotCheckGlobalText()</slot>
-    </connection>
-</connections>
-<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>
-    <tabstop>comboPPPOEDev</tabstop>
-    <tabstop>checkPPPAlwaysOn</tabstop>
-    <tabstop>checkPPPNat</tabstop>
-</tabstops>
-<includes>
-    <include location="local" impldecl="in declaration">qprocess.h</include>
-    <include location="local" impldecl="in declaration">qmessagebox.h</include>
-    <include location="local" impldecl="in declaration">qtimer.h</include>
-    <include location="local" impldecl="in declaration">restartpopup.h</include>
-    <include location="local" impldecl="in declaration">klocale.h</include>
-    <include location="local" impldecl="in declaration">kglobal.h</include>
-    <include location="local" impldecl="in declaration">kcmodule.h</include>
-    <include location="local" impldecl="in declaration">kaboutdata.h</include>
-    <include location="local" impldecl="in declaration">kpopupmenu.h</include>
-    <include location="global" impldecl="in declaration">qregexp.h</include>
-    <include location="global" impldecl="in declaration">netif.h</include>
-    <include location="global" impldecl="in declaration">utils.h</include>
-    <include location="local" impldecl="in implementation">networkman.ui.h</include>
-</includes>
-<variables>
-    <variable access="private">QString Devs[100];</variable>
-    <variable access="private">QString DevsIP[100];</variable>
-    <variable access="private">QString DevsStatus[100];</variable>
-    <variable access="private">QString DevsMAC[100];</variable>
-    <variable access="private">QProcess *GetDevList;</variable>
-    <variable access="private">int workingDev;</variable>
-    <variable access="private">QProcess *GetDevName;</variable>
-    <variable access="private">QString DevsName[100];</variable>
-    <variable access="private">QProcess *StartDHCP;</variable>
-    <variable access="private">QProcess *KillDHClient;</variable>
-    <variable access="private">QString DevsNetmask[100];</variable>
-    <variable access="private">restartPopup *restartDialog;</variable>
-    <variable access="private">QString DevsType[100];</variable>
-    <variable access="private">QProcess *ConfigDevice;</variable>
-    <variable access="private">QString username;</variable>
-    <variable access="private">int firstUpdate;</variable>
-    <variable access="private">KPopupMenu *popup;</variable>
-    <variable access="private">QString DevsUp[100];</variable>
-    <variable access="private">bool Changed;</variable>
-    <variable access="private">QColor colourWhite;</variable>
-    <variable access="private">QColor colourRed;</variable>
-</variables>
-<signals>
-    <signal>changed(bool)</signal>
-</signals>
-<slots>
-    <slot>Init()</slot>
-    <slot access="private">detectDev()</slot>
-    <slot access="private">DevSelectionChanged()</slot>
-    <slot access="private">PropertiesSlot()</slot>
-    <slot access="private">restartNetwork()</slot>
-    <slot access="private">refreshDevices()</slot>
-    <slot access="private">slotSysTray()</slot>
-    <slot>save()</slot>
-    <slot>slotCheckGlobalText()</slot>
-    <slot access="private">slotDoubleClick( QListBoxItem * item )</slot>
-    <slot>slotPPPOECheckBox()</slot>
-    <slot access="private">slotPPPOEChanged()</slot>
-    <slot access="private">slotTimerRefresh()</slot>
-    <slot access="private">slotIPv6Checked()</slot>
-    <slot access="private">slotListRightClick( QListBoxItem * item, const QPoint &amp; pos )</slot>
-    <slot access="private">slotDisableDevice()</slot>
-    <slot access="private">slotEnableDevice()</slot>
-    <slot access="private">slotShowInfoConfig()</slot>
-</slots>
-<functions>
-    <function access="private" returnType="QString">getLineFromCommandOutput( QString command )</function>
-    <function returnType="QString">getNameForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getIpForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getMacForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getStatusForIdent( QString ident )</function>
-    <function access="private" returnType="bool">checkValue( QString File, QString Key, QString Value )</function>
-    <function access="private">runCommand( QString command )</function>
-    <function access="private" returnType="QString">getValue( QString File, QString Key, int occur )</function>
-    <function access="private">saveValue( QString File, QString oldKey, QString newKey, int occur )</function>
-    <function access="private">loadGlobals()</function>
-    <function access="private" returnType="QString">getNetmaskForIdent( QString ident )</function>
-    <function access="private" returnType="bool">checkRange( QString IP )</function>
-    <function access="private" returnType="QString">getTypeForIdent( QString ident )</function>
-    <function access="private">loadPPPOEConfig()</function>
-    <function access="private">savePPPOEConfig()</function>
-    <function access="private">updatePPPconf()</function>
-    <function access="private">disablePPPOEConfig()</function>
-    <function>setNotRoot()</function>
-    <function access="private" returnType="QString">getUpStatusForIdent( QString ident )</function>
-</functions>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <customwidgets>
+  <customwidget>
+   <class>Q3GroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>Qt3Support/Q3GroupBox</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>Q3ListBox</class>
+   <extends>Q3Frame</extends>
+   <header>q3listbox.h</header>
+  </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>
+  <tabstop>comboPPPOEDev</tabstop>
+  <tabstop>checkPPPAlwaysOn</tabstop>
+  <tabstop>checkPPPNat</tabstop>
+ </tabstops>
+ <includes>
+  <include location="local" >q3process.h</include>
+  <include location="local" >qmessagebox.h</include>
+  <include location="local" >qtimer.h</include>
+  <include location="local" >restartpopup.h</include>
+  <include location="local" >klocale.h</include>
+  <include location="local" >kglobal.h</include>
+  <include location="local" >kcmodule.h</include>
+  <include location="local" >kaboutdata.h</include>
+  <include location="global" >qregexp.h</include>
+  <include location="global" >netif.h</include>
+  <include location="global" >utils.h</include>
+ </includes>
+ <resources>
+  <include location="NetworkManager.qrc" />
+ </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>
+   <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>checkPPPNat</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>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>
+   <slot>slotListRightClick(Q3ListBoxItem*,QPoint)</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>comboPPPOEDev</sender>
+   <signal>highlighted(QString)</signal>
+   <receiver>NetworkMan</receiver>
+   <slot>slotCheckGlobalText()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Deleted: pcbsd/trunk/NetworkManager/notroot.ui

Added: pcbsd/trunk/NetworkManager/restartpopup.cpp

Added: pcbsd/trunk/NetworkManager/restartpopup.h

Modified: pcbsd/trunk/NetworkManager/restartpopup.ui
===================================================================
--- pcbsd/trunk/NetworkManager/restartpopup.ui	2008-06-23 14:27:27 UTC (rev 2154)
+++ pcbsd/trunk/NetworkManager/restartpopup.ui	2008-06-23 16:16:50 UTC (rev 2155)
@@ -1,56 +1,50 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>restartPopup</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>restartPopup</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>336</width>
-            <height>120</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>Restarting Network</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>textLabel1</cstring>
-            </property>
-            <property name="frameShape">
-                <enum>NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Plain</enum>
-            </property>
-            <property name="text">
-                <string>Restarting the Network... Please Wait...</string>
-            </property>
-            <property name="alignment">
-                <set>AlignCenter</set>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<includes>
-    <include location="local" impldecl="in implementation">qtimer.h</include>
-    <include location="local" impldecl="in declaration">qprocess.h</include>
-    <include location="local" impldecl="in implementation">restartpopup.ui.h</include>
-</includes>
-<variables>
-    <variable access="private">QProcess *restartNet;</variable>
-</variables>
-<slots>
-    <slot>init()</slot>
-    <slot>restart()</slot>
-    <slot access="private">slotClose()</slot>
-</slots>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+<ui version="4.0" >
+ <class>restartPopup</class>
+ <widget class="QDialog" name="restartPopup" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>336</width>
+    <height>120</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Restarting Network</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="NetworkManager.qrc" >
+    <normaloff>:/connect_to_network.png</normaloff>:/connect_to_network.png</iconset>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="textLabel1" >
+     <property name="frameShape" >
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Plain</enum>
+     </property>
+     <property name="text" >
+      <string>Restarting the Network... Please Wait...</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <includes>
+  <include location="local" >q3process.h</include>
+ </includes>
+ <resources>
+  <include location="NetworkManager.qrc" />
+ </resources>
+ <connections/>
+</ui>



More information about the Commits mailing list