author | zautrix <zautrix> | 2005-07-01 11:19:13 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-01 11:19:13 (UTC) |
commit | 5d603fd22bc8126c6a9a6f377701669d3cee18f2 (patch) (unidiff) | |
tree | 9fdef25d24a3a57e3ecf5ae2e4b1cc3d3fb0e0bf /korganizer/mainwindow.cpp | |
parent | 409f5296344084e22833b35c03923b89d7be653b (diff) | |
download | kdepimpi-5d603fd22bc8126c6a9a6f377701669d3cee18f2.zip kdepimpi-5d603fd22bc8126c6a9a6f377701669d3cee18f2.tar.gz kdepimpi-5d603fd22bc8126c6a9a6f377701669d3cee18f2.tar.bz2 |
many menu fixes
-rw-r--r-- | korganizer/mainwindow.cpp | 171 |
1 files changed, 99 insertions, 72 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 23537a6..a5d8824 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -649,16 +649,21 @@ void MainWindow::initActions() | |||
649 | { | 649 | { |
650 | //KOPrefs::instance()->mShowFullMenu | 650 | //KOPrefs::instance()->mShowFullMenu |
651 | iconToolBar->clear(); | 651 | iconToolBar->clear(); |
652 | KOPrefs *p = KOPrefs::instance(); | 652 | KOPrefs *p = KOPrefs::instance(); |
653 | //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); | 653 | //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); |
654 | 654 | ||
655 | QPopupMenu *viewMenu = new QPopupMenu( this ); | 655 | QPopupMenu *viewMenu = new QPopupMenu( this ); |
656 | QPopupMenu *actionMenu = new QPopupMenu( this ); | 656 | QPopupMenu *actionMenu = new QPopupMenu( this ); |
657 | #ifdef DESKTOP_VERSION | ||
658 | mCurrentItemMenu = actionMenu; | ||
659 | #else | ||
660 | mCurrentItemMenu = new QPopupMenu ( this ); | ||
661 | #endif | ||
657 | QPopupMenu *importMenu = new QPopupMenu( this ); | 662 | QPopupMenu *importMenu = new QPopupMenu( this ); |
658 | QPopupMenu *importMenu_X = new QPopupMenu( this ); | 663 | QPopupMenu *importMenu_X = new QPopupMenu( this ); |
659 | QPopupMenu *exportMenu_X = new QPopupMenu( this ); | 664 | QPopupMenu *exportMenu_X = new QPopupMenu( this ); |
660 | QPopupMenu *beamMenu_X = new QPopupMenu( this ); | 665 | QPopupMenu *beamMenu_X = new QPopupMenu( this ); |
661 | selectFilterMenu = new QPopupMenu( this ); | 666 | selectFilterMenu = new QPopupMenu( this ); |
662 | selectFilterMenu->setCheckable( true ); | 667 | selectFilterMenu->setCheckable( true ); |
663 | syncMenu = new QPopupMenu( this ); | 668 | syncMenu = new QPopupMenu( this ); |
664 | configureAgendaMenu = new QPopupMenu( this ); | 669 | configureAgendaMenu = new QPopupMenu( this ); |
@@ -760,60 +765,104 @@ void MainWindow::initActions() | |||
760 | int iii ; | 765 | int iii ; |
761 | for ( iii = 1;iii<= 10 ;++iii ){ | 766 | for ( iii = 1;iii<= 10 ;++iii ){ |
762 | configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); | 767 | configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); |
763 | } | 768 | } |
764 | //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); | 769 | //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); |
765 | 770 | ||
766 | connect( configureAgendaMenu, SIGNAL( aboutToShow()), | 771 | connect( configureAgendaMenu, SIGNAL( aboutToShow()), |
767 | this, SLOT( showConfigureAgenda( ) ) ); | 772 | this, SLOT( showConfigureAgenda( ) ) ); |
773 | icon = loadPixmap( pathString + "today" ); | ||
774 | QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); | ||
775 | today_action->addTo( actionMenu ); | ||
776 | connect( today_action, SIGNAL( activated() ), | ||
777 | mView, SLOT( goToday() ) ); | ||
778 | |||
779 | icon = loadPixmap( pathString + "picker" ); | ||
780 | QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this ); | ||
781 | dPickerAction->addTo( actionMenu ); | ||
782 | connect( dPickerAction, SIGNAL( activated() ), | ||
783 | mView, SLOT( showDatePicker() ) ); | ||
784 | |||
785 | icon = loadPixmap( pathString + "search" ); | ||
786 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); | ||
787 | search_action->addTo( actionMenu ); | ||
788 | connect( search_action, SIGNAL( activated() ), | ||
789 | mView->dialogManager(), SLOT( showSearchDialog() ) ); | ||
768 | 790 | ||
769 | icon = loadPixmap( pathString + "configure" ); | ||
770 | action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); | ||
771 | action->addTo( actionMenu ); | ||
772 | connect( action, SIGNAL( activated() ), | ||
773 | mView, SLOT( edit_options() ) ); | ||
774 | icon = loadPixmap( pathString + "configure" ); | ||
775 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); | ||
776 | action->addTo( actionMenu ); | ||
777 | connect( action, SIGNAL( activated() ), | ||
778 | mView, SLOT( edit_global_options() ) ); | ||
779 | actionMenu->insertSeparator(); | 791 | actionMenu->insertSeparator(); |
792 | |||
793 | |||
780 | 794 | ||
781 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); | 795 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); |
782 | action->addTo( actionMenu ); | 796 | action->addTo( actionMenu ); |
783 | connect( action, SIGNAL( activated() ), | 797 | connect( action, SIGNAL( activated() ), |
784 | mView, SLOT( undo_delete() ) ); | 798 | mView, SLOT( undo_delete() ) ); |
785 | actionMenu->insertSeparator(); | ||
786 | 799 | ||
787 | icon = loadPixmap( pathString + "newevent" ); | 800 | icon = loadPixmap( pathString + "newevent" ); |
788 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); | 801 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); |
789 | configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); | 802 | configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); |
790 | configureToolBarMenu->insertSeparator(); | 803 | configureToolBarMenu->insertSeparator(); |
791 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); | 804 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); |
792 | configureToolBarMenu->insertSeparator(); | 805 | configureToolBarMenu->insertSeparator(); |
793 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); | 806 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); |
794 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); | 807 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); |
808 | |||
809 | #ifndef DESKTOP_VERSION | ||
810 | actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); | ||
811 | #endif | ||
812 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); | ||
813 | mShowAction->addTo( mCurrentItemMenu ); | ||
814 | connect( mShowAction, SIGNAL( activated() ), | ||
815 | mView, SLOT( showIncidence() ) ); | ||
816 | |||
817 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); | ||
818 | mEditAction->addTo( mCurrentItemMenu ); | ||
819 | connect( mEditAction, SIGNAL( activated() ), | ||
820 | mView, SLOT( editIncidence() ) ); | ||
821 | |||
822 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); | ||
823 | mDeleteAction->addTo( mCurrentItemMenu ); | ||
824 | connect( mDeleteAction, SIGNAL( activated() ), | ||
825 | mView, SLOT( deleteIncidence() ) ); | ||
826 | |||
827 | |||
828 | mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); | ||
829 | mCloneAction->addTo( mCurrentItemMenu ); | ||
830 | connect( mCloneAction, SIGNAL( activated() ), | ||
831 | mView, SLOT( cloneIncidence() ) ); | ||
832 | mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); | ||
833 | mMoveAction->addTo( mCurrentItemMenu ); | ||
834 | connect( mMoveAction, SIGNAL( activated() ), | ||
835 | mView, SLOT( moveIncidence() ) ); | ||
836 | mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); | ||
837 | mBeamAction->addTo(mCurrentItemMenu ); | ||
838 | connect( mBeamAction, SIGNAL( activated() ), | ||
839 | mView, SLOT( beamIncidence() ) ); | ||
840 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); | ||
841 | mCancelAction->addTo( mCurrentItemMenu ); | ||
842 | connect( mCancelAction, SIGNAL( activated() ), | ||
843 | mView, SLOT( toggleCancelIncidence() ) ); | ||
844 | #ifdef DESKTOP_VERSION | ||
845 | actionMenu->insertSeparator(); | ||
846 | #endif | ||
847 | |||
848 | |||
795 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); | 849 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); |
796 | ne_action->addTo( actionMenu ); | 850 | ne_action->addTo( actionMenu ); |
797 | connect( ne_action, SIGNAL( activated() ), | 851 | connect( ne_action, SIGNAL( activated() ), |
798 | mView, SLOT( newEvent() ) ); | 852 | mView, SLOT( newEvent() ) ); |
799 | icon = loadPixmap( pathString + "newtodo" ); | 853 | icon = loadPixmap( pathString + "newtodo" ); |
800 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); | 854 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); |
801 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); | 855 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); |
802 | nt_action->addTo( actionMenu ); | 856 | nt_action->addTo( actionMenu ); |
803 | connect( nt_action, SIGNAL( activated() ), | 857 | connect( nt_action, SIGNAL( activated() ), |
804 | mView, SLOT( newTodo() ) ); | 858 | mView, SLOT( newTodo() ) ); |
805 | 859 | ||
806 | icon = loadPixmap( pathString + "today" ); | 860 | |
807 | QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); | ||
808 | today_action->addTo( viewMenu ); | ||
809 | connect( today_action, SIGNAL( activated() ), | ||
810 | mView, SLOT( goToday() ) ); | ||
811 | viewMenu->insertSeparator(); | ||
812 | 861 | ||
813 | // *********************** | 862 | // *********************** |
814 | if ( KOPrefs::instance()->mVerticalScreen ) { | 863 | if ( KOPrefs::instance()->mVerticalScreen ) { |
815 | icon = SmallIcon( "1updownarrow" ); | 864 | icon = SmallIcon( "1updownarrow" ); |
816 | } else { | 865 | } else { |
817 | icon = SmallIcon("1leftrightarrow" ); | 866 | icon = SmallIcon("1leftrightarrow" ); |
818 | } | 867 | } |
819 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); | 868 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); |
@@ -850,23 +899,18 @@ void MainWindow::initActions() | |||
850 | mToggleNav, SLOT( setEnabled ( bool ) ) ); | 899 | mToggleNav, SLOT( setEnabled ( bool ) ) ); |
851 | //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), | 900 | //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), |
852 | // mToggleFilter, SLOT( setEnabled ( bool ) ) ); | 901 | // mToggleFilter, SLOT( setEnabled ( bool ) ) ); |
853 | connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), | 902 | connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), |
854 | mToggleAllday, SLOT( setEnabled ( bool ) ) ); | 903 | mToggleAllday, SLOT( setEnabled ( bool ) ) ); |
855 | // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), | 904 | // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), |
856 | // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); | 905 | // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); |
857 | 906 | ||
858 | viewMenu->insertSeparator(); | 907 | |
859 | icon = loadPixmap( pathString + "picker" ); | 908 | dPickerAction->addTo( iconToolBar ); |
860 | action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); | ||
861 | action->addTo( viewMenu ); | ||
862 | connect( action, SIGNAL( activated() ), | ||
863 | mView, SLOT( showDatePicker() ) ); | ||
864 | action->addTo( iconToolBar ); | ||
865 | viewMenu->insertSeparator(); | 909 | viewMenu->insertSeparator(); |
866 | 910 | ||
867 | if ( p-> mShowIconToggleFull ) | 911 | if ( p-> mShowIconToggleFull ) |
868 | FSaction->addTo( iconToolBar ); | 912 | FSaction->addTo( iconToolBar ); |
869 | if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); | 913 | if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); |
870 | 914 | ||
871 | //******************** | 915 | //******************** |
872 | if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); | 916 | if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); |
@@ -955,69 +999,50 @@ void MainWindow::initActions() | |||
955 | #endif | 999 | #endif |
956 | 1000 | ||
957 | mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, | 1001 | mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, |
958 | this ); | 1002 | this ); |
959 | mNewSubTodoAction->addTo( actionMenu ); | 1003 | mNewSubTodoAction->addTo( actionMenu ); |
960 | connect( mNewSubTodoAction, SIGNAL( activated() ), | 1004 | connect( mNewSubTodoAction, SIGNAL( activated() ), |
961 | mView, SLOT( newSubTodo() ) ); | 1005 | mView, SLOT( newSubTodo() ) ); |
962 | 1006 | ||
963 | actionMenu->insertSeparator(); | 1007 | action = new QAction( "purge_completed", i18n("Purge Completed..."), 0, |
964 | 1008 | this ); | |
965 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); | 1009 | action->addTo( actionMenu ); |
966 | mShowAction->addTo( actionMenu ); | 1010 | connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); |
967 | connect( mShowAction, SIGNAL( activated() ), | ||
968 | mView, SLOT( showIncidence() ) ); | ||
969 | 1011 | ||
970 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); | 1012 | |
971 | mEditAction->addTo( actionMenu ); | 1013 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); |
972 | connect( mEditAction, SIGNAL( activated() ), | ||
973 | mView, SLOT( editIncidence() ) ); | ||
974 | 1014 | ||
975 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); | ||
976 | mDeleteAction->addTo( actionMenu ); | ||
977 | connect( mDeleteAction, SIGNAL( activated() ), | ||
978 | mView, SLOT( deleteIncidence() ) ); | ||
979 | 1015 | ||
980 | 1016 | ||
981 | mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); | ||
982 | mCloneAction->addTo( actionMenu ); | ||
983 | connect( mCloneAction, SIGNAL( activated() ), | ||
984 | mView, SLOT( cloneIncidence() ) ); | ||
985 | mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); | ||
986 | mMoveAction->addTo( actionMenu ); | ||
987 | connect( mMoveAction, SIGNAL( activated() ), | ||
988 | mView, SLOT( moveIncidence() ) ); | ||
989 | mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); | ||
990 | mBeamAction->addTo( actionMenu ); | ||
991 | connect( mBeamAction, SIGNAL( activated() ), | ||
992 | mView, SLOT( beamIncidence() ) ); | ||
993 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); | ||
994 | mCancelAction->addTo( actionMenu ); | ||
995 | connect( mCancelAction, SIGNAL( activated() ), | ||
996 | mView, SLOT( toggleCancelIncidence() ) ); | ||
997 | |||
998 | actionMenu->insertSeparator(); | 1017 | actionMenu->insertSeparator(); |
999 | 1018 | action = new QAction( "manage cat", i18n("Edit category list..."), 0, | |
1000 | action = new QAction( "purge_completed", i18n("Purge Completed"), 0, | ||
1001 | this ); | 1019 | this ); |
1002 | action->addTo( actionMenu ); | 1020 | action->addTo( actionMenu ); |
1003 | connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); | 1021 | connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) ); |
1004 | 1022 | ||
1005 | icon = loadPixmap( pathString + "search" ); | 1023 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, |
1006 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); | 1024 | this ); |
1007 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); | 1025 | action->addTo( actionMenu ); |
1008 | search_action->addTo( actionMenu ); | 1026 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); |
1009 | connect( search_action, SIGNAL( activated() ), | ||
1010 | mView->dialogManager(), SLOT( showSearchDialog() ) ); | ||
1011 | 1027 | ||
1012 | |||
1013 | 1028 | ||
1029 | actionMenu->insertSeparator(); | ||
1030 | icon = loadPixmap( pathString + "configure" ); | ||
1031 | action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); | ||
1032 | action->addTo( actionMenu ); | ||
1033 | connect( action, SIGNAL( activated() ), | ||
1034 | mView, SLOT( edit_options() ) ); | ||
1035 | icon = loadPixmap( pathString + "configure" ); | ||
1036 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); | ||
1037 | action->addTo( actionMenu ); | ||
1038 | connect( action, SIGNAL( activated() ), | ||
1039 | mView, SLOT( edit_global_options() ) ); | ||
1014 | if ( KOPrefs::instance()->mShowFullMenu ) { | 1040 | if ( KOPrefs::instance()->mShowFullMenu ) { |
1015 | actionMenu->insertSeparator(); | ||
1016 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); | 1041 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); |
1017 | 1042 | ||
1018 | } | 1043 | } |
1019 | // actionMenu->insertSeparator(); | 1044 | // actionMenu->insertSeparator(); |
1020 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, | 1045 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, |
1021 | this ); | 1046 | this ); |
1022 | action->addTo( importMenu_X ); | 1047 | action->addTo( importMenu_X ); |
1023 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); | 1048 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); |
@@ -1119,21 +1144,17 @@ void MainWindow::initActions() | |||
1119 | 1144 | ||
1120 | action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); | 1145 | action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); |
1121 | action->addTo( beamMenu_X ); | 1146 | action->addTo( beamMenu_X ); |
1122 | connect( action, SIGNAL( activated() ), | 1147 | connect( action, SIGNAL( activated() ), |
1123 | mView, SLOT( slotprintSelInc() ) ); | 1148 | mView, SLOT( slotprintSelInc() ) ); |
1124 | 1149 | ||
1125 | importMenu->insertItem( i18n("Print"), beamMenu_X ); | 1150 | importMenu->insertItem( i18n("Print"), beamMenu_X ); |
1126 | #endif | 1151 | #endif |
1127 | importMenu->insertSeparator(); | 1152 | |
1128 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | ||
1129 | this ); | ||
1130 | action->addTo( importMenu ); | ||
1131 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | ||
1132 | importMenu->insertSeparator(); | 1153 | importMenu->insertSeparator(); |
1133 | action = new QAction( "beam all", i18n("Save"), 0, | 1154 | action = new QAction( "beam all", i18n("Save"), 0, |
1134 | this ); | 1155 | this ); |
1135 | action->addTo( importMenu ); | 1156 | action->addTo( importMenu ); |
1136 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 1157 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
1137 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 1158 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, |
1138 | this ); | 1159 | this ); |
1139 | action->addTo( importMenu ); | 1160 | action->addTo( importMenu ); |
@@ -1709,24 +1730,29 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1709 | mShowAction->setText( i18n("Delete...") ); | 1730 | mShowAction->setText( i18n("Delete...") ); |
1710 | 1731 | ||
1711 | mNewSubTodoAction->setEnabled( false ); | 1732 | mNewSubTodoAction->setEnabled( false ); |
1712 | } | 1733 | } |
1713 | } | 1734 | } |
1714 | 1735 | ||
1715 | void MainWindow::enableIncidenceActions( bool enabled ) | 1736 | void MainWindow::enableIncidenceActions( bool enabled ) |
1716 | { | 1737 | { |
1738 | |||
1739 | #ifndef DESKTOP_VERSION | ||
1740 | mCurrentItemMenu->setEnabled( enabled ); | ||
1741 | #else | ||
1717 | mShowAction->setEnabled( enabled ); | 1742 | mShowAction->setEnabled( enabled ); |
1718 | mEditAction->setEnabled( enabled ); | 1743 | mEditAction->setEnabled( enabled ); |
1719 | mDeleteAction->setEnabled( enabled ); | 1744 | mDeleteAction->setEnabled( enabled ); |
1720 | 1745 | ||
1721 | mCloneAction->setEnabled( enabled ); | 1746 | mCloneAction->setEnabled( enabled ); |
1722 | mMoveAction->setEnabled( enabled ); | 1747 | mMoveAction->setEnabled( enabled ); |
1723 | mBeamAction->setEnabled( enabled ); | 1748 | mBeamAction->setEnabled( enabled ); |
1724 | mCancelAction->setEnabled( enabled ); | 1749 | mCancelAction->setEnabled( enabled ); |
1750 | #endif | ||
1725 | } | 1751 | } |
1726 | 1752 | ||
1727 | void MainWindow::importOL() | 1753 | void MainWindow::importOL() |
1728 | { | 1754 | { |
1729 | #ifdef _OL_IMPORT_ | 1755 | #ifdef _OL_IMPORT_ |
1730 | mView->clearAllViews(); | 1756 | mView->clearAllViews(); |
1731 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); | 1757 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); |
1732 | id->exec(); | 1758 | id->exec(); |
@@ -2269,16 +2295,17 @@ void MainWindow::configureToolBar( int item ) | |||
2269 | p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); | 2295 | p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); |
2270 | p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); | 2296 | p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); |
2271 | p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); | 2297 | p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); |
2272 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); | 2298 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); |
2273 | p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); | 2299 | p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); |
2274 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); | 2300 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); |
2275 | p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); | 2301 | p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); |
2276 | // initActions(); | 2302 | // initActions(); |
2303 | setCaption ( i18n("Toolbar changes needs a restart!") ); | ||
2277 | } | 2304 | } |
2278 | void MainWindow::setCaption ( const QString & c ) | 2305 | void MainWindow::setCaption ( const QString & c ) |
2279 | { | 2306 | { |
2280 | QString cap = c; | 2307 | QString cap = c; |
2281 | cap.replace( QRegExp("\n"), " " ); | 2308 | cap.replace( QRegExp("\n"), " " ); |
2282 | cap = cap.stripWhiteSpace(); | 2309 | cap = cap.stripWhiteSpace(); |
2283 | if ( cap.isEmpty() ) | 2310 | if ( cap.isEmpty() ) |
2284 | cap = "KO/Pi"; | 2311 | cap = "KO/Pi"; |