[PC-BSD Commits] r109 - in pcbsd/trunk: NetworkManager NetworkTray ethernetconfig ethernetconfig/src ethernetconfig/templates wificonfig

svn at pcbsd.org svn at pcbsd.org
Fri Feb 23 14:10:20 PST 2007


Author: kris
Date: 2007-02-23 23:10:19 +0100 (Fri, 23 Feb 2007)
New Revision: 109

Added:
   pcbsd/trunk/ethernetconfig/src/Makefile
   pcbsd/trunk/ethernetconfig/src/Makefile.am
   pcbsd/trunk/ethernetconfig/src/Makefile.in
   pcbsd/trunk/ethernetconfig/src/ethernetconfig
   pcbsd/trunk/ethernetconfig/src/ethernetconfig.cpp
   pcbsd/trunk/ethernetconfig/src/ethernetconfig.desktop
   pcbsd/trunk/ethernetconfig/src/ethernetconfig.h
   pcbsd/trunk/ethernetconfig/src/ethernetconfig.lsm
   pcbsd/trunk/ethernetconfig/src/ethernetconfig.moc
   pcbsd/trunk/ethernetconfig/src/ethernetconfigui.rc
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.moc
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.cpp
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.h
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.moc
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui
   pcbsd/trunk/ethernetconfig/src/hi16-app-ethernetconfig.png
   pcbsd/trunk/ethernetconfig/src/hi32-app-ethernetconfig.png
   pcbsd/trunk/ethernetconfig/src/main.cpp
   pcbsd/trunk/ethernetconfig/src/network_local.png
   pcbsd/trunk/ethernetconfig/templates/cpp
   pcbsd/trunk/ethernetconfig/templates/h
Modified:
   pcbsd/trunk/NetworkManager/NetworkManager_en.ts
   pcbsd/trunk/NetworkManager/networkman.ui
   pcbsd/trunk/NetworkManager/networkman.ui.h
   pcbsd/trunk/NetworkManager/restartpopup.ui
   pcbsd/trunk/NetworkManager/restartpopup.ui.h
   pcbsd/trunk/NetworkTray/NetworkTray.cpp
   pcbsd/trunk/ethernetconfig/ethernetconfig.kdevelop.pcs
   pcbsd/trunk/ethernetconfig/ethernetconfig.kdevses
   pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h
Log:
Updates for 0.6 Beta of the network manager

Modified: pcbsd/trunk/NetworkManager/NetworkManager_en.ts
===================================================================
--- pcbsd/trunk/NetworkManager/NetworkManager_en.ts	2007-02-22 20:04:41 UTC (rev 108)
+++ pcbsd/trunk/NetworkManager/NetworkManager_en.ts	2007-02-23 22:10:19 UTC (rev 109)
@@ -66,41 +66,61 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS / Gateway</source>
+        <source>System Hostname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Below you can set system-wide configuration settings for your network setup.</source>
+        <source>System-wide configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Configuration</source>
+        <source>DNS 1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server 2:</source>
+        <source>DNS 2:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server 1:</source>
+        <source>Remote gateway:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Below you can specify your DNS settings if your ISP requires them. Normally when using DHCP this is not necessary.</source>
+        <source>DSL / PPPoE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default Router / Gateway device:</source>
+        <source>PPPoE configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>System Hostname:</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh List</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>PPPoE Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alwa&amp;ys on connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alt+Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Internet Connection Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable PPPoE on this system</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotRoot</name>

Modified: pcbsd/trunk/NetworkManager/networkman.ui
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui	2007-02-22 20:04:41 UTC (rev 108)
+++ pcbsd/trunk/NetworkManager/networkman.ui	2007-02-23 22:10:19 UTC (rev 109)
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>674</width>
-            <height>663</height>
+            <width>700</width>
+            <height>531</height>
         </rect>
     </property>
     <property name="caption">
@@ -46,8 +46,51 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="Line" row="5" column="0" rowspan="1" colspan="4">
+                    <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>70</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">
@@ -60,105 +103,167 @@
                             <enum>Horizontal</enum>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="6" column="0" rowspan="1" colspan="4">
+                    <widget class="QLabel" row="9" column="0" rowspan="1" colspan="10">
                         <property name="name">
-                            <cstring>textLabel2</cstring>
+                            <cstring>textLabel1_2</cstring>
                         </property>
                         <property name="text">
-                            <string>Device Status</string>
+                            <string>System-wide configuration settings</string>
                         </property>
                         <property name="alignment">
-                            <set>AlignCenter</set>
+                            <set>WordBreak|AlignCenter</set>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="8" column="0">
+                    <widget class="QLineEdit" row="10" column="3" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>textStatusLabel2</cstring>
+                            <cstring>lineDNS1</cstring>
                         </property>
-                        <property name="text">
-                            <string>IP Address:</string>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
                         </property>
                         <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
+                            <set>AlignHCenter</set>
                         </property>
+                        <property name="inputMask">
+                            <string>999\.999\.999\.999; </string>
+                        </property>
                     </widget>
-                    <widget class="QLabel" row="9" column="0">
+                    <widget class="QLabel" row="10" column="1" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>textStatusLabel3</cstring>
+                            <cstring>textLabel11_2_2</cstring>
                         </property>
                         <property name="text">
-                            <string>MAC Address:</string>
+                            <string>DNS 1:</string>
                         </property>
                         <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="7" column="0">
+                    <spacer row="10" column="0" rowspan="2" colspan="1">
                         <property name="name">
-                            <cstring>textStatusLabel1</cstring>
+                            <cstring>spacer21</cstring>
                         </property>
+                        <property name="orientation">
+                            <enum>Horizontal</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>60</width>
+                                <height>61</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="QLabel" row="11" column="1" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>textLabel11_2_3</cstring>
+                        </property>
                         <property name="text">
-                            <string>Link Status:</string>
+                            <string>DNS 2:</string>
                         </property>
                         <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="7" column="1" rowspan="1" colspan="3">
+                    <widget class="QLineEdit" row="11" column="3" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>textStatus1</cstring>
+                            <cstring>lineDNS2</cstring>
                         </property>
-                        <property name="text">
-                            <string></string>
+                        <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="8" column="1" rowspan="1" colspan="3">
+                    <widget class="QLabel" row="10" column="5">
                         <property name="name">
-                            <cstring>textStatus2</cstring>
+                            <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></string>
+                            <string>System Hostname:</string>
                         </property>
+                        <property name="alignment">
+                            <set>AlignVCenter|AlignRight</set>
+                        </property>
                     </widget>
-                    <widget class="QLabel" row="9" column="1" rowspan="1" colspan="3">
+                    <widget class="QLabel" row="11" column="5">
                         <property name="name">
-                            <cstring>textStatus3</cstring>
+                            <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></string>
+                            <string>Remote gateway:</string>
                         </property>
+                        <property name="alignment">
+                            <set>AlignVCenter|AlignRight</set>
+                        </property>
                     </widget>
-                    <widget class="QPushButton" row="3" column="3" rowspan="2" colspan="1">
+                    <widget class="QLineEdit" row="10" column="6" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>pushConfigure</cstring>
+                            <cstring>lineHostname</cstring>
                         </property>
-                        <property name="text">
-                            <string>&amp;Configure</string>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
                         </property>
-                        <property name="accel">
-                            <string>Alt+C</string>
-                        </property>
                     </widget>
-                    <spacer row="3" column="2">
+                    <widget class="QLineEdit" row="11" column="6" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>spacer10</cstring>
+                            <cstring>lineGateway</cstring>
                         </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
                         </property>
-                        <property name="sizeType">
-                            <enum>Minimum</enum>
+                        <property name="alignment">
+                            <set>AlignHCenter</set>
                         </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
+                        <property name="inputMask">
+                            <string>999\.999\.999\.999; </string>
                         </property>
-                    </spacer>
-                    <spacer row="4" column="2">
+                    </widget>
+                    <spacer row="10" column="8" rowspan="2" colspan="1">
                         <property name="name">
-                            <cstring>spacer3</cstring>
+                            <cstring>spacer21_2</cstring>
                         </property>
                         <property name="orientation">
                             <enum>Horizontal</enum>
@@ -168,22 +273,32 @@
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>300</width>
-                                <height>20</height>
+                                <width>60</width>
+                                <height>50</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QCheckBox" row="3" column="0" rowspan="2" colspan="2">
+                    <widget class="QLabel" row="12" column="0" rowspan="1" colspan="10">
                         <property name="name">
-                            <cstring>checkSysTray</cstring>
+                            <cstring>textGlobalError</cstring>
                         </property>
+                        <property name="paletteForegroundColor">
+                            <color>
+                                <red>255</red>
+                                <green>0</green>
+                                <blue>0</blue>
+                            </color>
+                        </property>
                         <property name="text">
-                            <string>Display system tray icon</string>
+                            <string></string>
                         </property>
+                        <property name="alignment">
+                            <set>AlignCenter</set>
+                        </property>
                     </widget>
-                    <spacer row="0" column="0" rowspan="1" colspan="4">
+                    <spacer row="13" column="0" rowspan="1" colspan="9">
                         <property name="name">
-                            <cstring>spacer10_2</cstring>
+                            <cstring>spacer23</cstring>
                         </property>
                         <property name="orientation">
                             <enum>Vertical</enum>
@@ -198,85 +313,92 @@
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3">
+                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="9">
                         <property name="name">
-                            <cstring>textLabel1</cstring>
+                            <cstring>textLabel2</cstring>
                         </property>
                         <property name="text">
-                            <string>Local Network Adapters</string>
+                            <string>Device Status</string>
                         </property>
                         <property name="alignment">
-                            <set>AlignTop|AlignLeft</set>
+                            <set>AlignCenter</set>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="3">
+                    <widget class="Line" row="8" column="0" rowspan="1" colspan="9">
                         <property name="name">
-                            <cstring>pushRefresh</cstring>
+                            <cstring>line1_2</cstring>
                         </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>1</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
+                        <property name="frameShape">
+                            <enum>HLine</enum>
                         </property>
+                        <property name="frameShadow">
+                            <enum>Sunken</enum>
+                        </property>
+                        <property name="orientation">
+                            <enum>Horizontal</enum>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="7" column="2" rowspan="1" colspan="7">
+                        <property name="name">
+                            <cstring>textStatus3</cstring>
+                        </property>
                         <property name="text">
-                            <string>Refresh List</string>
+                            <string></string>
                         </property>
                     </widget>
-                    <widget class="QListBox" row="2" column="0" rowspan="1" colspan="4">
+                    <widget class="QLabel" row="5" column="2" rowspan="1" colspan="7">
                         <property name="name">
-                            <cstring>listNetDev</cstring>
+                            <cstring>textStatus1</cstring>
                         </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>7</hsizetype>
-                                <vsizetype>7</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
+                        <property name="text">
+                            <string></string>
                         </property>
-                        <property name="font">
-                            <font>
-                                <pointsize>9</pointsize>
-                            </font>
+                    </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>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>TabPage</cstring>
-                </property>
-                <attribute name="title">
-                    <string>DNS / Gateway</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="9">
+                    <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>textLabel10</cstring>
+                            <cstring>textStatusLabel1</cstring>
                         </property>
-                        <property name="frameShape">
-                            <enum>NoFrame</enum>
+                        <property name="text">
+                            <string>Link Status:</string>
                         </property>
-                        <property name="frameShadow">
-                            <enum>Plain</enum>
+                        <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>Below you can set system-wide configuration settings for your network setup.</string>
+                            <string>IP Address:</string>
                         </property>
                         <property name="alignment">
-                            <set>WordBreak|AlignTop|AlignHCenter</set>
+                            <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
-                    <spacer row="1" column="0" rowspan="10" colspan="1">
+                    <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>spacer17</cstring>
+                            <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>
@@ -285,15 +407,39 @@
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>60</width>
-                                <height>430</height>
+                                <width>230</width>
+                                <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <spacer row="1" column="8" rowspan="10" colspan="1">
+                    <widget class="QPushButton" row="2" column="7" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>spacer16</cstring>
+                            <cstring>pushConfigure</cstring>
                         </property>
+                        <property name="text">
+                            <string>&amp;Configure</string>
+                        </property>
+                        <property name="accel">
+                            <string>Alt+C</string>
+                        </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>
@@ -302,42 +448,42 @@
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>71</width>
-                                <height>410</height>
+                                <width>181</width>
+                                <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <spacer row="1" column="1" rowspan="1" colspan="7">
+                    <spacer row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>spacer13</cstring>
+                            <cstring>spacer27</cstring>
                         </property>
                         <property name="orientation">
-                            <enum>Vertical</enum>
+                            <enum>Horizontal</enum>
                         </property>
                         <property name="sizeType">
-                            <enum>Fixed</enum>
+                            <enum>Expanding</enum>
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>430</width>
-                                <height>16</height>
+                                <width>191</width>
+                                <height>21</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="7" column="1" rowspan="1" colspan="7">
+                    <widget class="QGroupBox" row="1" column="1" rowspan="1" colspan="3">
                         <property name="name">
-                            <cstring>groupBox1</cstring>
+                            <cstring>groupBoxPPPOE</cstring>
                         </property>
                         <property name="title">
-                            <string>DNS Configuration</string>
+                            <string>PPPoE configuration</string>
                         </property>
                         <grid>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLineEdit" row="2" column="2">
+                            <widget class="QLineEdit" row="0" column="1">
                                 <property name="name">
-                                    <cstring>lineDNS1</cstring>
+                                    <cstring>linePPPUsername</cstring>
                                 </property>
                                 <property name="sizePolicy">
                                     <sizepolicy>
@@ -347,16 +493,10 @@
                                         <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="QLineEdit" row="3" column="2">
+                            <widget class="QLineEdit" row="1" column="1">
                                 <property name="name">
-                                    <cstring>lineDNS2</cstring>
+                                    <cstring>linePPPPassword</cstring>
                                 </property>
                                 <property name="sizePolicy">
                                     <sizepolicy>
@@ -366,55 +506,48 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="alignment">
-                                    <set>AlignHCenter</set>
+                                <property name="echoMode">
+                                    <enum>Password</enum>
                                 </property>
-                                <property name="inputMask">
-                                    <string>999\.999\.999\.999; </string>
-                                </property>
                             </widget>
-                            <spacer row="2" column="3" rowspan="2" colspan="1">
+                            <widget class="QLabel" row="1" column="0">
                                 <property name="name">
-                                    <cstring>spacer11</cstring>
+                                    <cstring>textLabel4</cstring>
                                 </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
+                                <property name="text">
+                                    <string>Password:</string>
                                 </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
+                                <property name="alignment">
+                                    <set>AlignVCenter|AlignRight</set>
                                 </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>121</width>
-                                        <height>51</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QLabel" row="3" column="1">
+                            </widget>
+                            <widget class="QLabel" row="0" column="0">
                                 <property name="name">
-                                    <cstring>textLabel11_2_3</cstring>
+                                    <cstring>textLabel3</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Server 2:</string>
+                                    <string>Username:</string>
                                 </property>
                                 <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="1">
+                            <widget class="QComboBox" row="0" column="3">
                                 <property name="name">
-                                    <cstring>textLabel11_2_2</cstring>
+                                    <cstring>comboPPPOEDev</cstring>
                                 </property>
+                            </widget>
+                            <widget class="QLabel" row="0" column="4">
+                                <property name="name">
+                                    <cstring>textLabel1_3</cstring>
+                                </property>
                                 <property name="text">
-                                    <string>Server 1:</string>
+                                    <string>PPPoE Device</string>
                                 </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
                             </widget>
-                            <spacer row="2" column="0" rowspan="2" colspan="1">
+                            <spacer row="0" column="5">
                                 <property name="name">
-                                    <cstring>spacer10_3</cstring>
+                                    <cstring>spacer31</cstring>
                                 </property>
                                 <property name="orientation">
                                     <enum>Horizontal</enum>
@@ -424,93 +557,83 @@
                                 </property>
                                 <property name="sizeHint">
                                     <size>
-                                        <width>81</width>
-                                        <height>41</height>
+                                        <width>51</width>
+                                        <height>21</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+                            <widget class="QCheckBox" row="1" column="3" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>textLabel1_2</cstring>
+                                    <cstring>checkPPPAlwaysOn</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Below you can specify your DNS settings if your ISP requires them. Normally when using DHCP this is not necessary.</string>
+                                    <string>Alwa&amp;ys on connection</string>
                                 </property>
-                                <property name="alignment">
-                                    <set>WordBreak|AlignVCenter</set>
+                                <property name="accel">
+                                    <string>Alt+Y</string>
                                 </property>
                             </widget>
-                            <spacer row="1" column="2">
+                            <widget class="QCheckBox" row="2" column="3" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>spacer12</cstring>
+                                    <cstring>checkPPPNat</cstring>
                                 </property>
+                                <property name="text">
+                                    <string>Internet Connection Sharing</string>
+                                </property>
+                                <property name="accel">
+                                    <string></string>
+                                </property>
+                            </widget>
+                            <spacer row="0" column="2" rowspan="3" colspan="1">
+                                <property name="name">
+                                    <cstring>spacer32</cstring>
+                                </property>
                                 <property name="orientation">
-                                    <enum>Vertical</enum>
+                                    <enum>Horizontal</enum>
                                 </property>
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
                                 <property name="sizeHint">
                                     <size>
-                                        <width>20</width>
-                                        <height>16</height>
+                                        <width>16</width>
+                                        <height>80</height>
                                     </size>
                                 </property>
                             </spacer>
                         </grid>
                     </widget>
-                    <widget class="QLineEdit" row="5" column="4">
+                    <widget class="QCheckBox" row="0" column="2">
                         <property name="name">
-                            <cstring>lineGateway</cstring>
+                            <cstring>checkPPPOE</cstring>
                         </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
+                        <property name="text">
+                            <string>Enable PPPoE on this system</string>
                         </property>
-                        <property name="alignment">
-                            <set>AlignHCenter</set>
+                        <property name="accel">
+                            <string></string>
                         </property>
-                        <property name="inputMask">
-                            <string>999\.999\.999\.999; </string>
-                        </property>
                     </widget>
-                    <widget class="QLineEdit" row="3" column="4">
+                    <spacer row="2" column="2">
                         <property name="name">
-                            <cstring>lineHostname</cstring>
+                            <cstring>spacer33</cstring>
                         </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                    </widget>
-                    <spacer row="2" column="6" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>spacer12_2</cstring>
-                        </property>
                         <property name="orientation">
-                            <enum>Horizontal</enum>
+                            <enum>Vertical</enum>
                         </property>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>120</width>
-                                <height>21</height>
+                                <width>21</width>
+                                <height>240</height>
                             </size>
                         </property>
                     </spacer>
-                    <spacer row="2" column="1" rowspan="1" colspan="2">
+                    <spacer row="1" column="4">
                         <property name="name">
-                            <cstring>spacer13_3</cstring>
+                            <cstring>spacer34</cstring>
                         </property>
                         <property name="orientation">
                             <enum>Horizontal</enum>
@@ -520,14 +643,14 @@
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>131</width>
-                                <height>20</height>
+                                <width>51</width>
+                                <height>31</height>
                             </size>
                         </property>
                     </spacer>
-                    <spacer row="3" column="1" rowspan="1" colspan="3">
+                    <spacer row="1" column="0">
                         <property name="name">
-                            <cstring>spacer14</cstring>
+                            <cstring>spacer35</cstring>
                         </property>
                         <property name="orientation">
                             <enum>Horizontal</enum>
@@ -537,203 +660,11 @@
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>151</width>
-                                <height>21</height>
+                                <width>91</width>
+                                <height>31</height>
                             </size>
                         </property>
                     </spacer>
-                    <spacer row="3" column="5" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>spacer15</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>141</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="5" column="1" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>spacer18</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>151</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="5" column="5" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>spacer19</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>141</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="4" column="1">
-                        <property name="name">
-                            <cstring>spacer16_2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>80</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="4" column="7">
-                        <property name="name">
-                            <cstring>spacer17_2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>70</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="2" column="3" rowspan="1" colspan="3">
-                        <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>System Hostname:</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignCenter</set>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="4" column="2" rowspan="1" colspan="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>Default Router / Gateway device:</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignCenter</set>
-                        </property>
-                    </widget>
-                    <spacer row="6" column="1" rowspan="1" colspan="7">
-                        <property name="name">
-                            <cstring>spacer13_2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Fixed</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>430</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="8" column="1" rowspan="1" colspan="7">
-                        <property name="name">
-                            <cstring>spacer13_2_2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Fixed</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>430</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="9" column="1" rowspan="1" colspan="7">
-                        <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>
-                    <spacer row="10" column="1" rowspan="1" colspan="7">
-                        <property name="name">
-                            <cstring>spacer20</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>420</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
                 </grid>
             </widget>
         </widget>
@@ -741,16 +672,44 @@
 </widget>
 <images>
     <image name="image0">
-        <data format="PNG" length="5466">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000152149444154789ced9b7f701ce779df3f9097f27beaa1dd530fea2d034cb02a61712f40867ba238bcabec0a18c5b540a95100a74e48b91a056a1b9bf2785439f574104deb81d4b4637126adc5da1e936a3212a9c4a5609721e0568a8e8a291d58feb86505f21615112e463863b7e40d6e2d9c71afc895b67fec1d0950a0445244d44cf3ccbcf3dcb3bbefbbeff37d9ef7799ff7ddf7e0ff736a59ed17880d23498171af0cacbb0562b344feb250cca40c2c8422908144607a126b5a28e2b80ce46b12f3cf39f9c5da6af70d56110075c3be2f10588fa9c9ec3feabb4b2adbef1bc44842ac678587172236760cfc59979d0746a57d3af5df64603d2b4f3efdfa6af5715548740fdfa3768f9c18f8da0be15c290c1717c388ceafcc17af70fdd45bf3e10b3be6c2cebb470eaa1b86377ed27a7d24a5baf7c545f7f01f0dffebe3e162b1a14c53f9771a7cfe3265e7afc0df59ce4776cc5de8dc7ce0193a47c427ade78aa476ef5b9fda3832fdea1f2f86f36717c3f07c18f1300c171b4acccdcd87e1f9309c9b5b6cf015e4f052bdb9066fca6f1c3913f6fef61b4745f713ed9fb4becb48edde77776ae3c8c29937c3303cdbb0dcdc152!
 c7ba661d50fe3e192762e97df0ac3dec7df7045f7f0fa4f5a6f20525edd30bc70a6b8d4922b5b70eeedc570f16c181e7f73ee8a3c3c1b8667de9ebf54fffc65ed9c8f9ecb3ef8ea270f82ba615fa7e81e765fddbf18866f37c6fbdb8df13db7c4728b61189622f154290ce7cf84e1fc9188bf71e4837238b7c4f2734bf8f9f0e27be6f26198da7ce0b4583792fcb87adc745db5eed9a7c8c0dad7ffd9ada9d47a097170bc2aa8e0941b7cb67ee97a3be40f392480c28c838c4361a6841effa09c9f714005d7ad4312dcd97ad49e578564c4b58d30f06b729d10f2bf7c5c00ae2b0f10ddc3ff7620d5f76f06bedac7e0dd800454c00352402592dd9320e350f44a6492698a1530926057ae2cf76f801851fdfa14c43aa1548174b2d16e124a1e680aa4b73e850c8c47fc135ffca3eb05e09a3d40740f770a457c53bdab4e6e3d387e151428cd541b9d8bf8d8090717c84f17d1e33af999227a1c26663e429e762e7a8e4c42fea4831e87b11325ea028a659774121ce9d2dfbb0d1958df56378ca8d70bc0a7aeb542fcb6afffa179c79a8dbf9ef93cfc9d185db7c5083c58bb3646e92ca46f8be1be09f2bce0e8ec517a123d1cfd19f424da38fab38f963775fc2a895b20715b8c580df4ce04fb8f401b71ecca1ada6825380b1da956bc771c9469ed16a7765acab387fee27a00b82!
 60f486d1c4949ac2f25d42cb667a1ab60cdb8a0427eda811a14a65d8a76958!
 233415d1
a14662d3aa5a4e05acbe5d9891565d42ab42d1ff3839b41a47cb66c005f7111ed60792e2606c2a802e663b40f5f5792744d0048c943423185337b102365529c0123a9f1dca102554765f4908b1a6858350b3d6e226b123dae63d52c8c84b14cbefcbe1e3731ba12e87a025cd09309f0404f252879904969d43d30531a56190c55c30aa07f631f226e2755d57c70d50100e3411958385e95df7f7e3731b78e5576a8d60cec8a851917d87e89816c1f9667a1c9688cfb52c79a5d22d75426660acbee7bd2664b2fb8e7ea172ddf8c29e92414bdc8d32ccfc54cc1f8c9129d126ccfc2d0fb915883ab0a80ba619f0ad63f108a0901f8359dc75edc89aae8985d09867afb98110ed24d30e1d479ea913eaa2987fe9e3eeab51209748ab53c7a20a956f2e8f134c55a013d9ea65e2b91d54da882d616834a64792a904e46dc486a585ec4a5079aa233519bc04c99e82917a198f75e0f00571f04935df72a8ad82a83328ad2830c2ca484c9f2696e3faff1f299a33cdc9b233f3dc9e494e4e51347f0e63426df9e2078bf0b79fe156aef38388b0914f1399cf9a3400fcefc24d0c59ab847669386ebd6694daec199ab92506394bc2a6d6a8ca3651723d98a55766853131cb227993ca3229532155f63f2cc2b42b9f5732f05954367570580f8daaff71354bea0283d1058288a094105dfef!
 c08f9d46bbb98b20d6c6e7fe7e07ef2ab37cf337fe21e2efb69169d3a8f83f24f97e17d3b556ba6e3528fb9374a92665dfa227d9c3ccbc45c72d9f61d36d095a3bd6c05c340be041dbad318a73d0736b2b8107895b13e44b25f4d62e3cbf85f879d83f314e101804f8f9e0ec417b550020d9f55b8ad2b35906168a22687a42edbc45d5af21439fe9196889bb6cfd6c86d3f32e9bda5b79e57f3ec7a6f8e7b1021fefac8e336fd1f27e17cebc45ece61e62f15984926172a68052e92096942452314ae5c8f2c5b28ba1b662792ead6a2bf9a912fa2fd21c999fe42ed1c1cc4d334cbe358bbf3883a0e7883cfbc3896b01e0aa6380c054092c9a3120e2912c6b609f5671dc09d4408ba2775c63f4e01ecc8e2c7dbd699ef9da16506c8cb841b566836a406063b667f06b45faba73e4fd02e33ff1d9f6cd9778ee070e43df7e094d68c8460c284c83a1a6b1823a19cdc0c2420d347c5f46fdc18a5f8bf2d70480c4024520030b14a3c12fc9beb470ca55dcc041aa50981ac3ad6854e3400a5cbfceb35fdb46acbd8a500cfcd305dc731a3b7e348a5fd379e9701ecfd3d8fdca38aeaf512c5b78159dc274091927b2bc0a965bc22446d1b5b0a7559e7e71f7b2feac1a00822596c75ed1130820a399144ee6c975e688892ab9ce0cc53268f1187a1c9e797c0bf9a7730cdd3788eb1791!
 b54e4a4e1e6d41076cc040535d32ed26d5aa8563c71af9461adb03b32d8d45!
 11433519
3f340acbde2f570f00895569222d0457f4841d3fda4bff862ce393e39822875571315428365689a572737e2f22a541b56621a5c48939101808c5c1afe9d89e4d2261327a2c8f26c0f24a184998708b181858150b3010c2bef47e4c7fd5001098334da485101fb07c53ee1429626a0c0d1d5bb131550d5906434d502c47f3fa4baf816527d0d419fa9239343541dfba2c32b0c9e92675696324a31831b0a10fdb0733998edcbf2d831d80a99908e1d09fea438d47fd915833ab0680c43ad9443a21321fb07c53f6021bdac0f66d0c4c0a9e0329b02b2e99e66ad1a922031b14035bb1d1f55e1c69934ae570a5434c31287a91851d59c24cc2c46c09234863cd16e90c60dccaa32773e89f8544bcd11f38b56a00a898c7086410215d448d67578c01fddd390006b2fdd8812497d2b11b195cdd83b49a60efc9714cc5006cd40e1355d898a90c0445ccce0ca9a443dfba2cf5c026818ee595a2b11fd431da0c2c6931fa0a686d0e66cac4f10a08c5f4e4c9a7a7570d00efe4176b60be26038bba8444dc5e31068c9f2844155290ed8282e7a0ab305176f1806d7fb007c7d5b08228e0f9b316be34b0bd222819ac0677039b6deb4caa58181712d8e7f26485c4ae5af8351d5f4ea0aa39f61e1e074006d69f5fabf200cab53c2cb1fe5428e6bdb266a367fb700fe51b96b72f79826b820!
 39aae51ad94d0fd68ec67da3576fe591e151da1588089c4c2c4c4f127e8bfbb0f5716e93772e84290d83008010cb5a5e10264d66850874c2c07360cdc35c49e8902f9836ae489987f72ed73c0356e89a91b465419c859a19871bdd383c0c09e8940687eeb03c9ab8f6f25f34fd300388e83f00585699b095b056cea350384859ecca2690e031bfbf0020fbd4b873ad19ed80560cd255eafd789c562cb3b7401f6fcd73176be4879e2c0d33a4c04ab0a4004c2be3f24b0bede97eaa3dae6e0b929dcca44633eb61171834c97c3d8ce6f40eba58eb20670010da80289151a6f3ed70461161050f24aa43bd3d19ea04ef42db1f552b5e2d162a029da6fafcdacdd77adfa5c330062c3705204e2340aaad9d587c4c275eb78be8f504cd4b88da6f53170b7c3f6070688e991d5aae7aa24da1217f9e54a57dd2a09128c1d1b23369b60bc5cc0ad44192601104806d66511dd926dbd83b8818bd6a15d6ca630510874457f60eda6b5ff7d55010050bb877f17c5fcaeaa3af4f7e4b02b368e9bc2af59f42773b86d0e4f3cb015cb19471702d101b9ce0c4e2d8ada5440aa92fcc93c9aa293b72d128a4ea16c63a85926ca16866a52f42c8ca4c1c4690bc74ba1aa0e83668e6a50e0f77f7310bd5d8f3ca20164e170a1a20bdd58bb696d6555010010ddc33f118af882de9e406d3541b1910!
 b3a52dae81d59b21b21a3183cf5674f23a58e103689986884dd28899141061!
 4073020b
0403191320a90f5c06a5cb7f1eb0650446dcd2169bca796e7854706487c3681aeeb518cf0638c1d1bdb75ff3fbeff9f5dad1ed7f7610410c2fc32819c76bd1460936b37d1da5c06b2bd0811adfa0a35499fb99544c2258349b50eba6a22031b3d6e4050c4505310141a999f859932008b5cbb494cb1c9ad33d135873ea30f946815e9940bb8be796cef89d147444dc0025180ac41a63df3d081fd07aefa8bd1c73a20a176bfb01ec539a8aa2295d613a8220b8a8596caa1c61d72f12c2fcde42148e3d7f2485f454a0b211aabb6c6c2ea22a84ae662862884832a4ca462e357746460539706f6e93c32604a4abf574eedf0767d7fd7e4d03f1fea6eb631f69331d2c9f4efdebee9f6ef5f8d0ed7ed0100fec987a6d4b8d94b40d93da747f37a7b8eba2c61244d0ab509facd1c5a4a30b07900634382adf70ca12635b2eb7208c526db9e4115b1488e3bf47767d1532e7deb4c687812d818aa81339b4728e69494f4caa91d1e404a49bd8ad3e8d0026452198a33c57bae56878f0500c0ccebf74fc5303649597cc3753526660a409a897201a198d8e76c7271154fdaf425b3f8f12a431bb712eb54d97ef77662ed826d1b06409518ebfa71159f6cb20f2770898928c04a69303e5920a68803be6fdd25a79ef49aefb73d5b926a08ad50f48ae817f475371a809646f9147033700bd1!
 d7c0db8076fbf5fb6f715e7ffa2bd2cfffa0aae8ef799502463c830c2419cd8c56851d268e02037765901d31fa7b3238b118d9ae1c4edc25d795251657e9ebcae208073395a35e2ba10983ea82b56804dabfb35ffbbdc7fca927e3c0ad91ba88be9ebe7b681ea7aa461e6007f60d8b01cdfb373594571a008825bc593e0d8854a7a91b776d7d3491d4eefa9dee7e3cd5c1d40cdcc061cbe6346ead8ea6c570dd88974e57d14582fc548974324d3d1ee5034f3d3f86e769efb9eef85fd8c7f6fec0f7ecff03bc0b9c6f96af7ee5ab1bfb1fe87f7ecb7d5ba25ed661ecb531b473dae13b1fbe337b35005c6953b46549b9e9b26be19202f0fe12b9a5e67b8b33a5570ed76bd5c33361e57d5d6c4a1d9d0b3efdab6d1a3f7deb34ba584bad0442ac61a2041d2246e10ce8a28dfdffab406da695dd07f6575b6be4c7c77eefbb53c7f6e665ad221bfdb858b21bb36d83bf3eb873f09f0c5ecc094b53256ebfe5768ece1fcd8f8e8efef86a00f8300f685972bfe532f9538db286c82b94c6ef9b81bfd52831e0661421b29b07eed0ba8c5fd153fd5d4238b799f15cab15141b51bf8821f59fe7fd89b3bee79cb1270b53f6c9836f2f013868940b342c6f769bf1ed8f6fff8f435f1efa6588deeccebaa8a858d3166256fcd69d0fdf390abcd730d07501b0942e8f154dcfb8bc3441583a!
 3462348647e3fea796949b2e03f6a3e8c2f083c377985bcd7f39f89b8397f2!
 e9734000
f5721d1f7f26dd9fcefa15ff1d22c0dee74340b8dae5f04a0d34af2d1d22e7898e4bfc824bca3683e6c538c1f238d204e3434148b5a7e2cf7ee5d987b55eedf3b96ceee2f56ab54a2248502c47e70c76beb8f349bfe2bf77957aadfe5159967bcbe5c3a5e9253737ca9a25f714608daaaab1a14786ee7be2cb4f3ca8a534156d49cb6ec4ea5e741c67efc1bddf7bf45f3cfaef819f13ad292fb03c5efd3f4137b1c2544ab4acb903e806cc547bea9e912747fed381fd07e6c3c5305c6c1e396d1cb23c73e64c18ce85e1f1e2f170f1adc570d7ee5d3f013e03fcbd46dbcd21f6a1f457e101000cfc306c9717b8b7bf8b7bdc1a6d7296c7773cdc32c772eb2b235f1bb923d199f8d2d65fdb3a985013ad7470697fa0c96d2e9e49aa8a2a7b0feeddfbd8f6c79e22b2fc02d1307c8f0f5abf85bf2a6f507784aab9337cb07f4ff8ecf09ba1bdaf148667e6c3f0c05b91055f3d132eecfa69f80da0cddc607e66e45b23ffead49e53878f1f39de3861bab88ccf9f9d0fc377c2f0d49ba72e5a7eae382747be35320218c02f017f9b08cce690bb9c3e60f01be7013b43a14a36f7ebdceb2e706f7f177702cae07a287a906b8f4e762ddbee5a00a7c65f964e56dbb7dc93f8349228bf5bb88c3b441f55bc46b2345dc7a939534ffee72787477f3c7a0a7807a811254acd6db1a5817ba99!
 ecb3ce08600a0ee0893b9248eaa13173e90047cd0da21abc016e3ca75ab7548c4a0345b27dd11a35ead134bc4705d172daee1780e7a528f948fa7193b31b6202db9eba13f78688f94d22782699148f92bb9fd8acadf304afd87f0d1b93361b8ef4818ee3a1286c7df0ec3e37361f8c29b6138f74ef47b255abcfcfadbd1e9d253a553d1f9e2b7c2309c8fdc7eae38f7eeb7777cfb4f8df5462f90063a88d60431a219a399532ca5163e98c42da36bda16bf12e5523c58982a925b9f61e70cf4c5411590d1c0a946bc4945371a0a6ec525b34e5bde5007b80b9050d214a6a24d92c2eb85057bd2fef1de1fed7dd13a66fd8cc8d57f4164f5f3442ebf343d5f49d116ae900c7dec2190fae3b07528c159dd1913b2364e2abb13d10e5bba2e3d33761a3415ac32649390964017976241931af2cebd2e06f69be387c7f7ef7e7ef7cbbeef2f3414af3714978da79b4a5d97f270fd1ed04c6e5a28d707077a6262f7c183ec7cc0638fbb1d39b98d976a2683668cbc13ed80fb5e952133b15ce925ca175cd0e2903f89bffb3bdb1eb60e1f7489ac5be792c5972ade5c8435015849f98f4c82aed7035a688cbbe1fde13ead3a767f6f4292566d48993c73c2c65fc8a1b5996437c69015c8adf45fa173e0c689be1aa7a233c0f8bc74ffa69611a2a0b6d8287522309a8b9ba58a5f498fab0!
 a781f6747e87d80d1d3d597c7bdbe43a8f6cf6937a8fa130cad87ac36ced6d!
 92f32fad
d673054289dae0250bf1055ce3b508d83ed41a61d9cc681e8e77eb4e78744094d0598278af2ef72c9f2972b7f395d53eafb7162407393e4264009e746fe3735f797a00f6a360883e2948dbfb08da22c3174df16120ad493203d2049e3dc5f9427a493909fc17934d3b299c8e2e759be9c5d959cfee37a40d0e43bbf336a12787f821c7f97761dd7b7c96c86c2cc1e0ca963792ef5244c9489ce1095415fc2c7a7386afb6c27b2787321d39cd7975afe86d28d488496ee17de14169ff812c2dd4db25f61ca61b795830ec1d6bb73f8356089c50b65024df03ff61c2a7de7b9a15ff92991c22b6572ab46abb1186a090bfd9d75219e8b25d5cddf783127b7ffc690ea0475f4548ca2075a1c5928f33d3be07bcf7daee52fb9bab1fdd78bc29ff6c6c3eff726771d09bf3777240c4f9d0dc3678f84eebe52f8cddfd91f5ef71f1cfedad1d6d1b0f38562f8fc132f870ff77e2bbc2199e7dfd0dfd08da3ff0b0a084384fb4687000000000049454e44ae426082</data>
+        <data format="PNG" length="5520">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000155749444154789ced9b71701bf775e73f5256f642057b0b17cc2d5432213c542ca0944a602455406455d8b83e1b741a1f39491a29ad5b3177d358beebf8e45ca7e5799a0ce37632b2a6cd8d79398fa5cba50995d627f1ee1c12ee50e532b1ac854e12410f25021c912170228740690eb19150602dadfdbb3f1690289a5224398c9bb9be99df3cbe5dee6ff77ddffb7d7f6f7ffb03fc7f2e6b56fb06726bb75726fa8865eb3b65e41d16d6c76549f35ab68e2cc958b6858c56b0d0a764491eb16ceb8716dadf73e153a5d57eb65515a575e831a5a5abbf69f7a96bfbbe724c4c1b428831b1b25c16425c15a25f17a2ffd5b2887cf6a58ad23af437724bd7ce0fdb8fbb16b9a56bb7d2d2fd56fbbffb9e284f0b512e579dbcbab22edfe2f8f8c545d17fa82c9a76760f2bad5d5b3f6cbf7eaaa82d436eb9a5ebbf1ffcdab410a9aa3335e72f57f5e23267176fa12fdfacbb0f95af35ed38f5224dddf287ede78aa2b40c6d52b7764f8d7c4788c579c7eb9a2e579d989b5baceaf26dedda7573cbfa3975665ac4be307e566e39d0f061fb7b93282d433bd5addd57162f0a21e6ab919bbb4564a7abd1bf9d164bfa596e5f1422f627e379b!
 9a56bd387ed37e038afb4765d594c2f8de4ca119cbb5416e2b210236373b7d5d397166fba7e793f23637322f2e4c8870f82d23ad424b774e54706851097aa11aae95a06d4229776d478ba7aee8ca34f9d59c15e5c12f9b965bada7f591742dd716a526eeef67e503fd6ded355bb8724cbd68fc51fdeafca4d45f042365b04b5aa7d909da9407dd56e06fd6416bf0c0313592a5e18984813f2bedfd627b2a0423e5f011fe4672ad5fe8ad0e8f4e7da09edbf956f9665ebdb1f14807b12b9a5ebab4f3f32228ef50987a92f55c7f0c52563b92c44f90d2116d3421c4b8c8bc531218e2584981bbbbd2d1697443ce5f4337ed1d1a2aac7d3ce3dd5addd42691dfafd0fe2cb5d6780dcd2d5244bf21fb32d4fbc15b28522b8213d51840648e71c3d703a4b4186be0b29c2de207d1329c25e484cdcded62f646f645403e8e7b204bd30703a0d0aa4a6f2041b2065e689c7f663d9fa41a5b55bb957003e72b717b83ffad5bf0a3d646f7d2afa79ccfb61cbc75c9083fa075da42f41f0632e2a6780b51e4e4c1a3cecdbce891fc3c33e1f277efcd3ed47376ec1b5163cbfea8245f06ff270fc0dd828d77366163e21d7215d828f35d531bb98c13b15589f299db7acf9933fba1700ee2a03d4adddaa85fe798f122799d309a9604ce4417522e7b1c1b890673403898c4ec58a92983408599!
 0c81a37db93fa8ab629171deea88df95c918edd602979da7640d6cee36a062!
 39727461
82b9005b46768e8baa722e9ae00b02cbe284b9a9c9de923d2a4a14f40b4c147cf09030a7e8e9ca8e0977ce8259d70bd8655aa10ae0fa19774a2bee84df6f2f3e17a8dc046f0fb3d90077fa307b2e06ff290ce41b8c907398836f9d0a720aafa18b661cfce0e64b7e15514edc9550700a24f5ab64eb650e499575ec497077d2a4bb114c598d1d1dc2e8c429ace98869ed509584e269856087d72895df293c80cdc743e5334688b41feed2aeb676f704ab001523927d38c5c1ead097acfa5095990cce904fc7bb1d03b561500a5754801fd93b2a4810d6629cc17bfff227eb79fd04638f0b8c6a89c422efa4964e0eb5fd6c8aaa3ecd9d646a564e09743e8a53e42928be2c27142de287a2941c81ba552328807a250045fbdcbc900bf076621d8e0e870830f23e7645c25070177904449476bd2f0ab6964497be45e00b87312f4363e2249f21ecb9e44927661d93a960567729384af0678f5e249fee8f1287d17ce727e4262f0dc1b14e6829c9d1ec47e6f3b66f9554a97b3642ecb48f267c8cc0f02bbc8ccbf016cc79627096ff791cf57a8f3ad239b2de2515da47345ea5517c6549e68431dfa549646d5c30f46539c9ff663729e0533c8f9e95765e9815dc7ed8593f3ab02807bc357e3d8338f49d22eb0752449037b06d3dc42c17596c02f6f67614d1d9ff9b5464c26f9ea177e!
 13e95fd4a13506995d78998df76de7bc29b16d4394a98537d8a66a4c2de8ec6ad845665e67f303dbd9f2808bbac67530039e8f5767970d2e52d3b07d431de440dde0a12f952654bf85dc8244e35a177f7bb217db8e6293d7edf9e1ccaa0080b7f1772469d70ecbd69124995a2694aeea14cd12e6b50253390f969c65ff6f8549cde5f9cde63afa7ed4c3a3eecf336c6529cc87c9ccebac796f1b99f9615cf7ed02790c59d2383b95a07e610b788b78fc2ed2934ee4535379c26a1d462e8f57ada3efad34a17f0c32389fe251f9638cbe779ef3176730cb1964769db1e6ff3a793700dc3107c8680ab64e8d031cedd8560932937eb2f9044d52007210f6fae87dbd97d8c638e1988f17bfd2069241d41ba1584a821a01db20d6ac619674dab7c6396e0e600cc3de7f7f9cbeef9a74761f27a0f860d619fb890b1055830cdba0f9c3e818f8a500a66939cf83eebe1be7e16e32e0a38d4f4a92dcba9403966742a96413f87517a15f6f64706c80ecac1fc967f1892d3ef2f3153ef71b61867367787b6133e6ff4d605dddce89b11fb06edd2ece4c2578f7ea7612237dd86bb6915d38c93b57a3b87f258fbfa99ed7c6d284d57af41fa779d8ae6770c1e0fc453f3dfff39b70e3797e681586efaa20ba9b0cb811798c1533011b347f94c4399db64d6db8e42c6d9bc2a4a6c0e775e191!
 e0c53f6d437f21c8817fdd49ded4b14a21d2d9e304ae84000388e0533268cd!
 1ac5a28e
99f555eb8d20460eb4c620c3a488faa2244e1e819bee6fdd8def77078085be8014c5b27564192c5ba76623c9d7ede7bf7f848e1d1abd677b89c971f4d93c61155253cedb627ad299df8d9c8e65452996742ccb62d4350a7614591ac52c8549e60c3c1e8d236ff6115440cfa5893640229b2242187dc600a2c8b271e3fe68e6aa0120a3e56a48cbb2fcbec8d7ec9012001902ae10492989a6fa600ac2aa87d49433af1fff3b18cdf8f129a3b47be3f8140fed2d712cdb201ed0a85806918628d8069d3bda310aa03504d1b369628d6192d54c93e5147bd57614b7f33c167a6ed500b0d02fd490f6c8dafb225fb3332503ea21994f1241632097852648cde609572b3b4f162c3b095284a494c4ef6f67d43450d5381933854b8aa2e774204aca34d01a203199266207199e4c11b2a1373980df1b4779d8c4e3ae3e0f8caf1a000ada396ccbae228de28eafc8017bb6c601d817db43d2aed0d6e4c7c839951c3908aa1e7a2ef4a249112089b23186221b684d4e3fda260dd59ba2a3254ec536f0cb61f45cda19fb36441ac3e89641df090fbefa51347f946c21812c6905ebc20b53ab0640e1c2a74aa0fdd0b2752a1678dcc68a1c70f47402005331896f86815c96900afa549ea20c7bffac976c3e806e278108e6e430a615c5c8e920694ee4258d74c9607fb346d6d2895ef363cce8c!
 46548e60dcc5208d34aa028717a868f0360d9fadfdfadf370979fc6e496ae2fc992f68a2c190462ed8c9ee8039cb18a14055b674f8346cf7fd1c00fe9f3693c969f94e9426b8617fe870e0b2afae43010c362188d18295792fd8fb4933175f686e2f871c10ea004d403d78075400570011948178af40c27480cfb314d1d883e615ef8d4c0aa02a0b4762b966dcdc892e6f63765c08e90c9f5390454fdd60716a967f7e3ff3d1f00d96c16d552495c4892ccf801834a290ab28edf1bc7e74bb177671bd95216ff46ff0d276b4e5775a552c1e572bdef997a8f0ed0f37dcf6cb2ff393f24ed5505c00161e8afb0f53f6a57dbc9d68f52c807c82f24aaf3b181ec8e12de9862e0c8738e032c71260ff88022e059a1f3e5919e011448e7d20437056116f0035780ba1b97a5cea6ec803bf085f5c1f5c7eed69fbb06406eedf2cab63c898412dad88ec530f97c858269224b1a8adbc0e76ba77de728cf7d76afe330507cbb88a7de735d2f77ba982fe2913d0cbc39806fc6cfd1d904f98528a6a5830dd816fb9ae3582d79f63ede41be94c7d7e8bbde8d9134ec903bf4e9f55bd6ffddaa0200a0b474fd2192f62d4549b1775b1c633649361fc02ce9ecf1c6c9d48ff2f5cf76a2678e13527c58f545e29b344617468936459d48aa70fcdc7102ee307da33a7e7788c45492a81a2731a51!
 3511d428c3644489c1f265b08a028293a2371b2a5042ffe6e271eafc7c9881!
 a08278d8
590120aacdfb27e61550100905bba5e9725f9317f8307a52e065212eb4a08cb4ae26f8c13d95a4493c23cf783ff84658590e5241e970c1280862ca7b06c0da4512002f63048312ccb21c88a3d5c3d9ec4ac44001da52e8e45f53ea53e06fea0131e06bfdfef7084e562e0cd81c34ffcf613ffe64efdb8b70f23802c6bbf8b6d4de50b012049bc59c3579fa133d68e2c1b44ebc3244ad011d98fc793412346b1022155c3b20d425e67d688a801b013441a1c10624d11609878730c979424de12c3ef1ba53dd40192f316999d4d9037b5733d6f1df903d556e10a0e412e80d6ac7db1ffb5fe3bfe62f4817688282dfd9b904687154556837e0f8a1c0749c7a7c651dca3c4dd1a4772036047314b7d58a61fcbd291e5ea026ef5c5ea3aa89276bd4294e5511459c3920ccc8510969da46245c84cf661d94c589619b3260e150ebf7cf87ce7bfed6ca9f531f0fa00d186e81f3eb0e58197efc4877bce0000f3c213138a5b8b61339b7f3b84858ed61ca76219441b3512259dbd91367caa4c67ac93402b3cfdd80114af8f784b1c593288376b28b2cbb1dda3ecd91ac7af66686fd14036887aa34092881a213bd3872c69139645cc9a38540008b8034364ab0f7405b4260d7d42df7da73e7c200000726f7e72c24574bb65e9a7f2f90089890410253139802c6918330671b78b4cd1a0dd!
 ab9193b21cd8da89a542d7cee7b0bc16fb5bf751940b049af790b1b3c4bded8c96d2b8e438c6ac816545387a36814b92fb4d53df664d3c5fa8dddfc819d67522ac033da713be166efe5903b0a6da3e02dc07ac0714e0a34043e6cd4faecfbef9c2972db3ef95a23bf46e612141c4ab61d915347f94a49422b631caa804fb1e0e5368843ddbc28cba20be39caa83b437cb386cbeda27db3464a1e45f33babc901254af1ca70396207fe3cf3c3af3c634e3cef061e70dc45eed8d6b19bb7ab4f597432c0b08d9f1907d4ceafad3a2f55019097e85abb1f90d5a6903fb06dcf973c5edfb6032d7bc92829347f9874294ddbee20f9850a3e9f8b7cded1e9c92241c5c3c05b69a20d41f25211bfece1b95706281482efe6f3bd3fca9c3bfa8a59c8fc03f00e70b5d69efef2d35be39f8e7fb7edf1b6eb0f3cf0fa00c1b783a71f7ceac1c89d0070ab25b1354bdada65c7c49206f0de127b4dc92c9473e913a72ba5e2e90931f35e4879541d9ce6fe5d8d1b181c4b135236608f814759873e069b15178369082bf57ce7ff184885460e1d7bb5d8687bf4befffda56f4d9c3baa5ba505abfa1cd75b646ba4bee3331d3d1d9febb85e13a6cfa7093f1066707e50efebebfb5f7702c0ed3260cd92f36b96d91fa9b67538592155ffbe0ff8a56a7301f721c9726447fb43be8d815ff3ab7b37!
 ca72eaa39a3b5ea7d716546d9d8815fe499f9998370bd9e9cc7963227361f8!
 d21280ed
6abb4635f2a196907bffb3fbbfd9b9aff3e3b54a323f93c727fb302e18f8667cbff3e0530ff601ef5603744f002c95e55c51cb8ce5ad06c2d2a1e1a23a3caae73fb2a4ad5d06ec4f936b079f3cf8907f8fff3f747cb6e3463dfd364e08a6a02257721bb40d1173c1bc8c03d87bdc0604e90e6fbc5207b5634b87c855c002fe911bced648f33a4f70338fd4c0b82d086a83eaeefd72ef53724c7e341a895e3f5e2c16f1481e525329c2de302f7cfb85e7cd05f3dd3bf4ebe722b5d9631d4e36d4e1b0b80a34019b802dc0562002ec021e011e033ead28cae70e3c7be0dbe574b9787de7484de6aa3b4a52ce8e91c32f1ffe16f0719c19ea7e6e64d83f2959cb0a5329ce6bcd43400b10521bd4ddddcf77ffe7fed7fa178510a25cdb725add64393d3d2dc4a21023a911c7f923875f073e01fccb6adfb521765bf9b9a1b3ef35d150b8c2237b36b33bb340bdbcc0b3cf7f6ecd1c0e18f75125d497bef2d243a87c7effa7f7772053472337d60796ac08a1023940819ed77b8e3eb3ff99af033fc1592db0700870e96c053766b1d517e59050423de2c978af78a9eba2c81c4b0bb15816a2ffa213c1a16971e5d819f11c501f6a0d7da2fb6bddff71ae77eef4c89911672bdce5f24d7a717e5188ab428c8f8d5f8f7c395db6babfd6dd0d04805f057e1907cc1a292f97550cf811212b8!
 7c4eea713e2ebb1ef88d38753e2da41c371fa58baba297af9c6e9cb422c2e8aa9fe4161d5ec15f5746d77d8b873cc1062ee8db94cfb93eded38c3c687c32db7727ef934feb345443924bc512f5925805b2ee08ce802f89a2162435be0d6d7162be071417aa642b0d145a558c1e57191cfe7f1797d647359fc0d7e6759cc1b64e0f4c015d7a8eb70db5fb4f55a9665e2a47c19a74abc55dad76475d25ffd86f852794e88636784383626c4c82521a61785f8de9813f991e5ecbd94c597ca2527eae3e9f19bf7058e8d8b72bafccec14307ff36b0291003824023ce6ce2c299ce5762fc35dc26fa3f3369ff8ee83f961811e53921ba7427ed17abe93ebd78b38f2373ce0ef291f4caa8cc5d16a27c498853c629212e09d1ff5affe5832f1cfcebd0d6d0e338d3e583384c5f8733d52d2da856727a6939ff3ef9c0a8a8af8aba4e99f950de900b0bbd04623d54bcd0b6f1c6ff0c4c4250057d0ae20de033818ddc5805ae49d5ee395a21e2ca8c1d1d3efada91ef1e19344df30ace57820a4eba5bd5ffae1563d7df456ee1e36dcbe17b915a7123a92f947f7f3a2dc4d3cf1e10c26817dfeb7d5af47f735c1c4b956b6c2fc62f093134b67833012e935373422c5e15e2704a14433b62bf0d6c034238855223f02b38ef18f77173cadf2ef277e4c8bd0220016b0f0e8a63aefcc013ed3!
 e173ed980268d174f1b702d8eab2e487c27e46721ba79855ede864a3de8931!
 06d02230
71e8be39fdcb2a61b87d4cad556c17921aabddcd4c8aca657f2e38e08ef83ac08bd07f0dfce17071385b69345d9f809cd518a8504cfb542c07394fd336d1cf9cb1789d6f60500956bcec57a16e72b7216b48d303a0bd10638f4fdde57710a9a05601187e5dfe146ca2f777eb92c9f05564d6a6f7ff703bf24165f9a15179f16e2d29010a96e21a687c4485fb7187975511c7cb9dff9edc0b27dff43d3ce2cd17fd121cdc329318d531ad708ae96eaab56d37fd00cb06bbae7e0911052e16f307bdfa13944be6010de0d894c0f512b8c9ecb83cf897c45758831a442620ac22a1c7d8bb3198bfd3811afe044bc36af2f8dfc3f39a94d33eb80fb45bafbf7447acf3571b95f8837bac5b19747c4e1be53425c16cecfe89644fc7b63e2dac825d1bfefc8f8bfa2b68072eb32f61746d68854dc5f4eb50f8bf97d9503df385c5cbc24c450ba7cbd2c1e9f17958386f8cb7d67c443accce8bff822cec4dce2e598f7d898f8afe5334e81f3d219911f9a167fbcef3571cf3f70f885933d7da2a93f2dbe7b60503c15fb9ab8d315a87f967f969f93fc3f3ec99e641deeaece0000000049454e44ae426082</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>comboPPPOEDev</sender>
+        <signal>highlighted(const QString&amp;)</signal>
+        <receiver>NetworkMan</receiver>
+        <slot>slotCheckGlobalText(const QString&amp;)</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>
+</connections>
 <tabstops>
     <tabstop>listNetDev</tabstop>
     <tabstop>pushConfigure</tabstop>
-    <tabstop>lineHostname</tabstop>
-    <tabstop>lineGateway</tabstop>
-    <tabstop>lineDNS1</tabstop>
-    <tabstop>lineDNS2</tabstop>
     <tabstop>tabNetMan</tabstop>
 </tabstops>
 <includes>
@@ -780,6 +739,7 @@
     <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>
 </variables>
 <signals>
     <signal>changed(bool)</signal>
@@ -789,17 +749,14 @@
     <slot access="private">readDetectDev()</slot>
     <slot access="private">DevSelectionChanged()</slot>
     <slot access="private">PropertiesSlot()</slot>
-    <slot access="private">saveGlobals()</slot>
-    <slot access="private">waitDHCP()</slot>
-    <slot>DHCPDetectDev()</slot>
-    <slot access="private">startDHCP()</slot>
-    <slot access="private">SaveDevice( QString IP, QString Netmask, bool DHCP )</slot>
     <slot access="private">restartNetwork()</slot>
     <slot access="private">refreshDevices()</slot>
     <slot access="private">slotSysTray()</slot>
     <slot>save()</slot>
     <slot access="private">slotCheckGlobalText( const QString &amp; text )</slot>
     <slot access="private">slotDoubleClick( QListBoxItem * item )</slot>
+    <slot>slotPPPOECheckBox()</slot>
+    <slot access="private">slotPPPOEChanged()</slot>
 </slots>
 <functions>
     <function access="private">startDetectDev()</function>
@@ -816,6 +773,10 @@
     <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>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

Modified: pcbsd/trunk/NetworkManager/networkman.ui.h
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui.h	2007-02-22 20:04:41 UTC (rev 108)
+++ pcbsd/trunk/NetworkManager/networkman.ui.h	2007-02-23 22:10:19 UTC (rev 109)
@@ -15,6 +15,8 @@
 
 void NetworkMan::Init()
 {
+    // Let the list box know to add new devices
+    firstUpdate = 0;
     
     username = QString::fromLocal8Bit(getenv("LOGNAME"));
     
@@ -24,17 +26,18 @@
     connect(listNetDev, SIGNAL(selectionChanged()), this, SLOT(DevSelectionChanged()) );
     connect(pushConfigure, SIGNAL(clicked()), this, SLOT(PropertiesSlot()) );
     connect(checkSysTray, SIGNAL(clicked()), this, SLOT(slotSysTray()) );
-    connect(pushRefresh, SIGNAL(clicked()), this, SLOT(refreshDevices()) );
-    
+       
     connect(listNetDev, SIGNAL(doubleClicked( QListBoxItem *) ), this, SLOT(slotDoubleClick(QListBoxItem *) ) );
-     
-    
+         
     // Connect the slots to determine if we need to enable the apply button
     connect( lineHostname, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
     connect( lineGateway, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
     connect( lineDNS1, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
     connect( lineDNS2, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
+    connect( linePPPUsername, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
+    connect( linePPPPassword, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
     
+    
     loadGlobals();
     
 }
@@ -79,14 +82,20 @@
 	    
 	    Buffer.remove(0, Buffer.find(" ") +1);
 	    
-	    if ( Devs[i] != "lo0" )
+	    if ( Devs[i].find("lo0") == -1 )
 	    {		
 		// Determine if its a wireless or wired device
 		DevsType[i] = getTypeForIdent(Devs[i]);
 		// Get HW Idtentify line
 		DevsName[i] = getNameForIdent(Devs[i]);
 		
+		if ( DevsType[i] != "Wireless" ) {
+		    comboPPPOEDev->insertItem(Devs[i]);
+	              }
+		
 		i++;
+	    } else {
+		Devs[i] = "";
 	    }
 	    
 	    
@@ -282,7 +291,7 @@
 	    ConfigDevice->addArgument( "/PCBSD/networkmanager/bin/wificonfig");
 	    ConfigDevice->addArgument( Devs[workingDev] );
     
-	    connect( ConfigDevice, SIGNAL(processExited()), this, SLOT(refreshDevices() ) );
+	    //connect( ConfigDevice, SIGNAL(processExited()), this, SLOT(refreshDevices() ) );
        	   
 	    if ( ConfigDevice->start() ) {
 	    }
@@ -292,7 +301,7 @@
     ConfigDevice->addArgument( "/PCBSD/networkmanager/bin/ethernetconfig");
     ConfigDevice->addArgument( Devs[workingDev] );
     
-    connect( ConfigDevice, SIGNAL(processExited()), this, SLOT(refreshDevices() ) );
+    //connect( ConfigDevice, SIGNAL(processExited()), this, SLOT(refreshDevices() ) );
        	   
      if ( ConfigDevice->start() ) {
          }
@@ -314,49 +323,6 @@
 }
 
 
-
-void NetworkMan::saveGlobals()
-{
-
-}
-
-
-
-void NetworkMan::waitDHCP()
-{
-QTimer::singleShot( 5000, this, SLOT(DHCPDetectDev()) );
-}
-
-
-void NetworkMan::DHCPDetectDev()
-{
-startDetectDev();
-}
-
-
-void NetworkMan::startDHCP()
-{
-       StartDHCP = new QProcess( this );
-        StartDHCP->addArgument( "dhclient" );
-        StartDHCP->addArgument( Devs[workingDev] );	
-        connect( StartDHCP, SIGNAL(processExited()), this, SLOT(waitDHCP() ) );
-       	   
-         if ( StartDHCP->start() ) {
-	listNetDev->clear();
-	listNetDev->insertItem("DHCP Reloading...");
-	pushConfigure->setEnabled(FALSE);
-         }
-
-	 
-
-	 
-	 
-}
-
-
-
-
-
 QString NetworkMan::getValue( QString File, QString Key, int occur )
 {
      int found = 1;
@@ -520,42 +486,22 @@
 
  
     
-}
+    // Load the PPPOE Configuration
 
-
-void NetworkMan::SaveDevice( QString IP, QString Netmask, bool DHCP )
-{
-
-    if ( DHCP)
-    {
-        saveValue( "/etc/rc.conf", "ifconfig_" + Devs[workingDev], "", -1);
-      
-        KillDHClient = new QProcess( this );
-        KillDHClient->addArgument( "killall" );
-        KillDHClient->addArgument( "-9" );
-        KillDHClient->addArgument( "dhclient" );	
-        connect( KillDHClient, SIGNAL(processExited()), this, SLOT(startDHCP() ) );
-       	   
-         if ( KillDHClient->start() ) {
-	listNetDev->clear();
-	listNetDev->insertItem("DHCP Reloading...");
-	pushConfigure->setEnabled(FALSE);
-         }
-
+    if ( QFile::exists( "/etc/ppp/ppp.conf" ) )
+   {
+       loadPPPOEConfig();
+   }
 	
-    } else {
-	saveValue( "/etc/rc.conf", "ifconfig_" + Devs[workingDev], "ifconfig_" + Devs[workingDev] + "=\"inet " + IP + " netmask " + Netmask + "\"", -1);
-	runCommand("ifconfig " + Devs[workingDev] + " " + IP + " netmask " + Netmask);
-	
-               // Start the device detection process
-               startDetectDev();
-    }
+    // See if we need to enable the PPPOE group box
+    slotPPPOECheckBox();
     
 }
 
 
 
 
+
 QString NetworkMan::getNetmaskForIdent( QString ident )
 {
         
@@ -670,15 +616,24 @@
 {
     
     int i = 0;
-    listNetDev->clear();
+    int curItem = 0;
     
+    if ( firstUpdate == 0 ) {
+       listNetDev->clear(); 
+   } else {
+         curItem = listNetDev->currentItem();
+   }
     while (! Devs[i].isEmpty() )
     {
 	
 	              DevsIP[i] = getIpForIdent(Devs[i]);
+		DevsStatus[i] = getStatusForIdent(Devs[i]);
+		
+		if ( firstUpdate == 0) {
 		DevsMAC[i] = getMacForIdent(Devs[i]);
-		DevsStatus[i] = getStatusForIdent(Devs[i]);
+		
 		DevsNetmask[i] = getNetmaskForIdent(Devs[i]);
+	             }
 
 		if ( DevsType[i] == "Wireless")
 		{
@@ -690,29 +645,49 @@
 		       QImage *Icon = new QImage("/PCBSD/networkmanager/pics/network_wifi.png");
 		       QPixmap PixmapIcon;
 	                     PixmapIcon.convertFromImage(Icon->scale(32,32));
-		       listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
+		       if ( firstUpdate == 0 ) {
+			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
+		       } else {
+			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
+			   listNetDev->setCurrentItem(curItem);
+		       }
 		    } else {
 		       QImage *Icon = new QImage("/PCBSD/networkmanager/pics/network_wifi_dis.png");
 		       QPixmap PixmapIcon;
 	                     PixmapIcon.convertFromImage(Icon->scale(32,32));
-		       listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
+		       if ( firstUpdate == 0 ) {
+			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
+		       } else {
+			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
+			    listNetDev->setCurrentItem(curItem);
+		       }
 		    }
 	                  
 		    
 		 } else {
 		   // If we are looking at a regular Ethernet device  
 		     
-		      if ( DevsStatus[i] == "active" )
+		      if ( DevsStatus[i] == "active" || DevsStatus[i] == "" )
 		    {
 		       QImage *Icon = new QImage("/PCBSD/networkmanager/pics/network_local.png");
 		       QPixmap PixmapIcon;
 	                     PixmapIcon.convertFromImage(Icon->scale(32,32));
-		       listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
+		        if ( firstUpdate == 0 ) {
+			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
+		       } else {
+			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
+			    listNetDev->setCurrentItem(curItem);
+		       }
 		    } else {
 		       QImage *Icon = new QImage("/PCBSD/networkmanager/pics/network_local_dis.png");
 		       QPixmap PixmapIcon;
 	                     PixmapIcon.convertFromImage(Icon->scale(32,32));
-		       listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
+		       if ( firstUpdate == 0 ) {
+			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
+		       } else {
+			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
+			    listNetDev->setCurrentItem(curItem);
+		       }
 		    }
 	                  
 		}
@@ -721,10 +696,15 @@
     }
     
     // Show the correct device. 
-    listNetDev->setSelected(0, TRUE);
-    DevSelectionChanged();
-    pushConfigure->setEnabled(TRUE);
+    if ( firstUpdate == 0)
+    {
+	    listNetDev->setSelected(0, TRUE);
+	    DevSelectionChanged();
+	    pushConfigure->setEnabled(TRUE);
+    }
     
+    firstUpdate = 1;
+    QTimer::singleShot( 5000, this, SLOT(refreshDevices()) );
 }
 
 
@@ -773,7 +753,11 @@
 
 void NetworkMan::save()
 {
-           saveValue("/etc/rc.conf", "hostname=", "hostname=\"" + lineHostname->text() + "\"", -1);
+    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 {
@@ -795,6 +779,13 @@
      saveValue("/etc/resolv.conf", "nameserver", "nameserver " + lineDNS2->text(), DNSline);  
    }   
    
+    if (checkPPPOE->isChecked())
+   {
+	savePPPOEConfig();
+   } else {
+	disablePPPOEConfig();
+   }
+   
     loadGlobals();
     restartNetwork();
 }
@@ -832,3 +823,143 @@
     // Start the configuration dialog
     PropertiesSlot();
 }
+
+
+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()
+{
+    
+    
+     QFile filein( "/etc/ppp/ppp.conf" );
+     int foundProfile = 0;
+     QString ProfileName = "internet";
+     QString tmp;
+     
+     // Check to see if PPPoE is enabled
+     tmp = getValue( "/etc/rc.conf", "ppp_enable=", 1 );
+     if ( tmp == "YES" ) {
+     checkPPPOE->setChecked(TRUE); 
+     }
+
+
+
+   	// Start loading the rc.conf information
+   	tmp = getValue( "/etc/rc.conf", "ppp_mode=", 1 );
+	if ( tmp == "ddial" ) {
+		checkPPPAlwaysOn->setChecked(TRUE);
+	}
+   	tmp = getValue( "/etc/rc.conf", "ppp_nat=", 1 );
+	if ( tmp == "YES" ) {
+		checkPPPNat->setChecked(TRUE);
+	}
+
+	// Now load the ppp.conf file
+	if ( filein.open( IO_ReadOnly ) ) {
+        QTextStream stream( &filein );
+        QString line;
+        while ( !stream.atEnd() ) {
+            line = stream.readLine(); // line of text excluding '\n'
+
+	    // Check if we are on a profile line
+	    if ( line.find(":") == line.length() -1  ) {
+		if ( line.find(ProfileName) != -1 ) {
+		    // If we find the existing profile for this device, remove it
+		    foundProfile = 1;
+		    
+		} else {
+		    foundProfile = 0;
+		}
+	    }
+
+	    if ( foundProfile == 1)
+	    {
+		// Search for the username and load it
+		if ( line.find("authname") != -1 )
+		{
+			tmp = line.remove(0, line.find("authname") + 9 );
+			linePPPUsername->setText(tmp);
+		}
+		// Search for the password and load it
+		if ( line.find("authkey") != -1 )
+		{
+			tmp = line.remove(0, line.find("authkey") + 8 );
+			linePPPPassword->setText(tmp);
+		}
+	    }
+
+	} 
+    } 
+
+}
+
+
+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=\"internet\"", -1);
+}
+
+
+void NetworkMan::updatePPPconf()
+{
+    
+     QString DeviceName = comboPPPOEDev->currentText();
+    
+     QFile filein( "/etc/ppp/ppp.conf" );
+     QFile fileout( "/etc/ppp/ppp.conf" );
+     QString SavedFile;
+     QString ProfileName = "internet";
+
+
+	SavedFile = "default:\n set timeout 180\n enable dns\n\ninternet:\n  set device PPPoE:" + DeviceName + "\n  set authname " + linePPPUsername->text() + "\n  set authkey " + linePPPPassword->text() + "\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
+	updatePPPconf();
+	saveValue( "/etc/rc.conf", "ppp_enable", "ppp_enable=\"NO\"", -1);
+}
+
+
+void NetworkMan::slotPPPOEChanged()
+{
+    // Run the check to see if we need to enable the apply button
+    slotCheckGlobalText( "");
+
+}

Modified: pcbsd/trunk/NetworkManager/restartpopup.ui
===================================================================
--- pcbsd/trunk/NetworkManager/restartpopup.ui	2007-02-22 20:04:41 UTC (rev 108)
+++ pcbsd/trunk/NetworkManager/restartpopup.ui	2007-02-23 22:10:19 UTC (rev 109)
@@ -40,15 +40,17 @@
 </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>
-<functions>
-    <function returnType="QString">getLineFromCommandOutput( QString command )</function>
-</functions>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

Modified: pcbsd/trunk/NetworkManager/restartpopup.ui.h
===================================================================
--- pcbsd/trunk/NetworkManager/restartpopup.ui.h	2007-02-22 20:04:41 UTC (rev 108)
+++ pcbsd/trunk/NetworkManager/restartpopup.ui.h	2007-02-23 22:10:19 UTC (rev 109)
@@ -13,42 +13,30 @@
 
 void restartPopup::init()
 {
-QTimer::singleShot( 1000, this, SLOT(restart()) );
+QTimer::singleShot( 500, this, SLOT(restart()) );
 }
 
 
 
 void restartPopup::restart()
 {
-    // Restart the Network
-    QString command = "/etc/rc.d/netif restart";
-     getLineFromCommandOutput(command);
-     close();
-   
+        restartNet = new QProcess( this );
+        restartNet->addArgument( "/etc/rc.d/netif" );
+        restartNet->addArgument( "restart" );	
+     
+        connect( restartNet, SIGNAL(processExited()), this, SLOT(slotClose() ) );	   
+         if ( !restartNet->start() ) {
+	      
+         }
+       
 }
 
 
 
 
-QString restartPopup::getLineFromCommandOutput( QString command )
-{
 
-          
-     	FILE *file = popen(command,"r"); 
-	
-	char buffer[100];
-	
-	QString line = ""; 
-	char firstChar;
-	
-	if ((firstChar = fgetc(file)) != -1){
-		line += firstChar;
-		line += fgets(buffer,100,file);
-	}
-	
-	
-	pclose(file);
-	
-	
-	return line;
+
+void restartPopup::slotClose()
+{
+    close();
 }

Modified: pcbsd/trunk/NetworkTray/NetworkTray.cpp
===================================================================
--- pcbsd/trunk/NetworkTray/NetworkTray.cpp	2007-02-22 20:04:41 UTC (rev 108)
+++ pcbsd/trunk/NetworkTray/NetworkTray.cpp	2007-02-23 22:10:19 UTC (rev 109)
@@ -58,7 +58,7 @@
 
     if ( Type == "Ethernet" )
     {
-        if ( DeviceStatus == "active" )
+        if ( DeviceStatus == "active" || DeviceStatus == "" )
         {
 	   Icon.load("/PCBSD/networkmanager/pics/tray_local.png");
 	} else {
@@ -96,9 +96,9 @@
         // Check for PPPOE configuration
 	tmp = getValue( "/etc/rc.conf", "ppp_enable=", 1 );
 	if ( tmp == "YES") {
- 	  QFile filein( "/etc/ppp.conf" );
+ 	  QFile filein( "/etc/ppp/ppp.conf" );
        	 
-     	  QString ProfileName = "pppoe-" + DeviceName;
+     	  QString ProfileName = "internet";
           
 	  // Now load the ppp.conf file
 	  if ( filein.open( IO_ReadOnly ) ) {
@@ -353,7 +353,7 @@
 
        if ( DeviceType == "Ethernet" )
        {
-            if ( DeviceStatus == "active" ) {
+            if ( DeviceStatus == "active" || DeviceStatus == "" ) {
    		tooltipStr += "<br>" + tr("IP:") + " " + DeviceIP;
 		tooltipStr += "<br>" + tr("MAC:") + " " + DeviceMAC;
    		tooltipStr += "<br>" + tr("Status:") + " " + DeviceStatus;
@@ -412,7 +412,7 @@
 
        if ( DeviceType == "Ethernet" )
        {
-            if ( tmp == "active" ) {
+            if ( tmp == "active" || tmp == "" ) {
              Icon.load("/PCBSD/networkmanager/pics/tray_local.png");
 	    } else {
              Icon.load("/PCBSD/networkmanager/pics/tray_local_dis.png");
@@ -550,7 +550,7 @@
 
 void NetworkTray::slotEnablePPPOE() {
 
-	QString ProfileName = "pppoe-" + DeviceName;
+	QString ProfileName = "internet";
  	// Run the enable PPPOE command
         QProcess  process(QStringList::split(' ', "/usr/local/bin/kdesu --noignorebutton ppp -background " + ProfileName));
     if(!process.start())

Modified: pcbsd/trunk/ethernetconfig/ethernetconfig.kdevelop.pcs
===================================================================
(Binary files differ)

Modified: pcbsd/trunk/ethernetconfig/ethernetconfig.kdevses
===================================================================
--- pcbsd/trunk/ethernetconfig/ethernetconfig.kdevses	2007-02-22 20:04:41 UTC (rev 108)
+++ pcbsd/trunk/ethernetconfig/ethernetconfig.kdevses	2007-02-23 22:10:19 UTC (rev 109)
@@ -1,13 +1,16 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="2" >
+ <DocsAndViews NumberOfDocuments="3" >
   <Doc0 NumberOfViews="1" URL="file:///usr/home/kris/ethernetconfig/src/ethernetconfigwidgetbase.ui" >
    <View0 Type="Other" />
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:///usr/home/kris/ethernetconfig/src/ethernetconfigwidget.cpp" >
-   <View0 line="94" Type="Source" />
+   <View0 Type="Source" />
   </Doc1>
+  <Doc2 NumberOfViews="1" URL="file:///usr/home/kris/ethernetconfig/src/ethernetconfigwidget.h" >
+   <View0 line="59" Type="Source" />
+  </Doc2>
  </DocsAndViews>
  <pluginList>
   <kdevdebugger>

Added: pcbsd/trunk/ethernetconfig/src/Makefile

Added: pcbsd/trunk/ethernetconfig/src/Makefile.am

Added: pcbsd/trunk/ethernetconfig/src/Makefile.in

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfig


Property changes on: pcbsd/trunk/ethernetconfig/src/ethernetconfig
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfig.cpp

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfig.desktop

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfig.h

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfig.lsm

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfig.moc

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfigui.rc

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.moc

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.cpp

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.h

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.moc

Added: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui

Added: pcbsd/trunk/ethernetconfig/src/hi16-app-ethernetconfig.png


Property changes on: pcbsd/trunk/ethernetconfig/src/hi16-app-ethernetconfig.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/ethernetconfig/src/hi32-app-ethernetconfig.png


Property changes on: pcbsd/trunk/ethernetconfig/src/hi32-app-ethernetconfig.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/ethernetconfig/src/main.cpp

Added: pcbsd/trunk/ethernetconfig/src/network_local.png


Property changes on: pcbsd/trunk/ethernetconfig/src/network_local.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/ethernetconfig/templates/cpp

Added: pcbsd/trunk/ethernetconfig/templates/h

Modified: pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h
===================================================================
--- pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h	2007-02-22 20:04:41 UTC (rev 108)
+++ pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h	2007-02-23 22:10:19 UTC (rev 109)
@@ -170,13 +170,9 @@
 	  
     
     
-        // Finish by asking if we need to restart the networt
-    if (QMessageBox::question(
-            this,
-            tr("Restart Network"), tr("Do you want to restart the network?"), tr("&Yes"), tr("&No"),
-            QString::null, 0, 1 ) ==  0) { 
-	runCommand("/etc/rc.d/netif restart &");
-     }
+      // Now restart the network for new settings to take effect
+      runCommand("/etc/rc.d/netif restart &");
+
     
 }
 



More information about the Commits mailing list