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
@@ -1189,21 +1189,25 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         delete eventRSync;
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); 
     QString delmess;
     if ( delFut  ) {
         delmess.sprintf(  i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInFuture, remRem-delFut); 
         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;
 }
 
 void CalendarView::setSyncDevice( QString s )
 {
     mCurrentSyncDevice= s;
 }
 void CalendarView::setSyncName( QString s )
@@ -1307,16 +1311,18 @@ void CalendarView::syncExternal( int mode  )
                 }
                 Incidence* lse = getLastSyncEvent();
                 if ( lse ) {
                     lse->setReadOnly( false );
                     lse->setDescription( "" );
                     lse->setReadOnly( true );
                 }
             }
+        } else {
+            topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") );
         }
         setModified( true );
     } else {
         QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ;
         QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"),
                                       question, i18n("Ok")) ;
 
     }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index fc2d59b..65566b5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -844,58 +844,65 @@ void MainWindow::initActions()
     action = new QAction( "beam all", i18n("Exit (+save)"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
 
     //menuBar->insertItem( "Configure",configureMenu );
     //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 );
     connect( action, SIGNAL( activated() ),
              SLOT( aboutAutoSaving() ) );
     action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( aboutKnownBugs() ) );
     action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
     action->addTo( helpMenu );
     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();
 
     // ******************************************************
     // menubar icons
 
 
     iconToolBar->setHorizontalStretchable (true );
     //menuBar->insertItem( iconToolBar );
@@ -1142,19 +1149,26 @@ void MainWindow::features()
 }
 
 void MainWindow::usertrans()
 {
 
     displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") );
 }
 
+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" );
 }
 void  MainWindow::faq()
 {
     displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") );
 
 }
 void  MainWindow::whatsNew()
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 0926313..ed65d36 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -48,16 +48,18 @@ class MainWindow : public QMainWindow
     protected slots:  
     void setCaptionToDates();
     void about(); 
     void licence(); 
     void faq(); 
     void usertrans(); 
     void features(); 
     void synchowto();   
+    void kdesynchowto();   
+    void multisynchowto();   
     void whatsNew();    
     void keyBindings();
     void aboutAutoSaving();;
     void aboutKnownBugs();
 
     void processIncidenceSelection( Incidence * );
 
     void importQtopia();