added howto to menus

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
         mes += delmess;
     }
+    mCalendar->checkAlarmForIncidence( 0, true );
+    qDebug( mes );
     if ( mSyncManager->mShowSyncSummary ) {
-        KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") );
+        if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
+                                                 i18n("KO/Pi  Synchronization"),i18n("Write back"))) {
+            qDebug("cancelled ");
+            return false;
+        }
     }
-    qDebug( mes );
-    mCalendar->checkAlarmForIncidence( 0, true );
     return syncOK;
 }
@@ -1313,4 +1317,6 @@ void CalendarView::syncExternal( int mode  )
                 }
             }
+        } else {
+            topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") );
         }
         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()
     //configureMenu->insertItem( "Toolbar",configureToolBarMenu  );
     icon = loadPixmap( "korganizer/korganizer" );
-    action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
+
+    action = new QAction( "Whats New", i18n("What's new?"), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
-             SLOT( keyBindings() ) );
+             SLOT( whatsNew() ) );
     action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( features() ) );
+    action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
+    action->addTo( helpMenu );
+    connect( action, SIGNAL( activated() ),
+             SLOT( keyBindings() ) );
+    action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
+    action->addTo( helpMenu );
+    connect( action, SIGNAL( activated() ),
+             SLOT( synchowto() ) );
+    action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
+    action->addTo( helpMenu );
+    connect( action, SIGNAL( activated() ),
+             SLOT( kdesynchowto() ) );
+    action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
+    action->addTo( helpMenu );
+    connect( action, SIGNAL( activated() ),
+             SLOT( multisynchowto() ) );
     action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
     action->addTo( helpMenu );
@@ -870,26 +887,16 @@ void MainWindow::initActions()
     connect( action, SIGNAL( activated() ),
              SLOT( usertrans() ) );
-    action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
-    action->addTo( helpMenu );
-    connect( action, SIGNAL( activated() ),
-             SLOT( synchowto() ) );
-    action = new QAction( "Whats New", i18n("What's new?"), 0,this );
-    action->addTo( helpMenu );
-    connect( action, SIGNAL( activated() ),
-             SLOT( whatsNew() ) );
     action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( faq() ) );
-
-
-    action = new QAction( "about", i18n("About..."), 0, this );
-    action->addTo( helpMenu );
-    connect( action, SIGNAL( activated() ),
-             SLOT( about() ) );
     action = new QAction( "licence", i18n("Licence..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( licence() ) );
+    action = new QAction( "about", i18n("About..."), 0, this );
+    action->addTo( helpMenu );
+    connect( action, SIGNAL( activated() ),
+             SLOT( about() ) );
     //menuBar->insertSeparator();
 
@@ -1148,7 +1155,14 @@ void MainWindow::usertrans()
 }
 
+void MainWindow::kdesynchowto()
+{
+    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" );
+}
+void MainWindow::multisynchowto()
+{
+    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" );
+}
 void MainWindow::synchowto()
 {
-
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
 }
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
     void features(); 
     void synchowto();   
+    void kdesynchowto();   
+    void multisynchowto();   
     void whatsNew();    
     void keyBindings();