added howto to menus

6 files changed, 74 insertions, 28 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 5ebd3a4..bdc5bd8 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1909,8 +1909,14 @@ void KABCore::initActions()
                  "wn" );
  mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
                  this, SLOT( synchowto() ), actionCollection(),
                  "sync" );
+ mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0,
+                 this, SLOT( kdesynchowto() ), actionCollection(),
+                 "kdesync" );
+ mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0,
+                 this, SLOT( multisynchowto() ), actionCollection(),
+                 "multisync" );
 
   mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
                  this, SLOT( createAboutData() ), actionCollection(),
                  "kaddressbook_about_data" );
@@ -2050,10 +2056,12 @@ void KABCore::addActionsManually()
 
      
   mActionWN->plug( helpMenu );
   mActionSyncHowto->plug( helpMenu );
-  mActionLicence->plug( helpMenu );
+  mActionKdeSyncHowto->plug( helpMenu );
+  mActionMultiSyncHowto->plug( helpMenu );
   mActionFaq->plug( helpMenu );
+  mActionLicence->plug( helpMenu );
   mActionAboutKAddressbook->plug( helpMenu );
 
   if (KGlobal::getDesktopSize() > KGlobal::Small ) {
 
@@ -2349,9 +2357,16 @@ void KABCore::whatsnew()
 void KABCore::synchowto()
 {
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
 }
-
+void KABCore::kdesynchowto()
+{
+    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" );
+}
+void KABCore::multisynchowto()
+{
+    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" );
+}
 void  KABCore::faq()
 {
   KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" );
 }
@@ -2777,12 +2792,16 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         remote->insertAddressee( addresseeRSync, false );
     local->insertAddressee( addresseeLSync, false );
     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"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); 
-    if ( syncManager->mShowSyncSummary ) {
-        KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") );
-    }
     qDebug( mes );
+    if ( syncManager->mShowSyncSummary ) { 
+        if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
+                                                                       i18n("KA/Pi  Synchronization"),i18n("Write back"))) {
+            qDebug("cancelled ");
+            return false;
+        }
+    }
     return syncOK;
 }
 
 
@@ -2873,9 +2892,10 @@ bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
                 abLocal.removeSyncAddressees( false );
                 abLocal.saveAB();
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
             }
-        }
+        } else
+            message( i18n("Sync cancelled or failed.") );
         setModified();
     }
     if ( syncOK )
         mViewManager->refreshView();
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 6831ec9..c01d598 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -151,8 +151,10 @@ class KABCore : public QWidget, public KSyncInterface
     void showLicence();
     void faq();
     void whatsnew() ;
     void synchowto() ;
+    void multisynchowto() ;
+    void kdesynchowto() ;
     void writeToPhone();
 
     /**
       Is called whenever a contact is selected in the view.
@@ -453,8 +455,10 @@ class KABCore : public QWidget, public KSyncInterface
     KAction *mActionLicence;
     KAction *mActionFaq;
     KAction *mActionWN;
     KAction *mActionSyncHowto;
+    KAction *mActionKdeSyncHowto;
+    KAction *mActionMultiSyncHowto;
 
     KAction *mActionDeleteView;
 
     QPopupMenu *viewMenu;
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 6e61351..4667918 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1193,13 +1193,17 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     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 )
@@ -1311,8 +1315,10 @@ void CalendarView::syncExternal( int mode  )
                     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") ;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index fc2d59b..65566b5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -848,16 +848,33 @@ void MainWindow::initActions()
 
     //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() ) );
@@ -868,30 +885,20 @@ void MainWindow::initActions()
     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
@@ -1146,11 +1153,18 @@ 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()
 {
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 0926313..ed65d36 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -52,8 +52,10 @@ class MainWindow : public QMainWindow
     void faq(); 
     void usertrans(); 
     void features(); 
     void synchowto();   
+    void kdesynchowto();   
+    void multisynchowto();   
     void whatsNew();    
     void keyBindings();
     void aboutAutoSaving();;
     void aboutKnownBugs();
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 17e6c75..9857e3e 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -479,9 +479,9 @@ bool  KSyncManager::syncWithFile( QString fn , bool quick )
         //qDebug("Now sycing ... ");
         if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) )
             mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") );
         else
-            mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
+            mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") );
         if ( ! quick )
             mPrefs->mLastSyncedLocalFile = fn;
     }
     return ret;
@@ -513,9 +513,9 @@ void KSyncManager::multiSync( bool askforPrefs  )
     mCurrentSyncDevice = i18n("Multiple profiles") ;
     mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs;
     if ( askforPrefs ) {
         if ( !edit_sync_options()) {
-            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
+            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted.") );
             return;
         }
         mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs;
     }