aboutsummaryrefslogtreecommitdiff
path: root/src/Configmenu.cc
diff options
context:
space:
mode:
authorpekdon <pekdon>2002-01-05 23:00:18 (GMT)
committerpekdon <pekdon>2002-01-05 23:00:18 (GMT)
commit69ebd4b8dca1acd5eb4bf18d668a706e9418bd2e (patch)
treee3d546000be35d359e25f117d7206d885d3e16f8 /src/Configmenu.cc
parent76334c6ed4a1191cbff03a1226de589acc26dd6e (diff)
downloadfluxbox_pavel-69ebd4b8dca1acd5eb4bf18d668a706e9418bd2e.zip
fluxbox_pavel-69ebd4b8dca1acd5eb4bf18d668a706e9418bd2e.tar.bz2
Changed tab placement/alignment enums to uppercase letters
Diffstat (limited to 'src/Configmenu.cc')
-rw-r--r--src/Configmenu.cc200
1 files changed, 100 insertions, 100 deletions
diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index edb527a..ca547bb 100644
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -538,112 +538,112 @@ Configmenu::Tabmenu::Tabmenu(Configmenu *cm) : Basemenu(cm->screen) {
538#else // !NLS 538#else // !NLS
539 0, 0, 539 0, 0,
540#endif // NLS 540#endif // NLS
541 "Top Left"), Tab::PTop + Tab::ALeft); 541 "Top Left"), Tab::PTOP + Tab::ALEFT);
542 insert(i18n->getMessage( 542 insert(i18n->getMessage(
543#ifdef NLS 543#ifdef NLS
544 CommonSet, CommonPlacementTopCenter, 544 CommonSet, CommonPlacementTopCenter,
545#else // !NLS 545#else // !NLS
546 0, 0, 546 0, 0,
547#endif // NLS 547#endif // NLS
548 "Top Center"), Tab::PTop + Tab::ACenter); 548 "Top Center"), Tab::PTOP + Tab::ACENTER);
549 insert(i18n->getMessage( 549 insert(i18n->getMessage(
550#ifdef NLS 550#ifdef NLS
551 CommonSet, CommonPlacementTopRight, 551 CommonSet, CommonPlacementTopRight,
552#else // !NLS 552#else // !NLS
553 0, 0, 553 0, 0,
554#endif // NLS 554#endif // NLS
555 "Top Right"), Tab::PTop + Tab::ARight); 555 "Top Right"), Tab::PTOP + Tab::ARIGHT);
556 insert(i18n->getMessage( 556 insert(i18n->getMessage(
557#ifdef NLS 557#ifdef NLS
558 CommonSet, CommonPlacementTopRelative, 558 CommonSet, CommonPlacementTopRelative,
559#else // !NLS 559#else // !NLS
560 0, 0, 560 0, 0,
561#endif // NLS 561#endif // NLS
562 "Top Relative"), Tab::PTop + Tab::ARelative); 562 "Top Relative"), Tab::PTOP + Tab::ARELATIVE);
563 insert(i18n->getMessage( 563 insert(i18n->getMessage(
564#ifdef NLS 564#ifdef NLS
565 CommonSet, CommonPlacementBottomLeft, 565 CommonSet, CommonPlacementBottomLeft,
566#else // !NLS 566#else // !NLS
567 0, 0, 567 0, 0,
568#endif // NLS 568#endif // NLS
569 "Bottom Left"), Tab::PBottom + Tab::ALeft); 569 "Bottom Left"), Tab::PBOTTOM + Tab::ALEFT);
570 insert(i18n->getMessage( 570 insert(i18n->getMessage(
571#ifdef NLS 571#ifdef NLS
572 CommonSet, CommonPlacementBottomCenter, 572 CommonSet, CommonPlacementBottomCenter,
573#else // !NLS 573#else // !NLS
574 0, 0, 574 0, 0,
575#endif // NLS 575#endif // NLS
576 "Bottom Center"), Tab::PBottom + Tab::ACenter); 576 "Bottom Center"), Tab::PBOTTOM + Tab::ACENTER);
577 insert(i18n->getMessage( 577 insert(i18n->getMessage(
578#ifdef NLS 578#ifdef NLS
579 CommonSet, CommonPlacementBottomRight, 579 CommonSet, CommonPlacementBottomRight,
580#else // !NLS 580#else // !NLS
581 0, 0, 581 0, 0,
582#endif // NLS 582#endif // NLS
583 "Bottom Right"), Tab::PBottom + Tab::ARight); 583 "Bottom Right"), Tab::PBOTTOM + Tab::ARIGHT);
584 insert(i18n->getMessage( 584 insert(i18n->getMessage(
585#ifdef NLS 585#ifdef NLS
586 CommonSet, CommonPlacementBottomRelative, 586 CommonSet, CommonPlacementBottomRelative,
587#else // !NLS 587#else // !NLS
588 0, 0, 588 0, 0,
589#endif // NLS 589#endif // NLS
590 "Bottom Relative"), Tab::PBottom + Tab::ARelative); 590 "Bottom Relative"), Tab::PBOTTOM + Tab::ARELATIVE);
591 insert(i18n->getMessage( 591 insert(i18n->getMessage(
592#ifdef NLS 592#ifdef NLS
593 CommonSet, CommonPlacementLeftTop, 593 CommonSet, CommonPlacementLeftTop,
594#else // !NLS 594#else // !NLS
595 0, 0, 595 0, 0,
596#endif // NLS 596#endif // NLS
597 "Left Top"), Tab::PLeft + Tab::ARight); 597 "Left Top"), Tab::PLEFT + Tab::ARIGHT);
598 insert(i18n->getMessage( 598 insert(i18n->getMessage(
599#ifdef NLS 599#ifdef NLS
600 CommonSet, CommonPlacementLeftCenter, 600 CommonSet, CommonPlacementLeftCenter,
601#else // !NLS 601#else // !NLS
602 0, 0, 602 0, 0,
603#endif // NLS 603#endif // NLS
604 "Left Center"), Tab::PLeft + Tab::ACenter); 604 "Left Center"), Tab::PLEFT + Tab::ACENTER);
605 insert(i18n->getMessage( 605 insert(i18n->getMessage(
606#ifdef NLS 606#ifdef NLS
607 CommonSet, CommonPlacementLeftBottom, 607 CommonSet, CommonPlacementLeftBottom,
608#else // !NLS 608#else // !NLS
609 0, 0, 609 0, 0,
610#endif // NLS 610#endif // NLS
611 "Left Bottom"), Tab::PLeft + Tab::ALeft); 611 "Left Bottom"), Tab::PLEFT + Tab::ALEFT);
612 insert(i18n->getMessage( 612 insert(i18n->getMessage(
613#ifdef NLS 613#ifdef NLS
614 CommonSet, CommonPlacementLeftRelative, 614 CommonSet, CommonPlacementLeftRelative,
615#else // !NLS 615#else // !NLS
616 0, 0, 616 0, 0,
617#endif // NLS 617#endif // NLS
618 "Left Relative"), Tab::PLeft + Tab::ARelative); 618 "Left Relative"), Tab::PLEFT + Tab::ARELATIVE);
619 insert(i18n->getMessage( 619 insert(i18n->getMessage(
620#ifdef NLS 620#ifdef NLS
621 CommonSet, CommonPlacementRightTop, 621 CommonSet, CommonPlacementRightTop,
622#else // !NLS 622#else // !NLS
623 0, 0, 623 0, 0,
624#endif // NLS 624#endif // NLS
625 "Right Top"), Tab::PRight + Tab::ARight); 625 "Right Top"), Tab::PRIGHT + Tab::ARIGHT);
626 insert(i18n->getMessage( 626 insert(i18n->getMessage(
627#ifdef NLS 627#ifdef NLS
628 CommonSet, CommonPlacementRightCenter, 628 CommonSet, CommonPlacementRightCenter,
629#else // !NLS 629#else // !NLS
630 0, 0, 630 0, 0,
631#endif // NLS 631#endif // NLS
632 "Right Center"), Tab::PRight + Tab::ACenter); 632 "Right Center"), Tab::PRIGHT + Tab::ACENTER);
633 insert(i18n->getMessage( 633 insert(i18n->getMessage(
634#ifdef NLS 634#ifdef NLS
635 CommonSet, CommonPlacementRightBottom, 635 CommonSet, CommonPlacementRightBottom,
636#else // !NLS 636#else // !NLS
637 0, 0, 637 0, 0,
638#endif // NLS 638#endif // NLS
639 "Right Bottom"), Tab::PRight + Tab::ALeft); 639 "Right Bottom"), Tab::PRIGHT + Tab::ALEFT);
640 insert(i18n->getMessage( 640 insert(i18n->getMessage(
641#ifdef NLS 641#ifdef NLS
642 CommonSet, CommonPlacementRightRelative, 642 CommonSet, CommonPlacementRightRelative,
643#else // !NLS 643#else // !NLS
644 0, 0, 644 0, 0,
645#endif // NLS 645#endif // NLS
646 "Right Relative"), Tab::PRight + Tab::ARelative); 646 "Right Relative"), Tab::PRIGHT + Tab::ARELATIVE);
647 insert(i18n->getMessage( 647 insert(i18n->getMessage(
648#ifdef NLS 648#ifdef NLS
649 ConfigmenuSet, ConfigmenuTabRotateVertical, 649 ConfigmenuSet, ConfigmenuTabRotateVertical,
@@ -662,127 +662,127 @@ void Configmenu::Tabmenu::itemSelected(int button, int index) {
662 BasemenuItem *item = find(index); 662 BasemenuItem *item = find(index);
663 663
664 switch (item->function()) { 664 switch (item->function()) {
665 case (Tab::PTop + Tab::ALeft): 665 case (Tab::PTOP + Tab::ALEFT):
666 configmenu->screen->saveTabPlacement(Tab::PTop); 666 configmenu->screen->saveTabPlacement(Tab::PTOP);
667 configmenu->screen->saveTabAlignment(Tab::ALeft); 667 configmenu->screen->saveTabAlignment(Tab::ALEFT);
668 668
669 configmenu->screen->reconfigure(); 669 configmenu->screen->reconfigure();
670 670
671 break; 671 break;
672 672
673 case (Tab::PTop + Tab::ACenter): 673 case (Tab::PTOP + Tab::ACENTER):
674 configmenu->screen->saveTabPlacement(Tab::PTop); 674 configmenu->screen->saveTabPlacement(Tab::PTOP);
675 configmenu->screen->saveTabAlignment(Tab::ACenter); 675 configmenu->screen->saveTabAlignment(Tab::ACENTER);
676 676
677 configmenu->screen->reconfigure(); 677 configmenu->screen->reconfigure();
678 678
679 break; 679 break;
680 680
681 case (Tab::PTop + Tab::ARight): 681 case (Tab::PTOP + Tab::ARIGHT):
682 configmenu->screen->saveTabPlacement(Tab::PTop); 682 configmenu->screen->saveTabPlacement(Tab::PTOP);
683 configmenu->screen->saveTabAlignment(Tab::ARight); 683 configmenu->screen->saveTabAlignment(Tab::ARIGHT);
684 684
685 configmenu->screen->reconfigure(); 685 configmenu->screen->reconfigure();
686 686
687 break; 687 break;
688 688
689 case (Tab::PTop + Tab::ARelative): 689 case (Tab::PTOP + Tab::ARELATIVE):
690 configmenu->screen->saveTabPlacement(Tab::PTop); 690 configmenu->screen->saveTabPlacement(Tab::PTOP);
691 configmenu->screen->saveTabAlignment(Tab::ARelative); 691 configmenu->screen->saveTabAlignment(Tab::ARELATIVE);
692 692
693 configmenu->screen->reconfigure(); 693 configmenu->screen->reconfigure();
694 694
695 break; 695 break;
696 696
697 case (Tab::PBottom + Tab::ALeft): 697 case (Tab::PBOTTOM + Tab::ALEFT):
698 configmenu->screen->saveTabPlacement(Tab::PBottom); 698 configmenu->screen->saveTabPlacement(Tab::PBOTTOM);
699 configmenu->screen->saveTabAlignment(Tab::ALeft); 699 configmenu->screen->saveTabAlignment(Tab::ALEFT);
700 700
701 configmenu->screen->reconfigure(); 701 configmenu->screen->reconfigure();
702 702
703 break; 703 break;
704 case (Tab::PBottom + Tab::ACenter): 704 case (Tab::PBOTTOM + Tab::ACENTER):
705 configmenu->screen->saveTabPlacement(Tab::PBottom); 705 configmenu->screen->saveTabPlacement(Tab::PBOTTOM);
706 configmenu->screen->saveTabAlignment(Tab::ACenter); 706 configmenu->screen->saveTabAlignment(Tab::ACENTER);
707 707
708 configmenu->screen->reconfigure(); 708 configmenu->screen->reconfigure();
709 709
710 break; 710 break;
711 711
712 case (Tab::PBottom + Tab::ARight): 712 case (Tab::PBOTTOM + Tab::ARIGHT):
713 configmenu->screen->saveTabPlacement(Tab::PBottom); 713 configmenu->screen->saveTabPlacement(Tab::PBOTTOM);
714 configmenu->screen->saveTabAlignment(Tab::ARight); 714 configmenu->screen->saveTabAlignment(Tab::ARIGHT);
715 715
716 configmenu->screen->reconfigure(); 716 configmenu->screen->reconfigure();
717 717
718 break; 718 break;
719 719
720 case (Tab::PBottom + Tab::ARelative): 720 case (Tab::PBOTTOM + Tab::ARELATIVE):
721 configmenu->screen->saveTabPlacement(Tab::PBottom); 721 configmenu->screen->saveTabPlacement(Tab::PBOTTOM);
722 configmenu->screen->saveTabAlignment(Tab::ARelative); 722 configmenu->screen->saveTabAlignment(Tab::ARELATIVE);
723 723
724 configmenu->screen->reconfigure(); 724 configmenu->screen->reconfigure();
725 725
726 break; 726 break;
727 727
728 case (Tab::PLeft + Tab::ARight): 728 case (Tab::PLEFT + Tab::ARIGHT):
729 configmenu->screen->saveTabPlacement(Tab::PLeft); 729 configmenu->screen->saveTabPlacement(Tab::PLEFT);
730 configmenu->screen->saveTabAlignment(Tab::ARight); 730 configmenu->screen->saveTabAlignment(Tab::ARIGHT);
731 731
732 configmenu->screen->reconfigure(); 732 configmenu->screen->reconfigure();
733 733
734 break; 734 break;
735 735
736 case (Tab::PLeft + Tab::ACenter): 736 case (Tab::PLEFT + Tab::ACENTER):
737 configmenu->screen->saveTabPlacement(Tab::PLeft); 737 configmenu->screen->saveTabPlacement(Tab::PLEFT);
738 configmenu->screen->saveTabAlignment(Tab::ACenter); 738 configmenu->screen->saveTabAlignment(Tab::ACENTER);
739 739
740 configmenu->screen->reconfigure(); 740 configmenu->screen->reconfigure();
741 741
742 break; 742 break;
743 743
744 case (Tab::PLeft + Tab::ALeft): 744 case (Tab::PLEFT + Tab::ALEFT):
745 configmenu->screen->saveTabPlacement(Tab::PLeft); 745 configmenu->screen->saveTabPlacement(Tab::PLEFT);
746 configmenu->screen->saveTabAlignment(Tab::ALeft); 746 configmenu->screen->saveTabAlignment(Tab::ALEFT);
747 747
748 configmenu->screen->reconfigure(); 748 configmenu->screen->reconfigure();
749 749
750 break; 750 break;
751 751
752 case (Tab::PLeft + Tab::ARelative): 752 case (Tab::PLEFT + Tab::ARELATIVE):
753 configmenu->screen->saveTabPlacement(Tab::PLeft); 753 configmenu->screen->saveTabPlacement(Tab::PLEFT);
754 configmenu->screen->saveTabAlignment(Tab::ARelative); 754 configmenu->screen->saveTabAlignment(Tab::ARELATIVE);
755 755
756 configmenu->screen->reconfigure(); 756 configmenu->screen->reconfigure();
757 757
758 break; 758 break;
759 759
760 case (Tab::PRight + Tab::ARight): 760 case (Tab::PRIGHT + Tab::ARIGHT):
761 configmenu->screen->saveTabPlacement(Tab::PRight); 761 configmenu->screen->saveTabPlacement(Tab::PRIGHT);
762 configmenu->screen->saveTabAlignment(Tab::ARight); 762 configmenu->screen->saveTabAlignment(Tab::ARIGHT);
763 763
764 configmenu->screen->reconfigure(); 764 configmenu->screen->reconfigure();
765 765
766 break; 766 break;
767 case (Tab::PRight + Tab::ACenter): 767 case (Tab::PRIGHT + Tab::ACENTER):
768 configmenu->screen->saveTabPlacement(Tab::PRight); 768 configmenu->screen->saveTabPlacement(Tab::PRIGHT);
769 configmenu->screen->saveTabAlignment(Tab::ACenter); 769 configmenu->screen->saveTabAlignment(Tab::ACENTER);
770 770
771 configmenu->screen->reconfigure(); 771 configmenu->screen->reconfigure();
772 772
773 break; 773 break;
774 774
775 case (Tab::PRight + Tab::ALeft): 775 case (Tab::PRIGHT + Tab::ALEFT):
776 configmenu->screen->saveTabPlacement(Tab::PRight); 776 configmenu->screen->saveTabPlacement(Tab::PRIGHT);
777 configmenu->screen->saveTabAlignment(Tab::ALeft); 777 configmenu->screen->saveTabAlignment(Tab::ALEFT);
778 778
779 configmenu->screen->reconfigure(); 779 configmenu->screen->reconfigure();
780 780
781 break; 781 break;
782 782
783 case (Tab::PRight + Tab::ARelative): 783 case (Tab::PRIGHT + Tab::ARELATIVE):
784 configmenu->screen->saveTabPlacement(Tab::PRight); 784 configmenu->screen->saveTabPlacement(Tab::PRIGHT);
785 configmenu->screen->saveTabAlignment(Tab::ARelative); 785 configmenu->screen->saveTabAlignment(Tab::ARELATIVE);
786 786
787 configmenu->screen->reconfigure(); 787 configmenu->screen->reconfigure();
788 788
@@ -802,41 +802,41 @@ void Configmenu::Tabmenu::itemSelected(int button, int index) {
802} 802}
803 803
804void Configmenu::Tabmenu::setSelected(void) { 804void Configmenu::Tabmenu::setSelected(void) {
805 setItemSelected(0, (configmenu->screen->getTabPlacement() == Tab::PTop && 805 setItemSelected(0, (configmenu->screen->getTabPlacement() == Tab::PTOP &&
806 configmenu->screen->getTabAlignment() == Tab::ALeft)); 806 configmenu->screen->getTabAlignment() == Tab::ALEFT));
807 setItemSelected(1, (configmenu->screen->getTabPlacement() == Tab::PTop && 807 setItemSelected(1, (configmenu->screen->getTabPlacement() == Tab::PTOP &&
808 configmenu->screen->getTabAlignment() == Tab::ACenter)); 808 configmenu->screen->getTabAlignment() == Tab::ACENTER));
809 setItemSelected(2, (configmenu->screen->getTabPlacement() == Tab::PTop && 809 setItemSelected(2, (configmenu->screen->getTabPlacement() == Tab::PTOP &&
810 configmenu->screen->getTabAlignment() == Tab::ARight)); 810 configmenu->screen->getTabAlignment() == Tab::ARIGHT));
811 setItemSelected(3, (configmenu->screen->getTabPlacement() == Tab::PTop && 811 setItemSelected(3, (configmenu->screen->getTabPlacement() == Tab::PTOP &&
812 configmenu->screen->getTabAlignment() == Tab::ARelative)); 812 configmenu->screen->getTabAlignment() == Tab::ARELATIVE));
813 setItemSelected(4, (configmenu->screen->getTabPlacement() == Tab::PBottom && 813 setItemSelected(4, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM &&
814 configmenu->screen->getTabAlignment() == Tab::ALeft)); 814 configmenu->screen->getTabAlignment() == Tab::ALEFT));
815 setItemSelected(5, (configmenu->screen->getTabPlacement() == Tab::PBottom && 815 setItemSelected(5, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM &&
816 configmenu->screen->getTabAlignment() == Tab::ACenter)); 816 configmenu->screen->getTabAlignment() == Tab::ACENTER));
817 setItemSelected(6, (configmenu->screen->getTabPlacement() == Tab::PBottom && 817 setItemSelected(6, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM &&
818 configmenu->screen->getTabAlignment() == Tab::ARight)); 818 configmenu->screen->getTabAlignment() == Tab::ARIGHT));
819 setItemSelected(7, (configmenu->screen->getTabPlacement() == Tab::PBottom && 819 setItemSelected(7, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM &&
820 configmenu->screen->getTabAlignment() == Tab::ARelative)); 820 configmenu->screen->getTabAlignment() == Tab::ARELATIVE));
821 setItemSelected(8, (configmenu->screen->getTabPlacement() == Tab::PLeft && 821 setItemSelected(8, (configmenu->screen->getTabPlacement() == Tab::PLEFT &&
822 configmenu->screen->getTabAlignment() == Tab::ARight)); 822 configmenu->screen->getTabAlignment() == Tab::ARIGHT));
823 setItemSelected(9, (configmenu->screen->getTabPlacement() == Tab::PLeft && 823 setItemSelected(9, (configmenu->screen->getTabPlacement() == Tab::PLEFT &&
824 configmenu->screen->getTabAlignment() == Tab::ACenter)); 824 configmenu->screen->getTabAlignment() == Tab::ACENTER));
825 setItemSelected(10, (configmenu->screen->getTabPlacement() == Tab::PLeft && 825 setItemSelected(10, (configmenu->screen->getTabPlacement() == Tab::PLEFT &&
826 configmenu->screen->getTabAlignment() == Tab::ALeft)); 826 configmenu->screen->getTabAlignment() == Tab::ALEFT));
827 setItemSelected(11, (configmenu->screen->getTabPlacement() == Tab::PLeft && 827 setItemSelected(11, (configmenu->screen->getTabPlacement() == Tab::PLEFT &&
828 configmenu->screen->getTabAlignment() == Tab::ARelative)); 828 configmenu->screen->getTabAlignment() == Tab::ARELATIVE));
829 setItemSelected(12, (configmenu->screen->getTabPlacement() == Tab::PRight && 829 setItemSelected(12, (configmenu->screen->getTabPlacement() == Tab::PRIGHT &&
830 configmenu->screen->getTabAlignment() == Tab::ARight)); 830 configmenu->screen->getTabAlignment() == Tab::ARIGHT));
831 setItemSelected(13, (configmenu->screen->getTabPlacement() == Tab::PRight && 831 setItemSelected(13, (configmenu->screen->getTabPlacement() == Tab::PRIGHT &&
832 configmenu->screen->getTabAlignment() == Tab::ACenter)); 832 configmenu->screen->getTabAlignment() == Tab::ACENTER));
833 setItemSelected(14, (configmenu->screen->getTabPlacement() == Tab::PRight && 833 setItemSelected(14, (configmenu->screen->getTabPlacement() == Tab::PRIGHT &&
834 configmenu->screen->getTabAlignment() == Tab::ALeft)); 834 configmenu->screen->getTabAlignment() == Tab::ALEFT));
835 setItemSelected(15, (configmenu->screen->getTabPlacement() == Tab::PRight && 835 setItemSelected(15, (configmenu->screen->getTabPlacement() == Tab::PRIGHT &&
836 configmenu->screen->getTabAlignment() == Tab::ARelative)); 836 configmenu->screen->getTabAlignment() == Tab::ARELATIVE));
837 setItemEnabled(16, (configmenu->screen->getTabPlacement() == Tab::PLeft || 837 setItemEnabled(16, (configmenu->screen->getTabPlacement() == Tab::PLEFT ||
838 configmenu->screen->getTabPlacement() == Tab::PRight)); 838 configmenu->screen->getTabPlacement() == Tab::PRIGHT));
839 setItemSelected(16, (configmenu->screen->isTabRotateVertical() && 839 setItemSelected(16, (configmenu->screen->isTabRotateVertical() &&
840 (configmenu->screen->getTabPlacement() == Tab::PLeft || 840 (configmenu->screen->getTabPlacement() == Tab::PLEFT ||
841 configmenu->screen->getTabPlacement() == Tab::PRight))); 841 configmenu->screen->getTabPlacement() == Tab::PRIGHT)));
842} 842}