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

svn at pcbsd.org svn at pcbsd.org
Tue Feb 27 14:14:39 PST 2007


Author: kris
Date: 2007-02-27 23:14:38 +0100 (Tue, 27 Feb 2007)
New Revision: 114

Modified:
   pcbsd/trunk/NetworkManager/networkman.ui
   pcbsd/trunk/NetworkManager/networkman.ui.h
   pcbsd/trunk/NetworkTray/NetworkTray.cpp
   pcbsd/trunk/NetworkTray/NetworkTray.h
   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/wificonfigwidgetbase.ui
   pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h
Log:
Update to Network manager which fixes crashing issues, also adds PPPoE service name field, and adds OK buttons to ethernetconfig and wificonfig programs also. 

Modified: pcbsd/trunk/NetworkManager/networkman.ui
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui	2007-02-27 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/NetworkManager/networkman.ui	2007-02-27 22:14:38 UTC (rev 114)
@@ -72,7 +72,7 @@
                         <property name="minimumSize">
                             <size>
                                 <width>0</width>
-                                <height>70</height>
+                                <height>140</height>
                             </size>
                         </property>
                         <property name="font">
@@ -470,6 +470,68 @@
                             </size>
                         </property>
                     </spacer>
+                    <widget class="QCheckBox" row="0" column="2">
+                        <property name="name">
+                            <cstring>checkPPPOE</cstring>
+                        </property>
+                        <property name="text">
+                            <string>Enable PPPoE on this system</string>
+                        </property>
+                        <property name="accel">
+                            <string></string>
+                        </property>
+                    </widget>
+                    <spacer row="1" column="4">
+                        <property name="name">
+                            <cstring>spacer34</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Horizontal</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>51</width>
+                                <height>31</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <spacer row="2" column="2">
+                        <property name="name">
+                            <cstring>spacer33</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>21</width>
+                                <height>270</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <spacer row="1" column="0">
+                        <property name="name">
+                            <cstring>spacer35</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Horizontal</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>50</width>
+                                <height>31</height>
+                            </size>
+                        </property>
+                    </spacer>
                     <widget class="QGroupBox" row="1" column="1" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>groupBoxPPPOE</cstring>
@@ -481,34 +543,16 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLineEdit" row="0" column="1">
+                            <widget class="QLabel" row="0" column="0">
                                 <property name="name">
-                                    <cstring>linePPPUsername</cstring>
+                                    <cstring>textLabel3</cstring>
                                 </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
+                                <property name="text">
+                                    <string>Username:</string>
                                 </property>
-                            </widget>
-                            <widget class="QLineEdit" row="1" column="1">
-                                <property name="name">
-                                    <cstring>linePPPPassword</cstring>
+                                <property name="alignment">
+                                    <set>AlignVCenter|AlignRight</set>
                                 </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="echoMode">
-                                    <enum>Password</enum>
-                                </property>
                             </widget>
                             <widget class="QLabel" row="1" column="0">
                                 <property name="name">
@@ -521,29 +565,27 @@
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="QCheckBox" row="2" column="3" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>textLabel3</cstring>
+                                    <cstring>checkPPPNat</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Username:</string>
+                                    <string>Internet Connection Sharing</string>
                                 </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
+                                <property name="accel">
+                                    <string></string>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="0" column="3">
+                            <widget class="QCheckBox" row="1" column="3" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>comboPPPOEDev</cstring>
+                                    <cstring>checkPPPAlwaysOn</cstring>
                                 </property>
-                            </widget>
-                            <widget class="QLabel" row="0" column="4">
-                                <property name="name">
-                                    <cstring>textLabel1_3</cstring>
-                                </property>
                                 <property name="text">
-                                    <string>PPPoE Device</string>
+                                    <string>Alwa&amp;ys on connection</string>
                                 </property>
+                                <property name="accel">
+                                    <string>Alt+Y</string>
+                                </property>
                             </widget>
                             <spacer row="0" column="5">
                                 <property name="name">
@@ -557,32 +599,23 @@
                                 </property>
                                 <property name="sizeHint">
                                     <size>
-                                        <width>51</width>
+                                        <width>16</width>
                                         <height>21</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QCheckBox" row="1" column="3" rowspan="1" colspan="3">
+                            <widget class="QLabel" row="0" column="4">
                                 <property name="name">
-                                    <cstring>checkPPPAlwaysOn</cstring>
+                                    <cstring>textLabel1_3</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Alwa&amp;ys on connection</string>
+                                    <string>PPPoE Device</string>
                                 </property>
-                                <property name="accel">
-                                    <string>Alt+Y</string>
-                                </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="3" rowspan="1" colspan="3">
+                            <widget class="QComboBox" row="0" column="3">
                                 <property name="name">
-                                    <cstring>checkPPPNat</cstring>
+                                    <cstring>comboPPPOEDev</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">
@@ -601,78 +634,80 @@
                                     </size>
                                 </property>
                             </spacer>
+                            <widget class="QLineEdit" row="2" column="1">
+                                <property name="name">
+                                    <cstring>linePPPService</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>0</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                                <property name="echoMode">
+                                    <enum>Normal</enum>
+                                </property>
+                            </widget>
+                            <widget class="QLineEdit" row="1" column="1">
+                                <property name="name">
+                                    <cstring>linePPPPassword</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>0</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                                <property name="echoMode">
+                                    <enum>Password</enum>
+                                </property>
+                            </widget>
+                            <widget class="QLineEdit" row="0" column="1">
+                                <property name="name">
+                                    <cstring>linePPPUsername</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>0</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="QLabel" row="2" column="0">
+                                <property name="name">
+                                    <cstring>textLabel4_2</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Service name (optional):</string>
+                                </property>
+                                <property name="alignment">
+                                    <set>AlignVCenter|AlignRight</set>
+                                </property>
+                            </widget>
                         </grid>
                     </widget>
-                    <widget class="QCheckBox" row="0" column="2">
-                        <property name="name">
-                            <cstring>checkPPPOE</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Enable PPPoE on this system</string>
-                        </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
-                    </widget>
-                    <spacer row="2" column="2">
-                        <property name="name">
-                            <cstring>spacer33</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>21</width>
-                                <height>240</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="1" column="4">
-                        <property name="name">
-                            <cstring>spacer34</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>51</width>
-                                <height>31</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="1" column="0">
-                        <property name="name">
-                            <cstring>spacer35</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>91</width>
-                                <height>31</height>
-                            </size>
-                        </property>
-                    </spacer>
                 </grid>
             </widget>
+            <widget class="QWidget">
+                <property name="name">
+                    <cstring>TabPage</cstring>
+                </property>
+                <attribute name="title">
+                    <string>Firewall</string>
+                </attribute>
+            </widget>
         </widget>
     </grid>
 </widget>
 <images>
     <image name="image0">
-        <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>
+        <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>
     </image>
 </images>
 <connections>
@@ -757,6 +792,7 @@
     <slot access="private">slotDoubleClick( QListBoxItem * item )</slot>
     <slot>slotPPPOECheckBox()</slot>
     <slot access="private">slotPPPOEChanged()</slot>
+    <slot access="private">slotTimerRefresh()</slot>
 </slots>
 <functions>
     <function access="private">startDetectDev()</function>

Modified: pcbsd/trunk/NetworkManager/networkman.ui.h
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui.h	2007-02-27 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/NetworkManager/networkman.ui.h	2007-02-27 22:14:38 UTC (rev 114)
@@ -19,10 +19,7 @@
     firstUpdate = 0;
     
     username = QString::fromLocal8Bit(getenv("LOGNAME"));
-    
-    // Start the device detection process
-    startDetectDev();
-    
+        
     connect(listNetDev, SIGNAL(selectionChanged()), this, SLOT(DevSelectionChanged()) );
     connect(pushConfigure, SIGNAL(clicked()), this, SLOT(PropertiesSlot()) );
     connect(checkSysTray, SIGNAL(clicked()), this, SLOT(slotSysTray()) );
@@ -37,9 +34,12 @@
     connect( linePPPUsername, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
     connect( linePPPPassword, SIGNAL( textChanged(const QString &) ), this, SLOT(slotCheckGlobalText(const QString & ) ) );
     
-    
+    // Load any global settings
     loadGlobals();
     
+     // Start the device detection process
+    startDetectDev();
+    
 }
 
 
@@ -53,7 +53,7 @@
         GetDevList->addArgument( "ifconfig" );
         GetDevList->addArgument( "-lu" );	
         connect( GetDevList, SIGNAL(readyReadStdout()), this, SLOT(readDetectDev() ) );
-        connect( GetDevList, SIGNAL(processExited()), this, SLOT(refreshDevices() ) );	   
+        connect( GetDevList, SIGNAL(processExited()), this, SLOT(slotTimerRefresh() ) );	   
          if ( !GetDevList->start() ) {
 	      
          }
@@ -84,6 +84,7 @@
 	    
 	    if ( Devs[i].find("lo0") == -1 )
 	    {		
+		qDebug("Found device: " + Devs[i]);
 		// Determine if its a wireless or wired device
 		DevsType[i] = getTypeForIdent(Devs[i]);
 		// Get HW Idtentify line
@@ -205,6 +206,10 @@
 {
     int    sel = listNetDev->currentItem();
     
+    if ( sel != -1 ) {
+    
+	pushConfigure->setEnabled(TRUE);
+	
     // Check to see if the network tray icon is enabled or not
      QString filename = "/home/" + username + "/.kde/Autostart/tray-" + Devs[sel] + ".desktop";
 
@@ -244,6 +249,8 @@
     }
 
     
+  }
+    
 }
 
 
@@ -649,7 +656,10 @@
 			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
 		       } else {
 			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
-			   listNetDev->setCurrentItem(curItem);
+			   qDebug("Updating device: " + Devs[i]);
+			   if ( curItem != -1) {
+			      listNetDev->setCurrentItem(curItem);
+		                 }
 		       }
 		    } else {
 		       QImage *Icon = new QImage("/PCBSD/networkmanager/pics/network_wifi_dis.png");
@@ -659,7 +669,10 @@
 			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
 		       } else {
 			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
-			    listNetDev->setCurrentItem(curItem);
+			   qDebug("Updating device: " + Devs[i]);
+			   if ( curItem != -1) {
+			      listNetDev->setCurrentItem(curItem);
+		                 }
 		       }
 		    }
 	                  
@@ -676,7 +689,10 @@
 			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
 		       } else {
 			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
-			    listNetDev->setCurrentItem(curItem);
+			   qDebug("Updating device: " + Devs[i]);
+			   if ( curItem != -1) {
+			      listNetDev->setCurrentItem(curItem);
+		                 }
 		       }
 		    } else {
 		       QImage *Icon = new QImage("/PCBSD/networkmanager/pics/network_local_dis.png");
@@ -686,7 +702,10 @@
 			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
 		       } else {
 			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
-			    listNetDev->setCurrentItem(curItem);
+			   qDebug("Updating device: " + Devs[i]);
+			   if ( curItem != -1) {
+			      listNetDev->setCurrentItem(curItem);
+		                 }
 		       }
 		    }
 	                  
@@ -698,9 +717,7 @@
     // Show the correct device. 
     if ( firstUpdate == 0)
     {
-	    listNetDev->setSelected(0, TRUE);
 	    DevSelectionChanged();
-	    pushConfigure->setEnabled(TRUE);
     }
     
     firstUpdate = 1;
@@ -843,7 +860,7 @@
      QFile filein( "/etc/ppp/ppp.conf" );
      int foundProfile = 0;
      QString ProfileName = "internet";
-     QString tmp;
+     QString tmp, tmp2;
      
      // Check to see if PPPoE is enabled
      tmp = getValue( "/etc/rc.conf", "ppp_enable=", 1 );
@@ -895,6 +912,29 @@
 			tmp = line.remove(0, line.find("authkey") + 8 );
 			linePPPPassword->setText(tmp);
 		}
+		
+		// Search for the device / service tag
+		if ( line.find("set device PPPoE:") != -1 )
+		{
+		    tmp = line.remove(0, line.find("set device PPPoE:") + 18 );
+		    
+		    // Search for the service tag in remainder line
+		    if ( tmp.find(":") != -1 ) {
+			tmp2 = tmp.remove(0, tmp.find(":") + 1 );
+			linePPPService->setText(tmp2);
+			tmp.truncate( tmp.find(":") );
+		    }
+		    
+		    // Now look for device string
+		   /* int i = 0;
+		    while (! Devs[i].isEmpty() ) {
+			if ( tmp == Devs[i] ) {
+			    comboPPPOEDev->setCurrentItem(i);
+			}
+			i++;
+		    }
+		   */
+		}
 	    }
 
 	} 
@@ -933,9 +973,17 @@
      QFile fileout( "/etc/ppp/ppp.conf" );
      QString SavedFile;
      QString ProfileName = "internet";
+     QString ServiceName = "";
+     ServiceName = linePPPService->text();
+     
+     // See if we have the optional service name
+     if  (! ServiceName.isEmpty() )
+     {
+	 ServiceName = ":" + ServiceName;
+     }
 
 
-	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";
+	SavedFile = "default:\n set timeout 180\n enable dns\n\ninternet:\n  set device PPPoE:" + DeviceName + ServiceName + "\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 );
@@ -963,3 +1011,9 @@
     slotCheckGlobalText( "");
 
 }
+
+
+void NetworkMan::slotTimerRefresh()
+{
+    QTimer::singleShot( 3000, this, SLOT(refreshDevices()) );
+}

Modified: pcbsd/trunk/NetworkTray/NetworkTray.cpp
===================================================================
--- pcbsd/trunk/NetworkTray/NetworkTray.cpp	2007-02-27 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/NetworkTray/NetworkTray.cpp	2007-02-27 22:14:38 UTC (rev 114)
@@ -88,6 +88,7 @@
   contextMenu()->insertTitle(PixmapIcon, tr("Device ") + DeviceName);
   contextMenu()->insertSeparator();
   contextMenu()->insertItem( tr("Configure ") + DeviceName, this, SLOT(openConfigDlg()));
+  contextMenu()->insertItem( tr("Start the Network Manager"), this, SLOT(openNetManager()));
   contextMenu()->insertItem( tr("Restart the Network"), this, SLOT(slotRestartNetwork()));
 
   // Check if we are on a ethernet device and PPPOE is enabled
@@ -543,7 +544,7 @@
 
 // If the user wants to restart the network, do so
 void NetworkTray::slotRestartNetwork() {
-    QProcess  process(QStringList::split(' ', "/usr/local/bin/kdesu --noignorebutton -d /etc/rc.d/netif restart "));
+    QProcess  process(QStringList::split(' ', "/usr/local/bin/kdesu --noignorebutton /etc/rc.d/netif restart "));
     if(!process.start())
         KMessageBox::error(this,  tr("Can not restart the network!"));
 }
@@ -563,6 +564,13 @@
         KMessageBox::error(this,  tr("Can not restart the network!"));
 }
 
+void NetworkTray::openNetManager() {
+	// Run the command to start the network manager
+        QProcess  process(QStringList::split(' ', "/usr/local/bin/kdesu --noignorebutton -d kcmshell pcbsdnetwork"));
+    if(!process.start())
+        KMessageBox::error(this, tr("Can not open the network manager!"));
+}
+
 QString NetworkTray::getValue( QString File, QString Key, int occur ) {
 
 int found = 1;

Modified: pcbsd/trunk/NetworkTray/NetworkTray.h
===================================================================
--- pcbsd/trunk/NetworkTray/NetworkTray.h	2007-02-27 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/NetworkTray/NetworkTray.h	2007-02-27 22:14:38 UTC (rev 114)
@@ -22,6 +22,7 @@
    void slotRestartNetwork();
    void slotEnablePPPOE();
    void slotDisablePPPOE();
+   void openNetManager();
    
 protected:
    virtual void mouseDoubleClickEvent(QMouseEvent *e);

Modified: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp
===================================================================
--- pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp	2007-02-27 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp	2007-02-27 22:14:38 UTC (rev 114)
@@ -31,6 +31,7 @@
 #include <qfile.h>
 #include <qtabwidget.h>
 #include <iostream>
+#include <qtranslator.h>
 
 QString DeviceName;
 
@@ -266,7 +267,7 @@
    QString tmp, tmp2;
    DeviceName = Device;
 
-   this->setCaption("Configuring device " + DeviceName );
+   this->setCaption(DeviceName + " " + tr("configuration") );
 
    // Start loading the device information
    tmp = getValue( "/etc/rc.conf", "ifconfig_" + DeviceName + "=", 1 );
@@ -374,6 +375,11 @@
 
 }
 
+void ethernetconfigWidget::slotOK()
+{
+  slot_apply();
+  exit(0);
+}
 
 
 
@@ -383,5 +389,7 @@
 
 
 
+
+
 #include "ethernetconfigwidget.moc"
 

Modified: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h
===================================================================
--- pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h	2007-02-27 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h	2007-02-27 22:14:38 UTC (rev 114)
@@ -47,6 +47,7 @@
     virtual void slot_apply();
     virtual void slot_close();
     virtual void slotDisableCheck();
+    virtual void slotOK();
 
 protected:
 private:

Modified: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui
===================================================================
--- pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui	2007-02-27 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui	2007-02-27 22:14:38 UTC (rev 114)
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>303</width>
-            <height>366</height>
+            <width>269</width>
+            <height>341</height>
         </rect>
     </property>
     <property name="caption">
@@ -22,40 +22,6 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <spacer row="2" column="2">
-            <property name="name">
-                <cstring>spacer1</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Fixed</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
-        <spacer row="2" column="0">
-            <property name="name">
-                <cstring>spacer2</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
         <widget class="QPushButton" row="2" column="3">
             <property name="name">
                 <cstring>buttonClose</cstring>
@@ -67,17 +33,6 @@
                 <string>Alt+C</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
-            <property name="name">
-                <cstring>buttonApply</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Apply</string>
-            </property>
-            <property name="accel">
-                <string>Alt+A</string>
-            </property>
-        </widget>
         <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>checkDisableNetwork</cstring>
@@ -104,17 +59,6 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>textLabel1</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Network address configuration</string>
-                        </property>
-                        <property name="alignment">
-                            <set>WordBreak|AlignTop|AlignLeft</set>
-                        </property>
-                    </widget>
                     <spacer row="1" column="0">
                         <property name="name">
                             <cstring>spacer3</cstring>
@@ -132,6 +76,48 @@
                             </size>
                         </property>
                     </spacer>
+                    <spacer row="4" column="0">
+                        <property name="name">
+                            <cstring>spacer4</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>21</width>
+                                <height>60</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="QCheckBox" row="2" column="0">
+                        <property name="name">
+                            <cstring>checkDHCP</cstring>
+                        </property>
+                        <property name="text">
+                            <string>O&amp;btain IP automatically (DHCP)</string>
+                        </property>
+                        <property name="accel">
+                            <string>Alt+B</string>
+                        </property>
+                        <property name="checked">
+                            <bool>false</bool>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="0" column="0">
+                        <property name="name">
+                            <cstring>textLabel1</cstring>
+                        </property>
+                        <property name="text">
+                            <string>Network address configuration</string>
+                        </property>
+                        <property name="alignment">
+                            <set>WordBreak|AlignTop|AlignLeft</set>
+                        </property>
+                    </widget>
                     <widget class="QGroupBox" row="3" column="0">
                         <property name="name">
                             <cstring>groupBoxIP</cstring>
@@ -190,47 +176,72 @@
                                     <string>999\.999\.999\.999; </string>
                                 </property>
                             </widget>
+                            <spacer row="0" column="2" rowspan="2" colspan="1">
+                                <property name="name">
+                                    <cstring>spacer8</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>60</height>
+                                    </size>
+                                </property>
+                            </spacer>
                         </grid>
                     </widget>
-                    <widget class="QCheckBox" row="2" column="0">
-                        <property name="name">
-                            <cstring>checkDHCP</cstring>
-                        </property>
-                        <property name="text">
-                            <string>O&amp;btain IP automatically (DHCP)</string>
-                        </property>
-                        <property name="accel">
-                            <string>Alt+B</string>
-                        </property>
-                        <property name="checked">
-                            <bool>false</bool>
-                        </property>
-                    </widget>
-                    <spacer row="4" column="0">
-                        <property name="name">
-                            <cstring>spacer4</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>21</width>
-                                <height>60</height>
-                            </size>
-                        </property>
-                    </spacer>
                 </grid>
             </widget>
         </widget>
+        <spacer row="2" column="0">
+            <property name="name">
+                <cstring>spacer2</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Horizontal</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>21</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="QPushButton" row="2" column="2">
+            <property name="name">
+                <cstring>buttonApply</cstring>
+            </property>
+            <property name="text">
+                <string>&amp;Apply</string>
+            </property>
+            <property name="accel">
+                <string>Alt+A</string>
+            </property>
+        </widget>
+        <widget class="QPushButton" row="2" column="1">
+            <property name="name">
+                <cstring>buttonOK</cstring>
+            </property>
+            <property name="text">
+                <string>&amp;OK</string>
+            </property>
+            <property name="accel">
+                <string>Alt+O</string>
+            </property>
+        </widget>
     </grid>
 </widget>
 <images>
     <image name="image0">
-        <data format="PNG" length="5106">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de000013b949444154789ce59b4f88244976e67fb94480394482397842f8520561d00d65a16a98cc9d82c990fad0017350167be82c74982a3187aed51ca667f730ddcc61b747a7d145d32d81989258ad4a0bd2762dec50398755a50ebb8a3968142590c868e822ac600a2ca012dc211cdc2102dc20025207b388cceacaac2a8d341aa9c62e0f738f3ffedefbecbdef3d33df383939e19779fcbb5ff403fca247e317fd00ffaca3e464fcd9981f7ffe6374a2b19545a79ae14f877cf89d0f37cefbcaeb850081577aa9318541a1309981e5c55f79bd0c50814a14a6616837da946989ded22fc4f9eb65001910d0f0f057b5c2ce2c1a7de1575e2f0314d04dba5861e9bdd5c33883ded24cc4e4c2afbc5e065821008d2d03127e9910307e3246250a2b7cf4b70d8bded29886b9f03bffe6d3e0c6b7374e588268c0df7ced6fc8abdc2320a4c015222e1abf50036c7c7be3840464035c0272096c01b597c2010950016d88aa302f4027602ad8fe2d3f2fe7f0b018b2dfbec5703ef43ca0b074932e83e9e0e267f859a9f0c6b7374e6840bb0dae01528203e2d83fa4705e2931f70f2f8212a208ca044901b5f4cad5ad20a5bfeea4ffbc3b3bafc0b!
 5bc519eb9ff39fc40fd05c2c5c886c4565e795b59c45341ef1bbd7389d03308e83ddc385112ec1c441b98c34e3b58ba0db6029d8229e107bf07e319a84d3033d09bfeba8ac14c414b3005a82b6072d057c2bc03b600d5f6732d05a65a7d5ea0a5c314825a5650800abf43022207958479507e75bf8ec154869b9ddb0c27c3b5f23ad10cb2013d7a2f4640df6c9cec681080022cdea3e011192da06e42544b7404a6168848c02c426f829d09dc268899446d3ab232c6c53594113aae31d308245009942cb1454425eb80800a0a810b4a57b2a6cc735ccba1e69abdce36b6109008e22a464b45367768e9d7f84ebacdf0ef1ed2137b64f38cb491ae953795415841efbdf311b036c0fbd38d93f427ef31f83d8b3db6b8a563ff3ff7f8f0b7dea38c2b76e8e1cde31833a64b1718033b8c17866e53c30268020b0b4d0d0b11e6069a3bb080ba69f924fb164a761815062d1d470528a93c7d950e53d4c856ce28777c70e5fb687aa84d0d336013cccca0cfce4b433c9788498c680b4693113ad1884a400287a3436e7dfdd68b97c0a480effdda47a872c8bd1fdef3a870fbd4956227ee0225105353d2e53a35255190dd669f9a8ca899529211377b41c69458e2e64e900a535b9c04534cd6704756d8c2e0a4c384356df2200bc39ebacd417617d98a19fd74e8d7fcb1236b55882790c!
 b927ebecf5e7283acca381a1d91b533f6aeede1847bb52c502770f8e83e12c!
 deeee2e5
a2a5ce2e8262a7c22867a4cd488217f40d448a13820126d988c88a482e321f1951e0f3a192ad20c6623d2cd14531ea162457ff1212a52f01494ac31854049c5b818a1248c8ad5f510e072d057bca7edf21e079ff9cf99473e0670ec9f9bc7f05ee77d6c61d9bdb4cb4175c0bdff7d8fc1f680bbfffd2ec3cd213becbcd8001470eb9d3dea7762ae739d8c2129296306beaac2b0f3c37bf0c3035f5d35385766ef3c24fece2e0f4b8b8a1da3a9a5231d47d311fd2db0f518256b6c05b5748c0b133ccd19e9608580cab0a71ce6c9e9fd5afa2c72569aca7223e9612bcbfb570ddb73cb277f2718fefd909d4be72b0f6798a096009688148014058ce906e5150109abd2f202994a87292354dcc54ca1b3a57cf4970a16a0a22eb6885052fb289fb810ed15a208cf510894745081961a33b3ebcfb3523af0815ae2ab40a91085a09b743972925884673af6f4f8a2b14680a9a04e1590119162b1b451583cb33218622521ed808c4108ff0742808cb9fbc871f7af8fe0f76baa3fba4fbb1373ebdb9ad1f108aef8b54c0a7636c62535a630b8c46143f43795c105f8d7d2919d8d016fdec63c36e77a7ec50f6c65e9258e7135a68be3b0f0dac9372431f1cb0d80048ba1cb0d80e0714b973e003b74e1ed1bf0f639bf52c26d07e59f7f8cf991c16070c760ad44bd1d9115162d353c1da0!
 5af1daf3758801a37ce4f37b0e4a3acac29de6f910037402e649f07c7e8a801549d26f284c65e977fa7c6fa2393496de6e8feed52e0ffee201d7b7afbfc40005a854fb684e8ac5a0d021da87688e22634c8a22c3f818b1b0a4714af679ed7fe74d50cb55e074d822475f85fcf108bef13b640eeaffb3cdb890def385c125676380c0b52ab61fedf9b4da88a9da0efe6f9fb21811bf7d3e533495e596f43160ef8d3d7abb3dfa57fb9445895a07f2171840490043b446804f1d1131700438b27a00916250ff181575b83f3b446f6a0e6787702ca9a465ef6b3dccd4b277798f878d43e4a5145b18b6650780ee12a242d0bea23021fa9b10fd47b987bf3896ec95ef617283a824778eef206903cf2a7f56aaabcac78e3752d435b5ae21e22466580d036f797eac83a0adbcda251900637c095953020ab33010294c6d5051cdb8f664c49312e02b39fd6f40f5e523fa5f77a4bf96b2f7761fbbb4ebb50c601b20db296e0efdb606a7d1977611cb3e373b3d7aeca13b3df2794e3a4f39fcdb43caaa249fe79e999ef13c67634061413ab2790649087c6dc8e619dde47ce59f41809360b0eb7cd9450586d78745896e6e636a838eb6a136ec445ef99dcd1ee399613beef070fa63cfe8a696de96e24139f03dbadc842ce369f647fcc043aeb6a094e7da0ac633c3fe9b0a973986c9110f!
 8b8728a9c8c87c94e779cfaf63c09734a6b0f4aff6a9ffe71dd4576f327c32!
 c4b53274
757e1df00c02287ce02bf12963bcb0749bca23a00990d28b6e21d1a4d16d248afee66d249aeb9bef93b2e3494ce5f37cb6b0a858610b834a1ca6f27f930159cb32280fb19163303d60dc18f1607a00c271f0f41e43064c8a096ee9bc2797dea36ef9bce745012c3cc274a2c98a0c5c872c3768a919160f7189e3a2b146804e402c0c51f396f75453c142103563580c899bde8a11021647444d0d8b9ab82960017133c554d0910a53e4f453c551798892daaff58ee6ce6f57b45b8ec3fc43545b716734424b184d6a3ad2611e432e73e4b1e403f1278cdd1825151515ed561b1ae72020f1565589e709e99752f8da75a210033efaf2c70c7e3238e5311721c014e09aa708b08b3175d305049cc68607b33b8c9b87dc2f3fe1a879c0a7e527d02c29c9e848c7a4b0e835027c7fde47e909475f111cb6dbb8c4f9987086d999425005069825153939b7be748bfebb7d6e7ee526b9cb7d79fa05cf53f8cbb63090e0119040599590403daf7d0a7ee9129060163ed5790474b18bb1cf020b414cea99dca60e75bfc6940615fb351c93322984474005695361a7c633c010e545c8fb9eb9b1bece8afe166e9ddf3fbef62dfed3d675ee881b7c2bfa4d065fbd8fb8f205cf87e716b02e7dd3245d477f2a88e2c857852f354001fa0c02cc628c6a7603029cbfdef4a5a88a35b634a1f961207!
 2948b8c5a7acf76241e01d223a09635e3a0a47d86fbd7a7dcbf80b2e57ca72828592615c322c72686cc4d70ea79cf3305b7f43c404bed3d2f0302b6a09ed5af160354022ccc7aadaba6f2d55f749df16248b7d98305e84db5f6fc68ea03cdb8b674a31ee46167a6c8b87e5991ce24ffedcd1f60ca314a2b280dbca5315383baaa1817866e477354185427f581ec8af7a4baea8da7bf2077bfbceb373d12ed03acd4fc871ffdca1a5971c733cd388da1f408185523d250e35c88005b806bea3331c0e02215ea7d758a8050e599006f531954a4bcc7138759e5e38585cd1857d7f4e2ebb81ad2780f57437f6b8f7a09d7d37d6a077be91e38c1dee57d580af62edf442c05fb6a3fc89b0804fb6feee39ca377b98f9b57f4da3d9cab7c9628acf77ce1d77e392d7d053fabbd715e860027c1d4867eb44280c6d6969da80b75461cf96aae17f7616648b73487d37b28a9886a413e715485a62735f6b1c55daa793079c0e8e143dcaf67e82b9abbc786ed64874f8fefa0a4e2dec4cb3b4f46de984fbc47cd639fd2cc638f30f328cc1f85fb61be3ddfa67f690f009d285f10757acf21c055172f81754b6ce7e1c6c983ddbf02daa474a9bfb34374759bfaeb1f03156e0171c8063129e52263c42798026ea6ef73f777efd34b7ad88625ad528edc11ce39eefce8137a7fa0905252b5aa3!
 3010fca560d852313f9f35ddeb35c3fb4dadc2234e5965edefff5bf4220f8d!
 51ffd2ad
f7febfbdc4a6e215a82388929ab92782ba69ed554938af4adf4c5dbe33a016a431a3873f4f9081e1922626c6d114d01758980d3bc5f84bc9f5962620e1e1d907d9671f76fef12cd23e2564cda4e432374950dbc729d10fdab56b556fe3c86f7c568ef4265ebe2407e428a5349880132c480ad8080cdc82f8f0bc6b33c20d2648bf1338ba3a644458ac3f2538ea2430ea6777dde5f647464cda418a31345e63276935dac0b4cb21ad3597648e336edc0fdf72e29709ace25859b771109c8b9244edaa4f33671fb599906292f7bc95220a6f83ec434344b2ab3668ac8c003e41762c0ab548348b033437f73d7cf43872722a6ae87a858ad031f35c451ca24f708a018af4f647465d7575fb28bc1b07ba9cf6db14daafb8c6786dba9afefebcb0e531af45b7ad56ff5d9e59a464cc1ede279c4968629b0e553ae96daef14c9330868041e5018fa57fb1e01ed18a6106d455445f57204507992932dec73087051173bb5be655d19880879dfe75f27bb9ef1e13b3270da861a1523ac80c1f490743366583e2413390fb301714b32c806e4c232c806be76280d6ecbad95b75303d2cfd71e0fcfb1223f2c4f8db14640519e22415ea8ffb3fd80f1cc70fd1c0498d910b5a5184d4721ef9bd3bc2f15b6f29c3d9b676b0428a9a8a9c984e5771e7d177d55f3c9e3ef52ca9aec3867d2a8bd67!
 8b2eed44e1d209fc045fc767dee34cc39a9f7a84c899842db19eaf90b1420005a457d25304149e110e3e1bbc1a0f509b9d3502b2dfd88777b72929d19b3b6465e53d501854a4291759d8c430a8b00d95ba948c0c9948ecdc121731d9e7a70cb19435d571eeb3c0f41479eb2aef1c867776cde7f38aea694e5ee5e44f73f2b9972c09c8009b87589067d0f24878110f581bc049b0e584b4e93fecdefb80c1d51e3131d122e57a7c3becdc28a2d92a0b0894d44827d87e631baec0cdafdea4ff769ff7fee37bc86b1237f74ad6d2911de7942105b215fe38c0f345d1fe39d938f5fc1a012be7846c93ca8084568c285ea516a840c53576113a37a5416da68ceb213479c6e3f5a6235b647e6d1606b7e9d879b78b7e3725fa0a545f3ee04eebbb0caedca3f75f15ee52899d589c74a7f5fc5904f062cfbb2588f2747e9e9c5493f59638f294196645e611f73203681976779b21afc69aa3e911ae9171341bae3dae137fec246da6eb7ebe292d69b4a2c55dcc1cd24492cf33ec1b96acc8d7e46795dfcf2240fc133cbf929da4b37e9e713e7e0609e362fc720398021f850302249a1b5b1f92cd2bf4a60a793f6c606e06ee2f9dafc26245565b94ec60eb31b5748cf211478d11659ea32e69f61a7bf4de78879de536bab3cd2e77d87ef3011df911f232a4f33602f18ff6fc590438e9!
 d6ca8ff331b47c4c78a55a0009766ad9d9ea07a617fbfa3ff6793bde4c99e4!
 c6e7fd99
f07b7e2b86570ad23865f0f490dee53e9389612c8cdfde4a60afb1cffbd73ef0795e873cbf1df2fcb50f60fac1b9797e948f68cbf6badd35ca47a4ad743d3fca8f48a59fbf73e91dec63cb6e7b37ec3b28c6c5986ed2e5fee3fb2fef0aebb9e0c616d4b303680ea8cb4f8123a2e9884858281fb0df86686e8984a12c1fb09738a80cb42c593944b5c61c4d0764ad724d63fd2106df3c710dc781bdc7a83162f874801092e1d381ef139c93e7b7dbdb54aea277a947e52af63a7b888660ffca3ea221b87df536aaa578ff4bef53b96abdc5ee5a0e5b5854cb23e1451da17531f43db371f251e7fb10f5a01e41d481a723b8ace1a981560a0d0b9b0aec11b414340cc41646161a13c26a8696804b408ecfeb8f05b4040f5cc56fe6d569fefe429e670a624b2066723d4f2fa7eb3dc26c9eb1d3de5923a074e5da68bd760f9ec07e677f7d3882caffffe1df1f72e3376ebcf880c4adbf8e4e3e7dfb7fc1a282a682f2088482a58546e5955119cc2a701626195c739ec656be97c71bc013e02ab0145e8912700e26febafaff827c56211a7e8d036bd2e5c2692fe7b870f7f945f29be29bdc52b7d6b45c8512999fc2cecd9d171f90d08983d987b009cc626838780c5cade1b1f3a79366c2df9ff8bd3b6641c9e3e0e94a4052c15c428a3fc11103e6f47eff529f3ffd1f07d47f7cf2dc0!
 36dfcc1c6894b8139e138cd29329e617e2b196a88b5ac41b5d469672af74839e4f0e5e7034c2540577e9362b3f287845a15541212e7957cd3ff0909e7cfaf380ff78e833a186b757f025c759847162ea84e4ffecbf346f9c78cc19f0d4e56cbc31636b4e70c7af90a5d612d9da7a2115eb61dcc85b7748537c2eafe45f3b0e6988bd3df89f01e4dc2ef25fcdc4e27668deccc59a38084963fdf70d1581b60702cb85f38eefe148e9ce3410e6507c653a00325e1c0137ecef2ccbc8d572e1cad230ecc6b757f6594ad40837f4e432fb5e7012d0f7fb7aa5596afc003065fad9f85dfa617aba305fffeb38d13fe9f43a4a0973ec5e989dfe7774ea012281f7946e9ac8f29ce09f496239ee38d3693a4ad9293bffca741fda261306ccbed75fe1fe75e0eb8f89ce02b83b17ef76778e860c45525baf1871b2727dffcf9280ffe5cc2aa2f30cec76b32f44a31e05f62fc3c9507b05874ebb42a348579690cf8377f5afcec50cbd0b65bfa7785140ab33428f70afd80d761187ca166f03b57869723e0b532805afab69d720101ce23e297e68d118b657b6b9b4131402c05c37c887002b3fc254280290dbd560f736c485d8ac90d6555f2f1ef7e7cee8b113ff30b13ff5ac7e0dee0242363fbf2b67f63a4dd455402d111eb024954829c1c754d6dbc7606588dbb7f7cf7442ffd0b53baa!
 17d8a0c275eb5f0f31b376fbcbe0678d5f15ac5809f65fc0344a33fc96a976!
 ec700000
00049454e44ae426082</data>
+        <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>
     </image>
 </images>
 <connections>
@@ -258,6 +269,12 @@
         <receiver>ethernetconfigwidgetbase</receiver>
         <slot>slotIPCheckbox()</slot>
     </connection>
+    <connection>
+        <sender>buttonOK</sender>
+        <signal>clicked()</signal>
+        <receiver>ethernetconfigwidgetbase</receiver>
+        <slot>slotOK()</slot>
+    </connection>
 </connections>
 <slots>
     <slot>button_clicked()</slot>
@@ -265,6 +282,7 @@
     <slot>slot_apply()</slot>
     <slot>slotIPCheckbox()</slot>
     <slot>slotDisableCheck()</slot>
+    <slot>slotOK()</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 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/ethernetconfig/src/main.cpp	2007-02-27 22:14:38 UTC (rev 114)
@@ -28,6 +28,7 @@
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
+#include <qtranslator.h>
 
 static const char description[] =
     I18N_NOOP("A KDE KPart Application");
@@ -68,7 +69,7 @@
         {
 		QString Device = argv[1];
 		mainWin->setDevice( Device );
-		mainWin->setCaption("Configuring device " + Device);
+		mainWin->setCaption(Device + " " + "configuration");
 	        mainWin->show();
 	} else {
 		exit(1);

Modified: pcbsd/trunk/wificonfig/Makefile
===================================================================
--- pcbsd/trunk/wificonfig/Makefile	2007-02-27 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/wificonfig/Makefile	2007-02-27 22:14:38 UTC (rev 114)
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: wificonfig
-# Generated by qmake (1.07a) (Qt 3.3.6) on: Wed Feb 21 17:34:49 2007
+# Generated by qmake (1.07a) (Qt 3.3.6) on: Tue Feb 27 14:15:09 2007
 # Project:  wificonfig.pro
 # Template: app
 # Command: $(QMAKE) -o Makefile wificonfig.pro
@@ -148,11 +148,7 @@
 
 ####### Compile
 
-.obj/main.o: main.cpp .ui/wificonfigwidgetbase.h \
-		.ui/wifiselectiondialog.h \
-		.ui/wepconfig.h \
-		.ui/dialogwpapersonal.h \
-		.ui/dialogwpaenterprise.h
+.obj/main.o: main.cpp .ui/wificonfigwidgetbase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/main.o main.cpp
 
 .ui/wificonfigwidgetbase.h: wificonfigwidgetbase.ui .ui/wifiselectiondialog.h \
@@ -211,10 +207,7 @@
 		.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 .ui/wifiselectiondialog.h \
-		.ui/wepconfig.h \
-		.ui/dialogwpapersonal.h \
-		.ui/dialogwpaenterprise.h
+.obj/moc_wificonfigwidgetbase.o: .moc/moc_wificonfigwidgetbase.cpp  .ui/wificonfigwidgetbase.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/wificonfigwidgetbase.ui
===================================================================
--- pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui	2007-02-27 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui	2007-02-27 22:14:38 UTC (rev 114)
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>tabMainWidget</cstring>
             </property>
@@ -404,6 +404,36 @@
                 </grid>
             </widget>
         </widget>
+        <widget class="QPushButton" row="2" column="3">
+            <property name="name">
+                <cstring>buttonCancel</cstring>
+            </property>
+            <property name="text">
+                <string>Close</string>
+            </property>
+            <property name="accel">
+                <string></string>
+            </property>
+        </widget>
+        <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="4">
+            <property name="name">
+                <cstring>checkDisableWireless</cstring>
+            </property>
+            <property name="text">
+                <string>Disable this wireless device</string>
+            </property>
+        </widget>
+        <widget class="QPushButton" row="2" column="2">
+            <property name="name">
+                <cstring>pushApply</cstring>
+            </property>
+            <property name="text">
+                <string>&amp;Apply</string>
+            </property>
+            <property name="accel">
+                <string>Alt+A</string>
+            </property>
+        </widget>
         <spacer row="2" column="0">
             <property name="name">
                 <cstring>spacer1</cstring>
@@ -416,41 +446,22 @@
             </property>
             <property name="sizeHint">
                 <size>
-                    <width>146</width>
+                    <width>100</width>
                     <height>21</height>
                 </size>
             </property>
         </spacer>
         <widget class="QPushButton" row="2" column="1">
             <property name="name">
-                <cstring>pushApply</cstring>
+                <cstring>pushOK</cstring>
             </property>
             <property name="text">
-                <string>&amp;Apply</string>
+                <string>&amp;OK</string>
             </property>
             <property name="accel">
-                <string>Alt+A</string>
+                <string>Alt+O</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="2">
-            <property name="name">
-                <cstring>buttonCancel</cstring>
-            </property>
-            <property name="text">
-                <string>Close</string>
-            </property>
-            <property name="accel">
-                <string></string>
-            </property>
-        </widget>
-        <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>checkDisableWireless</cstring>
-            </property>
-            <property name="text">
-                <string>Disable this wireless device</string>
-            </property>
-        </widget>
     </grid>
 </widget>
 <connections>
@@ -514,6 +525,12 @@
         <receiver>wificonfigwidgetbase</receiver>
         <slot>slotCheckDisabled()</slot>
     </connection>
+    <connection>
+        <sender>pushOK</sender>
+        <signal>clicked()</signal>
+        <receiver>wificonfigwidgetbase</receiver>
+        <slot>slotOK()</slot>
+    </connection>
 </connections>
 <tabstops>
     <tabstop>tabMainWidget</tabstop>
@@ -568,6 +585,7 @@
     <slot access="private">slotWPAPChanged( QString newKey )</slot>
     <slot access="private">slotWPAEChanged( int type, QString EAPIdent, QString CACert, QString ClientCert, QString PrivKeyFile, QString PrivKeyPass )</slot>
     <slot access="private">slotCheckDisabled()</slot>
+    <slot access="private">slotOK()</slot>
 </slots>
 <functions>
     <function>setDevice( QString Device )</function>

Modified: pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h
===================================================================
--- pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h	2007-02-27 17:43:44 UTC (rev 113)
+++ pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h	2007-02-27 22:14:38 UTC (rev 114)
@@ -746,3 +746,10 @@
 	}
 	 
 }
+
+
+void wificonfigWidgetBase::slotOK()
+{
+        slotApply();
+        close();
+}



More information about the Commits mailing list