summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings2/editconnection.cpp20
-rw-r--r--noncore/settings/networksettings2/wlan/wlanGUI.ui244
2 files changed, 171 insertions, 93 deletions
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp
index bda9d7e..a9bef65 100644
--- a/noncore/settings/networksettings2/editconnection.cpp
+++ b/noncore/settings/networksettings2/editconnection.cpp
@@ -442,8 +442,8 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
if( ! NN ) {
- // intermediate node
+ // intermediate (controller) node
NN = (*Mapping)[ it->parent() ];
if( NN ) {
- // figure out type of this node -> produce mesage
+ // figure out type of this node -> produce message
Description_LBL->setText( NSResources->netNode2Description(
NN->needs()[0]) );
@@ -454,4 +454,5 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
}
+ // clicked on regular node
Description_LBL->setText( NN->nodeDescription() );
@@ -462,11 +463,14 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
ANetNode::NetNodeList & NNL = NN->alternatives();
- if( NNL.size() != 1 ) {
- if( NNL.size() == 0 ||
- ! ((MyQCheckListItem *)it)->isOn()
- ) {
- // not clicked on Check or Radio item
+ if( NNL.size() == 0 ) {
+ // this item has no alternatives -> end node
+ TmpIsValid = 0;
+ updateGUI( it, NN );
return;
}
+
+ if( ! ((MyQCheckListItem *)it)->isOn() ) {
+ // not clicked on Check or Radio item
+ return;
}
@@ -530,4 +534,5 @@ void EditNetworkSetup::updateGUI( QListViewItem * it, ANetNode * NN ) {
bool HCC = haveCompleteConfig( it );
Tab_TB->setTabEnabled( Setup_FRM, HCC );
+ Log(( "COMPLETE CONFIG %d\n", HCC ));
Setup_FRM->setEnabled( HCC );
@@ -627,4 +632,5 @@ bool EditNetworkSetup::haveCompleteConfig( QListViewItem * it ) {
if( ! Found ) {
+ Log(( "Setup not complete\n" ));
return 0; // no not complete -> a radio should have been chkd
}
diff --git a/noncore/settings/networksettings2/wlan/wlanGUI.ui b/noncore/settings/networksettings2/wlan/wlanGUI.ui
index 7ba0b16..bb31ae7 100644
--- a/noncore/settings/networksettings2/wlan/wlanGUI.ui
+++ b/noncore/settings/networksettings2/wlan/wlanGUI.ui
@@ -12,6 +12,6 @@
<x>0</x>
<y>0</y>
- <width>207</width>
- <height>313</height>
+ <width>199</width>
+ <height>311</height>
</rect>
</property>
@@ -33,5 +33,5 @@
<property stdset="1">
<name>spacing</name>
- <number>1</number>
+ <number>2</number>
</property>
<widget>
@@ -598,5 +598,5 @@
<property stdset="1">
<name>sizeType</name>
- <enum>Expanding</enum>
+ <enum>MinimumExpanding</enum>
</property>
<property>
@@ -633,5 +633,5 @@
<property stdset="1">
<name>name</name>
- <cstring>Layout13</cstring>
+ <cstring>Layout8</cstring>
</property>
<property>
@@ -647,9 +647,16 @@
<number>2</number>
</property>
- <widget row="4" column="1" >
+ <widget row="0" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>Frequency_LBL</cstring>
+ <cstring>Station_LBL</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
@@ -666,20 +673,45 @@
</property>
</widget>
- <widget row="2" column="0" >
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel9_2</cstring>
+ <cstring>TextLabel1_3</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
<name>text</name>
- <string>AP</string>
+ <string>Station</string>
+ </property>
+ </widget>
+ <widget row="1" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel2_3</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>ESSID</string>
</property>
</widget>
- <widget row="5" column="1" >
+ <widget row="1" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>Channel_LBL</cstring>
+ <cstring>ESSID_LBL</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
@@ -696,9 +728,16 @@
</property>
</widget>
- <widget row="0" column="1" >
+ <widget row="2" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>Station_LBL</cstring>
+ <cstring>AP_LBL</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
@@ -715,20 +754,40 @@
</property>
</widget>
- <widget row="6" column="0" >
+ <widget row="2" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel4_2_2</cstring>
+ <cstring>TextLabel9_2</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Rate</string>
+ <string>AP</string>
</property>
</widget>
- <widget row="6" column="1" >
+ </grid>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout7</cstring>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>2</number>
+ </property>
+ <widget row="0" column="3" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>Rate_LBL</cstring>
+ <cstring>Frequency_LBL</cstring>
</property>
<property stdset="1">
@@ -752,9 +811,27 @@
</property>
</widget>
- <widget row="2" column="1" >
+ <widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>AP_LBL</cstring>
+ <cstring>TextLabel4_3</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Channel</string>
+ </property>
+ </widget>
+ <widget row="1" column="1" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Channel_LBL</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
@@ -771,28 +848,38 @@
</property>
</widget>
- <widget row="3" column="1" >
+ <widget row="1" column="2" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>Mode_LBL</cstring>
+ <cstring>TextLabel4_2_2</cstring>
</property>
<property stdset="1">
- <name>frameShape</name>
- <enum>Box</enum>
+ <name>text</name>
+ <string>Rate</string>
</property>
+ </widget>
+ <widget row="0" column="2" >
+ <class>QLabel</class>
<property stdset="1">
- <name>frameShadow</name>
- <enum>Plain</enum>
+ <name>name</name>
+ <cstring>TextLabel4_3_2</cstring>
</property>
<property stdset="1">
- <name>indent</name>
- <number>0</number>
+ <name>text</name>
+ <string>Freq</string>
</property>
</widget>
- <widget row="1" column="1" >
+ <widget row="0" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>ESSID_LBL</cstring>
+ <cstring>Mode_LBL</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
@@ -809,5 +896,5 @@
</property>
</widget>
- <widget row="3" column="0" >
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
@@ -820,46 +907,28 @@
</property>
</widget>
- <widget row="5" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel4_3</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Channel</string>
- </property>
- </widget>
- <widget row="0" column="0" >
+ <widget row="1" column="3" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_3</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Station</string>
+ <cstring>Rate_LBL</cstring>
</property>
- </widget>
- <widget row="1" column="0" >
- <class>QLabel</class>
<property stdset="1">
- <name>name</name>
- <cstring>TextLabel2_3</cstring>
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
- <name>text</name>
- <string>ESSID</string>
+ <name>frameShape</name>
+ <enum>Box</enum>
</property>
- </widget>
- <widget row="4" column="0" >
- <class>QLabel</class>
<property stdset="1">
- <name>name</name>
- <cstring>TextLabel4_3_2</cstring>
+ <name>frameShadow</name>
+ <enum>Plain</enum>
</property>
<property stdset="1">
- <name>text</name>
- <string>Frequency</string>
+ <name>indent</name>
+ <number>0</number>
</property>
</widget>
@@ -971,30 +1040,12 @@
</grid>
</widget>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer11</cstring>
- </property>
- <property stdset="1">
- <name>orientation</name>
- <enum>Vertical</enum>
- </property>
- <property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout21</cstring>
+ <cstring>Layout7</cstring>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
</property>
<hbox>
@@ -1005,5 +1056,5 @@
<property stdset="1">
<name>spacing</name>
- <number>6</number>
+ <number>2</number>
</property>
<widget>
@@ -1048,4 +1099,25 @@
</hbox>
</widget>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer6</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Vertical</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</vbox>
</widget>