summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings2/editconnection.cpp24
-rw-r--r--noncore/settings/networksettings2/wlan/wlanGUI.ui244
2 files changed, 173 insertions, 95 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
@@ -438,39 +438,43 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
}
// store conversion from lvitem to node
NN = (*Mapping)[ 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]) );
} else {
Description_LBL->setText( "" );
}
return;
}
+ // clicked on regular node
Description_LBL->setText( NN->nodeDescription() );
if( ! it->isSelectable() ) {
return;
}
ANetNode::NetNodeList & NNL = NN->alternatives();
- if( NNL.size() != 1 ) {
- if( NNL.size() == 0 ||
- ! ((MyQCheckListItem *)it)->isOn()
- ) {
- // not clicked on Check or Radio item
- return;
- }
+ 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;
}
// item has really changed -> update
TmpIsValid = 0;
updateGUI( it, NN );
}
@@ -526,12 +530,13 @@ void EditNetworkSetup::SLOT_AlterTab( const QString & S ) {
// update visual feedback of selection state
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 );
// disable children of all siblings at same level
QListViewItem * Sbl = it->parent()->firstChild();
while( Sbl ) {
if ( Sbl != it ) {
@@ -623,12 +628,13 @@ bool EditNetworkSetup::haveCompleteConfig( QListViewItem * it ) {
break;
}
it = it->nextSibling();
}
if( ! Found ) {
+ Log(( "Setup not complete\n" ));
return 0; // no not complete -> a radio should have been chkd
}
// it now contains selected radio
NN = (*Mapping)[it];
} else {
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
@@ -8,14 +8,14 @@
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>207</width>
- <height>313</height>
+ <width>199</width>
+ <height>311</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Form1</string>
</property>
@@ -29,13 +29,13 @@
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>1</number>
+ <number>2</number>
</property>
<widget>
<class>QTabWidget</class>
<property stdset="1">
<name>name</name>
<cstring>WLan_TAB</cstring>
@@ -594,13 +594,13 @@
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>sizeType</name>
- <enum>Expanding</enum>
+ <enum>MinimumExpanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -629,13 +629,13 @@
<number>2</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout13</cstring>
+ <cstring>Layout8</cstring>
</property>
<property>
<name>layoutSpacing</name>
</property>
<grid>
<property stdset="1">
@@ -643,17 +643,24 @@
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<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">
<name>frameShape</name>
<enum>Box</enum>
</property>
<property stdset="1">
@@ -662,28 +669,53 @@
</property>
<property stdset="1">
<name>indent</name>
<number>0</number>
</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="5" column="1" >
+ <widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>Channel_LBL</cstring>
+ <cstring>TextLabel2_3</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>ESSID</string>
+ </property>
+ </widget>
+ <widget row="1" column="1" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>ESSID_LBL</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
<name>frameShape</name>
<enum>Box</enum>
</property>
<property stdset="1">
@@ -692,17 +724,24 @@
</property>
<property stdset="1">
<name>indent</name>
<number>0</number>
</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">
<name>frameShape</name>
<enum>Box</enum>
</property>
<property stdset="1">
@@ -711,28 +750,48 @@
</property>
<property stdset="1">
<name>indent</name>
<number>0</number>
</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">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>1</vsizetype>
@@ -748,17 +807,35 @@
</property>
<property stdset="1">
<name>indent</name>
<number>0</number>
</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">
<name>frameShape</name>
<enum>Box</enum>
</property>
<property stdset="1">
@@ -767,36 +844,46 @@
</property>
<property stdset="1">
<name>indent</name>
<number>0</number>
</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">
<name>frameShape</name>
<enum>Box</enum>
</property>
<property stdset="1">
@@ -805,65 +892,47 @@
</property>
<property stdset="1">
<name>indent</name>
<number>0</number>
</property>
</widget>
- <widget row="3" column="0" >
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel3_3</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Mode</string>
</property>
</widget>
- <widget row="5" column="0" >
+ <widget row="1" column="3" >
<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" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1_3</cstring>
+ <cstring>Rate_LBL</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Station</string>
- </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>
</grid>
</widget>
<widget>
<class>QGroupBox</class>
@@ -967,47 +1036,29 @@
<name>progress</name>
<number>10</number>
</property>
</widget>
</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>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>6</number>
+ <number>2</number>
</property>
<widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>Refresh_CB</cstring>
@@ -1044,12 +1095,33 @@
<height>20</height>
</size>
</property>
</spacer>
</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>
</widget>
</vbox>
</widget>
<connections>