[PC-BSD Commits] r3871 - in pcbsd: trunk/wificonfig trunk-current/wificonfig
svn at pcbsd.org
svn at pcbsd.org
Tue May 5 19:54:08 PDT 2009
Author: kris
Date: 2009-05-05 19:54:08 -0700 (Tue, 05 May 2009)
New Revision: 3871
Modified:
pcbsd/trunk-current/wificonfig/dialogwpaenterprise.cpp
pcbsd/trunk-current/wificonfig/dialogwpaenterprise.h
pcbsd/trunk-current/wificonfig/dialogwpaenterprise.ui
pcbsd/trunk-current/wificonfig/dialogwpapersonal.cpp
pcbsd/trunk-current/wificonfig/dialogwpapersonal.h
pcbsd/trunk-current/wificonfig/dialogwpapersonal.ui
pcbsd/trunk-current/wificonfig/wepconfig.cpp
pcbsd/trunk-current/wificonfig/wepconfig.h
pcbsd/trunk-current/wificonfig/wepconfig.ui
pcbsd/trunk-current/wificonfig/wificonfigwidgetbase.cpp
pcbsd/trunk/wificonfig/dialogwpaenterprise.cpp
pcbsd/trunk/wificonfig/dialogwpaenterprise.h
pcbsd/trunk/wificonfig/dialogwpaenterprise.ui
pcbsd/trunk/wificonfig/dialogwpapersonal.cpp
pcbsd/trunk/wificonfig/dialogwpapersonal.h
pcbsd/trunk/wificonfig/dialogwpapersonal.ui
pcbsd/trunk/wificonfig/wepconfig.cpp
pcbsd/trunk/wificonfig/wepconfig.h
pcbsd/trunk/wificonfig/wepconfig.ui
pcbsd/trunk/wificonfig/wificonfigwidgetbase.cpp
Log:
Few more updates to the wifi tool. Now you can change priorties with ssids, and not need to re-click each time. Also, added feature to "show key" so you can see your network key, if needed.
Modified: pcbsd/trunk/wificonfig/dialogwpaenterprise.cpp
===================================================================
--- pcbsd/trunk/wificonfig/dialogwpaenterprise.cpp 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk/wificonfig/dialogwpaenterprise.cpp 2009-05-06 02:54:08 UTC (rev 3871)
@@ -141,3 +141,15 @@
slotTypeChanged();
}
+
+void dialogWPAEnterprise::slotShowKey()
+{
+ if(checkShowKey->isChecked())
+ {
+ linePrivateKeyPassword->setEchoMode(QLineEdit::Normal);
+ linePrivateKeyPassword2->setEchoMode(QLineEdit::Normal);
+ } else {
+ linePrivateKeyPassword->setEchoMode(QLineEdit::Password);
+ linePrivateKeyPassword2->setEchoMode(QLineEdit::Password);
+ }
+}
Modified: pcbsd/trunk/wificonfig/dialogwpaenterprise.h
===================================================================
--- pcbsd/trunk/wificonfig/dialogwpaenterprise.h 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk/wificonfig/dialogwpaenterprise.h 2009-05-06 02:54:08 UTC (rev 3871)
@@ -28,6 +28,7 @@
void slotSelectCACert();
void slotSelectClientCert();
void slotSelectPrivateKeyFile();
+ void slotShowKey();
private:
Modified: pcbsd/trunk/wificonfig/dialogwpaenterprise.ui
===================================================================
--- pcbsd/trunk/wificonfig/dialogwpaenterprise.ui 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk/wificonfig/dialogwpaenterprise.ui 2009-05-06 02:54:08 UTC (rev 3871)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>395</width>
- <height>338</height>
+ <width>424</width>
+ <height>378</height>
</rect>
</property>
<property name="windowTitle" >
@@ -48,7 +48,7 @@
<property name="title" >
<string>WPA Enterprise Configuration</string>
</property>
- <layout class="QGridLayout" >
+ <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
@@ -59,8 +59,33 @@
</property>
</widget>
</item>
- <item row="2" column="1" colspan="2" >
- <widget class="QLineEdit" name="lineEAPIdentity" />
+ <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>
<item row="2" column="0" >
<widget class="QLabel" name="textLabel2" >
@@ -75,6 +100,9 @@
</property>
</widget>
</item>
+ <item row="2" column="1" colspan="2" >
+ <widget class="QLineEdit" name="lineEAPIdentity" />
+ </item>
<item row="3" column="0" >
<widget class="QLabel" name="textCACert" >
<property name="text" >
@@ -88,6 +116,20 @@
</property>
</widget>
</item>
+ <item row="3" column="1" >
+ <widget class="QLineEdit" name="lineCACert" >
+ <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="4" column="0" >
<widget class="QLabel" name="textClientCert" >
<property name="text" >
@@ -101,6 +143,20 @@
</property>
</widget>
</item>
+ <item row="4" column="1" >
+ <widget class="QLineEdit" name="lineClientCert" >
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2" >
+ <widget class="QPushButton" name="pushSelectClientCert" >
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
<item row="5" column="0" >
<widget class="QLabel" name="textPrivateKeyFile" >
<property name="text" >
@@ -114,20 +170,6 @@
</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" >
@@ -135,8 +177,8 @@
</property>
</widget>
</item>
- <item row="3" column="2" >
- <widget class="QPushButton" name="pushSelectCACert" >
+ <item row="5" column="2" >
+ <widget class="QPushButton" name="pushSelectPrivateKeyFile" >
<property name="text" >
<string/>
</property>
@@ -155,6 +197,13 @@
</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="7" column="0" >
<widget class="QLabel" name="textPrivateKey2" >
<property name="text" >
@@ -175,55 +224,13 @@
</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" >
+ <item row="8" column="0" colspan="3" >
+ <widget class="QCheckBox" name="checkShowKey" >
<property name="text" >
- <string/>
+ <string>Show Key</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>
@@ -358,5 +365,21 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>checkShowKey</sender>
+ <signal>clicked()</signal>
+ <receiver>dialogWPAEnterprise</receiver>
+ <slot>slotShowKey()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>211</x>
+ <y>299</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>211</x>
+ <y>188</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
Modified: pcbsd/trunk/wificonfig/dialogwpapersonal.cpp
===================================================================
--- pcbsd/trunk/wificonfig/dialogwpapersonal.cpp 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk/wificonfig/dialogwpapersonal.cpp 2009-05-06 02:54:08 UTC (rev 3871)
@@ -37,3 +37,16 @@
emit saved(lineKey->text());
close();
}
+
+void dialogWPAPersonal::slotShowKey()
+{
+ if(checkShowKey->isChecked())
+ {
+ lineKey2->setEchoMode(QLineEdit::Normal);
+ lineKey->setEchoMode(QLineEdit::Normal);
+ } else {
+ lineKey2->setEchoMode(QLineEdit::Password);
+ lineKey->setEchoMode(QLineEdit::Password);
+ }
+}
+
Modified: pcbsd/trunk/wificonfig/dialogwpapersonal.h
===================================================================
--- pcbsd/trunk/wificonfig/dialogwpapersonal.h 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk/wificonfig/dialogwpapersonal.h 2009-05-06 02:54:08 UTC (rev 3871)
@@ -22,6 +22,7 @@
private slots:
void slotClose();
+ void slotShowKey();
private:
Modified: pcbsd/trunk/wificonfig/dialogwpapersonal.ui
===================================================================
--- pcbsd/trunk/wificonfig/dialogwpapersonal.ui 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk/wificonfig/dialogwpapersonal.ui 2009-05-06 02:54:08 UTC (rev 3871)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>308</width>
- <height>149</height>
+ <width>319</width>
+ <height>174</height>
</rect>
</property>
<property name="windowTitle" >
@@ -16,37 +16,11 @@
<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>&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>
+ <layout class="QGridLayout" name="gridLayout_2" >
<item row="0" column="0" colspan="2" >
<widget class="Q3GroupBox" name="groupBox3" >
<property name="title" >
- <string>Wireless network key</string>
+ <string>Wireless Network Key</string>
</property>
<property name="frameShape" >
<enum>Q3GroupBox::GroupBoxPanel</enum>
@@ -54,7 +28,7 @@
<property name="frameShadow" >
<enum>Q3GroupBox::Sunken</enum>
</property>
- <layout class="QGridLayout" >
+ <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
@@ -67,13 +41,12 @@
</item>
<item row="0" column="1" >
<widget class="QLineEdit" name="lineKey" >
- <property name="echoMode" >
- <enum>QLineEdit::Password</enum>
+ <property name="minimumSize" >
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="lineKey2" >
<property name="echoMode" >
<enum>QLineEdit::Password</enum>
</property>
@@ -89,9 +62,55 @@
</property>
</widget>
</item>
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="lineKey2" >
+ <property name="minimumSize" >
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2" >
+ <widget class="QCheckBox" name="checkShowKey" >
+ <property name="text" >
+ <string>Show Key</string>
+ </property>
+ </widget>
+ </item>
</layout>
</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="1" column="1" >
+ <widget class="QPushButton" name="pushClose" >
+ <property name="text" >
+ <string>&Close</string>
+ </property>
+ <property name="shortcut" >
+ <string>Alt+C</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
@@ -127,5 +146,21 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>checkShowKey</sender>
+ <signal>clicked()</signal>
+ <receiver>dialogWPAPersonal</receiver>
+ <slot>slotShowKey()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>129</x>
+ <y>85</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>129</x>
+ <y>73</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
Modified: pcbsd/trunk/wificonfig/wepconfig.cpp
===================================================================
--- pcbsd/trunk/wificonfig/wepconfig.cpp 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk/wificonfig/wepconfig.cpp 2009-05-06 02:54:08 UTC (rev 3871)
@@ -55,3 +55,16 @@
close();
}
}
+
+void wepConfig::slotShowKey()
+{
+ if(checkShowKey->isChecked())
+ {
+ lineKey2->setEchoMode(QLineEdit::Normal);
+ lineKey->setEchoMode(QLineEdit::Normal);
+ } else {
+ lineKey2->setEchoMode(QLineEdit::Password);
+ lineKey->setEchoMode(QLineEdit::Password);
+ }
+}
+
Modified: pcbsd/trunk/wificonfig/wepconfig.h
===================================================================
--- pcbsd/trunk/wificonfig/wepconfig.h 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk/wificonfig/wepconfig.h 2009-05-06 02:54:08 UTC (rev 3871)
@@ -22,6 +22,7 @@
private slots:
void slotClose();
+ void slotShowKey();
private:
Modified: pcbsd/trunk/wificonfig/wepconfig.ui
===================================================================
--- pcbsd/trunk/wificonfig/wepconfig.ui 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk/wificonfig/wepconfig.ui 2009-05-06 02:54:08 UTC (rev 3871)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>324</width>
- <height>222</height>
+ <width>342</width>
+ <height>234</height>
</rect>
</property>
<property name="windowTitle" >
@@ -114,6 +114,13 @@
</property>
</spacer>
</item>
+ <item row="4" column="0" colspan="3" >
+ <widget class="QCheckBox" name="checkShowKey" >
+ <property name="text" >
+ <string>Show Key</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -178,5 +185,21 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>checkShowKey</sender>
+ <signal>clicked()</signal>
+ <receiver>wepConfig</receiver>
+ <slot>slotShowKey()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>170</x>
+ <y>177</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>170</x>
+ <y>116</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
Modified: pcbsd/trunk/wificonfig/wificonfigwidgetbase.cpp
===================================================================
--- pcbsd/trunk/wificonfig/wificonfigwidgetbase.cpp 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk/wificonfig/wificonfigwidgetbase.cpp 2009-05-06 02:54:08 UTC (rev 3871)
@@ -402,6 +402,8 @@
QString tmpString;
int tmpInt;
bool tmpBool;
+ int curRow = 1;
+ bool MovedItem = false;
// Check if we have a selection to work with
if ( listWifi->currentRow() != -1 )
@@ -464,13 +466,18 @@
tmpInt = WPAEType[i-1];
WPAEType[i-1] = WPAEType[i];
WPAEType[i] = tmpInt;
+ curRow=i-1;
+ MovedItem=true;
break;
}
}
// Refresh the SSID list and enable the apply button
- slotRefreshSSIDList();
- pushApply->setEnabled(TRUE);
+ if ( MovedItem) {
+ slotRefreshSSIDList();
+ pushApply->setEnabled(TRUE);
+ listWifi->setCurrentRow(curRow);
+ }
}
}
@@ -481,6 +488,8 @@
QString tmpString;
int tmpInt;
bool tmpBool;
+ int curRow = 1;
+ bool MovedItem = false;
// Check if we have a selection to work with
if ( listWifi->currentRow() != -1 )
@@ -543,13 +552,19 @@
tmpInt = WPAEType[i+1];
WPAEType[i+1] = WPAEType[i];
WPAEType[i] = tmpInt;
+ curRow=i+1;
+ MovedItem=true;
break;
}
}
// Refresh the SSID list and enable the apply button
- slotRefreshSSIDList();
- pushApply->setEnabled(TRUE);
+ if ( MovedItem) {
+ slotRefreshSSIDList();
+ pushApply->setEnabled(TRUE);
+ listWifi->setCurrentRow(curRow);
+ }
+
}
}
Modified: pcbsd/trunk-current/wificonfig/dialogwpaenterprise.cpp
===================================================================
--- pcbsd/trunk-current/wificonfig/dialogwpaenterprise.cpp 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk-current/wificonfig/dialogwpaenterprise.cpp 2009-05-06 02:54:08 UTC (rev 3871)
@@ -141,3 +141,15 @@
slotTypeChanged();
}
+
+void dialogWPAEnterprise::slotShowKey()
+{
+ if(checkShowKey->isChecked())
+ {
+ linePrivateKeyPassword->setEchoMode(QLineEdit::Normal);
+ linePrivateKeyPassword2->setEchoMode(QLineEdit::Normal);
+ } else {
+ linePrivateKeyPassword->setEchoMode(QLineEdit::Password);
+ linePrivateKeyPassword2->setEchoMode(QLineEdit::Password);
+ }
+}
Modified: pcbsd/trunk-current/wificonfig/dialogwpaenterprise.h
===================================================================
--- pcbsd/trunk-current/wificonfig/dialogwpaenterprise.h 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk-current/wificonfig/dialogwpaenterprise.h 2009-05-06 02:54:08 UTC (rev 3871)
@@ -28,6 +28,7 @@
void slotSelectCACert();
void slotSelectClientCert();
void slotSelectPrivateKeyFile();
+ void slotShowKey();
private:
Modified: pcbsd/trunk-current/wificonfig/dialogwpaenterprise.ui
===================================================================
--- pcbsd/trunk-current/wificonfig/dialogwpaenterprise.ui 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk-current/wificonfig/dialogwpaenterprise.ui 2009-05-06 02:54:08 UTC (rev 3871)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>395</width>
- <height>338</height>
+ <width>424</width>
+ <height>378</height>
</rect>
</property>
<property name="windowTitle" >
@@ -48,7 +48,7 @@
<property name="title" >
<string>WPA Enterprise Configuration</string>
</property>
- <layout class="QGridLayout" >
+ <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
@@ -59,8 +59,33 @@
</property>
</widget>
</item>
- <item row="2" column="1" colspan="2" >
- <widget class="QLineEdit" name="lineEAPIdentity" />
+ <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>
<item row="2" column="0" >
<widget class="QLabel" name="textLabel2" >
@@ -75,6 +100,9 @@
</property>
</widget>
</item>
+ <item row="2" column="1" colspan="2" >
+ <widget class="QLineEdit" name="lineEAPIdentity" />
+ </item>
<item row="3" column="0" >
<widget class="QLabel" name="textCACert" >
<property name="text" >
@@ -88,6 +116,20 @@
</property>
</widget>
</item>
+ <item row="3" column="1" >
+ <widget class="QLineEdit" name="lineCACert" >
+ <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="4" column="0" >
<widget class="QLabel" name="textClientCert" >
<property name="text" >
@@ -101,6 +143,20 @@
</property>
</widget>
</item>
+ <item row="4" column="1" >
+ <widget class="QLineEdit" name="lineClientCert" >
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2" >
+ <widget class="QPushButton" name="pushSelectClientCert" >
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
<item row="5" column="0" >
<widget class="QLabel" name="textPrivateKeyFile" >
<property name="text" >
@@ -114,20 +170,6 @@
</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" >
@@ -135,8 +177,8 @@
</property>
</widget>
</item>
- <item row="3" column="2" >
- <widget class="QPushButton" name="pushSelectCACert" >
+ <item row="5" column="2" >
+ <widget class="QPushButton" name="pushSelectPrivateKeyFile" >
<property name="text" >
<string/>
</property>
@@ -155,6 +197,13 @@
</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="7" column="0" >
<widget class="QLabel" name="textPrivateKey2" >
<property name="text" >
@@ -175,55 +224,13 @@
</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" >
+ <item row="8" column="0" colspan="3" >
+ <widget class="QCheckBox" name="checkShowKey" >
<property name="text" >
- <string/>
+ <string>Show Key</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>
@@ -358,5 +365,21 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>checkShowKey</sender>
+ <signal>clicked()</signal>
+ <receiver>dialogWPAEnterprise</receiver>
+ <slot>slotShowKey()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>211</x>
+ <y>299</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>211</x>
+ <y>188</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
Modified: pcbsd/trunk-current/wificonfig/dialogwpapersonal.cpp
===================================================================
--- pcbsd/trunk-current/wificonfig/dialogwpapersonal.cpp 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk-current/wificonfig/dialogwpapersonal.cpp 2009-05-06 02:54:08 UTC (rev 3871)
@@ -37,3 +37,16 @@
emit saved(lineKey->text());
close();
}
+
+void dialogWPAPersonal::slotShowKey()
+{
+ if(checkShowKey->isChecked())
+ {
+ lineKey2->setEchoMode(QLineEdit::Normal);
+ lineKey->setEchoMode(QLineEdit::Normal);
+ } else {
+ lineKey2->setEchoMode(QLineEdit::Password);
+ lineKey->setEchoMode(QLineEdit::Password);
+ }
+}
+
Modified: pcbsd/trunk-current/wificonfig/dialogwpapersonal.h
===================================================================
--- pcbsd/trunk-current/wificonfig/dialogwpapersonal.h 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk-current/wificonfig/dialogwpapersonal.h 2009-05-06 02:54:08 UTC (rev 3871)
@@ -22,6 +22,7 @@
private slots:
void slotClose();
+ void slotShowKey();
private:
Modified: pcbsd/trunk-current/wificonfig/dialogwpapersonal.ui
===================================================================
--- pcbsd/trunk-current/wificonfig/dialogwpapersonal.ui 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk-current/wificonfig/dialogwpapersonal.ui 2009-05-06 02:54:08 UTC (rev 3871)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>308</width>
- <height>149</height>
+ <width>319</width>
+ <height>174</height>
</rect>
</property>
<property name="windowTitle" >
@@ -16,37 +16,11 @@
<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>&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>
+ <layout class="QGridLayout" name="gridLayout_2" >
<item row="0" column="0" colspan="2" >
<widget class="Q3GroupBox" name="groupBox3" >
<property name="title" >
- <string>Wireless network key</string>
+ <string>Wireless Network Key</string>
</property>
<property name="frameShape" >
<enum>Q3GroupBox::GroupBoxPanel</enum>
@@ -54,7 +28,7 @@
<property name="frameShadow" >
<enum>Q3GroupBox::Sunken</enum>
</property>
- <layout class="QGridLayout" >
+ <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
@@ -67,13 +41,12 @@
</item>
<item row="0" column="1" >
<widget class="QLineEdit" name="lineKey" >
- <property name="echoMode" >
- <enum>QLineEdit::Password</enum>
+ <property name="minimumSize" >
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="lineKey2" >
<property name="echoMode" >
<enum>QLineEdit::Password</enum>
</property>
@@ -89,9 +62,55 @@
</property>
</widget>
</item>
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="lineKey2" >
+ <property name="minimumSize" >
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2" >
+ <widget class="QCheckBox" name="checkShowKey" >
+ <property name="text" >
+ <string>Show Key</string>
+ </property>
+ </widget>
+ </item>
</layout>
</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="1" column="1" >
+ <widget class="QPushButton" name="pushClose" >
+ <property name="text" >
+ <string>&Close</string>
+ </property>
+ <property name="shortcut" >
+ <string>Alt+C</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
@@ -127,5 +146,21 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>checkShowKey</sender>
+ <signal>clicked()</signal>
+ <receiver>dialogWPAPersonal</receiver>
+ <slot>slotShowKey()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>129</x>
+ <y>85</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>129</x>
+ <y>73</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
Modified: pcbsd/trunk-current/wificonfig/wepconfig.cpp
===================================================================
--- pcbsd/trunk-current/wificonfig/wepconfig.cpp 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk-current/wificonfig/wepconfig.cpp 2009-05-06 02:54:08 UTC (rev 3871)
@@ -55,3 +55,16 @@
close();
}
}
+
+void wepConfig::slotShowKey()
+{
+ if(checkShowKey->isChecked())
+ {
+ lineKey2->setEchoMode(QLineEdit::Normal);
+ lineKey->setEchoMode(QLineEdit::Normal);
+ } else {
+ lineKey2->setEchoMode(QLineEdit::Password);
+ lineKey->setEchoMode(QLineEdit::Password);
+ }
+}
+
Modified: pcbsd/trunk-current/wificonfig/wepconfig.h
===================================================================
--- pcbsd/trunk-current/wificonfig/wepconfig.h 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk-current/wificonfig/wepconfig.h 2009-05-06 02:54:08 UTC (rev 3871)
@@ -22,6 +22,7 @@
private slots:
void slotClose();
+ void slotShowKey();
private:
Modified: pcbsd/trunk-current/wificonfig/wepconfig.ui
===================================================================
--- pcbsd/trunk-current/wificonfig/wepconfig.ui 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk-current/wificonfig/wepconfig.ui 2009-05-06 02:54:08 UTC (rev 3871)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>324</width>
- <height>222</height>
+ <width>342</width>
+ <height>234</height>
</rect>
</property>
<property name="windowTitle" >
@@ -114,6 +114,13 @@
</property>
</spacer>
</item>
+ <item row="4" column="0" colspan="3" >
+ <widget class="QCheckBox" name="checkShowKey" >
+ <property name="text" >
+ <string>Show Key</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -178,5 +185,21 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>checkShowKey</sender>
+ <signal>clicked()</signal>
+ <receiver>wepConfig</receiver>
+ <slot>slotShowKey()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>170</x>
+ <y>177</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>170</x>
+ <y>116</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
Modified: pcbsd/trunk-current/wificonfig/wificonfigwidgetbase.cpp
===================================================================
--- pcbsd/trunk-current/wificonfig/wificonfigwidgetbase.cpp 2009-05-05 23:21:36 UTC (rev 3870)
+++ pcbsd/trunk-current/wificonfig/wificonfigwidgetbase.cpp 2009-05-06 02:54:08 UTC (rev 3871)
@@ -402,6 +402,8 @@
QString tmpString;
int tmpInt;
bool tmpBool;
+ int curRow = 1;
+ bool MovedItem = false;
// Check if we have a selection to work with
if ( listWifi->currentRow() != -1 )
@@ -464,13 +466,18 @@
tmpInt = WPAEType[i-1];
WPAEType[i-1] = WPAEType[i];
WPAEType[i] = tmpInt;
+ curRow=i-1;
+ MovedItem=true;
break;
}
}
// Refresh the SSID list and enable the apply button
- slotRefreshSSIDList();
- pushApply->setEnabled(TRUE);
+ if ( MovedItem) {
+ slotRefreshSSIDList();
+ pushApply->setEnabled(TRUE);
+ listWifi->setCurrentRow(curRow);
+ }
}
}
@@ -481,6 +488,8 @@
QString tmpString;
int tmpInt;
bool tmpBool;
+ int curRow = 1;
+ bool MovedItem = false;
// Check if we have a selection to work with
if ( listWifi->currentRow() != -1 )
@@ -543,13 +552,19 @@
tmpInt = WPAEType[i+1];
WPAEType[i+1] = WPAEType[i];
WPAEType[i] = tmpInt;
+ curRow=i+1;
+ MovedItem=true;
break;
}
}
// Refresh the SSID list and enable the apply button
- slotRefreshSSIDList();
- pushApply->setEnabled(TRUE);
+ if ( MovedItem) {
+ slotRefreshSSIDList();
+ pushApply->setEnabled(TRUE);
+ listWifi->setCurrentRow(curRow);
+ }
+
}
}
More information about the Commits
mailing list