-rw-r--r-- | korganizer/calendarview.cpp | 12 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 48 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 2 |
3 files changed, 42 insertions, 20 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 6e61351..4667918 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1195,9 +1195,13 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1195 | mes += delmess; | 1195 | mes += delmess; |
1196 | } | 1196 | } |
1197 | mCalendar->checkAlarmForIncidence( 0, true ); | ||
1198 | qDebug( mes ); | ||
1197 | if ( mSyncManager->mShowSyncSummary ) { | 1199 | if ( mSyncManager->mShowSyncSummary ) { |
1198 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); | 1200 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, |
1201 | i18n("KO/Pi Synchronization"),i18n("Write back"))) { | ||
1202 | qDebug("cancelled "); | ||
1203 | return false; | ||
1204 | } | ||
1199 | } | 1205 | } |
1200 | qDebug( mes ); | ||
1201 | mCalendar->checkAlarmForIncidence( 0, true ); | ||
1202 | return syncOK; | 1206 | return syncOK; |
1203 | } | 1207 | } |
@@ -1313,4 +1317,6 @@ void CalendarView::syncExternal( int mode ) | |||
1313 | } | 1317 | } |
1314 | } | 1318 | } |
1319 | } else { | ||
1320 | topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") ); | ||
1315 | } | 1321 | } |
1316 | setModified( true ); | 1322 | setModified( true ); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index fc2d59b..65566b5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -850,12 +850,29 @@ void MainWindow::initActions() | |||
850 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); | 850 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); |
851 | icon = loadPixmap( "korganizer/korganizer" ); | 851 | icon = loadPixmap( "korganizer/korganizer" ); |
852 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | 852 | |
853 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | ||
853 | action->addTo( helpMenu ); | 854 | action->addTo( helpMenu ); |
854 | connect( action, SIGNAL( activated() ), | 855 | connect( action, SIGNAL( activated() ), |
855 | SLOT( keyBindings() ) ); | 856 | SLOT( whatsNew() ) ); |
856 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); | 857 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); |
857 | action->addTo( helpMenu ); | 858 | action->addTo( helpMenu ); |
858 | connect( action, SIGNAL( activated() ), | 859 | connect( action, SIGNAL( activated() ), |
859 | SLOT( features() ) ); | 860 | SLOT( features() ) ); |
861 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | ||
862 | action->addTo( helpMenu ); | ||
863 | connect( action, SIGNAL( activated() ), | ||
864 | SLOT( keyBindings() ) ); | ||
865 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | ||
866 | action->addTo( helpMenu ); | ||
867 | connect( action, SIGNAL( activated() ), | ||
868 | SLOT( synchowto() ) ); | ||
869 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); | ||
870 | action->addTo( helpMenu ); | ||
871 | connect( action, SIGNAL( activated() ), | ||
872 | SLOT( kdesynchowto() ) ); | ||
873 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); | ||
874 | action->addTo( helpMenu ); | ||
875 | connect( action, SIGNAL( activated() ), | ||
876 | SLOT( multisynchowto() ) ); | ||
860 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 877 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); |
861 | action->addTo( helpMenu ); | 878 | action->addTo( helpMenu ); |
@@ -870,26 +887,16 @@ void MainWindow::initActions() | |||
870 | connect( action, SIGNAL( activated() ), | 887 | connect( action, SIGNAL( activated() ), |
871 | SLOT( usertrans() ) ); | 888 | SLOT( usertrans() ) ); |
872 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | ||
873 | action->addTo( helpMenu ); | ||
874 | connect( action, SIGNAL( activated() ), | ||
875 | SLOT( synchowto() ) ); | ||
876 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | ||
877 | action->addTo( helpMenu ); | ||
878 | connect( action, SIGNAL( activated() ), | ||
879 | SLOT( whatsNew() ) ); | ||
880 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); | 889 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); |
881 | action->addTo( helpMenu ); | 890 | action->addTo( helpMenu ); |
882 | connect( action, SIGNAL( activated() ), | 891 | connect( action, SIGNAL( activated() ), |
883 | SLOT( faq() ) ); | 892 | SLOT( faq() ) ); |
884 | |||
885 | |||
886 | action = new QAction( "about", i18n("About..."), 0, this ); | ||
887 | action->addTo( helpMenu ); | ||
888 | connect( action, SIGNAL( activated() ), | ||
889 | SLOT( about() ) ); | ||
890 | action = new QAction( "licence", i18n("Licence..."), 0, this ); | 893 | action = new QAction( "licence", i18n("Licence..."), 0, this ); |
891 | action->addTo( helpMenu ); | 894 | action->addTo( helpMenu ); |
892 | connect( action, SIGNAL( activated() ), | 895 | connect( action, SIGNAL( activated() ), |
893 | SLOT( licence() ) ); | 896 | SLOT( licence() ) ); |
897 | action = new QAction( "about", i18n("About..."), 0, this ); | ||
898 | action->addTo( helpMenu ); | ||
899 | connect( action, SIGNAL( activated() ), | ||
900 | SLOT( about() ) ); | ||
894 | //menuBar->insertSeparator(); | 901 | //menuBar->insertSeparator(); |
895 | 902 | ||
@@ -1148,7 +1155,14 @@ void MainWindow::usertrans() | |||
1148 | } | 1155 | } |
1149 | 1156 | ||
1157 | void MainWindow::kdesynchowto() | ||
1158 | { | ||
1159 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); | ||
1160 | } | ||
1161 | void MainWindow::multisynchowto() | ||
1162 | { | ||
1163 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); | ||
1164 | } | ||
1150 | void MainWindow::synchowto() | 1165 | void MainWindow::synchowto() |
1151 | { | 1166 | { |
1152 | |||
1153 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); | 1167 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); |
1154 | } | 1168 | } |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 0926313..ed65d36 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -54,4 +54,6 @@ class MainWindow : public QMainWindow | |||
54 | void features(); | 54 | void features(); |
55 | void synchowto(); | 55 | void synchowto(); |
56 | void kdesynchowto(); | ||
57 | void multisynchowto(); | ||
56 | void whatsNew(); | 58 | void whatsNew(); |
57 | void keyBindings(); | 59 | void keyBindings(); |