summaryrefslogtreecommitdiff
authorwimpie <wimpie>2005-01-12 02:21:58 (UTC)
committer wimpie <wimpie>2005-01-12 02:21:58 (UTC)
commit551fd59bc878f0f95aac939a5a9fdedd14707d17 (patch) (unidiff)
treeaf49b228e04da59895ad77ae691ce9f900ef3d83
parentc48160f6ac67b2f2fc4b6f982b641861ad078237 (diff)
downloadopie-551fd59bc878f0f95aac939a5a9fdedd14707d17.zip
opie-551fd59bc878f0f95aac939a5a9fdedd14707d17.tar.gz
opie-551fd59bc878f0f95aac939a5a9fdedd14707d17.tar.bz2
Fixed problem with selection of lowest node level
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
@@ -428,59 +428,63 @@ void EditNetworkSetup::SLOT_AutoCollapse( bool b ) {
428} 428}
429 429
430// clicked on node in tree -> update GUI 430// clicked on node in tree -> update GUI
431void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) { 431void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
432 ANetNode * NN; 432 ANetNode * NN;
433 if( it == 0 || it->depth() == 0 ) { 433 if( it == 0 || it->depth() == 0 ) {
434 Description_LBL->setText( 434 Description_LBL->setText(
435 NSResources->netNode2Description( "fullsetup" ) ); 435 NSResources->netNode2Description( "fullsetup" ) );
436 // topevel or no selection 436 // topevel or no selection
437 return; 437 return;
438 } 438 }
439 439
440 // store conversion from lvitem to node 440 // store conversion from lvitem to node
441 NN = (*Mapping)[ it ]; 441 NN = (*Mapping)[ 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]) );
450 } else { 450 } else {
451 Description_LBL->setText( "" ); 451 Description_LBL->setText( "" );
452 } 452 }
453 return; 453 return;
454 } 454 }
455 455
456 // clicked on regular node
456 Description_LBL->setText( NN->nodeDescription() ); 457 Description_LBL->setText( NN->nodeDescription() );
457 458
458 if( ! it->isSelectable() ) { 459 if( ! it->isSelectable() ) {
459 return; 460 return;
460 } 461 }
461 462
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
473 // item has really changed -> update 477 // item has really changed -> update
474 TmpIsValid = 0; 478 TmpIsValid = 0;
475 updateGUI( it, NN ); 479 updateGUI( it, NN );
476} 480}
477 481
478// cliecked on TAB to go to setup 482// cliecked on TAB to go to setup
479void EditNetworkSetup::SLOT_AlterTab( const QString & S ) { 483void EditNetworkSetup::SLOT_AlterTab( const QString & S ) {
480 if( S == tr( "Setup" ) && Setup_FRM->isEnabled() ) { 484 if( S == tr( "Setup" ) && Setup_FRM->isEnabled() ) {
481 // switched to setup -> update CB and populate ws with 485 // switched to setup -> update CB and populate ws with
482 // forms for devices 486 // forms for devices
483 487
484 if( ! TmpIsValid ) { 488 if( ! TmpIsValid ) {
485 getTmpCollection(); 489 getTmpCollection();
486 490
@@ -516,32 +520,33 @@ void EditNetworkSetup::SLOT_AlterTab( const QString & S ) {
516 tr("No configuration required")); 520 tr("No configuration required"));
517 } 521 }
518 Setup_WS->addWidget( W , i ); 522 Setup_WS->addWidget( W , i );
519 i ++; 523 i ++;
520 } 524 }
521 } 525 }
522 Setup_WS->raiseWidget( 0 ); 526 Setup_WS->raiseWidget( 0 );
523 } // still valid 527 } // still valid
524 } 528 }
525} 529}
526 530
527// update visual feedback of selection state 531// update visual feedback of selection state
528void EditNetworkSetup::updateGUI( QListViewItem * it, ANetNode * NN ) { 532void EditNetworkSetup::updateGUI( QListViewItem * it, ANetNode * NN ) {
529 533
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
534 // disable children of all siblings at same level 539 // disable children of all siblings at same level
535 QListViewItem * Sbl = it->parent()->firstChild(); 540 QListViewItem * Sbl = it->parent()->firstChild();
536 while( Sbl ) { 541 while( Sbl ) {
537 if ( Sbl != it ) { 542 if ( Sbl != it ) {
538 disableTree( Sbl->firstChild(), FALSE ); 543 disableTree( Sbl->firstChild(), FALSE );
539 Sbl->setSelectable( TRUE ); 544 Sbl->setSelectable( TRUE );
540 if( AutoCollapse ) 545 if( AutoCollapse )
541 Sbl->setOpen( FALSE ); 546 Sbl->setOpen( FALSE );
542 } 547 }
543 Sbl = Sbl->nextSibling(); 548 Sbl = Sbl->nextSibling();
544 } 549 }
545 550
546 // enable selected path (as deep as it goes 551 // enable selected path (as deep as it goes
547 it->setOpen( TRUE ); 552 it->setOpen( TRUE );
@@ -613,28 +618,29 @@ bool EditNetworkSetup::haveCompleteConfig( QListViewItem * it ) {
613 // this item is a controller -> 618 // this item is a controller ->
614 // has radio items as children -> 619 // has radio items as children ->
615 // find selected one 620 // find selected one
616 it = it->firstChild(); 621 it = it->firstChild();
617 Found = 0; 622 Found = 0;
618 while( it ) { 623 while( it ) {
619 if( ((QCheckListItem *)it)->isOn() ) { 624 if( ((QCheckListItem *)it)->isOn() ) {
620 Found = 1; 625 Found = 1;
621 // go deeper 626 // go deeper
622 it = it->firstChild(); 627 it = it->firstChild();
623 break; 628 break;
624 } 629 }
625 it = it->nextSibling(); 630 it = it->nextSibling();
626 } 631 }
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 }
631 637
632 // it now contains selected radio 638 // it now contains selected radio
633 NN = (*Mapping)[it]; 639 NN = (*Mapping)[it];
634 } else { 640 } else {
635 // automatic selection 641 // automatic selection
636 it = it->firstChild(); 642 it = it->firstChild();
637 } 643 }
638 } 644 }
639 return 1; 645 return 1;
640} 646}
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
@@ -1,51 +1,51 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>WLanGUI</class> 2<class>WLanGUI</class>
3<widget> 3<widget>
4 <class>QWidget</class> 4 <class>QWidget</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>WLanGUI</cstring> 7 <cstring>WLanGUI</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
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>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Form1</string> 20 <string>Form1</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
28 <vbox> 28 <vbox>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>0</number> 31 <number>0</number>
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>1</number> 35 <number>2</number>
36 </property> 36 </property>
37 <widget> 37 <widget>
38 <class>QTabWidget</class> 38 <class>QTabWidget</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>WLan_TAB</cstring> 41 <cstring>WLan_TAB</cstring>
42 </property> 42 </property>
43 <property stdset="1"> 43 <property stdset="1">
44 <name>enabled</name> 44 <name>enabled</name>
45 <bool>true</bool> 45 <bool>true</bool>
46 </property> 46 </property>
47 <property> 47 <property>
48 <name>layoutMargin</name> 48 <name>layoutMargin</name>
49 </property> 49 </property>
50 <property> 50 <property>
51 <name>layoutSpacing</name> 51 <name>layoutSpacing</name>
@@ -584,33 +584,33 @@
584 <property stdset="1"> 584 <property stdset="1">
585 <name>text</name> 585 <name>text</name>
586 <string>Accept Non-Encrypted packets</string> 586 <string>Accept Non-Encrypted packets</string>
587 </property> 587 </property>
588 </widget> 588 </widget>
589 <spacer> 589 <spacer>
590 <property> 590 <property>
591 <name>name</name> 591 <name>name</name>
592 <cstring>Spacer30</cstring> 592 <cstring>Spacer30</cstring>
593 </property> 593 </property>
594 <property stdset="1"> 594 <property stdset="1">
595 <name>orientation</name> 595 <name>orientation</name>
596 <enum>Vertical</enum> 596 <enum>Vertical</enum>
597 </property> 597 </property>
598 <property stdset="1"> 598 <property stdset="1">
599 <name>sizeType</name> 599 <name>sizeType</name>
600 <enum>Expanding</enum> 600 <enum>MinimumExpanding</enum>
601 </property> 601 </property>
602 <property> 602 <property>
603 <name>sizeHint</name> 603 <name>sizeHint</name>
604 <size> 604 <size>
605 <width>20</width> 605 <width>20</width>
606 <height>20</height> 606 <height>20</height>
607 </size> 607 </size>
608 </property> 608 </property>
609 </spacer> 609 </spacer>
610 </vbox> 610 </vbox>
611 </widget> 611 </widget>
612 <widget> 612 <widget>
613 <class>QWidget</class> 613 <class>QWidget</class>
614 <property stdset="1"> 614 <property stdset="1">
615 <name>name</name> 615 <name>name</name>
616 <cstring>tab</cstring> 616 <cstring>tab</cstring>
@@ -619,261 +619,330 @@
619 <name>title</name> 619 <name>title</name>
620 <string>State</string> 620 <string>State</string>
621 </attribute> 621 </attribute>
622 <vbox> 622 <vbox>
623 <property stdset="1"> 623 <property stdset="1">
624 <name>margin</name> 624 <name>margin</name>
625 <number>0</number> 625 <number>0</number>
626 </property> 626 </property>
627 <property stdset="1"> 627 <property stdset="1">
628 <name>spacing</name> 628 <name>spacing</name>
629 <number>2</number> 629 <number>2</number>
630 </property> 630 </property>
631 <widget> 631 <widget>
632 <class>QLayoutWidget</class> 632 <class>QLayoutWidget</class>
633 <property stdset="1"> 633 <property stdset="1">
634 <name>name</name> 634 <name>name</name>
635 <cstring>Layout13</cstring> 635 <cstring>Layout8</cstring>
636 </property> 636 </property>
637 <property> 637 <property>
638 <name>layoutSpacing</name> 638 <name>layoutSpacing</name>
639 </property> 639 </property>
640 <grid> 640 <grid>
641 <property stdset="1"> 641 <property stdset="1">
642 <name>margin</name> 642 <name>margin</name>
643 <number>0</number> 643 <number>0</number>
644 </property> 644 </property>
645 <property stdset="1"> 645 <property stdset="1">
646 <name>spacing</name> 646 <name>spacing</name>
647 <number>2</number> 647 <number>2</number>
648 </property> 648 </property>
649 <widget row="4" column="1" > 649 <widget row="0" column="1" >
650 <class>QLabel</class> 650 <class>QLabel</class>
651 <property stdset="1"> 651 <property stdset="1">
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>
655 <property stdset="1"> 662 <property stdset="1">
656 <name>frameShape</name> 663 <name>frameShape</name>
657 <enum>Box</enum> 664 <enum>Box</enum>
658 </property> 665 </property>
659 <property stdset="1"> 666 <property stdset="1">
660 <name>frameShadow</name> 667 <name>frameShadow</name>
661 <enum>Plain</enum> 668 <enum>Plain</enum>
662 </property> 669 </property>
663 <property stdset="1"> 670 <property stdset="1">
664 <name>indent</name> 671 <name>indent</name>
665 <number>0</number> 672 <number>0</number>
666 </property> 673 </property>
667 </widget> 674 </widget>
668 <widget row="2" column="0" > 675 <widget row="0" column="0" >
669 <class>QLabel</class> 676 <class>QLabel</class>
670 <property stdset="1"> 677 <property stdset="1">
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>
674 <property stdset="1"> 688 <property stdset="1">
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>
681 <property stdset="1"> 695 <property stdset="1">
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>
685 <property stdset="1"> 717 <property stdset="1">
686 <name>frameShape</name> 718 <name>frameShape</name>
687 <enum>Box</enum> 719 <enum>Box</enum>
688 </property> 720 </property>
689 <property stdset="1"> 721 <property stdset="1">
690 <name>frameShadow</name> 722 <name>frameShadow</name>
691 <enum>Plain</enum> 723 <enum>Plain</enum>
692 </property> 724 </property>
693 <property stdset="1"> 725 <property stdset="1">
694 <name>indent</name> 726 <name>indent</name>
695 <number>0</number> 727 <number>0</number>
696 </property> 728 </property>
697 </widget> 729 </widget>
698 <widget row="0" column="1" > 730 <widget row="2" column="1" >
699 <class>QLabel</class> 731 <class>QLabel</class>
700 <property stdset="1"> 732 <property stdset="1">
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>
704 <property stdset="1"> 743 <property stdset="1">
705 <name>frameShape</name> 744 <name>frameShape</name>
706 <enum>Box</enum> 745 <enum>Box</enum>
707 </property> 746 </property>
708 <property stdset="1"> 747 <property stdset="1">
709 <name>frameShadow</name> 748 <name>frameShadow</name>
710 <enum>Plain</enum> 749 <enum>Plain</enum>
711 </property> 750 </property>
712 <property stdset="1"> 751 <property stdset="1">
713 <name>indent</name> 752 <name>indent</name>
714 <number>0</number> 753 <number>0</number>
715 </property> 754 </property>
716 </widget> 755 </widget>
717 <widget row="6" column="0" > 756 <widget row="2" column="0" >
718 <class>QLabel</class> 757 <class>QLabel</class>
719 <property stdset="1"> 758 <property stdset="1">
720 <name>name</name> 759 <name>name</name>
721 <cstring>TextLabel4_2_2</cstring> 760 <cstring>TextLabel9_2</cstring>
722 </property> 761 </property>
723 <property stdset="1"> 762 <property stdset="1">
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>
730 <property stdset="1"> 789 <property stdset="1">
731 <name>name</name> 790 <name>name</name>
732 <cstring>Rate_LBL</cstring> 791 <cstring>Frequency_LBL</cstring>
733 </property> 792 </property>
734 <property stdset="1"> 793 <property stdset="1">
735 <name>sizePolicy</name> 794 <name>sizePolicy</name>
736 <sizepolicy> 795 <sizepolicy>
737 <hsizetype>7</hsizetype> 796 <hsizetype>7</hsizetype>
738 <vsizetype>1</vsizetype> 797 <vsizetype>1</vsizetype>
739 </sizepolicy> 798 </sizepolicy>
740 </property> 799 </property>
741 <property stdset="1"> 800 <property stdset="1">
742 <name>frameShape</name> 801 <name>frameShape</name>
743 <enum>Box</enum> 802 <enum>Box</enum>
744 </property> 803 </property>
745 <property stdset="1"> 804 <property stdset="1">
746 <name>frameShadow</name> 805 <name>frameShadow</name>
747 <enum>Plain</enum> 806 <enum>Plain</enum>
748 </property> 807 </property>
749 <property stdset="1"> 808 <property stdset="1">
750 <name>indent</name> 809 <name>indent</name>
751 <number>0</number> 810 <number>0</number>
752 </property> 811 </property>
753 </widget> 812 </widget>
754 <widget row="2" column="1" > 813 <widget row="1" column="0" >
755 <class>QLabel</class> 814 <class>QLabel</class>
756 <property stdset="1"> 815 <property stdset="1">
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>
760 <property stdset="1"> 837 <property stdset="1">
761 <name>frameShape</name> 838 <name>frameShape</name>
762 <enum>Box</enum> 839 <enum>Box</enum>
763 </property> 840 </property>
764 <property stdset="1"> 841 <property stdset="1">
765 <name>frameShadow</name> 842 <name>frameShadow</name>
766 <enum>Plain</enum> 843 <enum>Plain</enum>
767 </property> 844 </property>
768 <property stdset="1"> 845 <property stdset="1">
769 <name>indent</name> 846 <name>indent</name>
770 <number>0</number> 847 <number>0</number>
771 </property> 848 </property>
772 </widget> 849 </widget>
773 <widget row="3" column="1" > 850 <widget row="1" column="2" >
774 <class>QLabel</class> 851 <class>QLabel</class>
775 <property stdset="1"> 852 <property stdset="1">
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>
794 <property stdset="1"> 874 <property stdset="1">
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>
798 <property stdset="1"> 885 <property stdset="1">
799 <name>frameShape</name> 886 <name>frameShape</name>
800 <enum>Box</enum> 887 <enum>Box</enum>
801 </property> 888 </property>
802 <property stdset="1"> 889 <property stdset="1">
803 <name>frameShadow</name> 890 <name>frameShadow</name>
804 <enum>Plain</enum> 891 <enum>Plain</enum>
805 </property> 892 </property>
806 <property stdset="1"> 893 <property stdset="1">
807 <name>indent</name> 894 <name>indent</name>
808 <number>0</number> 895 <number>0</number>
809 </property> 896 </property>
810 </widget> 897 </widget>
811 <widget row="3" column="0" > 898 <widget row="0" column="0" >
812 <class>QLabel</class> 899 <class>QLabel</class>
813 <property stdset="1"> 900 <property stdset="1">
814 <name>name</name> 901 <name>name</name>
815 <cstring>TextLabel3_3</cstring> 902 <cstring>TextLabel3_3</cstring>
816 </property> 903 </property>
817 <property stdset="1"> 904 <property stdset="1">
818 <name>text</name> 905 <name>text</name>
819 <string>Mode</string> 906 <string>Mode</string>
820 </property> 907 </property>
821 </widget> 908 </widget>
822 <widget row="5" column="0" > 909 <widget row="1" column="3" >
823 <class>QLabel</class> 910 <class>QLabel</class>
824 <property stdset="1"> 911 <property stdset="1">
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>
865 </widget> 934 </widget>
866 </grid> 935 </grid>
867 </widget> 936 </widget>
868 <widget> 937 <widget>
869 <class>QGroupBox</class> 938 <class>QGroupBox</class>
870 <property stdset="1"> 939 <property stdset="1">
871 <name>name</name> 940 <name>name</name>
872 <cstring>GroupBox1</cstring> 941 <cstring>GroupBox1</cstring>
873 </property> 942 </property>
874 <property stdset="1"> 943 <property stdset="1">
875 <name>margin</name> 944 <name>margin</name>
876 <number>0</number> 945 <number>0</number>
877 </property> 946 </property>
878 <property stdset="1"> 947 <property stdset="1">
879 <name>title</name> 948 <name>title</name>
@@ -957,67 +1026,49 @@
957 </property> 1026 </property>
958 <property stdset="1"> 1027 <property stdset="1">
959 <name>frameShadow</name> 1028 <name>frameShadow</name>
960 <enum>Plain</enum> 1029 <enum>Plain</enum>
961 </property> 1030 </property>
962 <property stdset="1"> 1031 <property stdset="1">
963 <name>lineWidth</name> 1032 <name>lineWidth</name>
964 <number>1</number> 1033 <number>1</number>
965 </property> 1034 </property>
966 <property stdset="1"> 1035 <property stdset="1">
967 <name>progress</name> 1036 <name>progress</name>
968 <number>10</number> 1037 <number>10</number>
969 </property> 1038 </property>
970 </widget> 1039 </widget>
971 </grid> 1040 </grid>
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>
995 <class>QLayoutWidget</class> 1043 <class>QLayoutWidget</class>
996 <property stdset="1"> 1044 <property stdset="1">
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>
1000 <hbox> 1051 <hbox>
1001 <property stdset="1"> 1052 <property stdset="1">
1002 <name>margin</name> 1053 <name>margin</name>
1003 <number>0</number> 1054 <number>0</number>
1004 </property> 1055 </property>
1005 <property stdset="1"> 1056 <property stdset="1">
1006 <name>spacing</name> 1057 <name>spacing</name>
1007 <number>6</number> 1058 <number>2</number>
1008 </property> 1059 </property>
1009 <widget> 1060 <widget>
1010 <class>QCheckBox</class> 1061 <class>QCheckBox</class>
1011 <property stdset="1"> 1062 <property stdset="1">
1012 <name>name</name> 1063 <name>name</name>
1013 <cstring>Refresh_CB</cstring> 1064 <cstring>Refresh_CB</cstring>
1014 </property> 1065 </property>
1015 <property stdset="1"> 1066 <property stdset="1">
1016 <name>sizePolicy</name> 1067 <name>sizePolicy</name>
1017 <sizepolicy> 1068 <sizepolicy>
1018 <hsizetype>1</hsizetype> 1069 <hsizetype>1</hsizetype>
1019 <vsizetype>5</vsizetype> 1070 <vsizetype>5</vsizetype>
1020 </sizepolicy> 1071 </sizepolicy>
1021 </property> 1072 </property>
1022 <property stdset="1"> 1073 <property stdset="1">
1023 <name>text</name> 1074 <name>text</name>
@@ -1034,32 +1085,53 @@
1034 <enum>Horizontal</enum> 1085 <enum>Horizontal</enum>
1035 </property> 1086 </property>
1036 <property stdset="1"> 1087 <property stdset="1">
1037 <name>sizeType</name> 1088 <name>sizeType</name>
1038 <enum>Expanding</enum> 1089 <enum>Expanding</enum>
1039 </property> 1090 </property>
1040 <property> 1091 <property>
1041 <name>sizeHint</name> 1092 <name>sizeHint</name>
1042 <size> 1093 <size>
1043 <width>20</width> 1094 <width>20</width>
1044 <height>20</height> 1095 <height>20</height>
1045 </size> 1096 </size>
1046 </property> 1097 </property>
1047 </spacer> 1098 </spacer>
1048 </hbox> 1099 </hbox>
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>
1051 </widget> 1123 </widget>
1052 </widget> 1124 </widget>
1053 </vbox> 1125 </vbox>
1054</widget> 1126</widget>
1055<connections> 1127<connections>
1056 <connection> 1128 <connection>
1057 <sender>EnableWEP_CB</sender> 1129 <sender>EnableWEP_CB</sender>
1058 <signal>toggled(bool)</signal> 1130 <signal>toggled(bool)</signal>
1059 <receiver>KeyButtonGroup</receiver> 1131 <receiver>KeyButtonGroup</receiver>
1060 <slot>setEnabled(bool)</slot> 1132 <slot>setEnabled(bool)</slot>
1061 </connection> 1133 </connection>
1062 <connection> 1134 <connection>
1063 <sender>SpecifyAP_CB</sender> 1135 <sender>SpecifyAP_CB</sender>
1064 <signal>toggled(bool)</signal> 1136 <signal>toggled(bool)</signal>
1065 <receiver>APMac_LE</receiver> 1137 <receiver>APMac_LE</receiver>