| -rw-r--r-- | noncore/settings/networksettings2/editconnection.cpp | 20 | ||||
| -rw-r--r-- | noncore/settings/networksettings2/wlan/wlanGUI.ui | 244 |
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 @@ -443,6 +443,6 @@ 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( @@ -455,2 +455,3 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) { + // clicked on regular node Description_LBL->setText( NN->nodeDescription() ); @@ -463,9 +464,12 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) { - 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; } @@ -531,2 +535,3 @@ void EditNetworkSetup::updateGUI( QListViewItem * it, ANetNode * NN ) { Tab_TB->setTabEnabled( Setup_FRM, HCC ); + Log(( "COMPLETE CONFIG %d\n", HCC )); Setup_FRM->setEnabled( HCC ); @@ -628,2 +633,3 @@ 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 @@ -13,4 +13,4 @@ <y>0</y> - <width>207</width> - <height>313</height> + <width>199</width> + <height>311</height> </rect> @@ -34,3 +34,3 @@ <name>spacing</name> - <number>1</number> + <number>2</number> </property> @@ -599,3 +599,3 @@ <name>sizeType</name> - <enum>Expanding</enum> + <enum>MinimumExpanding</enum> </property> @@ -634,3 +634,3 @@ <name>name</name> - <cstring>Layout13</cstring> + <cstring>Layout8</cstring> </property> @@ -648,3 +648,3 @@ </property> - <widget row="4" column="1" > + <widget row="0" column="1" > <class>QLabel</class> @@ -652,3 +652,10 @@ <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> @@ -667,3 +674,3 @@ </widget> - <widget row="2" column="0" > + <widget row="0" column="0" > <class>QLabel</class> @@ -671,3 +678,10 @@ <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> @@ -675,6 +689,17 @@ <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> @@ -682,3 +707,10 @@ <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> @@ -697,3 +729,3 @@ </widget> - <widget row="0" column="1" > + <widget row="2" column="1" > <class>QLabel</class> @@ -701,3 +733,10 @@ <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> @@ -716,3 +755,3 @@ </widget> - <widget row="6" column="0" > + <widget row="2" column="0" > <class>QLabel</class> @@ -720,3 +759,3 @@ <name>name</name> - <cstring>TextLabel4_2_2</cstring> + <cstring>TextLabel9_2</cstring> </property> @@ -724,6 +763,26 @@ <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> @@ -731,3 +790,3 @@ <name>name</name> - <cstring>Rate_LBL</cstring> + <cstring>Frequency_LBL</cstring> </property> @@ -753,3 +812,3 @@ </widget> - <widget row="2" column="1" > + <widget row="1" column="0" > <class>QLabel</class> @@ -757,3 +816,21 @@ <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> @@ -772,3 +849,3 @@ </widget> - <widget row="3" column="1" > + <widget row="1" column="2" > <class>QLabel</class> @@ -776,18 +853,21 @@ <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> @@ -795,3 +875,10 @@ <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> @@ -810,3 +897,3 @@ </widget> - <widget row="3" column="0" > + <widget row="0" column="0" > <class>QLabel</class> @@ -821,14 +908,3 @@ </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> @@ -836,29 +912,22 @@ <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> @@ -972,23 +1041,2 @@ </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> @@ -997,3 +1045,6 @@ <name>name</name> - <cstring>Layout21</cstring> + <cstring>Layout7</cstring> + </property> + <property> + <name>layoutSpacing</name> </property> @@ -1006,3 +1057,3 @@ <name>spacing</name> - <number>6</number> + <number>2</number> </property> @@ -1049,2 +1100,23 @@ </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> |