[PC-BSD Commits] r2166 - pcbsd/trunk/wificonfig

svn at pcbsd.org svn at pcbsd.org
Tue Jun 24 12:49:04 PDT 2008


Author: kris
Date: 2008-06-24 12:49:03 -0700 (Tue, 24 Jun 2008)
New Revision: 2166

Added:
   pcbsd/trunk/wificonfig/dialogwpaenterprise.cpp
   pcbsd/trunk/wificonfig/dialogwpaenterprise.h
   pcbsd/trunk/wificonfig/dialogwpapersonal.cpp
   pcbsd/trunk/wificonfig/dialogwpapersonal.h
   pcbsd/trunk/wificonfig/wepconfig.cpp
   pcbsd/trunk/wificonfig/wepconfig.h
   pcbsd/trunk/wificonfig/wificonfig.qrc
   pcbsd/trunk/wificonfig/wificonfigwidgetbase.cpp
   pcbsd/trunk/wificonfig/wificonfigwidgetbase.h
   pcbsd/trunk/wificonfig/wifiselectiondialog.cpp
   pcbsd/trunk/wificonfig/wifiselectiondialog.h
Removed:
   pcbsd/trunk/wificonfig/dialogwpaenterprise.ui.h
   pcbsd/trunk/wificonfig/dialogwpapersonal.ui.h
   pcbsd/trunk/wificonfig/wepconfig.ui.h
   pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h
   pcbsd/trunk/wificonfig/wifiselectiondialog.ui.h
Modified:
   pcbsd/trunk/wificonfig/dialogwpaenterprise.ui
   pcbsd/trunk/wificonfig/dialogwpapersonal.ui
   pcbsd/trunk/wificonfig/main.cpp
   pcbsd/trunk/wificonfig/wepconfig.ui
   pcbsd/trunk/wificonfig/wificonfig.pro
   pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui
   pcbsd/trunk/wificonfig/wifiselectiondialog.ui
Log:

Updated the wificonfig tool to KDE / QT 4



Added: pcbsd/trunk/wificonfig/dialogwpaenterprise.cpp

Added: pcbsd/trunk/wificonfig/dialogwpaenterprise.h

Modified: pcbsd/trunk/wificonfig/dialogwpaenterprise.ui
===================================================================
--- pcbsd/trunk/wificonfig/dialogwpaenterprise.ui	2008-06-24 15:28:06 UTC (rev 2165)
+++ pcbsd/trunk/wificonfig/dialogwpaenterprise.ui	2008-06-24 19:49:03 UTC (rev 2166)
@@ -1,325 +1,362 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>dialogWPAEnterprise</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>dialogWPAEnterprise</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>367</width>
-            <height>330</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>WPA-Enterprise Configuration</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
+<ui version="4.0" >
+ <class>dialogWPAEnterprise</class>
+ <widget class="QDialog" name="dialogWPAEnterprise" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>395</width>
+    <height>338</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>WPA-Enterprise Configuration</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="wificonfig.qrc" >
+    <normaloff>:/tray_wifi85.png</normaloff>:/tray_wifi85.png</iconset>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="1" column="0" >
+    <spacer name="spacer8" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>261</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QPushButton" name="pushClose" >
+     <property name="text" >
+      <string>&amp;Close</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+C</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2" >
+    <widget class="Q3ButtonGroup" name="buttonGroup2" >
+     <property name="title" >
+      <string>WPA Enterprise Configuration</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" colspan="2" >
+       <widget class="QLabel" name="textLabel1" >
+        <property name="text" >
+         <string>EAP authentication method</string>
         </property>
-        <spacer row="1" column="0">
-            <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>261</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QPushButton" row="1" column="1">
-            <property name="name">
-                <cstring>pushClose</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Close</string>
-            </property>
-            <property name="accel">
-                <string>Alt+C</string>
-            </property>
-        </widget>
-        <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>buttonGroup2</cstring>
-            </property>
-            <property name="title">
-                <string>WPA Enterprise Configuration</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>textLabel1</cstring>
-                    </property>
-                    <property name="text">
-                        <string>EAP authentication method</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>lineEAPIdentity</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="2" column="0">
-                    <property name="name">
-                        <cstring>textLabel2</cstring>
-                    </property>
-                    <property name="text">
-                        <string>EAP Identity:</string>
-                    </property>
-                    <property name="alignment">
-                        <set>AlignVCenter|AlignRight</set>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="3" column="0">
-                    <property name="name">
-                        <cstring>textCACert</cstring>
-                    </property>
-                    <property name="text">
-                        <string>CA Certificate:</string>
-                    </property>
-                    <property name="alignment">
-                        <set>AlignVCenter|AlignRight</set>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="4" column="0">
-                    <property name="name">
-                        <cstring>textClientCert</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Client Certificate:</string>
-                    </property>
-                    <property name="alignment">
-                        <set>AlignVCenter|AlignRight</set>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="5" column="0">
-                    <property name="name">
-                        <cstring>textPrivateKeyFile</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Private Key File:</string>
-                    </property>
-                    <property name="alignment">
-                        <set>AlignVCenter|AlignRight</set>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="3" column="1">
-                    <property name="name">
-                        <cstring>lineCACert</cstring>
-                    </property>
-                    <property name="readOnly">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="4" column="1">
-                    <property name="name">
-                        <cstring>lineClientCert</cstring>
-                    </property>
-                    <property name="readOnly">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="5" column="1">
-                    <property name="name">
-                        <cstring>linePrivateKeyFile</cstring>
-                    </property>
-                    <property name="readOnly">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="3" column="2">
-                    <property name="name">
-                        <cstring>pushSelectCACert</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>image0</pixmap>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="6" column="0">
-                    <property name="name">
-                        <cstring>textPrivateKey</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Password:</string>
-                    </property>
-                    <property name="alignment">
-                        <set>AlignVCenter|AlignRight</set>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="7" column="0">
-                    <property name="name">
-                        <cstring>textPrivateKey2</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Repeat Password:</string>
-                    </property>
-                    <property name="alignment">
-                        <set>AlignVCenter|AlignRight</set>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="7" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>linePrivateKeyPassword2</cstring>
-                    </property>
-                    <property name="echoMode">
-                        <enum>Password</enum>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="6" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>linePrivateKeyPassword</cstring>
-                    </property>
-                    <property name="echoMode">
-                        <enum>Password</enum>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="4" column="2">
-                    <property name="name">
-                        <cstring>pushSelectClientCert</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>image1</pixmap>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="5" column="2">
-                    <property name="name">
-                        <cstring>pushSelectPrivateKeyFile</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>image1</pixmap>
-                    </property>
-                </widget>
-                <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>layout1</cstring>
-                    </property>
-                    <hbox>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <widget class="QRadioButton">
-                            <property name="name">
-                                <cstring>radioEAPTLS</cstring>
-                            </property>
-                            <property name="text">
-                                <string>EAP-TLS</string>
-                            </property>
-                            <property name="checked">
-                                <bool>true</bool>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton">
-                            <property name="name">
-                                <cstring>radioEAPTTLS</cstring>
-                            </property>
-                            <property name="text">
-                                <string>EAP-TTLS</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton">
-                            <property name="name">
-                                <cstring>radioEAPPEAP</cstring>
-                            </property>
-                            <property name="text">
-                                <string>EAP-PEAP</string>
-                            </property>
-                        </widget>
-                    </hbox>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<images>
-    <image name="image0">
-        <data format="PNG" length="1126">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042d49444154388da5946168d4651cc73f77feb77bfe75d3ff41d19d9d7a23899d34dcc68c9648dd91bd3852db2cca8914faa2d81204895e4ca2105fface158514d122a179118e59c2a660b637ea61a91753b7a1b5ffb11dbb2777dcff617bf4e9c5ffa6961966df370f0ffc9eeff379be7c7916f12072128f37bf7ae0bdaddd07fb55d98a14264e0e03e6ce11eb3f1986138b134d998de90d3bba628dc956845d23eaeb9fe6847040cd8868f3134ebc6db3bc7cfcc4fd195b22146dea4ca5dbbb77a6532d6917842a832b21d9d0f6e4c823c9d58986ccf29654e75b287b457622570adc795ec49b97d7b7a6d7960aee54e174f62470c36948b7a437ecee4eaf6f7e391a8f2cc94b900a3c096a1654d1d5aae0fe2a9c484d7ec229e5f3b95a75fa9d0f2c00114d3acdedddaf6f6defe8ca3c135b757682ebd9af0f1f926539dfb965c72bf5719696800909110ba4ae922848c662d688741e1b3e2fcfaa592cb408a1dca2e5249a9777ef3bbcbf737dfdc6558f52eb01994622c9c4e6b7b1402a024a8394202c1897e029b0b507c266f012c8a2fdb09a2d84d04e18e56ac00bc656b6ad5b3005b07d106275046c08080b3c0d8e8052191!
 c0d310b3c6d939bf06311616ca72eba02cd622ca1011df4b4ac00f30b39970001c879bf334a83ed9383065bc0781926a6fd794f83d204d044d108b49c03e682996d3ddb6282d08271a4ba3a35fea10562618152d568bdea5efb997b1284b0435808ac5808a80d4622767da4ee769f4bd555cefba44afba4e3bf79d43be096ab73d517948afe854a114c2ec34946dd87806070f8e8e09717a76f4711a966ecd4540f96a1508464d4bed506a5c0d6a064b5a6167434414fbbac4d279d25404d3077b4f7bb91f3eee83f653c2e7d93641c0ada8fc495fecdaef4f7b130ec79c163ebba71626145be500058145485f12bd9238303defc5f33069fb625e13f5b00b2ecaf4af92dd9dc0407b678a41b156e01b3e7e3e12bc347b31fa1e5d8226e6aa6e5ac4cae7971e3aa6575e1925f067e998188803210d070a9e837a3380dd130bcb6dae38d351a5991647fb856f9b0b7f7c8f91f7bdfd7329705feb000e4e5917383c7f3df675a636f466ac0abc6e158fe2db9b2df6fa1a1a3119e8d8213b6193eed9acfbef9e9f2e0b7fb3f55c5dc2150bff3b75f0ee7a9cc73433f9b62c5185331c60c8c19333667ccd094317da3c6f49d356672c6984ac598992963f67e72a69c68ede9c77252558e7b4838a18e77fb3fafcc1933638c19ba6acc998a31a7668cb930656ee9c2a8b9d9b1b32f2fe!
 2a95d401c08dcdb74813ad1b6e6e0b1c96b15634cffa83193c6989939dfb05!
 231a66f707236f1fcee4388e8ba7fa7bc5bc1b66d07f69eba6a6e9cba7a07e598b9d9b56f282f12a95d5862e97d51dea57034be7dff9991818bbee9c16363d79b5feaf9ea4128ef92d3d0b169f71793eef67d03e79c95992e20fabf0c6fc91221b132b58970742d0f48f927cc2b0d85bfc0bfa10000000049454e44ae426082</data>
-    </image>
-    <image name="image1">
-        <data format="PNG" length="1131">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000043249444154388da5946f6855651cc73fbb9ebbfb9cbacb73c1e85c9b7a2f69b8e1c86b2b5826b54bf662a5e65dd19fe10bd70b73260833220611a82f7cb15752100c0c52111a8b722e5a34855abed06d44e995a1f70e939d8b5eee39cd71cf613beed78b73e7ac49987de1f03c0fe7395f3ebfeff33bcf121e4446e2f1d4db3d1fb6edfea2976915bb3e71660890bbb768ffc9309a7824b1be656b7acb9e8e7843b291a81e26197f96b3ca00afa4ccd413466d53ab73e5ccd9fb33d654c45cdfde9cdebe676fcbe6fa74de47e141be08a975e927cf2dab7b2ab136b3724373db2ee5ab552726c6ecaabbbf57b5a995c9c6f446bb60dd285ce8fb09b86dac4d6f486fe9da93de5cf75a22115b3a5604c707b708de2df08a96ef15eccbcad0c3d909d3ce66cf557b17deff440350669d917aa3f3adb62d998eccf3b1fa5fae3035f0d5e99305a730dbbee3ddd79326cb1d0db245882b708aa06be079905a11d7ce38f1c7862edba39e8d866f44f0aca26624522b3b0f9deece6c8e6fad7f946a17686d20569778e53d5d81354d950758453014640be0faa07b2e4ae9f465c129f2b0673b11fc64142fef036e28be3abd69de1440075c2!
 0594395f2a93214d81ec4a3603910277840676c22884545d18d5872153e8fa0c57cc00fb9be55d63566e773b62be685d960e278100bc8d12b7d94f7206b05fb5d0f3c9f2a3cd7c447e15b33c04ca875e7c11da64664de385619cd30d86e50beed55c669505a70688602cf0f32771d50513d8286424b4680ea90aa21a9d72cf4b35d190bb310ab10eb4076c2a56e19e49de0bd350df860158243f4a609d5adc0a833f30f01a1d0d00f435f5ebab91045ac92b1190e269e07f9026ca8d5297815622fd8e73941344a83b646e8da6e57b734c49702e1d0d8a9ee6fc62edbe3f7ca383f1d949f4a04b942f053ccff1c6e258a832f41a6294fd2f018bb9e075812f20af9ab27beeeebff67c62a1c74c1736b82b20d2d58c72ac446145ad743cf0e4837b8d84525fb8f0c5c1dfa6ee0337c27b784399f9bce2d67cdd32f6fad5f51139d273e7f3368b1a21fac7f2b04ad65596046e1cd06975d4d610a5316df7e6f953f3ad27deaf79f3ffdd877cef7017fcedf05e18ec3c3476546ee68a424922b89e466448e8d8bf48c8a740d88f48f8a94ae89c89448ff6069ee9dddfde36a59d37e50b5c0dfae08008c752d2f0c5f9262b962dc9f139914911f6f88f4e6448e8d8a94a644ca65917249e4c0e723d389c603bd684633a01619de913222990f7a8f8a88944564785264a42c32322592b!
 bb150492e277399bdc7b2aab6791f706fca45d489a6677a0627ff1011e91d1!
 7298948a9124fb92cd23b58ba9578b1f324cadcf4ef948b156adad97360f89adc1e995ca0bc9893b9cec3c3599568de87a696df17e52245cddaf6ee8be7fa2f05a63d83b9a9d4ab5dc71f8472918cb5996d5dc74b56fba1fe5f8dd5990ec0fc5f8677a4a9885addbc8da8b99107a4fc0b6b9e1d056486f58a0000000049454e44ae426082</data>
-    </image>
-</images>
-<connections>
-    <connection>
-        <sender>radioEAPTLS</sender>
-        <signal>clicked()</signal>
-        <receiver>dialogWPAEnterprise</receiver>
-        <slot>slotTypeChanged()</slot>
-    </connection>
-    <connection>
-        <sender>radioEAPTTLS</sender>
-        <signal>clicked()</signal>
-        <receiver>dialogWPAEnterprise</receiver>
-        <slot>slotTypeChanged()</slot>
-    </connection>
-    <connection>
-        <sender>radioEAPPEAP</sender>
-        <signal>clicked()</signal>
-        <receiver>dialogWPAEnterprise</receiver>
-        <slot>slotTypeChanged()</slot>
-    </connection>
-    <connection>
-        <sender>pushClose</sender>
-        <signal>clicked()</signal>
-        <receiver>dialogWPAEnterprise</receiver>
-        <slot>slotClose()</slot>
-    </connection>
-    <connection>
-        <sender>pushSelectCACert</sender>
-        <signal>clicked()</signal>
-        <receiver>dialogWPAEnterprise</receiver>
-        <slot>slotSelectCACert()</slot>
-    </connection>
-    <connection>
-        <sender>pushSelectClientCert</sender>
-        <signal>clicked()</signal>
-        <receiver>dialogWPAEnterprise</receiver>
-        <slot>slotSelectClientCert()</slot>
-    </connection>
-    <connection>
-        <sender>pushSelectPrivateKeyFile</sender>
-        <signal>clicked()</signal>
-        <receiver>dialogWPAEnterprise</receiver>
-        <slot>slotSelectPrivateKeyFile()</slot>
-    </connection>
-</connections>
-<includes>
-    <include location="local" impldecl="in declaration">qfiledialog.h</include>
-    <include location="local" impldecl="in declaration">qmessagebox.h</include>
-    <include location="local" impldecl="in implementation">dialogwpaenterprise.ui.h</include>
-</includes>
-<signals>
-    <signal>saved(int, QString, QString, QString, QString, QString)</signal>
-</signals>
-<slots>
-    <slot access="private">slotTypeChanged()</slot>
-    <slot access="private">slotClose()</slot>
-    <slot access="private">slotSelectCACert()</slot>
-    <slot access="private">slotSelectClientCert()</slot>
-    <slot access="private">slotSelectPrivateKeyFile()</slot>
-</slots>
-<functions>
-    <function>setVariables( int type, QString EAPIdent, QString CACert, QString ClientCert, QString PrivKeyFile, QString Password )</function>
-</functions>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QLineEdit" name="lineEAPIdentity" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="textLabel2" >
+        <property name="text" >
+         <string>EAP Identity:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="textCACert" >
+        <property name="text" >
+         <string>CA Certificate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="textClientCert" >
+        <property name="text" >
+         <string>Client Certificate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="textPrivateKeyFile" >
+        <property name="text" >
+         <string>Private Key File:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLineEdit" name="lineCACert" >
+        <property name="readOnly" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="lineClientCert" >
+        <property name="readOnly" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" >
+       <widget class="QLineEdit" name="linePrivateKeyFile" >
+        <property name="readOnly" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2" >
+       <widget class="QPushButton" name="pushSelectCACert" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0" >
+       <widget class="QLabel" name="textPrivateKey" >
+        <property name="text" >
+         <string>Password:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" >
+       <widget class="QLabel" name="textPrivateKey2" >
+        <property name="text" >
+         <string>Repeat Password:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="1" colspan="2" >
+       <widget class="QLineEdit" name="linePrivateKeyPassword2" >
+        <property name="echoMode" >
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2" >
+       <widget class="QLineEdit" name="linePrivateKeyPassword" >
+        <property name="echoMode" >
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="2" >
+       <widget class="QPushButton" name="pushSelectClientCert" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2" >
+       <widget class="QPushButton" name="pushSelectPrivateKeyFile" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2" >
+       <layout class="QHBoxLayout" >
+        <item>
+         <widget class="QRadioButton" name="radioEAPTLS" >
+          <property name="text" >
+           <string>EAP-TLS</string>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="radioEAPTTLS" >
+          <property name="text" >
+           <string>EAP-TTLS</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="radioEAPPEAP" >
+          <property name="text" >
+           <string>EAP-PEAP</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <customwidgets>
+  <customwidget>
+   <class>Q3ButtonGroup</class>
+   <extends>Q3GroupBox</extends>
+   <header>Qt3Support/Q3ButtonGroup</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <includes>
+  <include location="local" >q3filedialog.h</include>
+  <include location="local" >qmessagebox.h</include>
+ </includes>
+ <resources>
+  <include location="wificonfig.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>radioEAPTLS</sender>
+   <signal>clicked()</signal>
+   <receiver>dialogWPAEnterprise</receiver>
+   <slot>slotTypeChanged()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>radioEAPTTLS</sender>
+   <signal>clicked()</signal>
+   <receiver>dialogWPAEnterprise</receiver>
+   <slot>slotTypeChanged()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>radioEAPPEAP</sender>
+   <signal>clicked()</signal>
+   <receiver>dialogWPAEnterprise</receiver>
+   <slot>slotTypeChanged()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushClose</sender>
+   <signal>clicked()</signal>
+   <receiver>dialogWPAEnterprise</receiver>
+   <slot>slotClose()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushSelectCACert</sender>
+   <signal>clicked()</signal>
+   <receiver>dialogWPAEnterprise</receiver>
+   <slot>slotSelectCACert()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushSelectClientCert</sender>
+   <signal>clicked()</signal>
+   <receiver>dialogWPAEnterprise</receiver>
+   <slot>slotSelectClientCert()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushSelectPrivateKeyFile</sender>
+   <signal>clicked()</signal>
+   <receiver>dialogWPAEnterprise</receiver>
+   <slot>slotSelectPrivateKeyFile()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Deleted: pcbsd/trunk/wificonfig/dialogwpaenterprise.ui.h

Added: pcbsd/trunk/wificonfig/dialogwpapersonal.cpp

Added: pcbsd/trunk/wificonfig/dialogwpapersonal.h

Modified: pcbsd/trunk/wificonfig/dialogwpapersonal.ui
===================================================================
--- pcbsd/trunk/wificonfig/dialogwpapersonal.ui	2008-06-24 15:28:06 UTC (rev 2165)
+++ pcbsd/trunk/wificonfig/dialogwpapersonal.ui	2008-06-24 19:49:03 UTC (rev 2166)
@@ -1,126 +1,131 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>dialogWPAPersonal</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>dialogWPAPersonal</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>308</width>
-            <height>144</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>WPA Personal Config</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
+<ui version="4.0" >
+ <class>dialogWPAPersonal</class>
+ <widget class="QDialog" name="dialogWPAPersonal" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>308</width>
+    <height>149</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>WPA Personal Config</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="wificonfig.qrc" >
+    <normaloff>:/tray_wifi85.png</normaloff>:/tray_wifi85.png</iconset>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="1" column="1" >
+    <widget class="QPushButton" name="pushClose" >
+     <property name="text" >
+      <string>&amp;Close</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+C</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <spacer name="spacer12" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>191</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="0" colspan="2" >
+    <widget class="Q3GroupBox" name="groupBox3" >
+     <property name="title" >
+      <string>Wireless network key</string>
+     </property>
+     <property name="frameShape" >
+      <enum>Q3GroupBox::GroupBoxPanel</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>Q3GroupBox::Sunken</enum>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="textLabel1" >
+        <property name="text" >
+         <string>Network Key</string>
         </property>
-        <widget class="QPushButton" row="1" column="1">
-            <property name="name">
-                <cstring>pushClose</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Close</string>
-            </property>
-            <property name="accel">
-                <string>Alt+C</string>
-            </property>
-        </widget>
-        <spacer row="1" column="0">
-            <property name="name">
-                <cstring>spacer12</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>191</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>groupBox3</cstring>
-            </property>
-            <property name="frameShape">
-                <enum>GroupBoxPanel</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Sunken</enum>
-            </property>
-            <property name="title">
-                <string>Wireless network key</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLabel" row="0" column="0">
-                    <property name="name">
-                        <cstring>textLabel1</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Network Key</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="0" column="1">
-                    <property name="name">
-                        <cstring>lineKey</cstring>
-                    </property>
-                    <property name="echoMode">
-                        <enum>Password</enum>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="1" column="1">
-                    <property name="name">
-                        <cstring>lineKey2</cstring>
-                    </property>
-                    <property name="echoMode">
-                        <enum>Password</enum>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>textLabel1_2</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Network Key (Repeat)</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>pushClose</sender>
-        <signal>clicked()</signal>
-        <receiver>dialogWPAPersonal</receiver>
-        <slot>slotClose()</slot>
-    </connection>
-</connections>
-<includes>
-    <include location="local" impldecl="in declaration">qmessagebox.h</include>
-    <include location="local" impldecl="in implementation">dialogwpapersonal.ui.h</include>
-</includes>
-<signals>
-    <signal>saved(QString)</signal>
-</signals>
-<slots>
-    <slot access="private">slotClose()</slot>
-</slots>
-<functions>
-    <function>setKey( QString Key )</function>
-</functions>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="lineKey" >
+        <property name="echoMode" >
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="lineKey2" >
+        <property name="echoMode" >
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="textLabel1_2" >
+        <property name="text" >
+         <string>Network Key (Repeat)</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>Q3GroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>Qt3Support/Q3GroupBox</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <includes>
+  <include location="local" >qmessagebox.h</include>
+ </includes>
+ <resources>
+  <include location="wificonfig.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>pushClose</sender>
+   <signal>clicked()</signal>
+   <receiver>dialogWPAPersonal</receiver>
+   <slot>slotClose()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Deleted: pcbsd/trunk/wificonfig/dialogwpapersonal.ui.h

Modified: pcbsd/trunk/wificonfig/main.cpp
===================================================================
--- pcbsd/trunk/wificonfig/main.cpp	2008-06-24 15:28:06 UTC (rev 2165)
+++ pcbsd/trunk/wificonfig/main.cpp	2008-06-24 19:49:03 UTC (rev 2166)
@@ -1,34 +1,43 @@
-#include "wificonfigwidgetbase.h"
 #include <kapplication.h>
-#include <kuniqueapplication.h>
+#include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <qtranslator.h>
 #include <qtextcodec.h>
+#include "wificonfigwidgetbase.h"
+#include "ui_wificonfigwidgetbase.h"
 
+static const char description[] = I18N_NOOP("WIFI Setup GUI");
+
 int main( int argc, char ** argv )
 {
- 
- static KCmdLineOptions options[] =
- {
-    { "+<device>", "Start the Network configuration on specified wireless device.", 0 },
-    { "info <device>", "Show the info tab on the specified wireless device.", 0 },
-    KCmdLineLastOption
- };
-   
-   KCmdLineArgs::init(argc, argv, "PC-BSD Wifi Editor", "PC-BSD Wifi Editor", "Configures the wifi settings", "1.0");
 
-        // Tell which options are supported
+   KAboutData aboutData("WIFIGUI", 0, ki18n("WIFIGUI"),
+                            "1.2", ki18n(description),
+                            KAboutData::License_BSD,
+                            ki18n("(c) 2008, Kris Moore(c)"));
+
+    aboutData.addAuthor(ki18n("Kris Moore"), ki18n("Current maintainer"), "kris at pcbsd.org");
+
+    KCmdLineArgs::init(argc, argv, &aboutData);
+
+    KCmdLineOptions options;
+    options.add("+<device>", ki18n("Start the Network configuration on specified wireless device"));
+    options.add("info <device>", ki18n("Show the info tab on the specified wireless device."));
+
+
+
+    // Tell which options are supported
     KCmdLineArgs::addCmdLineOptions( options );
-    
-    
-    //KApplication a;
-    KUniqueApplication a;
 
+
+    KApplication a;
+
+ 
     QTranslator translator( 0 );
     translator.load( QString("wificonfig_") + QTextCodec::locale(), "/PCBSD/LANGS/" );
     a.installTranslator( &translator );
 
-    wificonfigWidgetBase w;
+    wificonfigwidgetbase w;
     a.setMainWidget(&w);
     a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
     

Added: pcbsd/trunk/wificonfig/wepconfig.cpp

Added: pcbsd/trunk/wificonfig/wepconfig.h

Modified: pcbsd/trunk/wificonfig/wepconfig.ui
===================================================================
--- pcbsd/trunk/wificonfig/wepconfig.ui	2008-06-24 15:28:06 UTC (rev 2165)
+++ pcbsd/trunk/wificonfig/wepconfig.ui	2008-06-24 19:49:03 UTC (rev 2166)
@@ -1,155 +1,161 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>wepConfig</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>wepConfig</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>301</width>
-            <height>182</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>WEP Configuration</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
+<ui version="4.0" >
+ <class>wepConfig</class>
+ <widget class="QDialog" name="wepConfig" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>301</width>
+    <height>182</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>WEP Configuration</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="wificonfig.qrc" >
+    <normaloff>:/tray_wifi85.png</normaloff>:/tray_wifi85.png</iconset>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" colspan="2" >
+    <widget class="Q3GroupBox" name="groupBox3" >
+     <property name="title" >
+      <string>Wireless network key</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="textLabel1" >
+        <property name="text" >
+         <string>Network Key</string>
         </property>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>groupBox3</cstring>
-            </property>
-            <property name="title">
-                <string>Wireless network key</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLabel" row="0" column="0">
-                    <property name="name">
-                        <cstring>textLabel1</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Network Key</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>lineKey</cstring>
-                    </property>
-                    <property name="echoMode">
-                        <enum>Password</enum>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>lineKey2</cstring>
-                    </property>
-                    <property name="echoMode">
-                        <enum>Password</enum>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>textLabel1_2</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Network Key (Repeat)</string>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="2" column="0">
-                    <property name="name">
-                        <cstring>textLabel1_2_2</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Key Index</string>
-                    </property>
-                </widget>
-                <widget class="QSpinBox" row="2" column="1">
-                    <property name="name">
-                        <cstring>spinIndex</cstring>
-                    </property>
-                    <property name="maxValue">
-                        <number>4</number>
-                    </property>
-                    <property name="minValue">
-                        <number>1</number>
-                    </property>
-                </widget>
-                <spacer row="2" column="2">
-                    <property name="name">
-                        <cstring>spacer11</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>61</width>
-                            <height>21</height>
-                        </size>
-                    </property>
-                </spacer>
-            </grid>
-        </widget>
-        <widget class="QPushButton" row="1" column="1">
-            <property name="name">
-                <cstring>pushClose</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Close</string>
-            </property>
-            <property name="accel">
-                <string>Alt+C</string>
-            </property>
-        </widget>
-        <spacer row="1" column="0">
-            <property name="name">
-                <cstring>spacer12</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>161</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>pushClose</sender>
-        <signal>clicked()</signal>
-        <receiver>wepConfig</receiver>
-        <slot>slotClose()</slot>
-    </connection>
-</connections>
-<includes>
-    <include location="local" impldecl="in declaration">qmessagebox.h</include>
-    <include location="local" impldecl="in implementation">wepconfig.ui.h</include>
-</includes>
-<signals>
-    <signal>saved(QString, int)</signal>
-</signals>
-<slots>
-    <slot>slotClose()</slot>
-</slots>
-<functions>
-    <function>setKey( QString Key, int index )</function>
-</functions>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="2" >
+       <widget class="QLineEdit" name="lineKey" >
+        <property name="echoMode" >
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QLineEdit" name="lineKey2" >
+        <property name="echoMode" >
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="textLabel1_2" >
+        <property name="text" >
+         <string>Network Key (Repeat)</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="textLabel1_2_2" >
+        <property name="text" >
+         <string>Key Index</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QSpinBox" name="spinIndex" >
+        <property name="minimum" >
+         <number>1</number>
+        </property>
+        <property name="maximum" >
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <spacer name="spacer11" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>61</width>
+          <height>21</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QPushButton" name="pushClose" >
+     <property name="text" >
+      <string>&amp;Close</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+C</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <spacer name="spacer12" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>161</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>Q3GroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>Qt3Support/Q3GroupBox</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <includes>
+  <include location="local" >qmessagebox.h</include>
+ </includes>
+ <resources>
+  <include location="wificonfig.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>pushClose</sender>
+   <signal>clicked()</signal>
+   <receiver>wepConfig</receiver>
+   <slot>slotClose()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Deleted: pcbsd/trunk/wificonfig/wepconfig.ui.h

Modified: pcbsd/trunk/wificonfig/wificonfig.pro
===================================================================
--- pcbsd/trunk/wificonfig/wificonfig.pro	2008-06-24 15:28:06 UTC (rev 2165)
+++ pcbsd/trunk/wificonfig/wificonfig.pro	2008-06-24 19:49:03 UTC (rev 2166)
@@ -3,12 +3,23 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -lkdeui -lpcbsd
+LIBS	+= -L/usr/local/kde4/lib -lkdeui -lkdecore -lkio -lpcbsd
 
-INCLUDEPATH	+= /PCBSD/includes
+INCLUDEPATH	+= /PCBSD/includes /usr/local/kde4/include
 
-SOURCES	+= main.cpp
+HEADERS += dialogwpaenterprise.h \
+	   dialogwpapersonal.h \
+	   wepconfig.h \
+	   wificonfigwidgetbase.h \
+	   wifiselectiondialog.h
 
+SOURCES	+= main.cpp \
+ 	   dialogwpaenterprise.cpp \
+	   dialogwpapersonal.cpp \
+	   wepconfig.cpp \
+	   wificonfigwidgetbase.cpp \
+	   wifiselectiondialog.cpp
+
 FORMS	= wificonfigwidgetbase.ui \
 	wifiselectiondialog.ui \
 	wepconfig.ui \
@@ -17,19 +28,8 @@
 
 TRANSLATIONS = wificonfig_en.ts
 
+TARGET  = wificonfig
 
-
-
-TARGET  = wificonfig
 DESTDIR = /PCBSD/networkmanager/bin/
 
-
-
-
-
-unix {
-  UI_DIR = .ui
-  MOC_DIR = .moc
-  OBJECTS_DIR = .obj
-}
-
+QT += qt3support

Added: pcbsd/trunk/wificonfig/wificonfig.qrc

Added: pcbsd/trunk/wificonfig/wificonfigwidgetbase.cpp

Added: pcbsd/trunk/wificonfig/wificonfigwidgetbase.h

Modified: pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui
===================================================================
--- pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui	2008-06-24 15:28:06 UTC (rev 2165)
+++ pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui	2008-06-24 19:49:03 UTC (rev 2166)
@@ -1,1077 +1,1192 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>wificonfigWidgetBase</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>wificonfigwidgetbase</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>348</width>
-            <height>463</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>Wireless Configuration</string>
-    </property>
-    <property name="icon">
-        <pixmap>image0</pixmap>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="4">
-            <property name="name">
-                <cstring>tabMainWidget</cstring>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>&amp;General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="2">
-                        <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>
-                    </widget>
-                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textLabel1</cstring>
-                        </property>
-                        <property name="frameShape">
-                            <enum>NoFrame</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Plain</enum>
-                        </property>
-                        <property name="text">
-                            <string>Network address configuration</string>
-                        </property>
-                    </widget>
-                    <widget class="Line" row="3" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>line1</cstring>
-                        </property>
-                        <property name="frameShape">
-                            <enum>HLine</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Sunken</enum>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                    </widget>
-                    <spacer row="2" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>spacer2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Fixed</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>270</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QPushButton" row="1" column="1">
-                        <property name="name">
-                            <cstring>pushChangeWifi</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Scan</string>
-                        </property>
-                        <property name="accel">
-                            <string>Alt+S</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textLabel2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Currently selected wireless network:</string>
-                        </property>
-                    </widget>
-                    <widget class="QLineEdit" row="1" column="0">
-                        <property name="name">
-                            <cstring>lineSSID</cstring>
-                        </property>
-                        <property name="frameShape">
-                            <enum>StyledPanel</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Raised</enum>
-                        </property>
-                        <property name="readOnly">
-                            <bool>false</bool>
-                        </property>
-                    </widget>
-                    <widget class="QGroupBox" row="6" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>groupBoxIP</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Assign static IP address</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QLabel" row="0" column="0">
-                                <property name="name">
-                                    <cstring>textLabel3</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>IP:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="1" column="0">
-                                <property name="name">
-                                    <cstring>textLabel3_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Netmask:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QLineEdit" row="1" column="1">
-                                <property name="name">
-                                    <cstring>lineNetmask</cstring>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignHCenter</set>
-                                </property>
-                                <property name="inputMask">
-                                    <string>999\.999\.999\.999; </string>
-                                </property>
-                            </widget>
-                            <widget class="QLineEdit" row="0" column="1">
-                                <property name="name">
-                                    <cstring>lineIP</cstring>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignHCenter</set>
-                                </property>
-                                <property name="inputMask">
-                                    <string>999\.999\.999\.999; </string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <spacer row="7" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>spacer3_2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Preferred</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>290</width>
-                                <height>16</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Securit&amp;y</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="3" 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>270</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>textLabel4</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Wireless security setup</string>
-                        </property>
-                    </widget>
-                    <spacer row="1" column="0">
-                        <property name="name">
-                            <cstring>spacer4_2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Fixed</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>270</width>
-                                <height>16</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QButtonGroup" row="2" column="0">
-                        <property name="name">
-                            <cstring>buttonGroupSecurity</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Security Mode</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <spacer row="4" column="0">
-                                <property name="name">
-                                    <cstring>spacer6</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>130</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>radioSecurityWPAEnt</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>WPA Enterprise</string>
-                                </property>
-                                <property name="accel">
-                                    <string></string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>radioSecurityWEP</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>WEP</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>radioSecurityWPAPersonal</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>WPA Personal</string>
-                                </property>
-                                <property name="accel">
-                                    <string></string>
-                                </property>
-                            </widget>
-                            <widget class="QPushButton" row="4" column="1">
-                                <property name="name">
-                                    <cstring>pushSecurity</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Configure</string>
-                                </property>
-                                <property name="accel">
-                                    <string></string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>radioSecurityDisabled</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Disa&amp;bled</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+B</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>TabPage</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Advanced</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QCheckBox" row="0" column="0">
-                        <property name="name">
-                            <cstring>checkMAC</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Use hardware defau&amp;lt MAC address</string>
-                        </property>
-                        <property name="accel">
-                            <string>Alt+L</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                    </widget>
-                    <widget class="QGroupBox" row="1" column="0">
-                        <property name="name">
-                            <cstring>groupMAC</cstring>
-                        </property>
-                        <property name="enabled">
-                            <bool>false</bool>
-                        </property>
-                        <property name="title">
-                            <string>Custom MAC address</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QLineEdit" row="0" column="0">
-                                <property name="name">
-                                    <cstring>lineMAC</cstring>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <widget class="QCheckBox" row="2" column="0">
-                        <property name="name">
-                            <cstring>checkBSSID</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Specify custom BSSID</string>
-                        </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
-                        <property name="checked">
-                            <bool>false</bool>
-                        </property>
-                    </widget>
-                    <widget class="QGroupBox" row="3" column="0">
-                        <property name="name">
-                            <cstring>groupBSSID</cstring>
-                        </property>
-                        <property name="enabled">
-                            <bool>false</bool>
-                        </property>
-                        <property name="title">
-                            <string>Custom wireless BSSID</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QLineEdit" row="0" column="0">
-                                <property name="name">
-                                    <cstring>lineBSSID</cstring>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <spacer row="4" column="0">
-                        <property name="name">
-                            <cstring>spacer7</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>240</width>
-                                <height>140</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>TabPage</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Info</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>textInfoName</cstring>
-                        </property>
-                        <property name="text">
-                            <string></string>
-                        </property>
-                    </widget>
-                    <widget class="QGroupBox" row="1" column="0">
-                        <property name="name">
-                            <cstring>groupBox4</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Configuration info</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QLabel" row="0" column="0">
-                                <property name="name">
-                                    <cstring>textLabel3_3</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>1</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string>IP:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="4" column="0">
-                                <property name="name">
-                                    <cstring>textLabel3_2_2_2_2</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>1</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string>Mac/Ether:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="4" column="1">
-                                <property name="name">
-                                    <cstring>textMac</cstring>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="1" column="0">
-                                <property name="name">
-                                    <cstring>textLabel3_2_2</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>1</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string>Netmask:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="2" column="0">
-                                <property name="name">
-                                    <cstring>textLabel3_2_3</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Gateway:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="3" column="0">
-                                <property name="name">
-                                    <cstring>textLabel3_2_3_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>IPv6:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="3" column="1">
-                                <property name="name">
-                                    <cstring>textIPv6</cstring>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="2" column="1">
-                                <property name="name">
-                                    <cstring>textGateway</cstring>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="1" column="1">
-                                <property name="name">
-                                    <cstring>textNetmask</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>7</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="0" column="1">
-                                <property name="name">
-                                    <cstring>textIP</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>7</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="6" column="0">
-                                <property name="name">
-                                    <cstring>textLabel3_2_2_2</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>1</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string>Status:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="6" column="1">
-                                <property name="name">
-                                    <cstring>textStatus</cstring>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="5" column="1">
-                                <property name="name">
-                                    <cstring>textMedia</cstring>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                                <property name="scaledContents">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="alignment">
-                                    <set>WordBreak|AlignVCenter</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="5" column="0">
-                                <property name="name">
-                                    <cstring>textLabel3_2_2_2_3</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>1</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string>Media:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <widget class="QGroupBox" row="2" column="0">
-                        <property name="name">
-                            <cstring>groupBox5</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Traffic info</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QLabel" row="1" column="2">
-                                <property name="name">
-                                    <cstring>textPacketsOut</cstring>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignCenter</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="1" column="1">
-                                <property name="name">
-                                    <cstring>textPacketsIn</cstring>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignCenter</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="2" column="2">
-                                <property name="name">
-                                    <cstring>textPacketsOutErrors</cstring>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignCenter</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="2" column="1">
-                                <property name="name">
-                                    <cstring>textPacketsInErrors</cstring>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignCenter</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="1" column="0">
-                                <property name="name">
-                                    <cstring>textLabel6</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Packets:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="2" column="0">
-                                <property name="name">
-                                    <cstring>textLabel6_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Errors:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignVCenter|AlignRight</set>
-                                </property>
-                            </widget>
-                            <spacer row="0" column="0">
-                                <property name="name">
-                                    <cstring>spacer8_2</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Vertical</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QLabel" row="0" column="1">
-                                <property name="name">
-                                    <cstring>textLabel5</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>In:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignCenter</set>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="0" column="2">
-                                <property name="name">
-                                    <cstring>textLabel5_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Out:</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignCenter</set>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <spacer row="3" column="0">
-                        <property name="name">
-                            <cstring>spacer9</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Fixed</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>300</width>
-                                <height>10</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
+<ui version="4.0" >
+ <class>wificonfigwidgetbase</class>
+ <widget class="QWidget" name="wificonfigwidgetbase" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>348</width>
+    <height>463</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Wireless Configuration</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="wificonfig.qrc" >
+    <normaloff>:/tray_wifi85.png</normaloff>:/tray_wifi85.png</iconset>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" colspan="4" >
+    <widget class="QTabWidget" name="tabMainWidget" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>328</width>
+        <height>356</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>&amp;General</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="5" column="0" colspan="2" >
+        <widget class="QCheckBox" name="checkDHCP" >
+         <property name="text" >
+          <string>O&amp;btain IP automatically (DHCP)</string>
+         </property>
+         <property name="shortcut" >
+          <string>Alt+B</string>
+         </property>
         </widget>
-        <widget class="QPushButton" row="2" column="3">
-            <property name="name">
-                <cstring>buttonCancel</cstring>
+       </item>
+       <item row="4" column="0" colspan="2" >
+        <widget class="QLabel" name="textLabel1" >
+         <property name="frameShape" >
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow" >
+          <enum>QFrame::Plain</enum>
+         </property>
+         <property name="text" >
+          <string>Network address configuration</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="2" >
+        <widget class="Line" name="line1" >
+         <property name="frameShape" >
+          <enum>QFrame::HLine</enum>
+         </property>
+         <property name="frameShadow" >
+          <enum>QFrame::Sunken</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2" >
+        <spacer name="spacer2" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>270</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QPushButton" name="pushChangeWifi" >
+         <property name="text" >
+          <string>&amp;Scan</string>
+         </property>
+         <property name="shortcut" >
+          <string>Alt+S</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" colspan="2" >
+        <widget class="QLabel" name="textLabel2" >
+         <property name="text" >
+          <string>Currently selected wireless network:</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLineEdit" name="lineSSID" >
+         <property name="readOnly" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="2" >
+        <widget class="Q3GroupBox" name="groupBoxIP" >
+         <property name="title" >
+          <string>Assign static IP address</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="textLabel3" >
+            <property name="text" >
+             <string>IP:</string>
             </property>
-            <property name="text">
-                <string>Close</string>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
-            <property name="accel">
-                <string></string>
+            <property name="wordWrap" >
+             <bool>false</bool>
             </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="textLabel3_2" >
+            <property name="text" >
+             <string>Netmask:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QLineEdit" name="lineNetmask" >
+            <property name="inputMask" >
+             <string>999\.999\.999\.999; </string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignHCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QLineEdit" name="lineIP" >
+            <property name="inputMask" >
+             <string>999\.999\.999\.999; </string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignHCenter</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
-        <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="4">
-            <property name="name">
-                <cstring>checkDisableWireless</cstring>
+       </item>
+       <item row="7" column="0" colspan="2" >
+        <spacer name="spacer3_2" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Preferred</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>290</width>
+           <height>16</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>328</width>
+        <height>356</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Securit&amp;y</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="3" column="0" >
+        <spacer name="spacer4" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>270</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="0" >
+        <widget class="QLabel" name="textLabel4" >
+         <property name="text" >
+          <string>Wireless security setup</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <spacer name="spacer4_2" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>270</width>
+           <height>16</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="0" >
+        <widget class="Q3ButtonGroup" name="buttonGroupSecurity" >
+         <property name="title" >
+          <string>Security Mode</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="4" column="0" >
+           <spacer name="spacer6" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
             </property>
-            <property name="text">
-                <string>Disable this wireless device</string>
+            <property name="sizeType" >
+             <enum>QSizePolicy::Expanding</enum>
             </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>130</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="3" column="0" colspan="2" >
+           <widget class="QRadioButton" name="radioSecurityWPAEnt" >
+            <property name="text" >
+             <string>WPA Enterprise</string>
+            </property>
+            <property name="shortcut" >
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="2" >
+           <widget class="QRadioButton" name="radioSecurityWEP" >
+            <property name="text" >
+             <string>WEP</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" colspan="2" >
+           <widget class="QRadioButton" name="radioSecurityWPAPersonal" >
+            <property name="text" >
+             <string>WPA Personal</string>
+            </property>
+            <property name="shortcut" >
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" >
+           <widget class="QPushButton" name="pushSecurity" >
+            <property name="text" >
+             <string>Configure</string>
+            </property>
+            <property name="shortcut" >
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" colspan="2" >
+           <widget class="QRadioButton" name="radioSecurityDisabled" >
+            <property name="text" >
+             <string>Disa&amp;bled</string>
+            </property>
+            <property name="shortcut" >
+             <string>Alt+B</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
-        <widget class="QPushButton" row="2" column="2">
-            <property name="name">
-                <cstring>pushApply</cstring>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="TabPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>328</width>
+        <height>356</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="QCheckBox" name="checkMAC" >
+         <property name="text" >
+          <string>Use hardware defau&amp;lt MAC address</string>
+         </property>
+         <property name="shortcut" >
+          <string>Alt+L</string>
+         </property>
+         <property name="checked" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="Q3GroupBox" name="groupMAC" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
+         <property name="title" >
+          <string>Custom MAC address</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QLineEdit" name="lineMAC" />
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QCheckBox" name="checkBSSID" >
+         <property name="text" >
+          <string>Specify custom BSSID</string>
+         </property>
+         <property name="shortcut" >
+          <string/>
+         </property>
+         <property name="checked" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" >
+        <widget class="Q3GroupBox" name="groupBSSID" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
+         <property name="title" >
+          <string>Custom wireless BSSID</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QLineEdit" name="lineBSSID" />
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="4" column="0" >
+        <spacer name="spacer7" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>240</width>
+           <height>140</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="TabPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>328</width>
+        <height>356</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Info</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="textInfoName" >
+         <property name="text" >
+          <string/>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="Q3GroupBox" name="groupBox4" >
+         <property name="title" >
+          <string>Configuration info</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="textLabel3_3" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
-            <property name="text">
-                <string>&amp;Apply</string>
+            <property name="text" >
+             <string>IP:</string>
             </property>
-            <property name="accel">
-                <string>Alt+A</string>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0" >
+           <widget class="QLabel" name="textLabel3_2_2_2_2" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text" >
+             <string>Mac/Ether:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" >
+           <widget class="QLabel" name="textMac" >
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="textLabel3_2_2" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text" >
+             <string>Netmask:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" >
+           <widget class="QLabel" name="textLabel3_2_3" >
+            <property name="text" >
+             <string>Gateway:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" >
+           <widget class="QLabel" name="textLabel3_2_3_2" >
+            <property name="text" >
+             <string>IPv6:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1" >
+           <widget class="QLabel" name="textIPv6" >
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" >
+           <widget class="QLabel" name="textGateway" >
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QLabel" name="textNetmask" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QLabel" name="textIP" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0" >
+           <widget class="QLabel" name="textLabel3_2_2_2" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text" >
+             <string>Status:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1" >
+           <widget class="QLabel" name="textStatus" >
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1" >
+           <widget class="QLabel" name="textMedia" >
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="scaledContents" >
+             <bool>true</bool>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0" >
+           <widget class="QLabel" name="textLabel3_2_2_2_3" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text" >
+             <string>Media:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
-        <spacer row="2" column="0">
-            <property name="name">
-                <cstring>spacer1</cstring>
+       </item>
+       <item row="2" column="0" >
+        <widget class="Q3GroupBox" name="groupBox5" >
+         <property name="title" >
+          <string>Traffic info</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="1" column="2" >
+           <widget class="QLabel" name="textPacketsOut" >
+            <property name="text" >
+             <string/>
             </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
+            <property name="alignment" >
+             <set>Qt::AlignCenter</set>
             </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
+            <property name="wordWrap" >
+             <bool>false</bool>
             </property>
-            <property name="sizeHint">
-                <size>
-                    <width>100</width>
-                    <height>21</height>
-                </size>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QLabel" name="textPacketsIn" >
+            <property name="text" >
+             <string/>
             </property>
-        </spacer>
-        <widget class="QPushButton" row="2" column="1">
-            <property name="name">
-                <cstring>pushOK</cstring>
+            <property name="alignment" >
+             <set>Qt::AlignCenter</set>
             </property>
-            <property name="text">
-                <string>&amp;OK</string>
+            <property name="wordWrap" >
+             <bool>false</bool>
             </property>
-            <property name="accel">
-                <string>Alt+O</string>
+           </widget>
+          </item>
+          <item row="2" column="2" >
+           <widget class="QLabel" name="textPacketsOutErrors" >
+            <property name="text" >
+             <string/>
             </property>
+            <property name="alignment" >
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" >
+           <widget class="QLabel" name="textPacketsInErrors" >
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="textLabel6" >
+            <property name="text" >
+             <string>Packets:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" >
+           <widget class="QLabel" name="textLabel6_2" >
+            <property name="text" >
+             <string>Errors:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" >
+           <spacer name="spacer8_2" >
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType" >
+             <enum>QSizePolicy::Expanding</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QLabel" name="textLabel5" >
+            <property name="text" >
+             <string>In:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2" >
+           <widget class="QLabel" name="textLabel5_2" >
+            <property name="text" >
+             <string>Out:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
-    </grid>
-</widget>
-<images>
-    <image name="image0">
-        <data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388dd59541681c5518c77f3b794dbf49b7fa061ad9d506b2d0a029b574838a89164ca008490f6d0aa2f6d634424dc183370b3d4813115b8492f62078d1d28b7890d22d45887ab0512a1d2490ed453768601653dc4197cce7f665d7c3ced660ebb1073f78fce68337fff9cfff0ddf645aad160fa3bc87a2fa3085cdf2d2f2f38b3717df150023e0b4cd7ba5c03fbd3a451014656c78ecedc4254b00d56a95427f814413ca4b654ce94a69726a7aea0028ea364bfc5b32ed8d806973f6bdd9830b5f2d3c3e7f7efe7a678f6ffcb66375da8c63656265f73a861e1c60b88bc36020ed5b389a181a1fb8ab3d792bc4f598c9c3937b674ecc7c7ee495232f9f3a7dea3a40e212003c0c24aa8811c1d11023e0d82246323832293d316270c8ee7e8b3ac58a25bc19be5aba56ba7566eecc6317cf5f3c04e08bdfcf16868caaa22e419d7a18bad5299876960fa087032b6df1e1fdc3a8eab6f252f993d103a35f26f5a4e067fde3973fbb7cc30882b61db70fe67eb6d4692bed3d9180841aa2826f7cfcac4fb158a4688acf56562b8d7031fc7ee6c4ccb4176b0c4e51a70d0c4d75ba91b2e33483c14bb92e02810460682f013fe!
 b03d8388a9f1b191df902054fb8e7ac9966d995121c8891bb389a69d6dd3845b242900d4834c18a4544f0c507a117c778ad5ec35357eb7c9ff21fd96e491d83c12cdcae2106c4b6c5a23b116284c4250842a2c993e15288077ec7193836c4482bed3bdcd8cc5933f1477925221021b7334760032aab15c2c590a1e210413618285d2b4d788926d8acedc4d19566c92676596351a75ded579347c230e4d6ed323e3ef9be3cf91df9f6fd5921df9f5f13231b06430603f3f61215b78218b0e4f05548147c8104501b13df8991354b7427a274a5d28856236fe49991a664a5db06166b6d439d9ec631647cf1e7ce7d78eed3f8cfb885a2b57a2d23467af27df9ab1876e200c7cf955f2baf012e8ee3268ebf8e4d1f7bb11a55df096f87dfe46ceeebc1a706bbe2385ec4b08c614f66f34092ac4ce56cee10866d855d85fd003e3e894ba8ac547e50d5baaa7e74f6fdb3939387270fc771dc254640b871f4f5a38b5ad7df311055a3b90cedd1b915d83e7e70fcdbc181c15d51358acae5f2b2aaaee1c8485682c24061408cf48ebd34e64dbd31d5535babdd7314f4065c387fe1a7936f9ddc0bacdf37436dd6f6da1df6090cdb811ee051200714803d22f2c2a58f2ffdd6ea54235de975715ff1cd8e56e63ef507d7d6f4415b8bfb8ac78b4f17f7e6fbf37dd65ad1ba6e44d5e897702!
 9fc31fc2e9c53a7770132ffbb7fdedf3b50e7fd82ea86670000000049454e4!
 4ae426082</data>
-    </image>
-</images>
-<connections>
-    <connection>
-        <sender>buttonCancel</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotClose()</slot>
-    </connection>
-    <connection>
-        <sender>checkDHCP</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckDHCPBox()</slot>
-    </connection>
-    <connection>
-        <sender>pushApply</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotApply()</slot>
-    </connection>
-    <connection>
-        <sender>pushChangeWifi</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotConfig()</slot>
-    </connection>
-    <connection>
-        <sender>pushSecurity</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckWhichSecurity()</slot>
-    </connection>
-    <connection>
-        <sender>radioSecurityDisabled</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckSecurityRadio()</slot>
-    </connection>
-    <connection>
-        <sender>radioSecurityWEP</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckSecurityRadio()</slot>
-    </connection>
-    <connection>
-        <sender>radioSecurityWPAEnt</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckSecurityRadio()</slot>
-    </connection>
-    <connection>
-        <sender>radioSecurityWPAPersonal</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckSecurityRadio()</slot>
-    </connection>
-    <connection>
-        <sender>checkDisableWireless</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckDisabled()</slot>
-    </connection>
-    <connection>
-        <sender>pushOK</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotOK()</slot>
-    </connection>
-    <connection>
-        <sender>checkMAC</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotMACClicked()</slot>
-    </connection>
-    <connection>
-        <sender>lineIP</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckGlobalText()</slot>
-    </connection>
-    <connection>
-        <sender>lineNetmask</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckGlobalText()</slot>
-    </connection>
-    <connection>
-        <sender>lineMAC</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckGlobalText()</slot>
-    </connection>
-    <connection>
-        <sender>lineSSID</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckGlobalText()</slot>
-    </connection>
-    <connection>
-        <sender>checkBSSID</sender>
-        <signal>clicked()</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotBSSIDChecked()</slot>
-    </connection>
-    <connection>
-        <sender>lineBSSID</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>wificonfigwidgetbase</receiver>
-        <slot>slotCheckGlobalText()</slot>
-    </connection>
-</connections>
-<tabstops>
-    <tabstop>tabMainWidget</tabstop>
-    <tabstop>lineSSID</tabstop>
-    <tabstop>pushChangeWifi</tabstop>
-    <tabstop>checkDHCP</tabstop>
-    <tabstop>lineIP</tabstop>
-    <tabstop>lineNetmask</tabstop>
-    <tabstop>pushOK</tabstop>
-    <tabstop>pushApply</tabstop>
-    <tabstop>buttonCancel</tabstop>
-    <tabstop>radioSecurityDisabled</tabstop>
-    <tabstop>pushSecurity</tabstop>
-    <tabstop>checkDisableWireless</tabstop>
-    <tabstop>checkMAC</tabstop>
-    <tabstop>lineMAC</tabstop>
-</tabstops>
-<includes>
-    <include location="local" impldecl="in declaration">qmessagebox.h</include>
-    <include location="local" impldecl="in declaration">qfile.h</include>
-    <include location="local" impldecl="in declaration">wifiselectiondialog.h</include>
-    <include location="local" impldecl="in declaration">qmessagebox.h</include>
-    <include location="local" impldecl="in declaration">wepconfig.h</include>
-    <include location="local" impldecl="in declaration">dialogwpapersonal.h</include>
-    <include location="local" impldecl="in declaration">dialogwpaenterprise.h</include>
-    <include location="local" impldecl="in declaration">qdesktopwidget.h</include>
-    <include location="local" impldecl="in declaration">qapplication.h</include>
-    <include location="local" impldecl="in declaration">qprocess.h</include>
-    <include location="global" impldecl="in declaration">netif.h</include>
-    <include location="global" impldecl="in declaration">utils.h</include>
-    <include location="local" impldecl="in implementation">wificonfigwidgetbase.ui.h</include>
-</includes>
-<variables>
-    <variable access="public">QString DeviceName;</variable>
-    <variable access="public">wifiselectiondialog *wifiselect;</variable>
-    <variable access="public">wepConfig *dialogWEP;</variable>
-    <variable access="public">QString WEPKey;</variable>
-    <variable access="public">int WEPIndex;</variable>
-    <variable access="public">dialogWPAPersonal *dialogWPAP;</variable>
-    <variable access="public">QString WPAPersonalKey;</variable>
-    <variable access="public">dialogWPAEnterprise *dialogWPAE;</variable>
-    <variable access="public">int WPAEType;</variable>
-    <variable access="public">QString WPAEIdent;</variable>
-    <variable access="public">QString WPAECACert;</variable>
-    <variable access="public">QString WPAEClientCert;</variable>
-    <variable access="public">QString WPAEPrivKeyFile;</variable>
-    <variable access="public">QString WPAEPassword;</variable>
-    <variable access="public">QProcess *netifProc;</variable>
-</variables>
-<slots>
-    <slot access="private">slotClose()</slot>
-    <slot access="private">slotApply()</slot>
-    <slot access="private">slotCheckDHCPBox()</slot>
-    <slot access="private">slotConfig()</slot>
-    <slot access="private">slotSSIDChanged( QString newSSID )</slot>
-    <slot access="private">slotConfigWEP()</slot>
-    <slot access="private">slotWEPChanged( QString newKey, int newIndex )</slot>
-    <slot access="private">slotCheckSecurityRadio()</slot>
-    <slot access="private">slotCheckWhichSecurity()</slot>
-    <slot access="private">slotConfigWPAP()</slot>
-    <slot access="private">slotConfigWPAE()</slot>
-    <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>
-    <slot access="private">slotMACClicked()</slot>
-    <slot access="private">loadInfo()</slot>
-    <slot access="private">slotFinishLoading()</slot>
-    <slot access="private">slotCheckGlobalText()</slot>
-    <slot>slotBSSIDChecked()</slot>
-</slots>
-<functions>
-    <function>setDevice( QString Device )</function>
-    <function access="private" returnType="bool">checkRange( QString IP )</function>
-    <function access="private">saveValue( QString File, QString oldKey, QString newKey, int occur )</function>
-    <function access="private" returnType="QString">getValue( QString File, QString Key, int occur )</function>
-    <function access="private">runCommand( QString Command )</function>
-    <function access="private" returnType="QString">getLineFromCommandOutput( QString command )</function>
-    <function access="private" returnType="QString">getNetmaskForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getOutErrorsForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getOutPacketsForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getInErrorsForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getInPacketsForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getStatusForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getMacForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getIpForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getNameForIdent( QString ident )</function>
-    <function>showInfo()</function>
-    <function access="private" returnType="QString">getIPv6ForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getGatewayForIdent( QString ident )</function>
-    <function access="private" returnType="QString">getMediaForIdent( QString ident )</function>
-</functions>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+       </item>
+       <item row="3" column="0" >
+        <spacer name="spacer9" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>300</width>
+           <height>10</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="2" column="3" >
+    <widget class="QPushButton" name="buttonCancel" >
+     <property name="text" >
+      <string>Close</string>
+     </property>
+     <property name="shortcut" >
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="4" >
+    <widget class="QCheckBox" name="checkDisableWireless" >
+     <property name="text" >
+      <string>Disable this wireless device</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <widget class="QPushButton" name="pushApply" >
+     <property name="text" >
+      <string>&amp;Apply</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+A</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <spacer name="spacer1" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>100</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QPushButton" name="pushOK" >
+     <property name="text" >
+      <string>&amp;OK</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+O</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <customwidgets>
+  <customwidget>
+   <class>Q3GroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>Qt3Support/Q3GroupBox</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>Q3ButtonGroup</class>
+   <extends>Q3GroupBox</extends>
+   <header>Qt3Support/Q3ButtonGroup</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>tabMainWidget</tabstop>
+  <tabstop>lineSSID</tabstop>
+  <tabstop>pushChangeWifi</tabstop>
+  <tabstop>checkDHCP</tabstop>
+  <tabstop>lineIP</tabstop>
+  <tabstop>lineNetmask</tabstop>
+  <tabstop>pushOK</tabstop>
+  <tabstop>pushApply</tabstop>
+  <tabstop>buttonCancel</tabstop>
+  <tabstop>radioSecurityDisabled</tabstop>
+  <tabstop>pushSecurity</tabstop>
+  <tabstop>checkDisableWireless</tabstop>
+  <tabstop>checkMAC</tabstop>
+  <tabstop>lineMAC</tabstop>
+ </tabstops>
+ <includes>
+  <include location="local" >qmessagebox.h</include>
+  <include location="local" >qfile.h</include>
+  <include location="local" >wifiselectiondialog.h</include>
+  <include location="local" >qmessagebox.h</include>
+  <include location="local" >wepconfig.h</include>
+  <include location="local" >dialogwpapersonal.h</include>
+  <include location="local" >dialogwpaenterprise.h</include>
+  <include location="local" >qdesktopwidget.h</include>
+  <include location="local" >qapplication.h</include>
+  <include location="local" >q3process.h</include>
+  <include location="global" >netif.h</include>
+  <include location="global" >utils.h</include>
+ </includes>
+ <resources>
+  <include location="wificonfig.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonCancel</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotClose()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>checkDHCP</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckDHCPBox()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushApply</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotApply()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushChangeWifi</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotConfig()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushSecurity</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckWhichSecurity()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>radioSecurityDisabled</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckSecurityRadio()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>radioSecurityWEP</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckSecurityRadio()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>radioSecurityWPAEnt</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckSecurityRadio()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>radioSecurityWPAPersonal</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckSecurityRadio()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>checkDisableWireless</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckDisabled()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushOK</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotOK()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>checkMAC</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotMACClicked()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>lineIP</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckGlobalText()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>lineNetmask</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckGlobalText()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>lineMAC</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckGlobalText()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>lineSSID</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckGlobalText()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>checkBSSID</sender>
+   <signal>clicked()</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotBSSIDChecked()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>lineBSSID</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>wificonfigwidgetbase</receiver>
+   <slot>slotCheckGlobalText()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Deleted: pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h

Added: pcbsd/trunk/wificonfig/wifiselectiondialog.cpp

Added: pcbsd/trunk/wificonfig/wifiselectiondialog.h

Modified: pcbsd/trunk/wificonfig/wifiselectiondialog.ui
===================================================================
--- pcbsd/trunk/wificonfig/wifiselectiondialog.ui	2008-06-24 15:28:06 UTC (rev 2165)
+++ pcbsd/trunk/wificonfig/wifiselectiondialog.ui	2008-06-24 19:49:03 UTC (rev 2166)
@@ -1,184 +1,199 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>wifiselectiondialog</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>wifiselectiondialog</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>292</width>
-            <height>274</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>Select Wireless Network</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
+<ui version="4.0" >
+ <class>wifiselectiondialog</class>
+ <widget class="QDialog" name="wifiselectiondialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>292</width>
+    <height>274</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Select Wireless Network</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="wificonfig.qrc" >
+    <normaloff>:/tray_wifi85.png</normaloff>:/tray_wifi85.png</iconset>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" colspan="3" >
+    <widget class="QLabel" name="textTop" >
+     <property name="frameShape" >
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Plain</enum>
+     </property>
+     <property name="text" >
+      <string>Select a wireless network to connect.</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="QPushButton" name="pushConnect" >
+     <property name="text" >
+      <string>&amp;Connect</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+C</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" >
+    <spacer name="spacer8" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>70</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="2" >
+    <widget class="QPushButton" name="pushCancel" >
+     <property name="text" >
+      <string>Cancel</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3" >
+    <spacer name="spacer9" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>270</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" colspan="3" >
+    <widget class="Q3GroupBox" name="groupBox2" >
+     <property name="title" >
+      <string>Available wireless networks</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" colspan="2" >
+       <widget class="Q3ListBox" name="listWifi" />
+      </item>
+      <item row="1" column="0" >
+       <spacer name="spacer10" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>textTop</cstring>
-            </property>
-            <property name="frameShape">
-                <enum>NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Plain</enum>
-            </property>
-            <property name="text">
-                <string>Select a wireless network to connect.</string>
-            </property>
-        </widget>
-        <widget class="QPushButton" row="3" column="1">
-            <property name="name">
-                <cstring>pushConnect</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Connect</string>
-            </property>
-            <property name="accel">
-                <string>Alt+C</string>
-            </property>
-        </widget>
-        <spacer row="3" column="0">
-            <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>70</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QPushButton" row="3" column="2">
-            <property name="name">
-                <cstring>pushCancel</cstring>
-            </property>
-            <property name="text">
-                <string>Cancel</string>
-            </property>
-        </widget>
-        <spacer row="2" column="0" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>spacer9</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Fixed</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>270</width>
-                    <height>16</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>groupBox2</cstring>
-            </property>
-            <property name="title">
-                <string>Available wireless networks</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QListBox" row="0" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>listWifi</cstring>
-                    </property>
-                </widget>
-                <spacer row="1" column="0">
-                    <property name="name">
-                        <cstring>spacer10</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>131</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget class="QPushButton" row="1" column="1">
-                    <property name="name">
-                        <cstring>pushRescan</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Rescan</string>
-                    </property>
-                    <property name="accel">
-                        <string>Alt+R</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>pushCancel</sender>
-        <signal>clicked()</signal>
-        <receiver>wifiselectiondialog</receiver>
-        <slot>slotCancel()</slot>
-    </connection>
-    <connection>
-        <sender>pushConnect</sender>
-        <signal>clicked()</signal>
-        <receiver>wifiselectiondialog</receiver>
-        <slot>slotConnect()</slot>
-    </connection>
-    <connection>
-        <sender>pushRescan</sender>
-        <signal>clicked()</signal>
-        <receiver>wifiselectiondialog</receiver>
-        <slot>slotRescan()</slot>
-    </connection>
-</connections>
-<includes>
-    <include location="local" impldecl="in declaration">qtimer.h</include>
-    <include location="local" impldecl="in declaration">qfile.h</include>
-    <include location="local" impldecl="in declaration">qimage.h</include>
-    <include location="local" impldecl="in declaration">qmessagebox.h</include>
-    <include location="local" impldecl="in implementation">wifiselectiondialog.ui.h</include>
-</includes>
-<variables>
-    <variable access="private">QString DeviceName;</variable>
-    <variable access="private">QString SSID;</variable>
-</variables>
-<signals>
-    <signal>saved(QString)</signal>
-</signals>
-<slots>
-    <slot access="private">slotCancel()</slot>
-    <slot access="private">slotConnect()</slot>
-    <slot access="private">slotRescan()</slot>
-    <slot access="private">startScan()</slot>
-</slots>
-<functions>
-    <function>init( QString Device, QString oldSSID )</function>
-    <function>scanWifi()</function>
-    <function access="private" returnType="QString">getLineFromCommandOutput( QString command )</function>
-    <function access="private">runCommand( QString Command )</function>
-</functions>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>131</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="pushRescan" >
+        <property name="text" >
+         <string>&amp;Rescan</string>
+        </property>
+        <property name="shortcut" >
+         <string>Alt+R</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>Q3GroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>Qt3Support/Q3GroupBox</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>Q3ListBox</class>
+   <extends>Q3Frame</extends>
+   <header>q3listbox.h</header>
+  </customwidget>
+ </customwidgets>
+ <includes>
+  <include location="local" >qtimer.h</include>
+  <include location="local" >qfile.h</include>
+  <include location="local" >qimage.h</include>
+  <include location="local" >qmessagebox.h</include>
+ </includes>
+ <resources>
+  <include location="wificonfig.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>pushCancel</sender>
+   <signal>clicked()</signal>
+   <receiver>wifiselectiondialog</receiver>
+   <slot>slotCancel()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushConnect</sender>
+   <signal>clicked()</signal>
+   <receiver>wifiselectiondialog</receiver>
+   <slot>slotConnect()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushRescan</sender>
+   <signal>clicked()</signal>
+   <receiver>wifiselectiondialog</receiver>
+   <slot>slotRescan()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Deleted: pcbsd/trunk/wificonfig/wifiselectiondialog.ui.h



More information about the Commits mailing list