diff options
author | fluxgen <fluxgen> | 2002-04-04 11:28:19 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-04-04 11:28:19 (GMT) |
commit | 2526e4bce821eedcd4bcc13e0f27ac7b9e255350 (patch) | |
tree | f86898efe146ecb882e597955e1e94b375154b19 /src/Slit.cc | |
parent | bd05695cfa6d066e5e5368d857eef8c0b11987c1 (diff) | |
download | fluxbox-2526e4bce821eedcd4bcc13e0f27ac7b9e255350.zip fluxbox-2526e4bce821eedcd4bcc13e0f27ac7b9e255350.tar.bz2 |
moved nls defines to enums in namespace FBNLS
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 142 |
1 files changed, 37 insertions, 105 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index 08370f9..388e4c2 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -663,14 +663,10 @@ void Slit::timeout(void) { | |||
663 | Slitmenu::Slitmenu(Slit *sl) : Basemenu(sl->screen) { | 663 | Slitmenu::Slitmenu(Slit *sl) : Basemenu(sl->screen) { |
664 | slit = sl; | 664 | slit = sl; |
665 | I18n *i18n = I18n::instance(); | 665 | I18n *i18n = I18n::instance(); |
666 | 666 | using namespace FBNLS; | |
667 | setLabel(i18n->getMessage( | 667 | setLabel(i18n->getMessage( |
668 | #ifdef NLS | 668 | SlitSet, SlitSlitTitle, |
669 | SlitSet, SlitSlitTitle, | 669 | "Slit")); |
670 | #else // !NLS | ||
671 | 0, 0, | ||
672 | #endif // NLS | ||
673 | "Slit")); | ||
674 | setInternalMenu(); | 670 | setInternalMenu(); |
675 | 671 | ||
676 | directionmenu = new Directionmenu(this); | 672 | directionmenu = new Directionmenu(this); |
@@ -682,20 +678,12 @@ Slitmenu::Slitmenu(Slit *sl) : Basemenu(sl->screen) { | |||
682 | #endif // XINERAMA | 678 | #endif // XINERAMA |
683 | 679 | ||
684 | insert(i18n->getMessage( | 680 | insert(i18n->getMessage( |
685 | #ifdef NLS | 681 | CommonSet, CommonDirectionTitle, |
686 | CommonSet, CommonDirectionTitle, | 682 | "Direction"), |
687 | #else // !NLS | ||
688 | 0, 0, | ||
689 | #endif // NLS | ||
690 | "Direction"), | ||
691 | directionmenu); | 683 | directionmenu); |
692 | insert(i18n->getMessage( | 684 | insert(i18n->getMessage( |
693 | #ifdef NLS | 685 | CommonSet, CommonPlacementTitle, |
694 | CommonSet, CommonPlacementTitle, | 686 | "Placement"), |
695 | #else // !NLS | ||
696 | 0, 0, | ||
697 | #endif // NLS | ||
698 | "Placement"), | ||
699 | placementmenu); | 687 | placementmenu); |
700 | 688 | ||
701 | #ifdef XINERAMA | 689 | #ifdef XINERAMA |
@@ -706,19 +694,11 @@ Slitmenu::Slitmenu(Slit *sl) : Basemenu(sl->screen) { | |||
706 | #endif // XINERAMA | 694 | #endif // XINERAMA |
707 | 695 | ||
708 | insert(i18n->getMessage( | 696 | insert(i18n->getMessage( |
709 | #ifdef NLS | 697 | CommonSet, CommonAlwaysOnTop, |
710 | CommonSet, CommonAlwaysOnTop, | 698 | "Always on top"), 1); |
711 | #else // !NLS | ||
712 | 0, 0, | ||
713 | #endif // NLS | ||
714 | "Always on top"), 1); | ||
715 | insert(i18n->getMessage( | 699 | insert(i18n->getMessage( |
716 | #ifdef NLS | 700 | CommonSet, CommonAutoHide, |
717 | CommonSet, CommonAutoHide, | 701 | "Auto hide"), 2); |
718 | #else // !NLS | ||
719 | 0, 0, | ||
720 | #endif // NLS | ||
721 | "Auto hide"), 2); | ||
722 | 702 | ||
723 | update(); | 703 | update(); |
724 | 704 | ||
@@ -792,31 +772,19 @@ void Slitmenu::reconfigure(void) { | |||
792 | Slitmenu::Directionmenu::Directionmenu(Slitmenu *sm) : Basemenu(sm->slit->screen) { | 772 | Slitmenu::Directionmenu::Directionmenu(Slitmenu *sm) : Basemenu(sm->slit->screen) { |
793 | slitmenu = sm; | 773 | slitmenu = sm; |
794 | I18n *i18n = I18n::instance(); | 774 | I18n *i18n = I18n::instance(); |
795 | 775 | using namespace FBNLS; | |
796 | setLabel(i18n->getMessage( | 776 | setLabel(i18n->getMessage( |
797 | #ifdef NLS | 777 | SlitSet, SlitSlitDirection, |
798 | SlitSet, SlitSlitDirection, | 778 | "Slit Direction")); |
799 | #else // !NLS | ||
800 | 0, 0, | ||
801 | #endif // NLS | ||
802 | "Slit Direction")); | ||
803 | setInternalMenu(); | 779 | setInternalMenu(); |
804 | 780 | ||
805 | insert(i18n->getMessage( | 781 | insert(i18n->getMessage( |
806 | #ifdef NLS | 782 | CommonSet, CommonDirectionHoriz, |
807 | CommonSet, CommonDirectionHoriz, | 783 | "Horizontal"), |
808 | #else // !NLS | ||
809 | 0, 0, | ||
810 | #endif // NLS | ||
811 | "Horizontal"), | ||
812 | Slit::HORIZONTAL); | 784 | Slit::HORIZONTAL); |
813 | insert(i18n->getMessage( | 785 | insert(i18n->getMessage( |
814 | #ifdef NLS | 786 | CommonSet, CommonDirectionVert, |
815 | CommonSet, CommonDirectionVert, | 787 | "Vertical"), |
816 | #else // !NLS | ||
817 | 0, 0, | ||
818 | #endif // NLS | ||
819 | "Vertical"), | ||
820 | Slit::VERTICAL); | 788 | Slit::VERTICAL); |
821 | 789 | ||
822 | update(); | 790 | update(); |
@@ -852,81 +820,45 @@ void Slitmenu::Directionmenu::itemSelected(int button, unsigned int index) { | |||
852 | Slitmenu::Placementmenu::Placementmenu(Slitmenu *sm) : Basemenu(sm->slit->screen) { | 820 | Slitmenu::Placementmenu::Placementmenu(Slitmenu *sm) : Basemenu(sm->slit->screen) { |
853 | slitmenu = sm; | 821 | slitmenu = sm; |
854 | I18n *i18n = I18n::instance(); | 822 | I18n *i18n = I18n::instance(); |
855 | 823 | using namespace FBNLS; | |
856 | setLabel(i18n->getMessage( | 824 | setLabel(i18n->getMessage( |
857 | #ifdef NLS | 825 | SlitSet, SlitSlitPlacement, |
858 | SlitSet, SlitSlitPlacement, | 826 | "Slit Placement")); |
859 | #else // !NLS | ||
860 | 0, 0, | ||
861 | #endif // NLS | ||
862 | "Slit Placement")); | ||
863 | setMinimumSublevels(3); | 827 | setMinimumSublevels(3); |
864 | setInternalMenu(); | 828 | setInternalMenu(); |
865 | 829 | ||
866 | insert(i18n->getMessage( | 830 | insert(i18n->getMessage( |
867 | #ifdef NLS | 831 | CommonSet, CommonPlacementTopLeft, |
868 | CommonSet, CommonPlacementTopLeft, | 832 | "Top Left"), |
869 | #else // !NLS | ||
870 | 0, 0, | ||
871 | #endif // NLS | ||
872 | "Top Left"), | ||
873 | Slit::TOPLEFT); | 833 | Slit::TOPLEFT); |
874 | insert(i18n->getMessage( | 834 | insert(i18n->getMessage( |
875 | #ifdef NLS | 835 | CommonSet, CommonPlacementCenterLeft, |
876 | CommonSet, CommonPlacementCenterLeft, | 836 | "Center Left"), |
877 | #else // !NLS | ||
878 | 0, 0, | ||
879 | #endif // NLS | ||
880 | "Center Left"), | ||
881 | Slit::CENTERLEFT); | 837 | Slit::CENTERLEFT); |
882 | insert(i18n->getMessage( | 838 | insert(i18n->getMessage( |
883 | #ifdef NLS | 839 | CommonSet, CommonPlacementBottomLeft, |
884 | CommonSet, CommonPlacementBottomLeft, | 840 | "Bottom Left"), |
885 | #else // !NLS | ||
886 | 0, 0, | ||
887 | #endif // NLS | ||
888 | "Bottom Left"), | ||
889 | Slit::BOTTOMLEFT); | 841 | Slit::BOTTOMLEFT); |
890 | insert(i18n->getMessage( | 842 | insert(i18n->getMessage( |
891 | #ifdef NLS | 843 | CommonSet, CommonPlacementTopCenter, |
892 | CommonSet, CommonPlacementTopCenter, | 844 | "Top Center"), |
893 | #else // !NLS | ||
894 | 0, 0, | ||
895 | #endif // NLS | ||
896 | "Top Center"), | ||
897 | Slit::TOPCENTER); | 845 | Slit::TOPCENTER); |
898 | insert(""); | 846 | insert(""); |
899 | insert(i18n->getMessage( | 847 | insert(i18n->getMessage( |
900 | #ifdef NLS | 848 | CommonSet, CommonPlacementBottomCenter, |
901 | CommonSet, CommonPlacementBottomCenter, | 849 | "Bottom Center"), |
902 | #else // !NLS | ||
903 | 0, 0, | ||
904 | #endif // NLS | ||
905 | "Bottom Center"), | ||
906 | Slit::BOTTOMCENTER); | 850 | Slit::BOTTOMCENTER); |
907 | insert(i18n->getMessage( | 851 | insert(i18n->getMessage( |
908 | #ifdef NLS | 852 | CommonSet, CommonPlacementTopRight, |
909 | CommonSet, CommonPlacementTopRight, | 853 | "Top Right"), |
910 | #else // !NLS | ||
911 | 0, 0, | ||
912 | #endif // NLS | ||
913 | "Top Right"), | ||
914 | Slit::TOPRIGHT); | 854 | Slit::TOPRIGHT); |
915 | insert(i18n->getMessage( | 855 | insert(i18n->getMessage( |
916 | #ifdef NLS | 856 | CommonSet, CommonPlacementCenterRight, |
917 | CommonSet, CommonPlacementCenterRight, | 857 | "Center Right"), |
918 | #else // !NLS | ||
919 | 0, 0, | ||
920 | #endif // NLS | ||
921 | "Center Right"), | ||
922 | Slit::CENTERRIGHT); | 858 | Slit::CENTERRIGHT); |
923 | insert(i18n->getMessage( | 859 | insert(i18n->getMessage( |
924 | #ifdef NLS | 860 | CommonSet, CommonPlacementBottomRight, |
925 | CommonSet, CommonPlacementBottomRight, | 861 | "Bottom Right"), |
926 | #else // !NLS | ||
927 | 0, 0, | ||
928 | #endif // NLS | ||
929 | "Bottom Right"), | ||
930 | Slit::BOTTOMRIGHT); | 862 | Slit::BOTTOMRIGHT); |
931 | 863 | ||
932 | update(); | 864 | update(); |