summaryrefslogtreecommitdiff
Unidiff
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
@@ -443,6 +443,6 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
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(
@@ -455,2 +455,3 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
455 455
456 // clicked on regular node
456 Description_LBL->setText( NN->nodeDescription() ); 457 Description_LBL->setText( NN->nodeDescription() );
@@ -463,9 +464,12 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
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 }
@@ -531,2 +535,3 @@ void EditNetworkSetup::updateGUI( QListViewItem * it, ANetNode * NN ) {
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 );
@@ -628,2 +633,3 @@ bool EditNetworkSetup::haveCompleteConfig( QListViewItem * it ) {
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
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 @@
13 <y>0</y> 13 <y>0</y>
14 <width>207</width> 14 <width>199</width>
15 <height>313</height> 15 <height>311</height>
16 </rect> 16 </rect>
@@ -34,3 +34,3 @@
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>1</number> 35 <number>2</number>
36 </property> 36 </property>
@@ -599,3 +599,3 @@
599 <name>sizeType</name> 599 <name>sizeType</name>
600 <enum>Expanding</enum> 600 <enum>MinimumExpanding</enum>
601 </property> 601 </property>
@@ -634,3 +634,3 @@
634 <name>name</name> 634 <name>name</name>
635 <cstring>Layout13</cstring> 635 <cstring>Layout8</cstring>
636 </property> 636 </property>
@@ -648,3 +648,3 @@
648 </property> 648 </property>
649 <widget row="4" column="1" > 649 <widget row="0" column="1" >
650 <class>QLabel</class> 650 <class>QLabel</class>
@@ -652,3 +652,10 @@
652 <name>name</name> 652 <name>name</name>
653 <cstring>Frequency_LBL</cstring> 653 <cstring>Station_LBL</cstring>
654 </property>
655 <property stdset="1">
656 <name>sizePolicy</name>
657 <sizepolicy>
658 <hsizetype>7</hsizetype>
659 <vsizetype>1</vsizetype>
660 </sizepolicy>
654 </property> 661 </property>
@@ -667,3 +674,3 @@
667 </widget> 674 </widget>
668 <widget row="2" column="0" > 675 <widget row="0" column="0" >
669 <class>QLabel</class> 676 <class>QLabel</class>
@@ -671,3 +678,10 @@
671 <name>name</name> 678 <name>name</name>
672 <cstring>TextLabel9_2</cstring> 679 <cstring>TextLabel1_3</cstring>
680 </property>
681 <property stdset="1">
682 <name>sizePolicy</name>
683 <sizepolicy>
684 <hsizetype>1</hsizetype>
685 <vsizetype>1</vsizetype>
686 </sizepolicy>
673 </property> 687 </property>
@@ -675,6 +689,6 @@
675 <name>text</name> 689 <name>text</name>
676 <string>AP</string> 690 <string>Station</string>
677 </property> 691 </property>
678 </widget> 692 </widget>
679 <widget row="5" column="1" > 693 <widget row="1" column="0" >
680 <class>QLabel</class> 694 <class>QLabel</class>
@@ -682,3 +696,21 @@
682 <name>name</name> 696 <name>name</name>
683 <cstring>Channel_LBL</cstring> 697 <cstring>TextLabel2_3</cstring>
698 </property>
699 <property stdset="1">
700 <name>text</name>
701 <string>ESSID</string>
702 </property>
703 </widget>
704 <widget row="1" column="1" >
705 <class>QLabel</class>
706 <property stdset="1">
707 <name>name</name>
708 <cstring>ESSID_LBL</cstring>
709 </property>
710 <property stdset="1">
711 <name>sizePolicy</name>
712 <sizepolicy>
713 <hsizetype>7</hsizetype>
714 <vsizetype>1</vsizetype>
715 </sizepolicy>
684 </property> 716 </property>
@@ -697,3 +729,3 @@
697 </widget> 729 </widget>
698 <widget row="0" column="1" > 730 <widget row="2" column="1" >
699 <class>QLabel</class> 731 <class>QLabel</class>
@@ -701,3 +733,10 @@
701 <name>name</name> 733 <name>name</name>
702 <cstring>Station_LBL</cstring> 734 <cstring>AP_LBL</cstring>
735 </property>
736 <property stdset="1">
737 <name>sizePolicy</name>
738 <sizepolicy>
739 <hsizetype>7</hsizetype>
740 <vsizetype>1</vsizetype>
741 </sizepolicy>
703 </property> 742 </property>
@@ -716,3 +755,3 @@
716 </widget> 755 </widget>
717 <widget row="6" column="0" > 756 <widget row="2" column="0" >
718 <class>QLabel</class> 757 <class>QLabel</class>
@@ -720,3 +759,3 @@
720 <name>name</name> 759 <name>name</name>
721 <cstring>TextLabel4_2_2</cstring> 760 <cstring>TextLabel9_2</cstring>
722 </property> 761 </property>
@@ -724,6 +763,26 @@
724 <name>text</name> 763 <name>text</name>
725 <string>Rate</string> 764 <string>AP</string>
726 </property> 765 </property>
727 </widget> 766 </widget>
728 <widget row="6" column="1" > 767 </grid>
768 </widget>
769 <widget>
770 <class>QLayoutWidget</class>
771 <property stdset="1">
772 <name>name</name>
773 <cstring>Layout7</cstring>
774 </property>
775 <property>
776 <name>layoutSpacing</name>
777 </property>
778 <grid>
779 <property stdset="1">
780 <name>margin</name>
781 <number>0</number>
782 </property>
783 <property stdset="1">
784 <name>spacing</name>
785 <number>2</number>
786 </property>
787 <widget row="0" column="3" >
729 <class>QLabel</class> 788 <class>QLabel</class>
@@ -731,3 +790,3 @@
731 <name>name</name> 790 <name>name</name>
732 <cstring>Rate_LBL</cstring> 791 <cstring>Frequency_LBL</cstring>
733 </property> 792 </property>
@@ -753,3 +812,3 @@
753 </widget> 812 </widget>
754 <widget row="2" column="1" > 813 <widget row="1" column="0" >
755 <class>QLabel</class> 814 <class>QLabel</class>
@@ -757,3 +816,21 @@
757 <name>name</name> 816 <name>name</name>
758 <cstring>AP_LBL</cstring> 817 <cstring>TextLabel4_3</cstring>
818 </property>
819 <property stdset="1">
820 <name>text</name>
821 <string>Channel</string>
822 </property>
823 </widget>
824 <widget row="1" column="1" >
825 <class>QLabel</class>
826 <property stdset="1">
827 <name>name</name>
828 <cstring>Channel_LBL</cstring>
829 </property>
830 <property stdset="1">
831 <name>sizePolicy</name>
832 <sizepolicy>
833 <hsizetype>7</hsizetype>
834 <vsizetype>1</vsizetype>
835 </sizepolicy>
759 </property> 836 </property>
@@ -772,3 +849,3 @@
772 </widget> 849 </widget>
773 <widget row="3" column="1" > 850 <widget row="1" column="2" >
774 <class>QLabel</class> 851 <class>QLabel</class>
@@ -776,18 +853,21 @@
776 <name>name</name> 853 <name>name</name>
777 <cstring>Mode_LBL</cstring> 854 <cstring>TextLabel4_2_2</cstring>
778 </property> 855 </property>
779 <property stdset="1"> 856 <property stdset="1">
780 <name>frameShape</name> 857 <name>text</name>
781 <enum>Box</enum> 858 <string>Rate</string>
782 </property> 859 </property>
860 </widget>
861 <widget row="0" column="2" >
862 <class>QLabel</class>
783 <property stdset="1"> 863 <property stdset="1">
784 <name>frameShadow</name> 864 <name>name</name>
785 <enum>Plain</enum> 865 <cstring>TextLabel4_3_2</cstring>
786 </property> 866 </property>
787 <property stdset="1"> 867 <property stdset="1">
788 <name>indent</name> 868 <name>text</name>
789 <number>0</number> 869 <string>Freq</string>
790 </property> 870 </property>
791 </widget> 871 </widget>
792 <widget row="1" column="1" > 872 <widget row="0" column="1" >
793 <class>QLabel</class> 873 <class>QLabel</class>
@@ -795,3 +875,10 @@
795 <name>name</name> 875 <name>name</name>
796 <cstring>ESSID_LBL</cstring> 876 <cstring>Mode_LBL</cstring>
877 </property>
878 <property stdset="1">
879 <name>sizePolicy</name>
880 <sizepolicy>
881 <hsizetype>7</hsizetype>
882 <vsizetype>1</vsizetype>
883 </sizepolicy>
797 </property> 884 </property>
@@ -810,3 +897,3 @@
810 </widget> 897 </widget>
811 <widget row="3" column="0" > 898 <widget row="0" column="0" >
812 <class>QLabel</class> 899 <class>QLabel</class>
@@ -821,3 +908,3 @@
821 </widget> 908 </widget>
822 <widget row="5" column="0" > 909 <widget row="1" column="3" >
823 <class>QLabel</class> 910 <class>QLabel</class>
@@ -825,40 +912,22 @@
825 <name>name</name> 912 <name>name</name>
826 <cstring>TextLabel4_3</cstring> 913 <cstring>Rate_LBL</cstring>
827 </property>
828 <property stdset="1">
829 <name>text</name>
830 <string>Channel</string>
831 </property>
832 </widget>
833 <widget row="0" column="0" >
834 <class>QLabel</class>
835 <property stdset="1">
836 <name>name</name>
837 <cstring>TextLabel1_3</cstring>
838 </property> 914 </property>
839 <property stdset="1"> 915 <property stdset="1">
840 <name>text</name> 916 <name>sizePolicy</name>
841 <string>Station</string> 917 <sizepolicy>
842 </property> 918 <hsizetype>7</hsizetype>
843 </widget> 919 <vsizetype>1</vsizetype>
844 <widget row="1" column="0" > 920 </sizepolicy>
845 <class>QLabel</class>
846 <property stdset="1">
847 <name>name</name>
848 <cstring>TextLabel2_3</cstring>
849 </property> 921 </property>
850 <property stdset="1"> 922 <property stdset="1">
851 <name>text</name> 923 <name>frameShape</name>
852 <string>ESSID</string> 924 <enum>Box</enum>
853 </property> 925 </property>
854 </widget>
855 <widget row="4" column="0" >
856 <class>QLabel</class>
857 <property stdset="1"> 926 <property stdset="1">
858 <name>name</name> 927 <name>frameShadow</name>
859 <cstring>TextLabel4_3_2</cstring> 928 <enum>Plain</enum>
860 </property> 929 </property>
861 <property stdset="1"> 930 <property stdset="1">
862 <name>text</name> 931 <name>indent</name>
863 <string>Frequency</string> 932 <number>0</number>
864 </property> 933 </property>
@@ -972,23 +1041,2 @@
972 </widget> 1041 </widget>
973 <spacer>
974 <property>
975 <name>name</name>
976 <cstring>Spacer11</cstring>
977 </property>
978 <property stdset="1">
979 <name>orientation</name>
980 <enum>Vertical</enum>
981 </property>
982 <property stdset="1">
983 <name>sizeType</name>
984 <enum>Expanding</enum>
985 </property>
986 <property>
987 <name>sizeHint</name>
988 <size>
989 <width>20</width>
990 <height>20</height>
991 </size>
992 </property>
993 </spacer>
994 <widget> 1042 <widget>
@@ -997,3 +1045,6 @@
997 <name>name</name> 1045 <name>name</name>
998 <cstring>Layout21</cstring> 1046 <cstring>Layout7</cstring>
1047 </property>
1048 <property>
1049 <name>layoutSpacing</name>
999 </property> 1050 </property>
@@ -1006,3 +1057,3 @@
1006 <name>spacing</name> 1057 <name>spacing</name>
1007 <number>6</number> 1058 <number>2</number>
1008 </property> 1059 </property>
@@ -1049,2 +1100,23 @@
1049 </widget> 1100 </widget>
1101 <spacer>
1102 <property>
1103 <name>name</name>
1104 <cstring>Spacer6</cstring>
1105 </property>
1106 <property stdset="1">
1107 <name>orientation</name>
1108 <enum>Vertical</enum>
1109 </property>
1110 <property stdset="1">
1111 <name>sizeType</name>
1112 <enum>Expanding</enum>
1113 </property>
1114 <property>
1115 <name>sizeHint</name>
1116 <size>
1117 <width>20</width>
1118 <height>20</height>
1119 </size>
1120 </property>
1121 </spacer>
1050 </vbox> 1122 </vbox>