summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings2/wlan
Side-by-side diff
Diffstat (limited to 'noncore/settings/networksettings2/wlan') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings2/wlan/wlanGUI.ui163
-rw-r--r--noncore/settings/networksettings2/wlan/wlan_NN.cpp2
2 files changed, 75 insertions, 90 deletions
diff --git a/noncore/settings/networksettings2/wlan/wlanGUI.ui b/noncore/settings/networksettings2/wlan/wlanGUI.ui
index 23d6f86..9614369 100644
--- a/noncore/settings/networksettings2/wlan/wlanGUI.ui
+++ b/noncore/settings/networksettings2/wlan/wlanGUI.ui
@@ -13,3 +13,3 @@
<y>0</y>
- <width>196</width>
+ <width>192</width>
<height>329</height>
@@ -40,3 +40,3 @@
<name>name</name>
- <cstring>tabWidget</cstring>
+ <cstring>WLan_TAB</cstring>
</property>
@@ -121,3 +121,3 @@
<name>name</name>
- <cstring>essid</cstring>
+ <cstring>ESSID_CB</cstring>
</property>
@@ -201,3 +201,3 @@
<name>name</name>
- <cstring>mode</cstring>
+ <cstring>Mode_CB</cstring>
</property>
@@ -242,3 +242,3 @@
<name>name</name>
- <cstring>specifyAp</cstring>
+ <cstring>SpecifyAP_CB</cstring>
</property>
@@ -275,3 +275,3 @@
<name>name</name>
- <cstring>macEdit</cstring>
+ <cstring>APMac_LE</cstring>
</property>
@@ -334,3 +334,3 @@
<name>name</name>
- <cstring>specifyChan</cstring>
+ <cstring>SpecifyChannel_CB</cstring>
</property>
@@ -345,3 +345,3 @@
<name>name</name>
- <cstring>networkChannel</cstring>
+ <cstring>ChannelNr_SB</cstring>
</property>
@@ -402,3 +402,3 @@
<name>margin</name>
- <number>0</number>
+ <number>2</number>
</property>
@@ -412,3 +412,3 @@
<name>name</name>
- <cstring>wepEnabled</cstring>
+ <cstring>EnableWEB_CB</cstring>
</property>
@@ -452,3 +452,3 @@
<name>name</name>
- <cstring>keyRadio0</cstring>
+ <cstring>Key1_RB</cstring>
</property>
@@ -467,3 +467,3 @@
<name>name</name>
- <cstring>keyRadio3</cstring>
+ <cstring>Key4_RB</cstring>
</property>
@@ -478,3 +478,7 @@
<name>name</name>
- <cstring>LineEdit6</cstring>
+ <cstring>Key1_LE</cstring>
+ </property>
+ <property stdset="1">
+ <name>frame</name>
+ <bool>true</bool>
</property>
@@ -485,3 +489,3 @@
<name>name</name>
- <cstring>keyRadio1</cstring>
+ <cstring>Key2_RB</cstring>
</property>
@@ -496,3 +500,3 @@
<name>name</name>
- <cstring>keyRadio2</cstring>
+ <cstring>Key3_RB</cstring>
</property>
@@ -507,3 +511,3 @@
<name>name</name>
- <cstring>LineEdit6_2</cstring>
+ <cstring>Key2_LE</cstring>
</property>
@@ -514,3 +518,3 @@
<name>name</name>
- <cstring>LineEdit6_4</cstring>
+ <cstring>Key4_LE</cstring>
</property>
@@ -521,3 +525,3 @@
<name>name</name>
- <cstring>LineEdit6_3</cstring>
+ <cstring>Key3_LE</cstring>
</property>
@@ -527,6 +531,6 @@
<widget>
- <class>QButtonGroup</class>
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>NonEncButtonGroup</cstring>
+ <cstring>CheckBox4</cstring>
</property>
@@ -537,57 +541,6 @@
<property stdset="1">
- <name>title</name>
- <string>Non-encrypted Packets</string>
- </property>
- <property stdset="1">
- <name>radioButtonExclusive</name>
- <bool>true</bool>
- </property>
- <property>
- <name>layoutMargin</name>
- </property>
- <grid>
- <property stdset="1">
- <name>margin</name>
- <number>2</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget row="0" column="0" >
- <class>QRadioButton</class>
- <property stdset="1">
- <name>name</name>
- <cstring>acceptNonEnc</cstring>
- </property>
- <property stdset="1">
<name>text</name>
- <string>&amp;Accept</string>
- </property>
- <property stdset="1">
- <name>checked</name>
- <bool>true</bool>
- </property>
- <property stdset="1">
- <name>buttonGroupId</name>
- <number>0</number>
+ <string>Accept Non-Encrypted packets</string>
</property>
</widget>
- <widget row="0" column="1" >
- <class>QRadioButton</class>
- <property stdset="1">
- <name>name</name>
- <cstring>rejectNonEnc</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>&amp;Reject</string>
- </property>
- <property stdset="1">
- <name>buttonGroupId</name>
- <number>1</number>
- </property>
- </widget>
- </grid>
- </widget>
<spacer>
@@ -675,3 +628,7 @@
<name>frameShadow</name>
- <enum>Sunken</enum>
+ <enum>Plain</enum>
+ </property>
+ <property stdset="1">
+ <name>indent</name>
+ <number>0</number>
</property>
@@ -734,3 +691,7 @@
<name>frameShadow</name>
- <enum>Sunken</enum>
+ <enum>Plain</enum>
+ </property>
+ <property stdset="1">
+ <name>indent</name>
+ <number>0</number>
</property>
@@ -756,3 +717,7 @@
<name>frameShadow</name>
- <enum>Sunken</enum>
+ <enum>Plain</enum>
+ </property>
+ <property stdset="1">
+ <name>indent</name>
+ <number>0</number>
</property>
@@ -782,3 +747,7 @@
<name>frameShadow</name>
- <enum>Sunken</enum>
+ <enum>Plain</enum>
+ </property>
+ <property stdset="1">
+ <name>indent</name>
+ <number>0</number>
</property>
@@ -789,3 +758,3 @@
<name>name</name>
- <cstring>essidLabel_3</cstring>
+ <cstring>ESSID_LBL</cstring>
</property>
@@ -797,3 +766,7 @@
<name>frameShadow</name>
- <enum>Sunken</enum>
+ <enum>Plain</enum>
+ </property>
+ <property stdset="1">
+ <name>indent</name>
+ <number>0</number>
</property>
@@ -804,3 +777,3 @@
<name>name</name>
- <cstring>modeLabel_3</cstring>
+ <cstring>Mode_LBL</cstring>
</property>
@@ -812,3 +785,7 @@
<name>frameShadow</name>
- <enum>Sunken</enum>
+ <enum>Plain</enum>
+ </property>
+ <property stdset="1">
+ <name>indent</name>
+ <number>0</number>
</property>
@@ -925,2 +902,10 @@
<property stdset="1">
+ <name>frameShadow</name>
+ <enum>Plain</enum>
+ </property>
+ <property stdset="1">
+ <name>lineWidth</name>
+ <number>1</number>
+ </property>
+ <property stdset="1">
<name>progress</name>
@@ -959,3 +944,3 @@
<connection>
- <sender>wepEnabled</sender>
+ <sender>EnableWEB_CB</sender>
<signal>toggled(bool)</signal>
@@ -965,5 +950,5 @@
<connection>
- <sender>wepEnabled</sender>
+ <sender>SpecifyAP_CB</sender>
<signal>toggled(bool)</signal>
- <receiver>NonEncButtonGroup</receiver>
+ <receiver>APMac_LE</receiver>
<slot>setEnabled(bool)</slot>
@@ -971,5 +956,5 @@
<connection>
- <sender>specifyAp</sender>
+ <sender>SpecifyAP_CB</sender>
<signal>toggled(bool)</signal>
- <receiver>macEdit</receiver>
+ <receiver>macLabel</receiver>
<slot>setEnabled(bool)</slot>
@@ -977,5 +962,5 @@
<connection>
- <sender>specifyAp</sender>
+ <sender>SpecifyChannel_CB</sender>
<signal>toggled(bool)</signal>
- <receiver>macLabel</receiver>
+ <receiver>ChannelNr_SB</receiver>
<slot>setEnabled(bool)</slot>
@@ -983,5 +968,5 @@
<connection>
- <sender>specifyChan</sender>
+ <sender>EnableWEB_CB</sender>
<signal>toggled(bool)</signal>
- <receiver>networkChannel</receiver>
+ <receiver>CheckBox4</receiver>
<slot>setEnabled(bool)</slot>
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.cpp b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
index 7a2c1a7..ce8a734 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.cpp
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
@@ -42,3 +42,3 @@ bool WLanNetNode::generateProperFilesFor(
ANetNodeInstance * ) {
- return 1;
+ return 0;
}