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

svn at pcbsd.org svn at pcbsd.org
Wed Feb 28 11:40:21 PST 2007


Author: kris
Date: 2007-02-28 20:40:20 +0100 (Wed, 28 Feb 2007)
New Revision: 115

Modified:
   pcbsd/trunk/NetworkManager/networkman.ui
   pcbsd/trunk/NetworkManager/networkman.ui.h
   pcbsd/trunk/NetworkTray/NetworkTray.cpp
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui
   pcbsd/trunk/ethernetconfig/src/main.cpp
   pcbsd/trunk/wificonfig/Makefile
   pcbsd/trunk/wificonfig/main.cpp
   pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h
Log:
Updates to Network manager, add IPv6 Support, fix restart issues with default gateways and more!

Modified: pcbsd/trunk/NetworkManager/networkman.ui
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui	2007-02-27 22:14:38 UTC (rev 114)
+++ pcbsd/trunk/NetworkManager/networkman.ui	2007-02-28 19:40:20 UTC (rev 115)
@@ -9,7 +9,7 @@
             <x>0</x>
             <y>0</y>
             <width>700</width>
-            <height>531</height>
+            <height>560</height>
         </rect>
     </property>
     <property name="caption">
@@ -103,17 +103,6 @@
                             <enum>Horizontal</enum>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="9" column="0" rowspan="1" colspan="10">
-                        <property name="name">
-                            <cstring>textLabel1_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>System-wide configuration settings</string>
-                        </property>
-                        <property name="alignment">
-                            <set>WordBreak|AlignCenter</set>
-                        </property>
-                    </widget>
                     <widget class="QLineEdit" row="10" column="3" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>lineDNS1</cstring>
@@ -144,23 +133,6 @@
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
-                    <spacer row="10" column="0" rowspan="2" colspan="1">
-                        <property name="name">
-                            <cstring>spacer21</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>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>
@@ -210,61 +182,91 @@
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="11" column="5">
+                    <widget class="QLineEdit" row="10" column="6" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>textLabel11_2</cstring>
+                            <cstring>lineHostname</cstring>
                         </property>
                         <property name="sizePolicy">
                             <sizepolicy>
-                                <hsizetype>5</hsizetype>
+                                <hsizetype>0</hsizetype>
                                 <vsizetype>0</vsizetype>
                                 <horstretch>0</horstretch>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
+                    </widget>
+                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="9">
+                        <property name="name">
+                            <cstring>textLabel2</cstring>
+                        </property>
                         <property name="text">
-                            <string>Remote gateway:</string>
+                            <string>Device Status</string>
                         </property>
                         <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
+                            <set>AlignCenter</set>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="10" column="6" rowspan="1" colspan="2">
+                    <widget class="QLabel" row="7" column="2" rowspan="1" colspan="7">
                         <property name="name">
-                            <cstring>lineHostname</cstring>
+                            <cstring>textStatus3</cstring>
                         </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
+                        <property name="text">
+                            <string></string>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="11" column="6" rowspan="1" colspan="2">
+                    <widget class="QLabel" row="5" column="2" rowspan="1" colspan="7">
                         <property name="name">
-                            <cstring>lineGateway</cstring>
+                            <cstring>textStatus1</cstring>
                         </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
+                        <property name="text">
+                            <string></string>
                         </property>
+                    </widget>
+                    <widget class="QLabel" row="6" column="2" rowspan="1" colspan="7">
+                        <property name="name">
+                            <cstring>textStatus2</cstring>
+                        </property>
+                        <property name="text">
+                            <string></string>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>textStatusLabel1</cstring>
+                        </property>
+                        <property name="text">
+                            <string>Link Status:</string>
+                        </property>
                         <property name="alignment">
-                            <set>AlignHCenter</set>
+                            <set>AlignVCenter|AlignRight</set>
                         </property>
-                        <property name="inputMask">
-                            <string>999\.999\.999\.999; </string>
+                    </widget>
+                    <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>textStatusLabel2</cstring>
                         </property>
+                        <property name="text">
+                            <string>IP Address:</string>
+                        </property>
+                        <property name="alignment">
+                            <set>AlignVCenter|AlignRight</set>
+                        </property>
                     </widget>
-                    <spacer row="10" column="8" rowspan="2" colspan="1">
+                    <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>spacer21_2</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>
@@ -273,30 +275,23 @@
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>60</width>
-                                <height>50</height>
+                                <width>230</width>
+                                <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="12" column="0" rowspan="1" colspan="10">
+                    <widget class="QPushButton" row="2" column="7" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>textGlobalError</cstring>
+                            <cstring>pushConfigure</cstring>
                         </property>
-                        <property name="paletteForegroundColor">
-                            <color>
-                                <red>255</red>
-                                <green>0</green>
-                                <blue>0</blue>
-                            </color>
-                        </property>
                         <property name="text">
-                            <string></string>
+                            <string>&amp;Configure</string>
                         </property>
-                        <property name="alignment">
-                            <set>AlignCenter</set>
+                        <property name="accel">
+                            <string>Alt+C</string>
                         </property>
                     </widget>
-                    <spacer row="13" column="0" rowspan="1" colspan="9">
+                    <spacer row="14" column="0" rowspan="1" colspan="9">
                         <property name="name">
                             <cstring>spacer23</cstring>
                         </property>
@@ -313,15 +308,15 @@
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="9">
+                    <widget class="QLabel" row="9" column="0" rowspan="1" colspan="9">
                         <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="Line" row="8" column="0" rowspan="1" colspan="9">
@@ -338,66 +333,64 @@
                             <enum>Horizontal</enum>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="7" column="2" rowspan="1" colspan="7">
+                    <spacer row="10" column="0" rowspan="3" colspan="1">
                         <property name="name">
-                            <cstring>textStatus3</cstring>
+                            <cstring>spacer21</cstring>
                         </property>
-                        <property name="text">
-                            <string></string>
+                        <property name="orientation">
+                            <enum>Horizontal</enum>
                         </property>
-                    </widget>
-                    <widget class="QLabel" row="5" column="2" rowspan="1" colspan="7">
-                        <property name="name">
-                            <cstring>textStatus1</cstring>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
                         </property>
-                        <property name="text">
-                            <string></string>
+                        <property name="sizeHint">
+                            <size>
+                                <width>87</width>
+                                <height>100</height>
+                            </size>
                         </property>
-                    </widget>
-                    <widget class="QLabel" row="6" column="2" rowspan="1" colspan="7">
+                    </spacer>
+                    <widget class="QLabel" row="11" column="5">
                         <property name="name">
-                            <cstring>textStatus2</cstring>
+                            <cstring>textLabel11_2</cstring>
                         </property>
-                        <property name="text">
-                            <string></string>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>5</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
                         </property>
-                    </widget>
-                    <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textStatusLabel1</cstring>
-                        </property>
                         <property name="text">
-                            <string>Link Status:</string>
+                            <string>Remote gateway:</string>
                         </property>
                         <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2">
+                    <widget class="QLineEdit" row="11" column="6" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>textStatusLabel2</cstring>
+                            <cstring>lineGateway</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>
-                    </widget>
-                    <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textStatusLabel3</cstring>
+                        <property name="inputMask">
+                            <string>999\.999\.999\.999; </string>
                         </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">
+                    <spacer row="10" column="8" rowspan="3" colspan="1">
                         <property name="name">
-                            <cstring>spacer3</cstring>
+                            <cstring>spacer21_2</cstring>
                         </property>
                         <property name="orientation">
                             <enum>Horizontal</enum>
@@ -407,22 +400,78 @@
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>230</width>
-                                <height>20</height>
+                                <width>86</width>
+                                <height>100</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="2" column="7" rowspan="1" colspan="2">
+                    <widget class="QLabel" row="12" column="5">
                         <property name="name">
-                            <cstring>pushConfigure</cstring>
+                            <cstring>textLabel11_2_4</cstring>
                         </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>5</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
                         <property name="text">
-                            <string>&amp;Configure</string>
+                            <string>IPv6 gateway:</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+C</string>
+                        <property name="alignment">
+                            <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
+                    <widget class="QLineEdit" row="12" column="6" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>lineIPv6Gateway</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="text">
+                            <string></string>
+                        </property>
+                        <property name="alignment">
+                            <set>AlignHCenter</set>
+                        </property>
+                        <property name="inputMask">
+                            <string></string>
+                        </property>
+                    </widget>
+                    <widget class="QCheckBox" row="12" column="2" rowspan="1" colspan="3">
+                        <property name="name">
+                            <cstring>checkIPv6Enable</cstring>
+                        </property>
+                        <property name="text">
+                            <string>Enable IPv6 on this system</string>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="13" column="0" rowspan="1" colspan="9">
+                        <property name="name">
+                            <cstring>textGlobalError</cstring>
+                        </property>
+                        <property name="paletteForegroundColor">
+                            <color>
+                                <red>255</red>
+                                <green>0</green>
+                                <blue>0</blue>
+                            </color>
+                        </property>
+                        <property name="text">
+                            <string></string>
+                        </property>
+                        <property name="alignment">
+                            <set>AlignCenter</set>
+                        </property>
+                    </widget>
                 </grid>
             </widget>
             <widget class="QWidget">
@@ -707,7 +756,7 @@
 </widget>
 <images>
     <image name="image0">
-        <data format="PNG" length="5238">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000143d49444154789ced9b7f701c6779c73f26e7640552678fca7057e2e0033b91cc854a4209d6d5014b84269120382712882e60d0f12bd6049aca40d373a6cd9cdd692aab34451aead62730e8449b4862ea9c948ec197d4c1e754b664d5b24eae9cb9f3c8ee9d46f19caeb2382df292a77fecae7e454eac14c730e599d979eed9bb7bdffd7e9f679ff779df7d17fe9fcbaaabdd8152122c54f0dda9e9a1cd0aca260dedbd8acd5fa8e921149b82a66b28f8c735422f2b36a55fd3b51734fc3fe3d4fba6aff6b55d55514b1277abee4064dd96d4a5fa6f768ac445e4a42c2f53868a4445860f8a54dcdf32a39624fe597107365f6b1c2b16c51dd8a2ba8383de47da453222b99c097276799dbbccf9e1d18c0c378bacdb1c7c5e2d09945f6b5c6f280e77225f71077ed0f994880c98602cf0a68725b3046ce6327a6ab10e36cba5759b527b581754ae35ce654575278a1ce5c19733fb453213066a4be74c10a954c6d4b9d7b5adffa596b473a42f21950fe68e29eec61baf35de45a2ba139b1de5c18b32212213a6e75297f16ce20af5c465ec5191ca277369c51d28bad6b80103bc5a12b828a9859e5cde83a93143f79f4cbdae4e8c651!
 6fd7f693bfd275352b13573ed49504b12eb1477209de9139131d34396b622c0f25cdc50c37131f2429fa18ff42d632ff47c6a89b6da8f8a3836a5ce28eb8385d706fd96844d71078e7b1f36b2b5884822b1449b1eb7ec43871322199148d4d2c3cbda876289c59164b533b6b8fded8f778aea0e3c7b4df02beec05f36dd9991ceee259e195de2c1c386f73a7b8745c6443a7bc5d4af632ff4b8399a0c8f2e6e7f382e2253228ef2a0a825892fbcd5e0d7a925c199ed8f45443222093302864f9adab423d184c8a8c8bea7fb57a40f1d4ecc7b7a76de8e4487456617e78cfa6f8a28eec02b6a49507dcb0850dd891f54debf4f860f881c892df1547cdef3b993222dfb8f486e40a465bf98fa8d6d49c97cee3023abb3d7682f72d08caec322322bd212ea97e0968ca8eec05fbc593cd7ade4c78ef2a0635a3ff64f1fdcb0c3369e8bb2adc6456c30cd5a7701d1e3496e2fb4131b4d631b2a20743e8aae7f8463a9189fd1d7129a88a1cf7ae6edd492ef4ddbf9de49ecefc923796e12fbda3c926726f17c388fa189341fad2820f6729ab52505c44ea6a99eb899b64bbd9c19ab716bd7e77f97a917f59512f0b695fc58d37848b1f995e4b956ea4aabe879093c6e27adcfc470692e763d039e4227a1e928b51baad0a6a1768387d074145fb16791bdf4fbda0d55146f0097cb0e697!
 0adb543125c1becc447a0ec56270c81a7c449f438788a9cb4e910f8642d4a7!
 eb85055f
d5b570a1e561801cabb427fa3bd1aba693aa7d37dac8f5deb3d1c9d497226f54186c6a3f8dfeee2e0a5385fbbe3769a9f8f72afe6a2ed7c0f9a7e172317a254e74c5bbb8b63a91ebcfacd73df5fd063f8bc6b49bf3243c1bb57934c4e6277e5113f33c9c65bf218184ae32c2a203698e623ee02c23f8b539d5943db5814edd236ce4e34a34fbcf8cc9b21e18a442d49a8aa3b206a4942547750d4928414dfd924326ade9b13222dfbfb65b857645fd8b8779b424724d327b2fdb1881c795a64fb63ed72646f42ea1f6932ed4e53478c5ac1aa18ad51c01a4dccdc3257371c16c9f48904761f9244af48fda311514b12936f06d795474061fe9d369b52a7e9c7b0d9b6a1e921340d0e9e3e43ed6c19ad27a3fcd9831ef6be1863e8f45a0e1eed613cf5310ec6bbd05ffd146733ad4c4f25393aa16153bec6d1b130f0198e8e75019fe2020394ddee249d9ea1c0b92002462659539c47ec581a8f996b5c4576da9e1f6028e121a9c5b890fd18438966c5f6ce8f74e9175e9c580901579c03149b7f3d3a28363fe82153c3c848158f9f0d539a5f45d7cf61e73d1ecadc03b43e5683f71ed8735f2dcefc3d543bbc64f562bc453eb2d361bceb0d5d57544b763a4cf1ea324882d39907e7cc5c70063616db193861e41a06a1caed22fc429cba5bcb70aa5091ef2176628f713d36e59695!
 80879545c0676db66d9b343d84cda66045c2f46c88c9ec34c98b6778f96c191718a0e1fe3206e2693e5a5e40dbbfb6f2d5fc3fa12d7b98f1895a62632156bdfa00b1b11f9277fd36b2f4a0d86af9e9a930b75ff820d9c2f97b7fcd863c064ea42933effdb54505845f88e3fdc546f68e0df055c549772ec6d0e839b2b9a3286cebd3269e3aba1202ae3c02f0ab0b3dbf3012b4691839534532dd4ae59a321884b2f54ec23f0e537f5b03f64ad8f3e735600be35b5fc7e4740714d5811ea6feb61ab2d35d347edcc79e6c0fe9413bbeaf7771e2593bfe6f7551b6ce09a78c08e8fa39f88a36d2a683bfb48c1031aa0a3d64b39a713d84f257021e561201efcadf6ab329250b73c0d248989ed671de6cc3f3d1b5f41cee2179be8a69fb08377fd849fadc0c5fbdab8c8ec183bc72e15eb2ffd58a36fb199efe8f3656afdec6c153217e35fb193a8eb4a2af7a8013e77fc82f677d28ef88b3b1640d5d87e3d416ad21d41fe7f3fa1af69e8f3134ea61f78f77c2fcf5bca08d3fffef2b2160251130ef79c2cb46023af84b3d74fd2c4acda61af29428359bca181802e7da3c98362221ba3b8f96fa1da4b321b4692ff1e41eaa2f7a8130508753edc55fee677232847d72233d2f41ad7b23e141f0dfba913606f0157be87d71172cea5f5b09f69511a011ba80cd87a6875014d0f41096!
 8d4d99b31ffa5e88dabbab08ff344cbd524bf4549ab22218189a0417c4cf18!
 3a7ca20b
4df331391d42d334baf3ba41f7a1d8bac94ed7d23118c66ef7b33312a2661d8407e3f8dcd07a62803aca080dc5001f8a129eef1f7ff6aa11a0e03f6b31ad28ca6b3c6fd9de75d5a041b5d34b872d4a5591138e4359919d8121d8b8c14ed7b37062a40aa7da4d6361034ed54ee3663f9a1ea6a1c2cf8c16a6ceed033dccaebbfd844f83cfbd91d08938f5b796d161469aa274b1d3d1889a6f5c8f46e8ec5523402374ca62daaef85fe379cbee3d1f8635d031d2411d55f40c26a104064ea529bb15e22393942541d33bc0564787ad0397ab81eeb35d381c3e7acf769167f3111a0c013ebacef6e07343e8589c3a7d236dc706f0eab0ebb91e5c850d4cde71027bbe793d307cd50850f11f47d7749369d4fc86657340e0e30d0034dce7a743879a1217b14128733be18431aeef3815c66fab033a506fab4755baf097d482de857f532d8ec22e1a37fb99d1c354396a080fc68d7b5f87ba5bcb086931ba7f5a86734d37fe520fc9f156149b7f5c3bb5fbe5ab46c0f8a9f74d83ff054d0f31a3813d3fbc6c0ed8fd5c2b0069d2f8ef809ec1249e22881e4f83037c5f0f934c5713d23b803ab2c7dac86ab58407bbc0564bc8d4bde7bbd8b3de47743c8cefd246c243511a14e81889919df690d55a51551f3b7ed20580a6877eb652f02b16c51df8925a92104779502a77e7442d092e9a1!
 ba8ee8034dd9d98abe1874f0ecfcf15322281270fc9bedd39a9d8da22155b7352bab5455ab6e6a4f2c17dd2df2d126cee34d616a2e61cc05a17b09e23e4e6e706b90191ed8fb7cbbacd29a37f77a2e6cd605ad1b341b524a86aba764eb1f9f35deb7a41af63e46cb39180cc677da031f9e82ef8bcf19f6432894b71d1f5f3284747aa803033d33e5042b80afd389d3df83e5143f27c12d70617cc0079c02560f5bc9e9999212f2fef35d714eee8a1f5c765e78f466a5d7074c5eb012b16b524f177aa3b20c13b3352f9e03e29de929285b344c7a684547fae491689e5c1a5cf0b96ca524f8f2d88a485b3c3295924fd7dfd9724259f7e337856fc74582909142aba72061b6ae9864634da48a76718cf66516c7ed4fc304e6723decdddecf8b2cff02630f9ca24f635f6393d27a68727d393d89d767a9eedc173ae8adde75b495ff091d542a003ba46707d0323ee18beba5ad2e7d238d73ae79a891d8de99e1b3d9f5c75d3aa7f5b099e15ad08016883bb2f80f618f848bed28abfa41ed75a3b8ec206b08569c86f40513af095fad8f5dd2ee2cfa4e9fa490f76dd4eecc51876c50e478149e87aa68b99e3b0ebaf428cfc147c5f6f8573353c74bc83527507e9e95ebc458da427edc4cef8a93d1a86f3d5f8bfbe07a7e684e4fc75792a3cb6d8d9d88f644c56f4ace04def0f50dc8!
 1e7149b72b7eb463b6a413dd83ad02e7ad1b40e5c6b1ba8281fc06f2ba3f6d!
 99d689a1
745e9c09ea7800dc08fa274a1e97eb0750375a0b781ad1e4d6b03ea99d1dbccf31d6467ea80106a41031a663fd3cdc4bfb88be41d495c2ed75c8ee879b667df27eefdc497af14c78a23608e00c5ff3974ede5f47835d04143b91fe79a5e82f735a028617c1bca689d86c67b7661b7f7e2a79ec919f01619159f77bd0ff4107545d5a0b752e73648a82fa903da6828af27cfd641c3e67a5cce6e1a2b7780cd984526cfb792cefa8fef18dcf94557be0b2e6224c83350535ef350e440e48aa3e0ffb44344750f1761eb7e5e5515c746971d55f1832d8cd3e143cd8fd2905fc5ceb33da0d7909d0ea165abd0b4108a623ee536275673a4dafc7315a2a274a32a7e345b98ec052f9adec18c56c7c89966349dd39a96add44e378fefdbbb6fc8ff15bfdb6aa3e7b91e6adc355f5b75d3aabd5782e14d470040f6d4074eabf9fe4a74cea75ff1a211c65fee6346ebc1776b15add35176de5383d301bbeef3535c92a4e9c15da8854e1a3637a0d8c23494fb51953cc3ceef267067032e472f8d77f84109e35bef033aa82baa2379ae19c5e63fad69546aa79bc701aad7561f9acb0517a1a6a486ae97bab65c29865fcb1ea1e2cd29274af81935dfff474e672f8e421f79f93d38f26bc016c36ff3d0418c3a9b870e06a8b795d1a60f504f196d5a8c3a3c84f4285085a647f1514548ef41d3!
 6a98bc1066fc829764ba157422e971edc1ece9c7e7f60f35ed6efaeb1d7fbee3db96ddf35c0f359335c757f956ddf6ebc066c92af3b80eb81e783ba002ef026e04deaf28eaada55b02ff58b93ba77b1f6e372abba78cd5db96fdfd923b69ae1667440e99cf0cdb9f36aaba7de17ef3499251e135ed3d2289a8b15adcf99448c5d6965f04b70cef06de0b388077020580227df2d25cc59831dbdddf9e5c16c5af11b803b809b819f820703b7007f071c7bad2af54dedfd4e77db85d52ad0638898b440e1ac5ccd27d04c3a3c633c0c8c1619194694f896c7f3c22de2f8b5ef189e021d551fc59a012f000e5669f45db1fdefe50a437b2a8288af44644f6cb8ad6055f0ff8db4cf0d76114a60af00ee6bd7f13b01e70031f3249b80bd8baaea8f21bd59f0bf61cd92f5381270dcfb6770f1bf57dd4a8e60e1d36bc16392822a386e7870f88d43fd29e697f221171dc58fa0de0d3c0bdc03dc0c7cc3e3e5c515e71677ba8fdbf17821f3e6990d81e6edfbf12a06f44c2c2cf96bd90149b79acc688927798471e703d3645a9d8e4bdc5b9a1f8032ec7ce0d8ad2f52e7f7e6d4148ef41b1d5a0e93dd46935ffd39c0d4d64c7938991a1d8e99153cf8f0162f6a59bc7256016982d7597e6373cdaf094bfdeff5eab924c9f4be3743889fd3c86e79ce7b3abb6adea067e05bcfa66095828!
 4b470b2b3a961e1609ca82230fb8c1fcbc7a0179d799ff5948ec1bc9a5cead!
 9db750c7
9fd6de5f3b5f4fbf02ac018e010ecedacbec15d90bd9290cc25ee57548b05d61c7cb35609db3c8596576a801bf601eac953b14e689b87e81b6c8785d121c373af2630fc7b6a52bd37feca9f0cc9d9f9c34e61603c706285b5fc6ceefec7c3c7b21fbab2bc4f596889544576344430146167700eb80228ca4560e54001f01ee04ee063ea9aaea038d8f367e5f523239379bb464e14e9229917d7bf77d0f63a45031c8b622ec374adec6f243a90bb80523a1963a6e746c093e1efcfbc88148464424676d3935a7cc89843137ee1fe837c087f63d87312abddb6cdbbac57e332478586eac0ecb178e8cc90f0251e9693f283703f9cc47c35ac015d91db9bba5b9e5fb322153737b8f724bb4b51365c018455a5a5bc24031f0071811b69ae5bdffd64583da2c6a69ab6cad0e4b4b6042463acd8b8e981b9d0e25e462ffa8ec00d6949694de1c7c22f82d09cb4bfd7dfd06d6a9dc229d99b0f6220dcf7b3e255af08960d004ff1ee0f730a2cb4aca4be52a12d02d8ada2c5b9a62b2ab72bfbc742821979acc3d4416f8390f5a2b3fc6cacecb9183a22db05fabad35c6b8b9321413919332e2ddeaf562dc364e0ccf5f0efcd261fcd72b6ab31456ef978b75a322f50744ea1322f5bd228109918805fe329231491936f703e63256a568ee1c1d4dcc839f15891c884c259e48fcada2281f0!
 2de8f9143f279fdb0bf7ae0011c4fca972427d2d927d23f661c2222ede6fb01fd4bb3b7254bcf5b6b8096a7ad7d814685f7cba6e6a67f292e2aae043662e48c77628c2cb62b007ff508f0ee9748676fbf484e24105decd9c49205508b8cfef8f2aca4a644644ae448ec88c894e1f1a6dd4d3f2c2d2fbd0763b87c1f46a62fc018ea161654cb81b68ab6ab238e835210382033fd4fa7a465f77649c4e7139d2596bd6f408cfbdffa7e76f1ef2cbb252c928966feb3f191c6a0aaaa77002518738ef70076167bfd9a80b78a1b9b6377ee0b9212d9fe68a348dc2bede1ed32fc544e3a078c10389430de193864ee247d0d68538ea4e6489a2cdd54792f701b508a5128ad057e1f638e713d8b43fef5c05f35598591746ee8ec93675bf64744fa12228783225329697aba493a7b73d272c00477b977852616474864542435269dc01f9ac06f020a4de0375c06f85b0edeeaf03ae086e2e6cc23d54fcae1e1c3c1ace41292e90b884c3449a43720d25a2d81c79b4466e7f7105bef081d4a2cafbd8fb53f805122176264f785c02f37797acb802f146bf67703f00e91c87919dd2e32951019088a6412d2df1d94cc4191a6bd1123f497ecfbb7402fc811098c61cd4a70cbdde7bf5132772bb43c56ba4632de1fcbc97a4d645852b1a0880425f84450524f891cea4b2d0bda2a925a62d2d!
 718977b78edb0f61b097ca1589976357083a4da3f2ff1ba4b22c3228783d2f!
 f7446f67
51f31502e01df7e522e65a624521f1abe0b6b01e5f265ec6f8dac9244b52b37e07d5e66eb671a9fdc3729532287e2b9398fe76665a62926dfa91f955bf82df3f6158b8c56e6cbdecac2fe31f90731df056ae993742223dfae3f206fdd0b0ed75aeaba65dd704a7ed47850b6553e2157ba02f53bf99dbc45f2bf9665080d7bf208c30000000049454e44ae426082</data>
+        <data format="PNG" length="4975">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000133649444154789ced5b7f505cd775feb057d2c386ccc3959ca5113634b22ca91b0714ec00951d70d45a168a43218a6c11453644b125a2242aa48eba681acdc24c54a00dedeeb44a7713d3ecd68db290a9b48b3334a00499c5830c4e85411ec12c1a49dd65305d36183f5ed0b3bffe71df836585642091e44c7366de1cceeebefbde77ce77cf3df707c0ff7349b8d90f90326dab25546e55b5da2d12a41c15eafd92c9ba5ad56a219924a89a0a09d65115b5c39249ea5535f5172aac3fc79b774dddec77bba922672adb648bd5979ecfab65dff29297489ee3c2322994af838c04c8dc9df6693953f90fc962dd72bb712c59248b355fb6d87e557cd04dce908aa2839c59582bd7f97ce042849106327d8bedb49c69cdbeddb83e50cc162549b2585fea7291ecd3c118e0f50833120736721d3d395fdb1a78353d87f548b749b71be782225b940de66cdb309bc8c898406d684507110a4574addcd036ee0bc5b5d3d51364c1333c2b592ad7de6ebcf344b6285bccd9b677a8901cd32317ba4e64838bd463d7b12f90050e86258b75c3edc60d40809733adef703236920b47307449e8de73a11beae0a5c8bcfbe3dbe93d17626ed187c00!
 972a6922e59ac610e526478c668830146e406851ad0357b84eaeab98e6d443e14a78df63b48730e87a475b6d5b7077dbe62922cd6d78bf78b6c4d92c1609cd6236ed8ed9d417286f475187a6041bb3d109ccf24a39d4bf3db3f70c44bd9623d755bf04b16eb77dc5b496f4b5c642ec445b093e424e96d1d2023a4b795babe811d1b717d3419b830bf7d8349e66c1be54ce5d95b0d3e5dceb44d1f38ec2367c8a0ce808173bad66d5f47900c91ce13bd4bd2ed9dc16b99439d219c9f33cabe454a16ebdb72a64dbe650e902dca4b053b9d8c74905d81b848197dbc53b0c0ded4455e20ed4dd4f522ec49cee50e9d59de56d19eaf4dffae537c6e77f5d2994fca16ebdf2e17cf9d4bf9b139db669ed24effeb430f549986a21dd8bb2b03819e30d21e4e4647f7081e494f41e0cd30d2fa93511fec80a63d86c0c500bea9a5a1fe4a00da4cde9c7d31ee7bdd4e4d9d40cac7123172790229698918199a40dea713d177258ccfe426233018465a6e320267c328195b8f86abcd18ba546e5157e29f3079465bae231625b2c55625672accda6667a483f4e97dd6ded445a587b4358808d91ada676da1dbc973f3edf8ef951e31179897038271ccd2e712ed06038e93914ed29c63a36c519e5e0ea6253140bad7ff77eafbb5f74d291a9aba7ae05897878ee80886420fa1fb5207aaefca4!
 0f3bb8378e1c94770f454079e5733501bf443d59e404fa803e58a6eab4fe0f!
 4453f2ab
4f5b3df5f5402282d4e43f8ed69247f740546462690929188c1a1096c7a30117dfd61a47e4244feb1dc64787e3a88f2c81ad40e7740bdba1717c78e421b3bf393e538615122672ab26cb152ce54285b6c9433156edc5a4786f4bea990f6a65e463a49a74744a8ced5450e92070efb186c250f1c7633e8515876b04eb7bdbaf689fe6e548c710c30ea88d93aa1537c66ad6da7d249961df251ce542696836bf10c588dad2693b45bd54ec3647a11aa560b5505dace0de16b339b71ecf50e7c7b5f1e1a5e09a0ffad34b475fb311afa2c4efeaa19dafb9f47ffa80353932368bb320e93f402da863d0076a16db819c0e7313ed387cd8fa4221c9e46726a0c03ce4f60cdc64404ce8691f770323ace8c20233b058e537de80fe6a17f3280f1e867d11f3c2a99ee79ac591b3f33b61c477ca0c899ca378dc8c732c19cad70fb3e37bb9a48ef499103ec4dbdfad025faadf5681d079ac8e2fde277b1bad72374b03526e2717545af31bb0c909c21dd2706c87364e511b2b7894cdf52473953a164b1952c15d75218f0b4c9f4628eaad5c264926030616aa61613d129f4ffef10862f6ec6f84c1f2abebc197d6f88acedf8b103df4efa268e8df9313a5682b6611712dedf8bb661171257eec595193f2453095afa3c786afc215c593dd7f7d73c9088be37c2d89c958c40771869d9c9f0f8!
 0651faee26d40ff7e13b522a1cd100fa2f5c4654f92f4878b1471dabed5eaa131625b24579293e07c433216b879d914e3d5224dd4d6e91b9f53ebc7d9f9bbe063277a793058d64f13e37239de4ee837a2e382272c5ee835eb61f27cbbee5156b077adff79e14ecb0bb04b36c8d5d1c38c1d8f759723db07806dc8b229349ca8ccd01f14c989ad290946e425e611afcad7e8c5c29c1c4dd7d58ffe954842f4fe3f992cdf8feab7ebc3dbe0bd1fe7aa8332fe007671c58b1622f9afb5c786f66178e9f76404bd88bcea00bbf992985b462109bb6ac4173eb204ab2d7c0f5cb413cafad417d3080fe0b7938dc540dccbdcf2fd4d1d3bf5caa1316258201baa7336dd765020749ef8976312a38bca20f1b6b8131f3fe602b999e5fc78df942bb77084664ed9863406e9193032d7abd3146ba4f887bedae5eb28731ef615d3603ee58ec0f55d48ec3540955ab852401aa560bc386499ab50beb5c28d9f9383c3ff5a0422a414777189b3f01f4f54f0019c0e090d0f5679aa1aa559898aa81aaaa7024ba00ad1492c985e854091a5ef52025a51c5f79d985420be0797510a53980e34c1f2ab01935dd01009590a486b9e7c31a5daa03162db245f99ae1e9f4fcba6b226fd83ebd1a640fe96c6a177d58cf090613bc27c9dc22326b9b9dee6d4277b9c8ed7bdc6c779005cf08bd7d8f9b03!
 2748778ba80d9c9e013167384eb28f34e7d4d15b143b0a583fbf545c4bc901!
 77994cd2
b3aa761a69f75463347a745e0e30724274550f763d9d07c77fbaf0fcca12f87f3d82f58fa6886cfec9640c9e9fc023bd89f8feb003b8a302dd773890717f05de883443fec82e9cbdd28cf7b45de8b8e8c28a3bf66268c68f6fffe57ab84e0fa25cdb04c7701f2ab45454bce6873af52c523e13c0c52bbb301a3d0a0047b4b13391a53a615162b62849b2c57a55ce54b8715b1dcd395c3007848c39fd24e97489713b7ed658bccf4d6f1199b5c3ce8206b2ec9097032df3756f93604257933eee0763b27f4317cdd964f173eed85c105e0eae45e780d137ef9a02acbf50b55a4cab404a52fd8239e06b3fa9070084a7c2287f12f0bf3a82bc6ca0a33b0cac034abfeec148b814b59a034005a2a71d88aa256838d30c984a50ab6bd75bcdf0ac2b8567d883d2ab9be0e9ee40850438ce06109dca4354ad862c97a2f447cd000055abfdf9721cb024912cd6afc8990acdd936163472c1d1c0bd4d999bc59d1b989b2bcc90d663edf43592b9457691038aecf4169105cf38196a236d0d5e51fd19b342635dc0d84730f61906459578e0889be95b74265a94c2e5605ad2dea09c6993554dbd2c99ac4919e93f00b40a9cbf580dc96485b1d707a8983854037c59dc333232828cd51968fe5907bacf3f0ec083e9a9524072216375395253fd28dd598891a111643c90014c0348047015c08!
 a393d3d3d8dc4c4c46bdec9f3ef7e385e2ebcd2edcbcb00ba6fee7a807082f23dd962a573ab88dc46b122335711e628dcbea78ef3c48860fc7e41bcc447fa520c9362eb8849ce93de9edeab9ce417968367c9bbc352a675b5a449433041ce7aa01a2a1c0887a7311a8d4232592127352035b51ac55b3ca8fa7ae9ec7d136f4f20654dcaac9e153dc213e109a4a4a6c07fca8fc2cb85a8ba528ff07815a26a0da001d05438d7d5a0c3d28cd2dd25085f0e23352d75b699407740cbdb90f7b9847b127eb61c472c49648bf505a31ef0350a26a4e79372b68dee6d64c11e27d947da8e79196925bd2d3e7292eceaec1221d36775de135e91d56b9d0cb690bb0fdad9db446e7fcea9d7034efa1a459d603cafdd41961d14eb10b38cd0a5abb3eb6d46b8a4bd82659f0f902cd6572493b42d636d0ae4e40ac0e482fa4e3954d5818cb40ae466f7a1cab4198f9faa86aa5640921a909228012600b042921c50b52ac0e402500e680ec054015515a3c3b43e4a4073203a5d01a01e72721554e8cf99aac6e0733518797404191919b339c27fcaefdcf1d48e7d8bc5b1e861f01a0748d63dd0d4e1f0681900176af2cb91bac603e79e0a48920755599b513305d4efac414a8a0bd5b062621aa8c8b642d51a5091590568f5a8cc2e173a4780b56ea900e0404d7e05124d0ed46cab4046aa0bf!
 59fd39d955d8e912b350847adaf57fdaafab90c7306f00e44821c020af30bb!
 fe43be95
b340b7eab1322b225b20126c7695996cc9b3252204be580c983547329e4a40e54273d8e8a8b7e402b4474ca0535ba1baa5a0b49d277b94dd500eae79c6aaa82aa3341925c90a572a8260fa2e3a5503517a6d5729c1faa81aae12d558d16a86f358c3a8f3bfbcbbf5a6e31daf0bfe247614ee10b09f7241cff6db02d5ad2b77043fa96bacb593bc4cace408b98d72b3da4ad515f0d6e14abbfd6867646dac8b2434e0e78c8ddfbc44a51d97e3b074e88cf4327c9ca236e865ac5383f70822cde277242fa161bd373785eda60331bcf6727bf376f749824bd27bc2f2ff6fd7f276784366e612aa4fa9fc849557f969aea817975291293fc30271502a600aa4c797020800a531e1ce8438569331c9a98d539d4002a90877aad03c0e350b50e54e271d46a7ea86a2126c63d181d2fc548b81ed0e00b8faacf44df3a327b7ea8aeb6eebb557f53f5a261fb5ff1a370a2f0f584d284877f17d80c49d0af3b01ac0470170019c0bd00d602f8b824c99fc8cab77ebfa0915af17eb7a8ec1a45d5666fea2583fa6af18cbeae3fa9cfef2f914e4fafbe93242abcbae3629fe1c0611fbb5c646e91fd5d677ea416c0fd00cc00ee01900c40e2205f9bad18237abb4dee919b0ddc0ce03e00eb013c04e011008f02f873737ad6570b76d6f514ef77930e1ddc25d2d7268a99f87304b37b896d03e4!
 e49c7de0888fc5fba8e5eeb0b5cbe68d4f0328009007205b7fe68603fb0f7cc9d7ea9b3714fa5a7d64137feb754103f81d3af83b210a5309c0dd988bfe7d00d601b000f894ee84270014a56f28f8c6f63d367fb08593d66322b2ee960151e5e9b57e7ba76084af8d6448443ed241961d7447da1b149f796dd637007c01c053009e04f059fd199fcecdceddea76b9ff2716fcc039e144b7c7ddb414a01fe484d8bf0d3bd62926fd5a01c192bbf52b11c04a98242937a7f8c1d40736fe6986b9fa01496abed79a54925cabf921990aa16a7e54aa85bfae8abac6a2a323c1f3fd81b7cebf79fa1200eacfd2f4eb2a801900335996aca48a43158de565e5f71b95a45119064e07907739efe984bd092d00de03f0fe721d102bf1f582c18ef8cb70821473250258a5ffbd22c67977eaf7c43af683e46a5751d783e1dde1bf2ad95932574fbf0d600d80b300d6e162cafa94dce8787412c261efe3064e302df2c10b35607c663827417fa00ae05dcc81357287843947ac8cd186336ee804f35a7352707f70ef1b056ffc4549eedcfec7c484985bf49dedc3e6cccda8b6551f898e47df5b24ae5b2246125d01c18664882c6e06900e60034452cb06900be031005b016c03f0395996bf5879a8f2879ce4c4ec6cd290b89324cee3ce7f8618296408671b0cfb50c91d587828cd00f0204442!
 cd32af35e7db8ed8fed177d2172149c53872aa4f99834151fdf4f6896d38a7!
 cbf90ac4
a8f451bd6da38b7d38c4d9c7b5db3d7c3618e14bd60efadb035c0f2009736c480390d1dbd8bbcdde60ff21154eceee112a71da382fd0271c6277d83d003602f8630886adc0c2d1bf756c901b28673958b4dd43bb55e179affed23e7dc3b33dc8774221560158939599b5de76d4f6d7f4f0b5de1e1151655299a72363c659a481b9c84f52b51db5d974f01f03f01108761949395e6ea203da28c90dcc779f634d41135f1b18e3d53a7d35d8003f1b4163e547acec0cfbdaa8c6d8d7ead99322faca50806490e78b8b8a8b21ba4d2a44e4af073e7e18ffdd8adcc0d5db9bf8ceee105976922c1b23cb5a49ab42fa0cf0d79188ee9401fd3ca012312a45fde4e885e03cf0be93be49e5a8f2f792247d0ac0c7217248126e4cfb9b071e00ccc7f81592f4f690a108d9abf75db7be13d41b9fbd0d89ffdc580334226d9c0b1415de6fea1aea7ebc71c3c602009b2072c63d10238b6911e06f9e038a9be8f3b68abe6bed981fd960dc02a8e18cdec185bd12d269df15e89a8d785d6dddbf6565673d09315cfe0944a64f8618ea620baa85401b45dbcd117380c9d6939c0eb592f6da03542ecd253a430cdb699cf430be9f99ff3bc3b67b48f6f0bf2b0f56da64597e144026c49ce3630052303feab705bc51dc98ccb5cab39c240f1caa242f15d3ed39c04823e9ed131468d71358bb7e92f!
 41ad0ba7485669d34919553f0148087016441144a6900fe08628eb112f3297f23f0374d122092ceaaae419eb237f9c84185ecb49124eb4ed4b1ab93b49fd4c15def7f85c6e633c4778164845e009fd481df0760b50e7cd57580df72f0c603ef04b06a6343e4e0f663ec1ce8b4454985911e2ba9d4d1d76a251ddb693d2236498c79bef13f42b3cc88d3c587dd5f842891574364f758e0d79b3cdd32e0b162ccfe5601b89becbdc20b07482a649f8d9c51d8db62230364dd717dd122eedcbf013a26470421863523c12dd4cf3f5432db15ec87b3d670a6f8659e2b53c90843011b491b6d476d6423d9de135a10b45124d903eca9bcc42771edb0f6a1041e2b46a65d01601527dbbfccc1dd57c908d929ce0b385bf41da138f0ee73bc4ad257e61a7802c602caf5cbd8df1b49e0d8f60ca5aff83459365d79cc394192ed834a6cc4a7eb02fc87b2101fc4ef59b4172d0c1524f178c1ea5084ff629cf3b3f730acccf0c5b293bc75ffe070bb65770bd32393fc51651bf7161ce56257a0fe207f905b24ff071b0b5b74c8e8db100000000049454e44ae426082</data>
     </image>
 </images>
 <connections>
@@ -741,6 +790,18 @@
         <receiver>NetworkMan</receiver>
         <slot>slotPPPOEChanged()</slot>
     </connection>
+    <connection>
+        <sender>checkIPv6Enable</sender>
+        <signal>clicked()</signal>
+        <receiver>NetworkMan</receiver>
+        <slot>slotIPv6Checked()</slot>
+    </connection>
+    <connection>
+        <sender>listNetDev</sender>
+        <signal>rightButtonClicked(QListBoxItem*,const QPoint&amp;)</signal>
+        <receiver>NetworkMan</receiver>
+        <slot>slotListRightClick(QListBoxItem*,const QPoint&amp;)</slot>
+    </connection>
 </connections>
 <tabstops>
     <tabstop>listNetDev</tabstop>
@@ -756,6 +817,7 @@
     <include location="local" impldecl="in declaration">kglobal.h</include>
     <include location="local" impldecl="in declaration">kcmodule.h</include>
     <include location="local" impldecl="in declaration">kaboutdata.h</include>
+    <include location="local" impldecl="in declaration">kpopupmenu.h</include>
     <include location="local" impldecl="in implementation">networkman.ui.h</include>
 </includes>
 <variables>
@@ -775,6 +837,7 @@
     <variable access="private">QProcess *ConfigDevice;</variable>
     <variable access="private">QString username;</variable>
     <variable access="private">int firstUpdate;</variable>
+    <variable access="private">KPopupMenu *popup;</variable>
 </variables>
 <signals>
     <signal>changed(bool)</signal>
@@ -793,6 +856,10 @@
     <slot>slotPPPOECheckBox()</slot>
     <slot access="private">slotPPPOEChanged()</slot>
     <slot access="private">slotTimerRefresh()</slot>
+    <slot access="private">slotIPv6Checked()</slot>
+    <slot access="private">slotListRightClick( QListBoxItem * item, const QPoint &amp; pos )</slot>
+    <slot access="private">slotDisableDevice()</slot>
+    <slot access="private">slotEnableDevice()</slot>
 </slots>
 <functions>
     <function access="private">startDetectDev()</function>

Modified: pcbsd/trunk/NetworkManager/networkman.ui.h
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui.h	2007-02-27 22:14:38 UTC (rev 114)
+++ pcbsd/trunk/NetworkManager/networkman.ui.h	2007-02-28 19:40:20 UTC (rev 115)
@@ -34,6 +34,9 @@
     connect( linePPPUsername, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
     connect( linePPPPassword, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
     
+    connect( lineIPv6Gateway, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
+    
+    
     // Load any global settings
     loadGlobals();
     
@@ -46,7 +49,8 @@
 void NetworkMan::startDetectDev()
 {
     listNetDev->clear();
-    listNetDev->insertItem("Detecting Devices...");
+   //listNetDev->insertItem("Detecting Devices...");
+    textGlobalError->setText(tr("Detecting Devices...") );
     pushConfigure->setEnabled(FALSE);
     
         GetDevList = new QProcess( this );
@@ -107,6 +111,8 @@
 	
     }
     
+     textGlobalError->setText("" );
+    
 }
 
 
@@ -226,8 +232,8 @@
     
     if ( DevsType[sel] == "Wireless")
    {
-    textStatusLabel1->setText("IP Address:");	
-    textStatus1->setText(DevsIP[sel]);
+    textStatusLabel1->setText("Address:");	
+    textStatus1->setText(tr("IP: ") + DevsIP[sel] + " / " + tr("Netmask: ") + DevsNetmask[sel]);
     
     textStatusLabel2->setText("MAC Address:");
     textStatus2->setText(DevsMAC[sel]);
@@ -237,8 +243,8 @@
     
     } else {
 	
-    textStatusLabel1->setText("IP Address:");	
-    textStatus1->setText(DevsIP[sel]);
+    textStatusLabel1->setText("Address:");	
+    textStatus1->setText(tr("IP: ") + DevsIP[sel] + " / " + tr("Netmask: ") + DevsNetmask[sel]);
     
     textStatusLabel2->setText("MAC Address:");
     textStatus2->setText(DevsMAC[sel]);
@@ -486,13 +492,26 @@
 
 void NetworkMan::loadGlobals()
 {    
+    QString tmp;
     lineHostname->setText(getValue("/etc/rc.conf", "hostname=", 1));
     lineGateway->setText(getValue("/etc/rc.conf", "defaultrouter=", 1) );
     lineDNS1->setText(getValue("/etc/resolv.conf", "nameserver", 1) );
     lineDNS2->setText(getValue("/etc/resolv.conf", "nameserver", 2) );
 
- 
+    // Check for IPv6 settings
+    tmp = getValue("/etc/rc.conf", "ipv6_enable=", 1) ;
+    if ( tmp == "YES" ) {
+	checkIPv6Enable->setChecked(TRUE);
+	lineIPv6Gateway->setEnabled(TRUE);
+    } else {
+	checkIPv6Enable->setChecked(FALSE);
+	lineIPv6Gateway->setEnabled(FALSE);
+    }
     
+    lineIPv6Gateway->setText(getValue("/etc/rc.conf", "ipv6_defaultrouter=", 1) );
+    
+    
+    
     // Load the PPPOE Configuration
 
     if ( QFile::exists( "/etc/ppp/ppp.conf" ) )
@@ -597,6 +616,8 @@
    restartDialog= new restartPopup();
    restartDialog->init();
    restartDialog->exec();
+   
+   runCommand("/etc/rc.d/routing restart &");
 
 }
 
@@ -635,11 +656,10 @@
 	
 	              DevsIP[i] = getIpForIdent(Devs[i]);
 		DevsStatus[i] = getStatusForIdent(Devs[i]);
+		DevsNetmask[i] = getNetmaskForIdent(Devs[i]);
 		
 		if ( firstUpdate == 0) {
 		DevsMAC[i] = getMacForIdent(Devs[i]);
-		
-		DevsNetmask[i] = getNetmaskForIdent(Devs[i]);
 	             }
 
 		if ( DevsType[i] == "Wireless")
@@ -721,7 +741,7 @@
     }
     
     firstUpdate = 1;
-    QTimer::singleShot( 5000, this, SLOT(refreshDevices()) );
+    QTimer::singleShot( 6000, this, SLOT(refreshDevices()) );
 }
 
 
@@ -803,6 +823,16 @@
 	disablePPPOEConfig();
    }
    
+   // Save the IPv6 stuff
+    if ( checkIPv6Enable->isChecked() ) {
+	
+	saveValue("/etc/rc.conf", "ipv6_enable=", "ipv6_enable=\"YES\"", -1);
+	saveValue("/etc/rc.conf", "ipv6_defaultrouter=", "ipv6_defaultrouter=\"" + lineIPv6Gateway->text() + "\"", -1);
+    } else {
+	saveValue("/etc/rc.conf", "ipv6_enable=", "ipv6_enable=\"NO\"", -1);
+	saveValue("/etc/rc.conf", "ipv6_defaultrouter=", "", -1);
+    }
+   
     loadGlobals();
     restartNetwork();
 }
@@ -1017,3 +1047,52 @@
 {
     QTimer::singleShot( 3000, this, SLOT(refreshDevices()) );
 }
+
+
+void NetworkMan::slotIPv6Checked()
+{
+    
+    if ( checkIPv6Enable->isChecked() ) {
+	lineIPv6Gateway->setEnabled(TRUE);
+    } else {
+	lineIPv6Gateway->setEnabled(FALSE);
+    }
+    emit changed(TRUE);
+}
+
+
+void NetworkMan::slotListRightClick( QListBoxItem *item, const QPoint &pos )
+{
+    int currentItem = listNetDev->currentItem();
+    if ( currentItem != -1 ) {
+	  popup = new KPopupMenu();
+	  popup->insertItem( tr("Configure ") + Devs[currentItem], this, SLOT(PropertiesSlot()));
+	  popup->insertItem( tr("Enable device (up) "), this, SLOT(slotEnableDevice()));
+	  popup->insertItem( tr("Disable device (down)"), this, SLOT(slotDisableDevice()));
+                popup->insertSeparator();
+                popup->insertItem( tr("Restart the Network"), this, SLOT(restartNetwork()));
+	  popup->exec( QCursor::pos() );
+    }
+
+}
+
+
+void NetworkMan::slotDisableDevice()
+{
+        int currentItem = listNetDev->currentItem();
+    if ( currentItem != -1 ) {
+	runCommand("ifconfig " + Devs[currentItem] + " down");		
+    }
+
+}
+
+
+
+
+void NetworkMan::slotEnableDevice()
+{
+        int currentItem = listNetDev->currentItem();
+    if ( currentItem != -1 ) {
+	runCommand("ifconfig " + Devs[currentItem] + " up");		
+    }	
+}

Modified: pcbsd/trunk/NetworkTray/NetworkTray.cpp
===================================================================
--- pcbsd/trunk/NetworkTray/NetworkTray.cpp	2007-02-27 22:14:38 UTC (rev 114)
+++ pcbsd/trunk/NetworkTray/NetworkTray.cpp	2007-02-28 19:40:20 UTC (rev 115)
@@ -89,6 +89,7 @@
   contextMenu()->insertSeparator();
   contextMenu()->insertItem( tr("Configure ") + DeviceName, this, SLOT(openConfigDlg()));
   contextMenu()->insertItem( tr("Start the Network Manager"), this, SLOT(openNetManager()));
+  contextMenu()->insertSeparator();
   contextMenu()->insertItem( tr("Restart the Network"), this, SLOT(slotRestartNetwork()));
 
   // Check if we are on a ethernet device and PPPOE is enabled
@@ -544,7 +545,7 @@
 
 // If the user wants to restart the network, do so
 void NetworkTray::slotRestartNetwork() {
-    QProcess  process(QStringList::split(' ', "/usr/local/bin/kdesu --noignorebutton /etc/rc.d/netif restart "));
+    QProcess  process(QStringList::split(' ', "/usr/local/bin/kdesu --noignorebutton -d /etc/rc.d/netif restart ; /etc/rc.d/routing restart"));
     if(!process.start())
         KMessageBox::error(this,  tr("Can not restart the network!"));
 }

Modified: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp
===================================================================
--- pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp	2007-02-27 22:14:38 UTC (rev 114)
+++ pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp	2007-02-28 19:40:20 UTC (rev 115)
@@ -136,10 +136,17 @@
     }
 
 
+    if ( checkIPv6Enable->isChecked() ) {
+       // Get rid of the ifconfig line for the ipv6 interface
+       saveValue( "/etc/rc.conf", "ipv6_ifconfig_" + DeviceName + "=", "", -1);
+    } else {
+       saveValue( "/etc/rc.conf", "ipv6_ifconfig_" + DeviceName + "=", "ipv6_ifconfig_" + DeviceName + "=\"" + lineIPv6Address->text() + "\"", -1);
+    }
 
+
     runCommand("/etc/rc.d/netif restart &");
+    runCommand("/etc/rc.d/routing restart &");
 
-
 }
 
 void ethernetconfigWidget::slotIPCheckbox()
@@ -284,17 +291,19 @@
    } else {
       	if ( tmp.find("inet") == 0)
 	{
-		// Get the IP address first
-		tmp = tmp.remove(0, tmp.find(" ") + 1);
+	        // Get the IP address first
 		tmp2 = tmp;
-		tmp2.truncate(tmp.find(" ") );
+		tmp2 = tmp2.remove(0, tmp.find("inet") + 5 );
+		//tmp2 = tmp2.remove(0, tmp.find(" ") );
+		tmp2.truncate(tmp.find("netmask") -1 );
 		lineIP->setText(tmp2);
 
 		// Look for the netmask
 		if ( tmp.find("netmask") != -1 ) {
-			tmp = tmp.remove(0, tmp.find("netmask") );
-			tmp = tmp.remove(0, tmp.find(" ") );
-			lineNetmask->setText(tmp);
+			tmp2 = tmp;
+			tmp2 = tmp2.remove(0, tmp.find("netmask") + 8 );
+			//tmp2 = tmp2.remove(0, tmp.find(" ") );
+			lineNetmask->setText(tmp2);
 		} else {
 		   lineNetmask->setText("255.255.255.0");
 		}
@@ -304,6 +313,18 @@
 
    }
 
+
+  // Check for the IPv6 Configuration
+  // Start loading the device information
+   tmp = getValue( "/etc/rc.conf", "ipv6_ifconfig_" + DeviceName + "=", 1 );
+   if ( tmp.isEmpty() ) {
+        checkIPv6Enable->setChecked(TRUE);
+   } else {
+	checkIPv6Enable->setChecked(FALSE);
+	lineIPv6Address->setText(tmp);
+   }
+
+  slotIPv6clicked();
        
 
 }
@@ -381,8 +402,16 @@
   exit(0);
 }
 
+void ethernetconfigWidget::slotIPv6clicked()
+{
+	if ( checkIPv6Enable->isChecked() ) {
+		groupIPv6->setEnabled(FALSE);
+	} else {
+		groupIPv6->setEnabled(TRUE);
+	}
 
 
+}
 
 
 
@@ -391,5 +420,9 @@
 
 
 
+
+
+
+
 #include "ethernetconfigwidget.moc"
 

Modified: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h
===================================================================
--- pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h	2007-02-27 22:14:38 UTC (rev 114)
+++ pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h	2007-02-28 19:40:20 UTC (rev 115)
@@ -48,6 +48,7 @@
     virtual void slot_close();
     virtual void slotDisableCheck();
     virtual void slotOK();
+    virtual void slotIPv6clicked();
 
 protected:
 private:

Modified: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui
===================================================================
--- pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui	2007-02-27 22:14:38 UTC (rev 114)
+++ pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui	2007-02-28 19:40:20 UTC (rev 115)
@@ -8,7 +8,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>269</width>
+            <width>276</width>
             <height>341</height>
         </rect>
     </property>
@@ -197,6 +197,73 @@
                     </widget>
                 </grid>
             </widget>
+            <widget class="QWidget">
+                <property name="name">
+                    <cstring>TabPage</cstring>
+                </property>
+                <attribute name="title">
+                    <string>IPv&amp;6</string>
+                </attribute>
+                <grid>
+                    <property name="name">
+                        <cstring>unnamed</cstring>
+                    </property>
+                    <widget class="QGroupBox" row="1" column="0">
+                        <property name="name">
+                            <cstring>groupIPv6</cstring>
+                        </property>
+                        <property name="title">
+                            <string>IPv6 static address</string>
+                        </property>
+                        <grid>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <widget class="QLineEdit" row="0" column="1">
+                                <property name="name">
+                                    <cstring>lineIPv6Address</cstring>
+                                </property>
+                            </widget>
+                            <widget class="QLabel" row="0" column="0">
+                                <property name="name">
+                                    <cstring>textLabel1_2</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Address:</string>
+                                </property>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget class="QCheckBox" row="0" column="0">
+                        <property name="name">
+                            <cstring>checkIPv6Enable</cstring>
+                        </property>
+                        <property name="text">
+                            <string>O&amp;btain IPv6 address automatically</string>
+                        </property>
+                        <property name="accel">
+                            <string>Alt+B</string>
+                        </property>
+                    </widget>
+                    <spacer row="2" column="0">
+                        <property name="name">
+                            <cstring>spacer5</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>21</width>
+                                <height>91</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </grid>
+            </widget>
         </widget>
         <spacer row="2" column="0">
             <property name="name">
@@ -241,7 +308,7 @@
 </widget>
 <images>
     <image name="image0">
-        <data format="PNG" length="5565">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000158449444154789ce59b5f681c5996e67f5a2488000b32408288250d0ab0c1a9ad82ba417b9988ee82712e0d332afaa1ede987b5671bc65ee6c1ead987764dc3ac7be7a53c2c33b67761c6de855ebb6016bb5eca52c16069610ba587ae764453558a28baac4c535538853350044ea1489c2623b004771f6e28255749b6e74f77b39e0be6f8c45564c639f7bbe79cefc4cd112925ff92c7bffa6d3fc06f7b8cfeb61fe09f7564c8e47ec2fc27f3b8075da224c2b55d163f5fe4ed9fbc3db2d72daf16020c08d31077cb25e8040804413b80adfd6f79b51c908053750846036a076ab4ad36ee41f7b9387fb51c609508187509d310277788ba111edebeb7bc5a0ee88057f588b48899a333f8858f7750e9fb8d57cb01264469848b0a80dea847d80d7171f7bde5957240f35e135115445a84677b84a321de418f6034d8f79effefd3e0c88f47245ba08d42f38f568852b5e7c334544e489f8f80dfaa03467e3c22a942650b8a2a549e0007814c49ad0754811498023d2df518dc2a0429883f517ab6058bf122a7a766597cb28857f508e310afea31df9dc7c1d9fb19feb1a5f0c88f4724a3609a508c42a502056018ea21b59e324a5b570!
 faf95466871694c298921379571f944294d75bd30d5df17bbf5148a09e59467e63f811bb5bb143db00fd80a01558f288d303b26d37f3cbd6721f40c02bc60440a13a275d0a68075a84f294f1fb3214ac0b3c0cfe0c67f03bf0fceb892deb8baee18e077c113e027200e43d0015728298e40148398822006d7d40852704d08620dd72c08628ddcec410c8e097e5c3a75154455dd4769bc30959e5b10a43eb347de66e1fec2d078b7ea329fcc33cdf4f311506f8d48a7061a208008b5a20039a06f423e067a5ec1d521c835345d83be8e3b0e515fa31807ad5f418c17b43283c2c821d3f18c1cbfabc324d0d510931951a2d3b372e8501aab519446f7cc9c6c35a59828b0d76b9c3c2288620daa1a466ae09a82d67a8a67b9844944ddaab3f8c922339593b4d65bd40ed486c6076980d936993ebd3702905222a5e4fc63e43bf3a7e5b1ef1c93535353d2ac9af2ec5f1e971b83bb7259de90526e48290752ca0db9226f97fa6d29e540ae3c5d52734f07a5bc2ba594523e95a55cdea56fc877d666e46d795e9e7b784cde7aeacab30f5c796d70569efe42c82b8f6bf264734a9e7fa449f763e4d2d36b72e571f9798f9558febabe71576e3c5a93839f0fa47c28e5d2ff5d9283e640ca8694f20b296ffced0db96de7d7ff0d11f0566b442e5437b8f9fe22efbdff1e00e7dcb398ffc!
 166da9e464526839c0c7d4f99a0639191603c23db18d84319e60de6f5cbd00!
 16166cfc
0bd6716e55e5708e84d141cdf3acd4fedebdc4c2e614fd8345617cb9850904cf4d06248cd8cfaea714e9a6768afb769dc69609916a7de3c454242f15181fd43fbf96428afc2cd4faf636b36aeeb72eefb67490ea54c57b7f78e0179131d0d3a0be8590f3ebf8ede69c18717d03f0fe183598c76c8427e89823673fd0b24845ccf6669d3804d7074511a9f13c41ac274867b9d585ddf1d003dd3833ef446dfe347bffc03dabccbfca7ef32cf7b049f2db2a82d127e1620cc1a511ce1541d7abd1e97fffb65cebc7306cbb608c7c33dd10fbb83600ca78e9d22073c7e4a824f1d8f260b4ce310e2e3bcff1ebc3fafd8d5287bcae45880fd1397c5ac8d300aee74db88c98246b78133798630f711664e94426e16f8b14f5106baa20c688559c0aad2fdd4a76e9fc4ff6a673e375516d92dfd34e24c759666dae4fc6b2dc49336973fd1f0039ffaa1fabe0e1822c0330142742c002c04e0ef18bf9d47b7a9e53ed2320b824c47181e4117c4a4839f8033294a047844b18e303db5f2d5a24480408b553620d6106601a94240d88f10a60b65f4d76385d8ed144aba7dbfc674759a4651c1aea867aaac5788d297e0027e0ae0909300d026021c9ab470f00809a156016b0a6a02840bafbb70f4187cf738d7ad19bcaf4cbcff9a73b93ec7dbdfbf8cb95ad0881a1456819f04300661dfa7a8!
 e604b14f512d08638dc22cf0d380c2cccb152e4a24801ffb38e31e411c0ceb83ed9567577d10a611540b9a69130f753fa34015dceacb54822634f199e6040076990ca751f0713801474fc0d13d3e25833340f6bf2e917e90e2e353c410b52a88ef5ab43a119ee942a7813361f3de2a886a811f6b38a6a0b17a47e5f755106641232e76f2fc1b2a06b85568dd2b577e750701db4592f79a204823ea47ea5c78bfc662ab8de77a4c8b69163e58e0adda5bcf4700314ce3ed4240000872b2d2c6360009cd5286404e73d30723a319abebd9e10cdbb6b10fdb404114478883d0ba77078eff3b9afff6df908ff6f0b7573e0e28aa0c573c88358a8902f1e90ca23343ef1ee44f727aefd7c93efae6ca6ba5eea711ae2968a76d4e1d3ac5853fbfc0a53fbb44966438d5bdcbe0671ce09800fe3006d82581d0318010839c3cbf4e8582467e158d82b9fe658cb1829bfdcbb4d7037a9536a7fe6886daefd95cf893f358b6857bc825ea80300500d35ba0c71aceaee8aff67e5ec2bb405bad702a3f87fd958bd5b2f98bbff90bec5e0db676f6fceef258c51201a9865db5b18fdad4bf53871e18158330dd3f0b0c1d109631202b11d04451488500077f33005d10e40142cff1731f6fdcc3effb78e3d07ba3c5f13f86f66b0d8effb040fb96cec9378f133d89867b19a03d0a95298b643de3!
 f8548dac57a376c8a57852e7ec110faf98a176c45315dd931a37fffe26592f!
 a3b5de52
95e9d7567e1803e208cc82643d812ab4d3364c41b29ee055f7ef080d0b21af3b22af4cde527b5d8199e666c4f4581d3681b1367eee2374017900ba4bd00f10e302bf1fe08c0b16bbf3884941d48d3833798985ec3a1819413b606634c33b7e47d5d7f30338ac43de047dbaacb5a1d90f991e7720c9f17f11b1182d626d59348b269ee9f176f187f07d86d9603702167e67892286fab7eaf03fafc2f766f17b3eda4441ed9e8bfefbfa0bbac2313838c3bdae8c2f63c018646878fa29c042d7cf0006f5f13380c55be3b368d888c99ca0eb23267392cd368e21883a810a78a9fa9a04c827da34b239325da7d1bd49a23759e8dec418d7b8d9b98aaf35883a11c556a1e0bba53a3dc5d637575e8b814d8530b7ea92c409148264d5c7333d16e3458a6ac17e638880b7bb23f252e5068c9d1a22804d0dc674d8f4616c178c364318734a64309457bbb38849872869316b5d6221bb0a077282f80e624290fefd22b589829b5a05674a457fd7843b718e300bfc5548cd94ca57152e2473cc7d36c7b4364dbb68539ba8f1f6d67f44fbdeb32b4f1568c3dc9b4bb8b18beeead041f51512c082c69d06f563f5e723c08f8131b10b013e8c152502c430362cf42f918c2d32975da03db6c0cdeca7254212c464419484b8d636025c823850d13d8d087f57e366c5a4a8aae8cfaecace8f35c50!
 55621a9f668152d66df9845fcbe60f6776669f55a6afb7c6de589d5e530f6a10a4927818390251958906739aef9323d4113fccd08031b80e9318fe6a6afb2c0a68e81a52ab971afe4fd1e7e16200c01391858448986b01c8204ac319bb01ba8e85fd6f8da76f44f158f7fb6f62f202e86f9fdd29b3fe20f26bfcdcdca094ee96fd1f8de1cda915dd1bfbaf3dc1aaa1b1ca401d6410b12302c03baa01b3a7aaabf840362f0762120dcf4991ef34a04e4eafa18f87d1fc7f008331f6140d00d40cfc9361372abc0eff8080b858049b7ace0f2b2d62f08cbda3f2859dfb0f68f219b289ec9f359b5c7629cd2aeb6487aab14b56fae3c1d28b6c04f435cd31dae7cd6cd6012f27e4e5ecdf775c090179f5d43caa7d7e4ce589372705b4a29e5ca2e7ebf2697e4ad8d77e403795b5e7b745eaec85b7265a0e62f3e3c2d97e41579f1e1d95d7c7d43deddb82d07724d0e366ec9815c934b8f6ec90df940de5ebb2137e403796bed867c2097e58d8757e483a74aae3c5d96d71eec92836579ed8b2b72ede90379fbe12db926d7947cba26b5bf452e3d5c92838f07c34797b26c594829effefceebefd80e17fdc8f9103b92237e403d564787a4b4ab92607652364fbfaad8d8bf2813c2f6f3c3a2f97e52d79edd13929e540ae3d7d2097e449f9cec3d3f2e2d3d372eda9fafbb5c18a9452c!
 a075f932b03d5245979bc3c6c6a483928e573f447a5fe6847d7ae232ffa17e!
 5e0e1406
eac29ab371e2939783c90832f062f6e88389d117969e21a75fd4c898d84300f71f4b720cf41d76113f2b136f47d18f778af7b15312970f2536469c67c7c15617a44ab21c70f9dc2bf1fb21ab5488eb570dff008629f7ab58e1ffb08d321286563b581630afc38c0315dfc38c0ab96f26bba30d5b672ab2ef6a8cd09fb14fabb232c7d7709520defa8378cfe650f073e02de64cf2cb0e3806044de7597e9a161314dfe1307fd3541fec34be840b6d9c318b3773a3d9b09edb1cb0409cc5ae7b9f457d7999998211a8da8f56a348a06455170f583cb783fb3a968157a13bd5d010fb2895c75762ae937bbbcbbbbc2659a2d3655c02bb6945cfafe324551f0ed0fbecdc5d72f325b9da5182d302c83ac9b614c1ae4fd1c52d00fbfa01072ab401e6095dd53fdf308eeb5d03168e611c6985946fb0a6c8231661124202c819f44d89acdbbf7dea5b85f70f99797b1b62c8c0306966941ba53fb7f3dfaf7267a7bd6f6fb45fb4251150a0b8238c09b54f5895355d9c5b00c9505260dc8401fd789e297e807043114ba4bb2a958dd3651cec998d60573d955dafa0237bb9755dedf4c10564ed4f1f12c41abd762666286b0a788879ffa882d8165989865ed7ff2904daf5763ea904db23e8d56550d0ba36a62ad9b1853cf4aab9495c34ab2a5a17550cd970eb8a68bdff5614bbd15c62ceb!
 80ed2c60a82c20aa625f073cd30f88fa01f5f159a5971d1e1d03f2051cc3c1effa88c932efeb56c9f21c487cf526260d55f9d95bc4333d7c7c660e9de03453e8b5b768f6434ebcee401f380a61e6e31cf6d45e7dbdd45ff7a00b0808bb3eced1523f0a7ed7572bde0526c14f7c3ccb83d1b20e8803ea47ebd001e36059074ceae49fe670f80508200531be3702d0d55b56315994795f2140f5e24272cb53bd3d0afc54b1beed3654236ed0ae1834ba734c8fdbf859837c3ca391cc611b360bc91c99d1662199c3310461e6c364ae8c9ff408bb3bba37e9a9159fcc95332c6f88003ff6714d5721c02c2bc1c91209e6be00d8418030c1ef07bcb50702c2fe02cea443a3dbc09d7469e63ed3ba071d704c8728f111a6a0b5de1a224098828484a4d2e64f3ffd11eeb75c2e7ff45fc8cc9ce49729ab0772b8033c398179c0a6b057e1170c6b7b0e021f967bbe035850e956e0a0061f2a7d58f397082006eb0d0b62306c635811363e6b50afeddd181d22208ac119174304243f380eff5e9091e18cd769666ddc4997200998d63db2cd04a7ecea0a4bbd86aa15355a458bca4485683dc25eb7493e49ca1e5f4066e6f4be4a5516e8ec206fc8f2f6a8f076eff9f4498fde9729692f25fd32257da2245b2ae660427bb5ad62413b81098584ed66cc731d5098106611d698ca02dae97768!
 1cf2304a2ef09671862009109680beca027eac214c0fbdaf517fbd4eef488f!
 d9efcd52
7fb3ceb91f9c83a3503c5146e66641f2554a56a6400e965f5cc2f379d1fe1b727467e5870830550cb04d5b21c12c913061a0c5da8b1d400a8e91d3de54513cca02c4788d66eeef8afa05412780f19c643301b3208a7d182fb07fcfc23b59a3782383efcc7361f44734de780fef3fdb148732daf7db1466b1c3e7772380e7af7cb1055ab2a3ef25b7df05b66385806d99c48942dc8b1ce09aeaedae3da61a88c27069741be87a41d8f755deef68b8075d9afd086bcc2af3b9839f4558ba8d9f04d8fa34c13a4c576dd2f584f66b6d92381d163f431ebf0b01da3f61e5b7a5a82ad6699b36cdd5e63348d86ec73dd701410c8ee10c1100162726dfa699b571c685428029083a01d3e38264b38d300b8234c4330449de46588276de24370b1aab0dc20311d96a8a7da8c6ccd60cde6bc7709e086a47046e7115f1bacf94f6532a87c15a37d1d0fec12bbf1b018559d05c6d326d4ed35c6dc2848a098eb97f5778480a6a4de4ad471787ac6f87fdad48f958b1ac2b0fcfc9bb4f6f0cdfca9effe2b4bcf5f88a941b6afec6c32b524a29677e5e9353bf424efd1dd20c91179be777111a29e523b98bd0ece877bfa62f3d5c926b4fd7e4ad078af5ddf8e2865cde5896577e75452e6f2ccb8be145797bedb63cfff179b93658934bfe926282a1fa8c955fad48b921e5adf95b2f6683c77fa!
 e49292fcac1e36b52ca6539d8b821a57c201f3cba22a55c9172e3b61cc8737269ed9c9472456e6cdc962b8393f2da1727a5942b726de3ae5c199c95cb8f6e4bd134e5d4a2327eeaef904b1bb7e5f2c6dd67a8ed3695bdfdf0961cec6279774b967777973e78197dedaedc78b021973f5e96f2a1942be18a946b4aaef96b2f668357db2372d6bc08fa0ce4774017d069c0410f3a3e4cd4602b827101ed064c38b0e583d186a80d0756a1d0d4461ed5c066274f471a4c682cf47afc61afb773bdf36c9ea703da410dad5b19ead6610b5255f6b6d65bd4a7ea4336d8eeb555c599facc4ccdd0bbd7e3cc9133ea9064c90da8c2dc2fe638f18313cf6783a73ed2e5cd371760b30d6302b206180ef44318efa9e2c44ea0df03da703f81a3852a630bd5cbe335e01ef02de089a6a8680650c07d75ddbead91f67b68a36a8f03c3a2ab284f7b1505fbbe7d7e9e3cab9de5947d6a58963b5587300d31be34b04fee7d3e6058097ad502fa67601ce81b70a080e85d10397c5e40a5077d4dcd7faededdd12f8dfc9cf2349706d51eac972bd847cdb776e64f1c3acee5bf7997fc67f21b0f34f2d723b2b0957fb1d8e1f5bb10b28d9cdd5ddfddfc5f4c085855ecd05f551ce5e69737b1cb5ee7be0ef0538d59bba75e526caff8440fba15a816f055f9a57969cc5efa1b057ca62964e4a5b3b6e!
 7ef03470bfc7b1165dbf11b43fea76f3ae51f32c2ff1dcaeded11c511a22af!
 0631f6fe
b25ce0a7b66a14a511d25ed02d63575b0294539617b7e3f7dfb1c5fa6ed7c8e0eac97f35d4dcdef70d07fd6d11a6da9541d97dde85585089f97a803e6bed2683c29b8fe25b42958680347a0d9056a90159a7a0982d279b24b9f4239eb20ca58a3acbcb6e7abe5fc645906ff9a86b7e5e1affa880941b01a50941c446cbd443fa0f1dd5cc1cf50ba5d6e99e9b2a5feafef8f483e2cd06ca83d51b57bed43f59e3fed69882ab42375d22469ab9892f434bcc94239e508d0af509bc8f0ffcf3f0deafb0d1f9fbaa97a8e5ed51bc680f9ce4b9c13fc4d8c91ff3122e5d95f8ff100cd779bb265284abe3b0bd889bdef49d1dfe869f15fa7f1001111de846ace38a6a3e48443c02b7c5a7cf7105b02bfe3e36c39f86d75b0cb8f7d44f112fd805761040438930e3e3e8e55ca1720e0957280d812343a0d4421f0db6ae5fd8eff2fe717231111f58375e6d7e7b1462d16d3452c2c82adfd11f01bcd02bfee11fe75285b9516b55e8dc5f54504826834822dd00e687bfe78f295720040f841285b798bfae1bafac5c89487966ae847f4675862a66518af1b23af9c03b6c7f59f5d97ee964b301ae08eba2a45a25ed6789a3af97ae2e48957d7012f3b5ea920f88f19ff0f03ee393c056ad50f0000000049454e44ae426082</data>
+        <data format="PNG" length="5482">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000153149444154789ce59b61681dd995e77f1a24a88216bc020b548b0455f00c7ea20d914843f4320dab4a02d912f361e5e90fb1328158b30b63cd7e899dc0aedc815d3b0b89e42c1bec593258593a23f9c38ca540235560322e2dede83974474f4dbb2599d643f5b0c4ab87d4a81e9679555882b31f6ee949b225b7b73399ec3817c4d1ad5bf55edd73fef7fccf39f7be2611e18fb9fdc91ffa05fed0edd5524084c48bb1dcfcc94d097e19c8f8df8c4b3817cad88fc64e84f9aba50003fcb28fbbe7e2ad7a3838782b1eec9dfcc8aba580109cac83d7ecd17baa97a259c43ded42f3c98fbc5a0a30530434bbf8651f2776f0d77d5cdc131f79b514b00efdd97e7ccd67f0cd41bcc4c33ded32a7cd9df8c8aba580ce1401b8f8418a843f26042c2f2ee3641d7ccdc7cdb9f8cd3eee6917afd93bf19917b8877f1dade93b4dc21e68cd50f9abca0102caa912ca2f46c01f54014ddf6912b2907902c969c86c01a7815049ad0a6481327006f472da2f819b05af0cdddf55fda8196e9726193e7399a92753b85917bfe4d39fed677c6b9c21868e7f87cf1b0a377da7496886f676489a21938104300cf5925a15922c681beae5b574125a299!
 d4c09c801ab105b6a7271472a2d35a9c452f72787fb65483a94528e8cdf83d9ee25c26a8dee53ddf8653579bfec935bcf61fe47b3e9b8791cf101f9fb4d72256c92fc074de2ec3489b3d224376992fea049c66992c1b049266992c1a849667e0c17df861bdf81816fc3d8b7c0fd3318f933e83e0597faa0bb19867bc17e0243dd607e0ae7ce82b1016e3a79d7d2d0cb5a2a334a9632904eda4925593559c75293c73ad42f416c8357f6c89fc9e36f1c4cdec93af8cdfec986dc4780b3d2243d39d00007f051160588017d17e216d0e30cae0e5eaca1e91aece8b8ade0ef6824ada0ed64705a130a914162c410e9b8468cb7a5431bb0a5e1b445f8a14ecd8c611de2ce1a041a895d8355a85931d1c32a494782bd9163f86c377ea081ad61ac1bb89d0e857005d774f1439f73e600931fdc66b07d98c24681fca9fcc1e4cb3eb9208779e1780420228808a34f91abd317a4ef4ffbc4b22c69ef68978b3f1c10912559900939dc966426fd4fc9a5a77755f7697af9e9fc33fd8523fdab1557e665542e3dea93bbd22b17d77ae58e8cc8854fba65e2694ece2f5b32fa5893def79105b9234b8fd3cf7bacc4c2b3fded7991c77591f7446453e4ee3fde155913115f441e894cbc3321fbf37cf6af8180fe952699cd0a937f37c9ed7fb80dc0d5de11b4bfc8d065770111601013a11f2b4!
 3744c22428c2332c0c06ec862ec33ad5f8775703a23bc40236e583e49d7ba4!
 240ad236
1e0c905aed8e34c8663749b3d4caf4ea63e2121eca8a195a06a45380f0718b62e53dc28e2cff998ed26835f1b244c42b47b1ac6b78c17fb80380b93bf1ea3dbe8a6b7b797abdf186125bb924e1ec08078191d03d667d163e0c138fa5608bfba86be1ac02f8631c280d9780c8d88a99d6b24048c47c3d428c22ef4e84e3af9182fd0e8b31d583d58cb8e151f7180aeedc20ef0da6dbe79ef2bd4b49f31fdeb9f31addde6fe6f3cbc8c47f137f7e9b3f2f8259f9e6c0fb55a8debffe33a43234398b689dffa923ec0cfd589a9a1631252c024cf32b374e150c4a3e7e7b7e11fa65576d5ccb132eceb86eff5e245e01809de16f4b52979b96d92623c4b4dbf8ebf0e516702ab90a49657088849ac84e8618da42361205108185cec61f1d4a27278966291c3ec315cbbca65eb0acbd565ba56de66ea373ed73fc831f6e331f2a7f2709a1723c0b5007c744c004cf27078f238eac6fdd4f20469da095ea4e3186e3a79072f04a7cd4911d08f1fe8389daeb2fce924b5bca32c6e01250dc74aa0ac1050dc29e058ae6283fdc9a7f1406c0165f53c25e8ca76319b64e86957ef643fb1f1cb2723a0a100af0ce01013021050001c96b94f0f2e457ce8ce806941ae1bba7be16c2fbcd1075f1b60dc74c997dac97f3fe6ba33c5d0bf7f9b5c35617a719ac44cf0420f5aa0b8334b62c7788147!
 723ac15fd548ac04afec9158315e09622bc14b9781b7ead1d39ac72b798df8601f01fb5499582a07200bcbe565fa51cfd30cd1a90827eb7cb602b06019af81009b3cb048170ea0d3c339383b0e3f0be0c745f8ef05f85101fe9b0fdf9e62e8e62c03ffe1126e66888c66926c68f88b19f2965af3aee9c2ba4f4f6b0fac429f9da0ad6a0dcb1df880044ac9219e573ec0cd1e6ff9fd20c9b514e57565bbb856ce31b99223df9ba7abbb8bd90f675f420125e8c23d84001fc813130110110010b29cca2200cbbb053060b9a4ae07a7036cdbc63e6d03097ec9c7e984fb8bd330f01596cffe1be2d76a78fb962f7924590e2c5ed2483a12ba7fedd2bdee12fcb6067b10fc9d4374ef79cb6b69df2bfb389643500e18ce0e73edfbd718fbaf6344e14b22c0b1802308500fe9184011030de2714c74fcf826261a533bd7b05b342677ae507bb2422d1330fc5783e4be6e73e3bb6398b689fbba8bbf0e7d561f005d7ba0978e5a5eadfd38b56c82f630c33057b14bbde4826eae8c5ea13be985bde72dbf2f9dac0365b0b336c61b06ce571da882611a2ff401072cf0a049fcb3db442418982ce3d385d3e0f9c2ee38f916073ff670f498d9181cddc1dbf1705a13bc28216fc4f85be0b6e9b03b8cd902d7d6af907426643e88b87c718e2081497f009e6470ec043f006c0d02703a12bcb2!
 4674aa46d7ff76c855734c5627d15ed3d09b75c65fbb4ee6cde373849144b1!
 40988498
1d264139c03e6d13ae87984f4cc81dcf028d88a8f7b18aba8e447c4722bc6d99af4f884845a47e4b442a72f7f12d11599399c737a42e4b726bf392acc98cdcdabca4e2c4ed5b322fb764646d409636fb44be88c8eb887c927e417d2995e9f73d4e23c68ac8d2bb4b32f29f4764e2ed09b9f89f2ecaccf519697f1b695f46dadf45da3f42daa7914c11c9fc3db2b4b920770be9fbfecf1b221591f9e2bcac6d2e887872622478c407f4e034d6faf2ae4f578b42002d109190d70789d1401f22069cd6212234fa5b87493070da62bc2d0fa72d26dc0d700c077fddc3b193946554a64b47881f4d816ee26f4d12eb21b35b93d8ad2693eb3759ce14985b9d23d94b147cf760ae3c47b277b0e68ff8805df04a1e4ed6210c4248fa081f16c85b79264bb7550afd593ec0cd02bb1e06b65aab2d8ab7750cd82d60a4be41f58bca57eca2aea7f280f775cc161b3ff2703a5dfc007abee072f3fbdd843fcf31f4f01ca1b6c8b9c52f1334ff803fff20cf0a97e9bfd7c30ff86bfef2fff4d3dbde4b9cc4389683deacd3dbd10bcdcfaffd249d9c93557182699bf08d2eccbe3c2470a5770c7fe365e28012d0721801b3d0428a803c51ca0eb33b63c42d1e53d135a2960293d1951421217d6d0973a18f6bee23c0557c6f83579ea3f8758d9b5a3b4956797f2c52de57debf6625f010c26c8df!
 bb5fb5cf9c215ec3e9b912f8d70bf7a5fa5a7cf589e92baec973cc842b81e422744610426c49152e2672a000b0abbfe2104f4b3bc3b9b5afcc0d24eab9b86b92e5ee4e1180ec46a7c2ed4e83355e467b6d8f85b1e4e1aebf75931dabef72f1f17fb2bfedfe7f9b1affd355f69ebc26b3f47bffe65fcb7a6d0ce3c6f792c95c2bb5955fe323b4d0895f7670b744357f583cf544009f2871050dc9da5aba5ff900f08a005e5f50d57c1db006fcb031da2dd90d84cf0d63dfa4c1402dad40e4d9c46788995e097bc94ef69447efbb940d4911ce1f9285b63b25425c8ae1056cb24ddcf5b9e5548f60ee2807dcb475b11b441bc13bfd00734bce1c836224f6f1de280ba487d3fdf3fc8efebb22077b6afcab6cccbadcd11a9c85d59aaabf1d1471764412664f4d1c523f9fafcf68cfabced3b225297bb9b7744645b662a1322b22d772a13b22d6b32f1e8464356644d6ead3d233fb92175d996994777a42ef586d4de4116361744de97068b88222ef5fdefcd9fc8020734f83e2252916d59534586a7ea65ebe9a7ec5fbfb33d2adb3222139b23b226771b945779ba260b725eae3eba20a372412a4fd5fd9594ead69e914bf58523d4b7b03dff7272f379a98d23a38551914d91ed4afabe9b4ad61fd7451ebd040d2616f8f1010bf4b4b814635ff98018757d17ce1943183b3906db2ea!
 935ded60731989fda2cdecb31c830c6af72989fb633fbcb59fcff759f2bf78!
 708f515a
eac0e11e901d75687a935075c5919a2dabcc2f0e239021619faa09f95bd4506ef1f92c92283f70ee462b2c8b93925a782497adaf200b8598742b9a0d67e08469b0111e8ad2ff6018d48b0e77e93147bd7088931e922fe5e0ffaebddc4df1a43c720da0d305aec834acf6e48ade53a5e08c3e618633f1a63f0d4207eb34fbe96672a992249126efee23af99fdb64c850eba81d72781075c4aab2d35e7dbeca7bb82abc0bb428a9a1d6bc0614bfb146580bf9f22fbecce8d9512e672f13ed4518a641b41561b419c43b317a4d87cecfaa076481d8c3445580f4078bf0f10a3a06cbb18fd16237bc3dbb60b4987821f4997d14429f9e4c0fd73fbe8e56d6b8f29b2be49a7318af1998ed26949fcffafa52ef5feba81d1bdb9fe4ed133b45acad829f7c8a80fd5ce03804144a85131170340ed05dc25d95d5ed6f99c44474e90e53d118915e6072eb9a6285dd903e33666edd236f3a14aa05ce9f3a8f5f55418757f6e8dbebc334da693f63b2b21130fcba4d50cd61bd6eb3b2d1859685cc460623db8eb9d18e71e6a834539939ab247b1ada2aaaf8b20aaee552d82ac05e5a0fb0d238609f050cc502f96cfe4405349c417705b9fbf8c601097c1d91eff6a6843023dbb220139b57a522f38dd8fdc6a38bb22477442a33b230b920a33f1895991fcec8f96f9c9799eb3332fac35199f8!
 c184c84733471cde916aee216fdde86fca1147b7df9f7fb65f517d7e8a2c6d2fc9ddf7d35ce0911cb94ffc977082945590731c02d0fbf1b77c9cb6e428ef7782b7ee83d9aff27a54650754ec0e305d9a266cb7f1b7a6e86aeda110f9d00a7e38458fd1cd6c380546c46c38458f91a71815a00d8a5b057adaf214b70efaf9b6bcb2781b14b60ae4cd7c03015ec9c3b19ca391605b8a04eb6400349ce0e5b049fa5ebb417febb01af9774daae4f5a302c59d59ec5693e9ad69dc369728862e3dcfd8fa304ea743126af02b83c246815c738edb1fdee6fc17cfb3b2b7c274ed36c61be0fea98bf7709ac88a093fae523e15430ae7f6669b24576eec00b182da235c4dd7fc2a6043663d03a7b5469f55755ff54195a5b796e82a75c11b40908e87a84313bff271bee6bcd809fa25705afb1a0808df1a806f771311d1d3da4f215ac46d73f1428f2e3d4fb41be27426788147de54db50f924cffdda7d32a732cc6dccd1f3690fe1bd30adf17944564cede3aa6281d503e435b2bc6322bcc36bbefaa446ed41956aad4af54195ea1325d9533e070b82d5006c5456682a24bc542e9058e04773982d8a05cc0b37f03bf218692ed06f0ce1851e8ee9c04eca02818693d6ed07de1820381330f2d608ce9b0e57ffe22ad11b11c91335c9d84a083fae12a514c8e9f48b5378bec8db3f279bd3!
 e70f49d752bbc1b665c36a9a1506292b944e9cff333ec088097655adcf8f3c!
 9cd63ccb
71a1e1f59d34d6a715c2dd10ec047f55f58d7fabe39ecf533d13607c759acb7bdfc4ffd26df2ffc526793d22f83020b192837cfe300278b1e5933dd08283fe7172ae3c879375084ac1f348b05e4201ae055e04764b0fa0b2bda9ad294c5da3b85350165fd7703b5d96770a982d66baa3e350887c4cddc60b3d6cbd0b6f03f2d96eaa1b21c11703c252b511fcecf3fb610468bf83e5f7655fb60f4a605b36cb0f978f2061b6747255b8e104bbe69a64be6f81daae5242448481c16c344ebf3144b41b12b6ac30b7ee31dc3946b81b107005afac71edf438611c801e93c430b6f736d58f038aa756a09460bf9ec3aedad43a62928735620b92d21089d54774ff369c9d442f2744718d642f21493759923d75f223493871276a5fde78f306c3a786d5ce50b68be5b2924139a07daf1dfdacfee29a606e0db9b339aa78b3b1ab2b52974a83b76f3cbaa47686d3fec82717e4eed389068f4f3c527184fb5e4eac4f10eb5d55c31b5d1ef95c3c7ff7d15da94b5deeaca9ac6fe2930959abafc98d8f6ec85a7d4d468ba332bf3d2f23ef8f485deaaa26b82d2245156b2c7db4245217b9337de7c438a0f1cfc07b9a888c4a3d2d74d6b755aabab67943442a22db33227249ee562e894845b6b767a422e7e5d627e745a42295ed79a9c84559d89c91eeb576b13c3579eb5d64a13e2f0bdbf34!
 752dbc329ed6165cc7f5e599917a9882cbcbf20b229b2545c12d956b25eac9fa880c612980c9b6430330afa20c4d3a0f7c1fa3474bab0ee41671e767c68752098820e079e786004b018c0a932d434c8007b9ae2e175a01358d4a04363b65ae39b49adc1dfcff23caba09dd6d0d6338dbe79d6547b84964b61a3c0b933e7f04a1e6ed6a5582de25a2e5ed963f0cc20c16f0386be3044b15ca427dba3b2c02c4cfdd314e7de3a77ec12682860f09e2e936fcec3ee22b438104d81e1a493aea5c145083b35e5923f0ce18d441d1b40d5f2f822f05ba01788343050e35a021faaebf62f34aa3b35b5b69fd958fd7f59f3c7c98bda4506ed41f2d97c4309c572117bd5c6387ffcf980c62931379bc0ce396805766e8291c0e2cfa03b860709b4d7604753e30fd4de1d3be9241f909ee6d2205b833003266a5fdf40457659605d63e8f521de1ebd4efcb7f2dc0b35fda449925c7abfcd4144f74ce4d790c133f78590efc8c343e8c9f6507858209fcd33b93ac92083c7cdffc0079c2f68229211a967945ccb886c22b29911a96b22ef1f1a3fb17f48ee7f4e3d23f2f4e07aafd72d7c9513d7e4eff2b7f6ce5ae378ccbc3f2ff24895c3b6dfd93ef1fb0ec501890a457594b413d8d0d4c1a632903d347e527f3db574a41d7c8e0e6ca4e35b9a1aff3d9d4e2c3417702c07bfe493b71412f!
 21d793c4e3e29da50c0f8c71ac5bd84f155885a126603a01b96b7801c44350!
 d5ad29b7
3c0a7cff43734e5f03650cb070ec6ed74bc2d796158fabb3677cf65f6e12c4e8783ff50d507fc928fb377722ef0d2f0d27c44fb2992790fe99d46ba3f42ceffa326b7d6904b054d663635b95ad464615b9389354db64593f9cd8c5a0e9574593c6e974b1f59bf17f88b0813ef4c48fda3baccbc3b23b22c0d796bfcd667c701ff127fdcfcfdacfdfdbfca7845ee4cdf917ab12e33d3330d65547e5af96c1ff02fd1e4e2f39eff9fb3f9f8b81d6ea338e2953c9c0ee7853ee05ffd69f1c3cdd973d46f85f6d46f851c5225242fb337f80a340f0fa75359dcb153f9190878a514e0ec394caf4ee32429021285883f9a5f8cf8f80c9c1e60fcd37172adea784d4ecfe1ed9d8c80cffd7b81ff1f5bf093400a9902f95a9ec94f2771488fcaef81f69ac6e5ef5d7e3efc7e95140010fc3290425460e0ec80fac5c8997e15a97e81a3596206384dd32ba780fd36feb7e3e2eea91f4cb9cdaea2485c3c3c5c4df5cf9d3ff7ea2ae065db2be5043f4ffbbf3cdf31b02b2fae0a0000000049454e44ae426082</data>
     </image>
 </images>
 <connections>
@@ -275,6 +342,12 @@
         <receiver>ethernetconfigwidgetbase</receiver>
         <slot>slotOK()</slot>
     </connection>
+    <connection>
+        <sender>checkIPv6Enable</sender>
+        <signal>clicked()</signal>
+        <receiver>ethernetconfigwidgetbase</receiver>
+        <slot>slotIPv6clicked()</slot>
+    </connection>
 </connections>
 <slots>
     <slot>button_clicked()</slot>
@@ -283,6 +356,7 @@
     <slot>slotIPCheckbox()</slot>
     <slot>slotDisableCheck()</slot>
     <slot>slotOK()</slot>
+    <slot>slotIPv6clicked()</slot>
 </slots>
 <functions>
     <function returnType="bool">checkRange(QString IP)</function>

Modified: pcbsd/trunk/ethernetconfig/src/main.cpp
===================================================================
--- pcbsd/trunk/ethernetconfig/src/main.cpp	2007-02-27 22:14:38 UTC (rev 114)
+++ pcbsd/trunk/ethernetconfig/src/main.cpp	2007-02-28 19:40:20 UTC (rev 115)
@@ -25,6 +25,7 @@
 
 #include "ethernetconfig.h"
 #include <kapplication.h>
+#include <kuniqueapplication.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
@@ -48,7 +49,8 @@
     about.addAuthor( "Kris Moore", 0, "kris at pcbsd.com" );
     KCmdLineArgs::init(argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    KUniqueApplication app;
+    //KApplication app;
     ethernetconfig *mainWin = 0;
 
     if (app.isRestored())

Modified: pcbsd/trunk/wificonfig/Makefile
===================================================================
--- pcbsd/trunk/wificonfig/Makefile	2007-02-27 22:14:38 UTC (rev 114)
+++ pcbsd/trunk/wificonfig/Makefile	2007-02-28 19:40:20 UTC (rev 115)
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: wificonfig
-# Generated by qmake (1.07a) (Qt 3.3.6) on: Tue Feb 27 14:15:09 2007
+# Generated by qmake (1.07a) (Qt 3.3.6) on: Wed Feb 28 09:38:55 2007
 # Project:  wificonfig.pro
 # Template: app
 # Command: $(QMAKE) -o Makefile wificonfig.pro
@@ -148,7 +148,11 @@
 
 ####### Compile
 
-.obj/main.o: main.cpp .ui/wificonfigwidgetbase.h
+.obj/main.o: main.cpp .ui/wificonfigwidgetbase.h \
+		.ui/wifiselectiondialog.h \
+		.ui/wepconfig.h \
+		.ui/dialogwpapersonal.h \
+		.ui/dialogwpaenterprise.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/main.o main.cpp
 
 .ui/wificonfigwidgetbase.h: wificonfigwidgetbase.ui .ui/wifiselectiondialog.h \
@@ -207,7 +211,10 @@
 		.ui/dialogwpaenterprise.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/dialogwpaenterprise.o .ui/dialogwpaenterprise.cpp
 
-.obj/moc_wificonfigwidgetbase.o: .moc/moc_wificonfigwidgetbase.cpp  .ui/wificonfigwidgetbase.h 
+.obj/moc_wificonfigwidgetbase.o: .moc/moc_wificonfigwidgetbase.cpp  .ui/wificonfigwidgetbase.h .ui/wifiselectiondialog.h \
+		.ui/wepconfig.h \
+		.ui/dialogwpapersonal.h \
+		.ui/dialogwpaenterprise.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/moc_wificonfigwidgetbase.o .moc/moc_wificonfigwidgetbase.cpp
 
 .obj/moc_wifiselectiondialog.o: .moc/moc_wifiselectiondialog.cpp  .ui/wifiselectiondialog.h 

Modified: pcbsd/trunk/wificonfig/main.cpp
===================================================================
--- pcbsd/trunk/wificonfig/main.cpp	2007-02-27 22:14:38 UTC (rev 114)
+++ pcbsd/trunk/wificonfig/main.cpp	2007-02-28 19:40:20 UTC (rev 115)
@@ -1,5 +1,6 @@
 #include "wificonfigwidgetbase.h"
 #include <kapplication.h>
+#include <kuniqueapplication.h>
 #include <kcmdlineargs.h>
 
 
@@ -19,7 +20,8 @@
     KCmdLineArgs::addCmdLineOptions( options );
     
     
-    KApplication a;
+    //KApplication a;
+    KUniqueApplication a;
     wificonfigWidgetBase w;
     a.setMainWidget(&w);
     a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );

Modified: pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h
===================================================================
--- pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h	2007-02-27 22:14:38 UTC (rev 114)
+++ pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h	2007-02-28 19:40:20 UTC (rev 115)
@@ -172,6 +172,7 @@
     
       // Now restart the network for new settings to take effect
       runCommand("/etc/rc.d/netif restart &");
+      runCommand("/etc/rc.d/routing restart &");
 
     
 }
@@ -222,16 +223,16 @@
    } else {
 	        // Get the IP address first
 		tmp2 = tmp;
-		tmp2 = tmp2.remove(0, tmp.find("inet") );
-		tmp2 = tmp2.remove(0, tmp.find(" ") );
-		tmp2.truncate(tmp.find(" ") );
+		tmp2 = tmp2.remove(0, tmp.find("inet") + 5 );
+		//tmp2 = tmp2.remove(0, tmp.find(" ") );
+		tmp2.truncate(tmp.find("netmask") -1 );
 		lineIP->setText(tmp2);
 
 		// Look for the netmask
 		if ( tmp.find("netmask") != -1 ) {
 			tmp2 = tmp;
-			tmp2 = tmp2.remove(0, tmp.find("netmask") );
-			tmp2 = tmp2.remove(0, tmp.find(" ") );
+			tmp2 = tmp2.remove(0, tmp.find("netmask") + 8 );
+			//tmp2 = tmp2.remove(0, tmp.find(" ") );
 			lineNetmask->setText(tmp2);
 		} else {
 		   lineNetmask->setText("255.255.255.0");



More information about the Commits mailing list