summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
Unidiff
Diffstat (limited to 'korganizer/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp167
1 files changed, 97 insertions, 70 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 23537a6..a5d8824 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -633,48 +633,53 @@ void MainWindow::startMultiSync()
633#ifndef DESKTOP_VERSION 633#ifndef DESKTOP_VERSION
634 QCopEnvelope e("QPE/Application/kapi", "doRingSync"); 634 QCopEnvelope e("QPE/Application/kapi", "doRingSync");
635#endif 635#endif
636} 636}
637QPixmap MainWindow::loadPixmap( QString name ) 637QPixmap MainWindow::loadPixmap( QString name )
638{ 638{
639 return SmallIcon( name ); 639 return SmallIcon( name );
640 640
641} 641}
642void MainWindow::setUsesBigPixmaps ( bool b ) 642void MainWindow::setUsesBigPixmaps ( bool b )
643{ 643{
644 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b); 644 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
645 if ( b ) 645 if ( b )
646 qDebug("KO: BigPixmaps are not supported "); 646 qDebug("KO: BigPixmaps are not supported ");
647} 647}
648void MainWindow::initActions() 648void 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 );
665 configureToolBarMenu = new QPopupMenu( this ); 670 configureToolBarMenu = new QPopupMenu( this );
666 QPopupMenu *helpMenu = new QPopupMenu( this ); 671 QPopupMenu *helpMenu = new QPopupMenu( this );
667 QIconSet icon; 672 QIconSet icon;
668 int pixWid = 22, pixHei = 22; 673 int pixWid = 22, pixHei = 22;
669 QString pathString = ""; 674 QString pathString = "";
670 if ( !p->mToolBarMiniIcons ) { 675 if ( !p->mToolBarMiniIcons ) {
671 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) { 676 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
672 pathString += "icons16/"; 677 pathString += "icons16/";
673 pixWid = 18; pixHei = 16; 678 pixWid = 18; pixHei = 16;
674 } 679 }
675 } else { 680 } else {
676 pathString += "iconsmini/"; 681 pathString += "iconsmini/";
677 pixWid = 18; pixHei = 16; 682 pixWid = 18; pixHei = 16;
678 } 683 }
679 if ( KOPrefs::instance()->mShowFullMenu ) { 684 if ( KOPrefs::instance()->mShowFullMenu ) {
680 QMenuBar *menuBar1; 685 QMenuBar *menuBar1;
@@ -744,145 +749,184 @@ void MainWindow::initActions()
744 connect( actionFilterMenuTB, SIGNAL( activated() ), 749 connect( actionFilterMenuTB, SIGNAL( activated() ),
745 this, SLOT( fillFilterMenuTB() ) ); 750 this, SLOT( fillFilterMenuTB() ) );
746 actionFilterMenuTB->addTo( iconToolBar ); 751 actionFilterMenuTB->addTo( iconToolBar );
747 selectFilterMenuTB = new QPopupMenu( this ); 752 selectFilterMenuTB = new QPopupMenu( this );
748 selectFilterMenuTB->setCheckable( true ); 753 selectFilterMenuTB->setCheckable( true );
749 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 754 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
750 } 755 }
751 756
752 //#endif 757 //#endif
753 // ****************** 758 // ******************
754 QAction *action; 759 QAction *action;
755 // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); 760 // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
756 configureToolBarMenu->setCheckable( true ); 761 configureToolBarMenu->setCheckable( true );
757 762
758 763
759 configureAgendaMenu->setCheckable( true ); 764 configureAgendaMenu->setCheckable( true );
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();
780 792
793
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 );
820 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); 869 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
821 FSaction->addTo( viewMenu ); 870 FSaction->addTo( viewMenu );
822 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); 871 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
823 872
824 873
825 icon = loadPixmap( pathString + "filter" ); 874 icon = loadPixmap( pathString + "filter" );
826 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); 875 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
827 icon = loadPixmap( pathString + "configure" ); 876 icon = loadPixmap( pathString + "configure" );
828 action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); 877 action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
829 action->addTo( viewMenu ); 878 action->addTo( viewMenu );
830 connect( action, SIGNAL( activated() ), 879 connect( action, SIGNAL( activated() ),
831 mView, SLOT( toggleFilter() ) ); 880 mView, SLOT( toggleFilter() ) );
832 mToggleFilter = action; 881 mToggleFilter = action;
833 icon = loadPixmap( pathString + "navi" ); 882 icon = loadPixmap( pathString + "navi" );
834 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); 883 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
835 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 884 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
836 action->addTo( viewMenu ); 885 action->addTo( viewMenu );
837 connect( action, SIGNAL( activated() ), 886 connect( action, SIGNAL( activated() ),
838 mView, SLOT( toggleDateNavigatorWidget() ) ); 887 mView, SLOT( toggleDateNavigatorWidget() ) );
839 mToggleNav = action ; 888 mToggleNav = action ;
840 icon = loadPixmap( pathString + "allday" ); 889 icon = loadPixmap( pathString + "allday" );
841 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); 890 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
842 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); 891 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
843 action->addTo( viewMenu ); 892 action->addTo( viewMenu );
844 connect( action, SIGNAL( activated() ), 893 connect( action, SIGNAL( activated() ),
845 mView, SLOT( toggleAllDaySize() ) ); 894 mView, SLOT( toggleAllDaySize() ) );
846 mToggleAllday = action; 895 mToggleAllday = action;
847 896
848 897
849 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 898 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
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 );
873 917
874 918
875 icon = loadPixmap( pathString + "whatsnext" ); 919 icon = loadPixmap( pathString + "whatsnext" );
876 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); 920 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
877 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); 921 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
878 whatsnext_action->addTo( viewMenu ); 922 whatsnext_action->addTo( viewMenu );
879 connect( whatsnext_action, SIGNAL( activated() ), 923 connect( whatsnext_action, SIGNAL( activated() ),
880 mView->viewManager(), SLOT( showWhatsNextView() ) ); 924 mView->viewManager(), SLOT( showWhatsNextView() ) );
881 925
882 icon = loadPixmap( pathString + "xdays" ); 926 icon = loadPixmap( pathString + "xdays" );
883 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); 927 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
884 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); 928 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
885 xdays_action->addTo( viewMenu ); 929 xdays_action->addTo( viewMenu );
886 connect( xdays_action, SIGNAL( activated() ), 930 connect( xdays_action, SIGNAL( activated() ),
887 mView->viewManager(), SLOT( showNextXView() ) ); 931 mView->viewManager(), SLOT( showNextXView() ) );
888 932
@@ -939,101 +983,82 @@ void MainWindow::initActions()
939 mView->viewManager(), SLOT( showListView() ) ); 983 mView->viewManager(), SLOT( showListView() ) );
940 984
941 icon = loadPixmap( pathString + "todo" ); 985 icon = loadPixmap( pathString + "todo" );
942 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); 986 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
943 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); 987 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
944 todoview_action->addTo( viewMenu ); 988 todoview_action->addTo( viewMenu );
945 connect( todoview_action, SIGNAL( activated() ), 989 connect( todoview_action, SIGNAL( activated() ),
946 mView->viewManager(), SLOT( showTodoView() ) ); 990 mView->viewManager(), SLOT( showTodoView() ) );
947 991
948 992
949 993
950#if 0 994#if 0
951 action = new QAction( "view_timespan", "Time Span", 0, this ); 995 action = new QAction( "view_timespan", "Time Span", 0, this );
952 action->addTo( viewMenu ); 996 action->addTo( viewMenu );
953 connect( action, SIGNAL( activated() ), 997 connect( action, SIGNAL( activated() ),
954 mView->viewManager(), SLOT( showTimeSpanView() ) ); 998 mView->viewManager(), SLOT( showTimeSpanView() ) );
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 );
971 mEditAction->addTo( actionMenu );
972 connect( mEditAction, SIGNAL( activated() ),
973 mView, SLOT( editIncidence() ) );
974 1012
975 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); 1013 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
976 mDeleteAction->addTo( actionMenu );
977 connect( mDeleteAction, SIGNAL( activated() ),
978 mView, SLOT( deleteIncidence() ) );
979 1014
980 1015
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 1016
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
1005 icon = loadPixmap( pathString + "search" );
1006 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
1007 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
1008 search_action->addTo( actionMenu );
1009 connect( search_action, SIGNAL( activated() ),
1010 mView->dialogManager(), SLOT( showSearchDialog() ) );
1011 1022
1023 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1024 this );
1025 action->addTo( actionMenu );
1026 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1012 1027
1013 1028
1014 if ( KOPrefs::instance()->mShowFullMenu ) {
1015 actionMenu->insertSeparator(); 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() ) );
1040 if ( KOPrefs::instance()->mShowFullMenu ) {
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() ) );
1024 action = new QAction( "import_quick", i18n("Import last file"), 0, 1049 action = new QAction( "import_quick", i18n("Import last file"), 0,
1025 this ); 1050 this );
1026 action->addTo( importMenu_X ); 1051 action->addTo( importMenu_X );
1027 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); 1052 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
1028 importMenu_X->insertSeparator(); 1053 importMenu_X->insertSeparator();
1029 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, 1054 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
1030 this ); 1055 this );
1031 action->addTo( importMenu_X ); 1056 action->addTo( importMenu_X );
1032 connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); 1057 connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
1033 //#ifndef DESKTOP_VERSION 1058 //#ifndef DESKTOP_VERSION
1034 importMenu_X->insertSeparator(); 1059 importMenu_X->insertSeparator();
1035 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, 1060 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
1036 this ); 1061 this );
1037 action->addTo( importMenu_X ); 1062 action->addTo( importMenu_X );
1038 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); 1063 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
1039 //#else 1064 //#else
@@ -1103,53 +1128,49 @@ void MainWindow::initActions()
1103 icon = loadPixmap( pathString + "print" ); 1128 icon = loadPixmap( pathString + "print" );
1104 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); 1129 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
1105 action->addTo( beamMenu_X ); 1130 action->addTo( beamMenu_X );
1106 connect( action, SIGNAL( activated() ), 1131 connect( action, SIGNAL( activated() ),
1107 this, SLOT( printSel() ) ); 1132 this, SLOT( printSel() ) );
1108 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); 1133 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
1109 action->addTo( beamMenu_X ); 1134 action->addTo( beamMenu_X );
1110 connect( action, SIGNAL( activated() ), 1135 connect( action, SIGNAL( activated() ),
1111 mView->viewManager(), SLOT( slotprintWNV() ) ); 1136 mView->viewManager(), SLOT( slotprintWNV() ) );
1112 1137
1113 1138
1114 icon = loadPixmap( pathString + "print" ); 1139 icon = loadPixmap( pathString + "print" );
1115 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); 1140 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
1116 action->addTo( beamMenu_X ); 1141 action->addTo( beamMenu_X );
1117 connect( action, SIGNAL( activated() ), 1142 connect( action, SIGNAL( activated() ),
1118 this, SLOT( printListView() ) ); 1143 this, SLOT( printListView() ) );
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 );
1140 connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); 1161 connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
1141 1162
1142 //menuBar->insertItem( "Configure",configureMenu ); 1163 //menuBar->insertItem( "Configure",configureMenu );
1143 //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); 1164 //configureMenu->insertItem( "Toolbar",configureToolBarMenu );
1144 icon = loadPixmap( "korganizer/korganizer" ); 1165 icon = loadPixmap( "korganizer/korganizer" );
1145 1166
1146 action = new QAction( "Whats New", i18n("What's new?"), 0,this ); 1167 action = new QAction( "Whats New", i18n("What's new?"), 0,this );
1147 action->addTo( helpMenu ); 1168 action->addTo( helpMenu );
1148 connect( action, SIGNAL( activated() ), 1169 connect( action, SIGNAL( activated() ),
1149 SLOT( whatsNew() ) ); 1170 SLOT( whatsNew() ) );
1150 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); 1171 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
1151 action->addTo( helpMenu ); 1172 action->addTo( helpMenu );
1152 connect( action, SIGNAL( activated() ), 1173 connect( action, SIGNAL( activated() ),
1153 SLOT( features() ) ); 1174 SLOT( features() ) );
1154 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); 1175 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
1155 action->addTo( helpMenu ); 1176 action->addTo( helpMenu );
@@ -1693,56 +1714,61 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
1693 1714
1694 if ( incidence->typeID() == eventID ) { 1715 if ( incidence->typeID() == eventID ) {
1695 mShowAction->setText( i18n("Show Event...") ); 1716 mShowAction->setText( i18n("Show Event...") );
1696 mEditAction->setText( i18n("Edit Event...") ); 1717 mEditAction->setText( i18n("Edit Event...") );
1697 mDeleteAction->setText( i18n("Delete Event...") ); 1718 mDeleteAction->setText( i18n("Delete Event...") );
1698 1719
1699 mNewSubTodoAction->setEnabled( false ); 1720 mNewSubTodoAction->setEnabled( false );
1700 } else if ( incidence->typeID() == todoID ) { 1721 } else if ( incidence->typeID() == todoID ) {
1701 mShowAction->setText( i18n("Show Todo...") ); 1722 mShowAction->setText( i18n("Show Todo...") );
1702 mEditAction->setText( i18n("Edit Todo...") ); 1723 mEditAction->setText( i18n("Edit Todo...") );
1703 mDeleteAction->setText( i18n("Delete Todo...") ); 1724 mDeleteAction->setText( i18n("Delete Todo...") );
1704 1725
1705 mNewSubTodoAction->setEnabled( true ); 1726 mNewSubTodoAction->setEnabled( true );
1706 } else { 1727 } else {
1707 mShowAction->setText( i18n("Show...") ); 1728 mShowAction->setText( i18n("Show...") );
1708 mShowAction->setText( i18n("Edit...") ); 1729 mShowAction->setText( i18n("Edit...") );
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
1715void MainWindow::enableIncidenceActions( bool enabled ) 1736void 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
1727void MainWindow::importOL() 1753void 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();
1733 delete id; 1759 delete id;
1734 mView->calendar()->checkAlarmForIncidence( 0, true ); 1760 mView->calendar()->checkAlarmForIncidence( 0, true );
1735 mView->updateView(); 1761 mView->updateView();
1736#endif 1762#endif
1737} 1763}
1738void MainWindow::importBday() 1764void MainWindow::importBday()
1739{ 1765{
1740 int result = QMessageBox::warning( this, i18n("KO/Pi import information!"), 1766 int result = QMessageBox::warning( this, i18n("KO/Pi import information!"),
1741 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), 1767 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
1742 i18n("Import!"), i18n("Cancel"), 0, 1768 i18n("Import!"), i18n("Cancel"), 0,
1743 0, 1 ); 1769 0, 1 );
1744 if ( result == 0 ) { 1770 if ( result == 0 ) {
1745 mView->importBday(); 1771 mView->importBday();
1746 1772
1747 } 1773 }
1748 1774
@@ -2253,48 +2279,49 @@ void MainWindow::configureToolBar( int item )
2253 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); 2279 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
2254 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 ); 2280 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 );
2255 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 ); 2281 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 );
2256 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 ); 2282 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 );
2257 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 ); 2283 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 );
2258 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); 2284 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
2259 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); 2285 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
2260 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); 2286 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
2261 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); 2287 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
2262 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 ); 2288 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
2263 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); 2289 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
2264 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); 2290 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
2265 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); 2291 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
2266 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); 2292 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
2267 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); 2293 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
2268 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); 2294 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
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}
2278void MainWindow::setCaption ( const QString & c ) 2305void 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";
2285 QWidget::setCaption( cap ); 2312 QWidget::setCaption( cap );
2286} 2313}
2287void MainWindow::setCaptionToDates() 2314void MainWindow::setCaptionToDates()
2288{ 2315{
2289 QString selDates; 2316 QString selDates;
2290 QDate date = mView->startDate(); 2317 QDate date = mView->startDate();
2291 if ( ! date.isValid() ) { 2318 if ( ! date.isValid() ) {
2292 setCaption(""); 2319 setCaption("");
2293 return; 2320 return;
2294 } 2321 }
2295 selDates = KGlobal::locale()->formatDate( date, true); 2322 selDates = KGlobal::locale()->formatDate( date, true);
2296 if (mView->startDate() < mView->endDate() ) 2323 if (mView->startDate() < mView->endDate() )
2297 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); 2324 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true);
2298 else { 2325 else {
2299 QString addString; 2326 QString addString;
2300 if ( date == QDateTime::currentDateTime().date() ) 2327 if ( date == QDateTime::currentDateTime().date() )