summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
Unidiff
Diffstat (limited to 'korganizer/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a5d8824..b6ce7d5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -633,53 +633,49 @@ 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 ); 657 mCurrentItemMenu = new QPopupMenu ( this );
661#endif
662 QPopupMenu *importMenu = new QPopupMenu( this ); 658 QPopupMenu *importMenu = new QPopupMenu( this );
663 QPopupMenu *importMenu_X = new QPopupMenu( this ); 659 QPopupMenu *importMenu_X = new QPopupMenu( this );
664 QPopupMenu *exportMenu_X = new QPopupMenu( this ); 660 QPopupMenu *exportMenu_X = new QPopupMenu( this );
665 QPopupMenu *beamMenu_X = new QPopupMenu( this ); 661 QPopupMenu *beamMenu_X = new QPopupMenu( this );
666 selectFilterMenu = new QPopupMenu( this ); 662 selectFilterMenu = new QPopupMenu( this );
667 selectFilterMenu->setCheckable( true ); 663 selectFilterMenu->setCheckable( true );
668 syncMenu = new QPopupMenu( this ); 664 syncMenu = new QPopupMenu( this );
669 configureAgendaMenu = new QPopupMenu( this ); 665 configureAgendaMenu = new QPopupMenu( this );
670 configureToolBarMenu = new QPopupMenu( this ); 666 configureToolBarMenu = new QPopupMenu( this );
671 QPopupMenu *helpMenu = new QPopupMenu( this ); 667 QPopupMenu *helpMenu = new QPopupMenu( this );
672 QIconSet icon; 668 QIconSet icon;
673 int pixWid = 22, pixHei = 22; 669 int pixWid = 22, pixHei = 22;
674 QString pathString = ""; 670 QString pathString = "";
675 if ( !p->mToolBarMiniIcons ) { 671 if ( !p->mToolBarMiniIcons ) {
676 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) { 672 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
677 pathString += "icons16/"; 673 pathString += "icons16/";
678 pixWid = 18; pixHei = 16; 674 pixWid = 18; pixHei = 16;
679 } 675 }
680 } else { 676 } else {
681 pathString += "iconsmini/"; 677 pathString += "iconsmini/";
682 pixWid = 18; pixHei = 16; 678 pixWid = 18; pixHei = 16;
683 } 679 }
684 if ( KOPrefs::instance()->mShowFullMenu ) { 680 if ( KOPrefs::instance()->mShowFullMenu ) {
685 QMenuBar *menuBar1; 681 QMenuBar *menuBar1;
@@ -785,51 +781,49 @@ void MainWindow::initActions()
785 icon = loadPixmap( pathString + "search" ); 781 icon = loadPixmap( pathString + "search" );
786 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); 782 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
787 search_action->addTo( actionMenu ); 783 search_action->addTo( actionMenu );
788 connect( search_action, SIGNAL( activated() ), 784 connect( search_action, SIGNAL( activated() ),
789 mView->dialogManager(), SLOT( showSearchDialog() ) ); 785 mView->dialogManager(), SLOT( showSearchDialog() ) );
790 786
791 actionMenu->insertSeparator(); 787 actionMenu->insertSeparator();
792 788
793 789
794 790
795 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 791 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
796 action->addTo( actionMenu ); 792 action->addTo( actionMenu );
797 connect( action, SIGNAL( activated() ), 793 connect( action, SIGNAL( activated() ),
798 mView, SLOT( undo_delete() ) ); 794 mView, SLOT( undo_delete() ) );
799 795
800 icon = loadPixmap( pathString + "newevent" ); 796 icon = loadPixmap( pathString + "newevent" );
801 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 797 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
802 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 798 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
803 configureToolBarMenu->insertSeparator(); 799 configureToolBarMenu->insertSeparator();
804 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 800 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
805 configureToolBarMenu->insertSeparator(); 801 configureToolBarMenu->insertSeparator();
806 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 802 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
807 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 803 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
808 804
809#ifndef DESKTOP_VERSION
810 actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); 805 actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
811#endif
812 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); 806 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
813 mShowAction->addTo( mCurrentItemMenu ); 807 mShowAction->addTo( mCurrentItemMenu );
814 connect( mShowAction, SIGNAL( activated() ), 808 connect( mShowAction, SIGNAL( activated() ),
815 mView, SLOT( showIncidence() ) ); 809 mView, SLOT( showIncidence() ) );
816 810
817 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); 811 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
818 mEditAction->addTo( mCurrentItemMenu ); 812 mEditAction->addTo( mCurrentItemMenu );
819 connect( mEditAction, SIGNAL( activated() ), 813 connect( mEditAction, SIGNAL( activated() ),
820 mView, SLOT( editIncidence() ) ); 814 mView, SLOT( editIncidence() ) );
821 815
822 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); 816 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
823 mDeleteAction->addTo( mCurrentItemMenu ); 817 mDeleteAction->addTo( mCurrentItemMenu );
824 connect( mDeleteAction, SIGNAL( activated() ), 818 connect( mDeleteAction, SIGNAL( activated() ),
825 mView, SLOT( deleteIncidence() ) ); 819 mView, SLOT( deleteIncidence() ) );
826 820
827 821
828 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); 822 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
829 mCloneAction->addTo( mCurrentItemMenu ); 823 mCloneAction->addTo( mCurrentItemMenu );
830 connect( mCloneAction, SIGNAL( activated() ), 824 connect( mCloneAction, SIGNAL( activated() ),
831 mView, SLOT( cloneIncidence() ) ); 825 mView, SLOT( cloneIncidence() ) );
832 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); 826 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
833 mMoveAction->addTo( mCurrentItemMenu ); 827 mMoveAction->addTo( mCurrentItemMenu );
834 connect( mMoveAction, SIGNAL( activated() ), 828 connect( mMoveAction, SIGNAL( activated() ),
835 mView, SLOT( moveIncidence() ) ); 829 mView, SLOT( moveIncidence() ) );
@@ -1057,49 +1051,49 @@ void MainWindow::initActions()
1057 connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); 1051 connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
1058 //#ifndef DESKTOP_VERSION 1052 //#ifndef DESKTOP_VERSION
1059 importMenu_X->insertSeparator(); 1053 importMenu_X->insertSeparator();
1060 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, 1054 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
1061 this ); 1055 this );
1062 action->addTo( importMenu_X ); 1056 action->addTo( importMenu_X );
1063 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); 1057 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
1064 //#else 1058 //#else
1065#ifdef _OL_IMPORT_ 1059#ifdef _OL_IMPORT_
1066 importMenu_X->insertSeparator(); 1060 importMenu_X->insertSeparator();
1067 action = new QAction( "import_ol", i18n("Import from OL"), 0, 1061 action = new QAction( "import_ol", i18n("Import from OL"), 0,
1068 this ); 1062 this );
1069 action->addTo( importMenu_X ); 1063 action->addTo( importMenu_X );
1070 connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); 1064 connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
1071#endif 1065#endif
1072 //#endif 1066 //#endif
1073 1067
1074 //importMenu->insertSeparator(); 1068 //importMenu->insertSeparator();
1075#if 0 1069#if 0
1076 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, 1070 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
1077 this ); 1071 this );
1078 action->addTo( importMenu ); 1072 action->addTo( importMenu );
1079 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); 1073 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
1080#endif 1074#endif
1081 action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, 1075 action = new QAction( "save_cal", i18n("Save Calendar Backup..."), 0,
1082 this ); 1076 this );
1083 action->addTo( importMenu ); 1077 action->addTo( importMenu );
1084 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); 1078 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
1085 importMenu->insertSeparator(); 1079 importMenu->insertSeparator();
1086 importMenu->insertItem( i18n("Import"), importMenu_X ); 1080 importMenu->insertItem( i18n("Import"), importMenu_X );
1087 //importMenu->insertSeparator(); 1081 //importMenu->insertSeparator();
1088 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, 1082 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
1089 this ); 1083 this );
1090 action->addTo( exportMenu_X ); 1084 action->addTo( exportMenu_X );
1091 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); 1085 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
1092 1086
1093 1087
1094 //LR 1088 //LR
1095 QPopupMenu *ex2phone = new QPopupMenu( this ); 1089 QPopupMenu *ex2phone = new QPopupMenu( this );
1096 ex2phone->insertItem(i18n("Complete calendar..."), 1 ); 1090 ex2phone->insertItem(i18n("Complete calendar..."), 1 );
1097 ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); 1091 ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
1098 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); 1092 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
1099 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); 1093 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
1100 1094
1101 importMenu->insertItem( i18n("Export"), exportMenu_X ); 1095 importMenu->insertItem( i18n("Export"), exportMenu_X );
1102#ifndef DESKTOP_VERSION 1096#ifndef DESKTOP_VERSION
1103 //importMenu->insertSeparator(); 1097 //importMenu->insertSeparator();
1104 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, 1098 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
1105 this ); 1099 this );