-rw-r--r-- | korganizer/mainwindow.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 6bc5b3a..def8431 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -753,192 +753,196 @@ void MainWindow::initActions() | |||
753 | mView, SLOT( goToday() ) ); | 753 | mView, SLOT( goToday() ) ); |
754 | 754 | ||
755 | if ( KOPrefs::instance()->mShowFullMenu ) { | 755 | if ( KOPrefs::instance()->mShowFullMenu ) { |
756 | actionMenu->insertSeparator(); | 756 | actionMenu->insertSeparator(); |
757 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); | 757 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); |
758 | 758 | ||
759 | } | 759 | } |
760 | // actionMenu->insertSeparator(); | 760 | // actionMenu->insertSeparator(); |
761 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, | 761 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, |
762 | this ); | 762 | this ); |
763 | action->addTo( importMenu ); | 763 | action->addTo( importMenu ); |
764 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); | 764 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); |
765 | action = new QAction( "import_quick", i18n("Import last file"), 0, | 765 | action = new QAction( "import_quick", i18n("Import last file"), 0, |
766 | this ); | 766 | this ); |
767 | action->addTo( importMenu ); | 767 | action->addTo( importMenu ); |
768 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); | 768 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); |
769 | importMenu->insertSeparator(); | 769 | importMenu->insertSeparator(); |
770 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, | 770 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, |
771 | this ); | 771 | this ); |
772 | action->addTo( importMenu ); | 772 | action->addTo( importMenu ); |
773 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); | 773 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); |
774 | #ifndef DESKTOP_VERSION | 774 | #ifndef DESKTOP_VERSION |
775 | importMenu->insertSeparator(); | 775 | importMenu->insertSeparator(); |
776 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, | 776 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, |
777 | this ); | 777 | this ); |
778 | action->addTo( importMenu ); | 778 | action->addTo( importMenu ); |
779 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); | 779 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); |
780 | #else | 780 | #else |
781 | #ifdef _WIN32_ | 781 | #ifdef _WIN32_ |
782 | importMenu->insertSeparator(); | 782 | importMenu->insertSeparator(); |
783 | action = new QAction( "import_ol", i18n("Import from OL"), 0, | 783 | action = new QAction( "import_ol", i18n("Import from OL"), 0, |
784 | this ); | 784 | this ); |
785 | action->addTo( importMenu ); | 785 | action->addTo( importMenu ); |
786 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); | 786 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); |
787 | #endif | 787 | #endif |
788 | #endif | 788 | #endif |
789 | 789 | ||
790 | importMenu->insertSeparator(); | 790 | importMenu->insertSeparator(); |
791 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, | 791 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, |
792 | this ); | 792 | this ); |
793 | action->addTo( importMenu ); | 793 | action->addTo( importMenu ); |
794 | connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); | 794 | connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); |
795 | 795 | ||
796 | action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, | 796 | action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, |
797 | this ); | 797 | this ); |
798 | action->addTo( importMenu ); | 798 | action->addTo( importMenu ); |
799 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); | 799 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); |
800 | 800 | ||
801 | importMenu->insertSeparator(); | 801 | importMenu->insertSeparator(); |
802 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, | 802 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, |
803 | this ); | 803 | this ); |
804 | action->addTo( importMenu ); connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); | 804 | action->addTo( importMenu ); connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); |
805 | 805 | ||
806 | 806 | ||
807 | //LR | 807 | //LR |
808 | QPopupMenu *ex2phone = new QPopupMenu( this ); | 808 | QPopupMenu *ex2phone = new QPopupMenu( this ); |
809 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 809 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
810 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 810 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
811 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); | 811 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); |
812 | importMenu->insertItem( i18n("Export to phone"), ex2phone ); | 812 | importMenu->insertItem( i18n("Export to phone"), ex2phone ); |
813 | 813 | ||
814 | importMenu->insertSeparator(); | 814 | importMenu->insertSeparator(); |
815 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | 815 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, |
816 | this ); | 816 | this ); |
817 | action->addTo( importMenu ); | 817 | action->addTo( importMenu ); |
818 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | 818 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); |
819 | #ifndef DESKTOP_VERSION | 819 | #ifndef DESKTOP_VERSION |
820 | importMenu->insertSeparator(); | 820 | importMenu->insertSeparator(); |
821 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, | 821 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, |
822 | this ); | 822 | this ); |
823 | brAction->addTo( importMenu ); | 823 | brAction->addTo( importMenu ); |
824 | brAction->setToggleAction (true ) ; | 824 | brAction->setToggleAction (true ) ; |
825 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); | 825 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); |
826 | 826 | ||
827 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, | 827 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, |
828 | this ); | 828 | this ); |
829 | action->addTo( importMenu ); | 829 | action->addTo( importMenu ); |
830 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); | 830 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); |
831 | 831 | ||
832 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, | 832 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, |
833 | this ); | 833 | this ); |
834 | action->addTo( importMenu ); | 834 | action->addTo( importMenu ); |
835 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); | 835 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); |
836 | #else | 836 | #else |
837 | importMenu->insertSeparator(); | 837 | importMenu->insertSeparator(); |
838 | icon = loadPixmap( pathString + "print" ); | 838 | icon = loadPixmap( pathString + "print" ); |
839 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 839 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
840 | action->addTo( importMenu ); | 840 | action->addTo( importMenu ); |
841 | connect( action, SIGNAL( activated() ), | 841 | connect( action, SIGNAL( activated() ), |
842 | this, SLOT( printCal() ) ); | 842 | this, SLOT( printCal() ) ); |
843 | 843 | ||
844 | icon = loadPixmap( pathString + "print" ); | 844 | icon = loadPixmap( pathString + "print" ); |
845 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); | 845 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); |
846 | action->addTo( importMenu ); | 846 | action->addTo( importMenu ); |
847 | connect( action, SIGNAL( activated() ), | 847 | connect( action, SIGNAL( activated() ), |
848 | this, SLOT( printSel() ) ); | 848 | this, SLOT( printSel() ) ); |
849 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); | ||
850 | action->addTo( importMenu ); | ||
851 | connect( action, SIGNAL( activated() ), | ||
852 | mView->viewManager(), SIGNAL( printWNV() ) ); | ||
849 | #endif | 853 | #endif |
850 | importMenu->insertSeparator(); | 854 | importMenu->insertSeparator(); |
851 | action = new QAction( "beam all", i18n("Save"), 0, | 855 | action = new QAction( "beam all", i18n("Save"), 0, |
852 | this ); | 856 | this ); |
853 | action->addTo( importMenu ); | 857 | action->addTo( importMenu ); |
854 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 858 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
855 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 859 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, |
856 | this ); | 860 | this ); |
857 | action->addTo( importMenu ); | 861 | action->addTo( importMenu ); |
858 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); | 862 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); |
859 | 863 | ||
860 | //menuBar->insertItem( "Configure",configureMenu ); | 864 | //menuBar->insertItem( "Configure",configureMenu ); |
861 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); | 865 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); |
862 | icon = loadPixmap( "korganizer/korganizer" ); | 866 | icon = loadPixmap( "korganizer/korganizer" ); |
863 | 867 | ||
864 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | 868 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); |
865 | action->addTo( helpMenu ); | 869 | action->addTo( helpMenu ); |
866 | connect( action, SIGNAL( activated() ), | 870 | connect( action, SIGNAL( activated() ), |
867 | SLOT( whatsNew() ) ); | 871 | SLOT( whatsNew() ) ); |
868 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); | 872 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); |
869 | action->addTo( helpMenu ); | 873 | action->addTo( helpMenu ); |
870 | connect( action, SIGNAL( activated() ), | 874 | connect( action, SIGNAL( activated() ), |
871 | SLOT( features() ) ); | 875 | SLOT( features() ) ); |
872 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | 876 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); |
873 | action->addTo( helpMenu ); | 877 | action->addTo( helpMenu ); |
874 | connect( action, SIGNAL( activated() ), | 878 | connect( action, SIGNAL( activated() ), |
875 | SLOT( keyBindings() ) ); | 879 | SLOT( keyBindings() ) ); |
876 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | 880 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); |
877 | action->addTo( helpMenu ); | 881 | action->addTo( helpMenu ); |
878 | connect( action, SIGNAL( activated() ), | 882 | connect( action, SIGNAL( activated() ), |
879 | SLOT( synchowto() ) ); | 883 | SLOT( synchowto() ) ); |
880 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); | 884 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); |
881 | action->addTo( helpMenu ); | 885 | action->addTo( helpMenu ); |
882 | connect( action, SIGNAL( activated() ), | 886 | connect( action, SIGNAL( activated() ), |
883 | SLOT( kdesynchowto() ) ); | 887 | SLOT( kdesynchowto() ) ); |
884 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); | 888 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); |
885 | action->addTo( helpMenu ); | 889 | action->addTo( helpMenu ); |
886 | connect( action, SIGNAL( activated() ), | 890 | connect( action, SIGNAL( activated() ), |
887 | SLOT( multisynchowto() ) ); | 891 | SLOT( multisynchowto() ) ); |
888 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 892 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); |
889 | action->addTo( helpMenu ); | 893 | action->addTo( helpMenu ); |
890 | connect( action, SIGNAL( activated() ), | 894 | connect( action, SIGNAL( activated() ), |
891 | SLOT( aboutAutoSaving() ) ); | 895 | SLOT( aboutAutoSaving() ) ); |
892 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); | 896 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); |
893 | action->addTo( helpMenu ); | 897 | action->addTo( helpMenu ); |
894 | connect( action, SIGNAL( activated() ), | 898 | connect( action, SIGNAL( activated() ), |
895 | SLOT( aboutKnownBugs() ) ); | 899 | SLOT( aboutKnownBugs() ) ); |
896 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); | 900 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); |
897 | action->addTo( helpMenu ); | 901 | action->addTo( helpMenu ); |
898 | connect( action, SIGNAL( activated() ), | 902 | connect( action, SIGNAL( activated() ), |
899 | SLOT( usertrans() ) ); | 903 | SLOT( usertrans() ) ); |
900 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); | 904 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); |
901 | action->addTo( helpMenu ); | 905 | action->addTo( helpMenu ); |
902 | connect( action, SIGNAL( activated() ), | 906 | connect( action, SIGNAL( activated() ), |
903 | SLOT( faq() ) ); | 907 | SLOT( faq() ) ); |
904 | action = new QAction( "licence", i18n("Licence..."), 0, this ); | 908 | action = new QAction( "licence", i18n("Licence..."), 0, this ); |
905 | action->addTo( helpMenu ); | 909 | action->addTo( helpMenu ); |
906 | connect( action, SIGNAL( activated() ), | 910 | connect( action, SIGNAL( activated() ), |
907 | SLOT( licence() ) ); | 911 | SLOT( licence() ) ); |
908 | action = new QAction( "about", i18n("About..."), 0, this ); | 912 | action = new QAction( "about", i18n("About..."), 0, this ); |
909 | action->addTo( helpMenu ); | 913 | action->addTo( helpMenu ); |
910 | connect( action, SIGNAL( activated() ), | 914 | connect( action, SIGNAL( activated() ), |
911 | SLOT( about() ) ); | 915 | SLOT( about() ) ); |
912 | //menuBar->insertSeparator(); | 916 | //menuBar->insertSeparator(); |
913 | 917 | ||
914 | // ****************************************************** | 918 | // ****************************************************** |
915 | // menubar icons | 919 | // menubar icons |
916 | 920 | ||
917 | 921 | ||
918 | iconToolBar->setHorizontalStretchable (true ); | 922 | iconToolBar->setHorizontalStretchable (true ); |
919 | //menuBar->insertItem( iconToolBar ); | 923 | //menuBar->insertItem( iconToolBar ); |
920 | //xdays_action | 924 | //xdays_action |
921 | if (p-> mShowIconNewEvent) | 925 | if (p-> mShowIconNewEvent) |
922 | ne_action->addTo( iconToolBar ); | 926 | ne_action->addTo( iconToolBar ); |
923 | if (p->mShowIconNewTodo ) | 927 | if (p->mShowIconNewTodo ) |
924 | nt_action->addTo( iconToolBar ); | 928 | nt_action->addTo( iconToolBar ); |
925 | if (p-> mShowIconSearch) | 929 | if (p-> mShowIconSearch) |
926 | search_action->addTo( iconToolBar ); | 930 | search_action->addTo( iconToolBar ); |
927 | if (p-> mShowIconNext) | 931 | if (p-> mShowIconNext) |
928 | whatsnext_action->addTo( iconToolBar ); | 932 | whatsnext_action->addTo( iconToolBar ); |
929 | if (p-> mShowIconNextDays) | 933 | if (p-> mShowIconNextDays) |
930 | xdays_action->addTo( iconToolBar ); | 934 | xdays_action->addTo( iconToolBar ); |
931 | if (p-> mShowIconList) | 935 | if (p-> mShowIconList) |
932 | showlist_action->addTo( iconToolBar ); | 936 | showlist_action->addTo( iconToolBar ); |
933 | if (p-> mShowIconDay1) | 937 | if (p-> mShowIconDay1) |
934 | day1_action->addTo( iconToolBar ); | 938 | day1_action->addTo( iconToolBar ); |
935 | if (p-> mShowIconDay5) | 939 | if (p-> mShowIconDay5) |
936 | day5_action->addTo( iconToolBar ); | 940 | day5_action->addTo( iconToolBar ); |
937 | if (p-> mShowIconDay7) | 941 | if (p-> mShowIconDay7) |
938 | day7_action->addTo( iconToolBar ); | 942 | day7_action->addTo( iconToolBar ); |
939 | if (p-> mShowIconMonth) | 943 | if (p-> mShowIconMonth) |
940 | month_action->addTo( iconToolBar ); | 944 | month_action->addTo( iconToolBar ); |
941 | if (p-> mShowIconTodoview) | 945 | if (p-> mShowIconTodoview) |
942 | todoview_action->addTo( iconToolBar ); | 946 | todoview_action->addTo( iconToolBar ); |
943 | if (p-> mShowIconJournal) | 947 | if (p-> mShowIconJournal) |
944 | viewjournal_action->addTo( iconToolBar ); | 948 | viewjournal_action->addTo( iconToolBar ); |