-rw-r--r-- | korganizer/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 501eed5..862d437 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1020,97 +1020,97 @@ void MainWindow::initActions() | |||
1020 | connect( action, SIGNAL( activated() ), | 1020 | connect( action, SIGNAL( activated() ), |
1021 | mView, SLOT( edit_options() ) ); | 1021 | mView, SLOT( edit_options() ) ); |
1022 | icon = loadPixmap( pathString + "configure" ); | 1022 | icon = loadPixmap( pathString + "configure" ); |
1023 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); | 1023 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); |
1024 | action->addTo( actionMenu ); | 1024 | action->addTo( actionMenu ); |
1025 | connect( action, SIGNAL( activated() ), | 1025 | connect( action, SIGNAL( activated() ), |
1026 | mView, SLOT( edit_global_options() ) ); | 1026 | mView, SLOT( edit_global_options() ) ); |
1027 | if ( KOPrefs::instance()->mShowFullMenu ) { | 1027 | if ( KOPrefs::instance()->mShowFullMenu ) { |
1028 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); | 1028 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); |
1029 | 1029 | ||
1030 | } | 1030 | } |
1031 | // actionMenu->insertSeparator(); | 1031 | // actionMenu->insertSeparator(); |
1032 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, | 1032 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, |
1033 | this ); | 1033 | this ); |
1034 | action->addTo( importMenu_X ); | 1034 | action->addTo( importMenu_X ); |
1035 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); | 1035 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); |
1036 | action = new QAction( "import_quick", i18n("Import last file"), 0, | 1036 | action = new QAction( "import_quick", i18n("Import last file"), 0, |
1037 | this ); | 1037 | this ); |
1038 | action->addTo( importMenu_X ); | 1038 | action->addTo( importMenu_X ); |
1039 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); | 1039 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); |
1040 | importMenu_X->insertSeparator(); | 1040 | importMenu_X->insertSeparator(); |
1041 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, | 1041 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, |
1042 | this ); | 1042 | this ); |
1043 | action->addTo( importMenu_X ); | 1043 | action->addTo( importMenu_X ); |
1044 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); | 1044 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); |
1045 | //#ifndef DESKTOP_VERSION | 1045 | //#ifndef DESKTOP_VERSION |
1046 | importMenu_X->insertSeparator(); | 1046 | importMenu_X->insertSeparator(); |
1047 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, | 1047 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, |
1048 | this ); | 1048 | this ); |
1049 | action->addTo( importMenu_X ); | 1049 | action->addTo( importMenu_X ); |
1050 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); | 1050 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); |
1051 | //#else | 1051 | //#else |
1052 | #ifdef _OL_IMPORT_ | 1052 | #ifdef _OL_IMPORT_ |
1053 | importMenu_X->insertSeparator(); | 1053 | importMenu_X->insertSeparator(); |
1054 | action = new QAction( "import_ol", i18n("Import from OL"), 0, | 1054 | action = new QAction( "import_ol", i18n("Import from OL"), 0, |
1055 | this ); | 1055 | this ); |
1056 | action->addTo( importMenu_X ); | 1056 | action->addTo( importMenu_X ); |
1057 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); | 1057 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); |
1058 | #endif | 1058 | #endif |
1059 | //#endif | 1059 | //#endif |
1060 | 1060 | ||
1061 | //importMenu->insertSeparator(); | 1061 | //importMenu->insertSeparator(); |
1062 | #if 0 | 1062 | #if 0 |
1063 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, | 1063 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, |
1064 | this ); | 1064 | this ); |
1065 | action->addTo( importMenu ); | 1065 | action->addTo( importMenu ); |
1066 | connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); | 1066 | connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); |
1067 | #endif | 1067 | #endif |
1068 | action = new QAction( "save_cal", i18n("Save Calendar Backup..."), 0, | 1068 | action = new QAction( "save_cal", i18n("Save Backup..."), 0, |
1069 | this ); | 1069 | this ); |
1070 | action->addTo( importMenu ); | 1070 | action->addTo( importMenu ); |
1071 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); | 1071 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); |
1072 | importMenu->insertSeparator(); | 1072 | importMenu->insertSeparator(); |
1073 | importMenu->insertItem( i18n("Import"), importMenu_X ); | 1073 | importMenu->insertItem( i18n("Import"), importMenu_X ); |
1074 | //importMenu->insertSeparator(); | 1074 | //importMenu->insertSeparator(); |
1075 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, | 1075 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, |
1076 | this ); | 1076 | this ); |
1077 | action->addTo( exportMenu_X ); | 1077 | action->addTo( exportMenu_X ); |
1078 | connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); | 1078 | connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); |
1079 | 1079 | ||
1080 | 1080 | ||
1081 | //LR | 1081 | //LR |
1082 | QPopupMenu *ex2phone = new QPopupMenu( this ); | 1082 | QPopupMenu *ex2phone = new QPopupMenu( this ); |
1083 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 1083 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
1084 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 1084 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
1085 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); | 1085 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); |
1086 | exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); | 1086 | exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); |
1087 | 1087 | ||
1088 | importMenu->insertItem( i18n("Export"), exportMenu_X ); | 1088 | importMenu->insertItem( i18n("Export"), exportMenu_X ); |
1089 | #ifndef DESKTOP_VERSION | 1089 | #ifndef DESKTOP_VERSION |
1090 | //importMenu->insertSeparator(); | 1090 | //importMenu->insertSeparator(); |
1091 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, | 1091 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, |
1092 | this ); | 1092 | this ); |
1093 | brAction->addTo( beamMenu_X ); | 1093 | brAction->addTo( beamMenu_X ); |
1094 | brAction->setToggleAction (true ) ; | 1094 | brAction->setToggleAction (true ) ; |
1095 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); | 1095 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); |
1096 | 1096 | ||
1097 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, | 1097 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, |
1098 | this ); | 1098 | this ); |
1099 | action->addTo( beamMenu_X ); | 1099 | action->addTo( beamMenu_X ); |
1100 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); | 1100 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); |
1101 | 1101 | ||
1102 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, | 1102 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, |
1103 | this ); | 1103 | this ); |
1104 | action->addTo( beamMenu_X ); | 1104 | action->addTo( beamMenu_X ); |
1105 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); | 1105 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); |
1106 | importMenu->insertItem( i18n("Beam"), beamMenu_X ); | 1106 | importMenu->insertItem( i18n("Beam"), beamMenu_X ); |
1107 | #else | 1107 | #else |
1108 | //importMenu->insertSeparator(); | 1108 | //importMenu->insertSeparator(); |
1109 | icon = loadPixmap( pathString + "print" ); | 1109 | icon = loadPixmap( pathString + "print" ); |
1110 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 1110 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
1111 | action->addTo( beamMenu_X ); | 1111 | action->addTo( beamMenu_X ); |
1112 | connect( action, SIGNAL( activated() ), | 1112 | connect( action, SIGNAL( activated() ), |
1113 | this, SLOT( printCal() ) ); | 1113 | this, SLOT( printCal() ) ); |
1114 | 1114 | ||
1115 | icon = loadPixmap( pathString + "print" ); | 1115 | icon = loadPixmap( pathString + "print" ); |
1116 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); | 1116 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); |