-rw-r--r-- | korganizer/mainwindow.cpp | 8 |
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 | |||
@@ -649,21 +649,17 @@ 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 ); | 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 ); |
@@ -801,19 +797,17 @@ void MainWindow::initActions() | |||
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() ), |
@@ -1073,17 +1067,17 @@ void MainWindow::initActions() | |||
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 ); |