summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings2/editconnection.cpp
Unidiff
Diffstat (limited to 'noncore/settings/networksettings2/editconnection.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings2/editconnection.cpp24
1 files changed, 15 insertions, 9 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 ) {
442 442
443 if( ! NN ) { 443 if( ! NN ) {
444 // intermediate node 444 // intermediate (controller) node
445 NN = (*Mapping)[ it->parent() ]; 445 NN = (*Mapping)[ it->parent() ];
446 if( NN ) { 446 if( NN ) {
447 // figure out type of this node -> produce mesage 447 // figure out type of this node -> produce message
448 Description_LBL->setText( NSResources->netNode2Description( 448 Description_LBL->setText( NSResources->netNode2Description(
449 NN->needs()[0]) ); 449 NN->needs()[0]) );
@@ -454,4 +454,5 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
454 } 454 }
455 455
456 // clicked on regular node
456 Description_LBL->setText( NN->nodeDescription() ); 457 Description_LBL->setText( NN->nodeDescription() );
457 458
@@ -462,11 +463,14 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
462 ANetNode::NetNodeList & NNL = NN->alternatives(); 463 ANetNode::NetNodeList & NNL = NN->alternatives();
463 464
464 if( NNL.size() != 1 ) { 465 if( NNL.size() == 0 ) {
465 if( NNL.size() == 0 || 466 // this item has no alternatives -> end node
466 ! ((MyQCheckListItem *)it)->isOn() 467 TmpIsValid = 0;
467 ) { 468 updateGUI( it, NN );
468 // not clicked on Check or Radio item 469 return;
469 return; 470 }
470 } 471
472 if( ! ((MyQCheckListItem *)it)->isOn() ) {
473 // not clicked on Check or Radio item
474 return;
471 } 475 }
472 476
@@ -530,4 +534,5 @@ void EditNetworkSetup::updateGUI( QListViewItem * it, ANetNode * NN ) {
530 bool HCC = haveCompleteConfig( it ); 534 bool HCC = haveCompleteConfig( it );
531 Tab_TB->setTabEnabled( Setup_FRM, HCC ); 535 Tab_TB->setTabEnabled( Setup_FRM, HCC );
536 Log(( "COMPLETE CONFIG %d\n", HCC ));
532 Setup_FRM->setEnabled( HCC ); 537 Setup_FRM->setEnabled( HCC );
533 538
@@ -627,4 +632,5 @@ bool EditNetworkSetup::haveCompleteConfig( QListViewItem * it ) {
627 632
628 if( ! Found ) { 633 if( ! Found ) {
634 Log(( "Setup not complete\n" ));
629 return 0; // no not complete -> a radio should have been chkd 635 return 0; // no not complete -> a radio should have been chkd
630 } 636 }