Fix of the syncprofiles

5 files changed, 24 insertions, 1 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index f859b90..689618d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1152,48 +1152,52 @@ bool CalendarView::syncCalendar(QString filename, int mode)
     calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
     FileStorage* storage = new FileStorage( calendar );
     bool syncOK = false;
     storage->setFileName( filename );
     // qDebug("loading ... ");
     if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mode );
         getEventViewerDialog()->setSyncMode( false );
         if (  syncOK ) {
            if ( KOPrefs::instance()->mWriteBackFile )
             {
                 storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
                 storage->save();
             }
         }
         setModified( true );
     }
     delete storage;
     delete calendar;
     if ( syncOK )
         updateView();
     return syncOK;
 }
+void CalendarView::syncPhone()
+{
+    qDebug("CalendarView::syncPhone() ");
+}
 void CalendarView::syncSharp()
 {
 #ifndef DESKTOP_VERSION
     mGlobalSyncMode = SYNC_MODE_EXTERNAL;
     //mCurrentSyncDevice = "sharp-DTM";
     if ( KOPrefs::instance()->mAskForPreferences )
         edit_sync_options(); 
     qApp->processEvents();
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
     bool syncOK = false;
     SharpFormat sharpFormat;
     if ( sharpFormat.load( calendar, mCalendar ) ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs );
         getEventViewerDialog()->setSyncMode( false );
         qApp->processEvents();
         if (  syncOK ) {
             if ( KOPrefs::instance()->mWriteBackFile )
             {
                 QPtrList<Incidence> iL = mCalendar->rawIncidences(); 
                 Incidence* inc = iL.first();
                 /* obsolete
                 while ( inc ) {
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index d564473..b2838db 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -404,48 +404,49 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void toggleExpand();
     void toggleDateNavigatorWidget();
     void toggleAllDaySize();
     void dialogClosing(Incidence *);
   
     /** Look for new messages in the inbox */
     void lookForIncomingMessages();
    /** Look for new messages in the outbox */
     void lookForOutgoingMessages();
 
     void processMainViewSelection( Incidence * );
     void processTodoListSelection( Incidence * );
     
     void processIncidenceSelection( Incidence * );
 
     void purgeCompleted();
     bool removeCompletedSubTodos( Todo* );
     void slotCalendarChanged();
     bool importBday();
     bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday  );
     bool importQtopia( const QString &categoriesFile,
                        const QString &datebookFile,
                        const QString &tasklistFile );
     void syncSharp( );
+    void syncPhone( );
     void slotSelectPickerDate( QDate ) ;
     void showDatePicker( ) ;
     void moveIncidence(Incidence *) ;
     void beamIncidence(Incidence *) ;
     void beamCalendar() ;
     void beamFilteredCalendar() ;
     void beamIncidenceList(QPtrList<Incidence>) ;
     void manageCategories();
     int addCategories();
     void removeCategories();
     void setSyncDevice( QString );
     void setSyncName( QString );
   protected slots:
     void timerAlarm();
     void suspendAlarm();
     void beamDone( Ir *ir );
     /** Select a view or adapt the current view to display the specified dates. */
     void showDates( const KCal::DateList & );
     void selectWeekNum ( int );
   
   public:
     // show a standard warning
     // returns KMsgBox::yesNoCancel()
     int msgCalModified();
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 424fa98..446fe2e 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -189,48 +189,51 @@ class KOPrefs : public KPimPrefs
     bool mShowIconNextDays;
     bool mShowIconNext;
     bool mShowIconJournal;
     
     bool mShowIconStretch;
 
     bool mToolBarHor;
     bool mToolBarUp;
     bool mToolBarMiniIcons;
 
     bool mAskForQuit;
     bool mUsePassWd;
     bool mWriteBackFile;
     bool mAskForPreferences;
     bool mShowSyncSummary;
     bool mShowSyncEvents;
     bool mShowTodoInAgenda;
     bool mWriteBackExistingOnly;
 
     QString mRemoteIP;
     QString mRemoteUser;
     QString mRemotePassWd;
     QString mRemoteFile;
     QString mLocalTempFile;
+    QString mPhoneDevice;
+    QString mPhoneConnection;
+    QString mPhoneModel;
 
     int mLastSyncTime;
     int mSyncAlgoPrefs;
     int mRingSyncAlgoPrefs;
     QStringList mSyncProfileNames;
     QStringList mExternSyncProfiles;
     QString mLocalMachineName;
     void setCategoryColor(QString cat,const QColor & color);
     QColor *categoryColor(QString cat);
 
     QString mArchiveFile;
     QString mHtmlExportFile;
     bool    mHtmlWithSave;
 
     QStringList mSelectedPlugins;
   
     QString mLastImportFile;
     QString mLastVcalFile;
     QString mLastSaveFile;
     QString mLastLoadFile;
     QString mLastSyncedLocalFile;
 
 
     QString mDefaultAlarmFile;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index c3c4c26..062c95f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -876,49 +876,55 @@ int MainWindow::ringSync()
     KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
     QStringList syncProfileNames = KOPrefs::instance()->mSyncProfileNames;
     KSyncProfile* temp = new KSyncProfile ();
     KOPrefs::instance()->mAskForPreferences = false;
     for ( i = 0; i < syncProfileNames.count(); ++i ) {
         mCurrentSyncProfile = i;
         temp->setName(syncProfileNames[mCurrentSyncProfile]);
         temp->readConfig(&config);
         if ( temp->getIncludeInRingSync() && ( i < 1 || i > 2  )) {
             setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
             ++syncedProfiles;
             // KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
             KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
             KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
             KOPrefs::instance()->mShowSyncSummary = false;
             mView->setSyncDevice(syncProfileNames[i] );
             mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
             if ( i == 0 ) {
                 syncSharp();
             } else {
                 if ( temp->getIsLocalFileSync() ) {
                     if ( syncWithFile( temp->getRemoteFileName( ), true ) ) 
                         KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName();
                 } else {
-                    syncRemote( temp, false );
+                    if (  temp->getIsPhoneSync() ) {
+                        KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ;
+                        KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( );
+                        KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( );
+                        syncPhone();
+                    } else
+                        syncRemote( temp, false );
                     
                 }
             }
             timer.start();
             setCaption(i18n("Multiple sync in progress ... please wait!") );
             while ( timer.elapsed () < 2000 ) {
                 qApp->processEvents();
 #ifndef _WIN32_
                 sleep (1);
 #endif
             }
  
         }
 
     }
     delete temp;
     return syncedProfiles;
 } 
 
 void MainWindow::multiSync( bool askforPrefs  )
 {
     if (mBlockSaveFlag)
         return;
     mBlockSaveFlag = true;   
@@ -2016,34 +2022,42 @@ void MainWindow::syncSSH()
 #if 0
     system ("scp zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics /home/polo/Applications/korganizer/z_sync.ics");
     while ( timer.elapsed() < 5000 )
         qApp->processEvents();
 
     qDebug("MainWindow::merging) ");
     mView->syncCalendar( "/home/polo/Applications/korganizer/z_sync.ics", 0 );
     while ( mBlockSaveFlag ) 
         qApp->processEvents();
     save();
     system ("scp /home/polo/Applications/korganizer/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics");
 #endif
 
 }
 
 
 void MainWindow::syncSharp()
 {
     if ( mCalendarModifiedFlag )
         save();
     mView->syncSharp();
     slotModifiedChanged( true );
    
 }
+void MainWindow::syncPhone()
+{
+    if ( mCalendarModifiedFlag )
+        save();
+    mView->syncPhone();
+    slotModifiedChanged( true );
+   
+}
 
 void MainWindow::printSel( )
 {
     mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 
 void MainWindow::printCal()
 {
     mView->print();//mCp->showDialog();
 }
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index fba8c52..1d87db0 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -54,48 +54,49 @@ class MainWindow : public QMainWindow
 
     void importQtopia();
     void importBday();
     void importOL();
     void importIcal();
     void importFile( QString, bool );
     void quickImportIcal();
     
     void slotModifiedChanged( bool );
     
     void save();
     void configureToolBar( int );
     void printSel();
     void printCal();
     void saveCalendar();
     void loadCalendar();
     void exportVCalendar();
     void fillFilterMenu();
     void selectFilter( int );
 
     void slotSyncMenu( int );
     void syncSSH();
     void confSync();
     void syncSharp();
+    void syncPhone();
     void syncLocalFile();
     bool syncWithFile( QString, bool );
     void quickSyncLocalFile();
     
     
   protected:
     void displayText( QString, QString);
     void displayFile( QString, QString);
     
     void enableIncidenceActions( bool );
     
   private:
     void saveOnClose();
     int mCurrentSyncProfile;
     void syncRemote( KSyncProfile* , bool ask = true);
     void fillSyncMenu();
     bool  mFlagKeyPressed;
     bool  mBlockAtStartup;
     QPEToolBar *iconToolBar;
     void initActions();
     void setDefaultPreferences(); 
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
     QPopupMenu *configureToolBarMenu;