Fix of the syncprofiles

8 files changed, 32 insertions, 17 deletions

diff --git a/kabc/resource.cpp b/kabc/resource.cpp
index d39fd6a..7b91239 100644
--- a/kabc/resource.cpp
+++ b/kabc/resource.cpp
@@ -36,10 +36,10 @@ using namespace KABC;
 Resource::Resource( const KConfig *config, bool syncable )
     : KRES::Resource( config ), mAddressBook( 0 ), mSyncProfile( 0 )
 {
   if(syncable == true) {
-    mSyncProfile = new KSyncProfile( identifier() );
-    mSyncProfile->setName(resourceName());
+    mSyncProfile = new KSyncProfile( );
+    mSyncProfile->setName("pending" /*resourceName()*/);
     mSyncProfile->readConfig( (KConfig *)config );
   }
 }
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index f859b90..689618d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1172,8 +1172,12 @@ bool CalendarView::syncCalendar(QString filename, int mode)
     if ( syncOK )
         updateView();
     return syncOK;
 }
+void CalendarView::syncPhone()
+{
+    qDebug("CalendarView::syncPhone() ");
+}
 void CalendarView::syncSharp()
 {
 #ifndef DESKTOP_VERSION
     mGlobalSyncMode = SYNC_MODE_EXTERNAL;
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index d564473..b2838db 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -424,8 +424,9 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     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 *) ;
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 424fa98..446fe2e 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -209,8 +209,11 @@ class KOPrefs : public KPimPrefs
     QString mRemoteUser;
     QString mRemotePassWd;
     QString mRemoteFile;
     QString mLocalTempFile;
+    QString mPhoneDevice;
+    QString mPhoneConnection;
+    QString mPhoneModel;
 
     int mLastSyncTime;
     int mSyncAlgoPrefs;
     int mRingSyncAlgoPrefs;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index c3c4c26..062c95f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -896,9 +896,15 @@ int MainWindow::ringSync()
                 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();
@@ -2036,8 +2042,16 @@ void MainWindow::syncSharp()
     mView->syncSharp();
     slotModifiedChanged( true );
    
 }
+void MainWindow::syncPhone()
+{
+    if ( mCalendarModifiedFlag )
+        save();
+    mView->syncPhone();
+    slotModifiedChanged( true );
+   
+}
 
 void MainWindow::printSel( )
 {
     mView->viewManager()->agendaView()->agenda()->printSelection();
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index fba8c52..1d87db0 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -74,8 +74,9 @@ class MainWindow : public QMainWindow
     void slotSyncMenu( int );
     void syncSSH();
     void confSync();
     void syncSharp();
+    void syncPhone();
     void syncLocalFile();
     bool syncWithFile( QString, bool );
     void quickSyncLocalFile();
     
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 15dc152..e7c35fb 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -29,15 +29,10 @@
 
 #include "ksyncprofile.h"
 
 
-KSyncProfile::KSyncProfile( const char * identifier): QObject (0, identifier )
+KSyncProfile::KSyncProfile(): QObject ()
 {
-    setIdentifier( identifier );
-
-    if (getIdentifier().isEmpty())
-      setIdentifier( "noID" );
-
     setDefault();
 }
 KSyncProfile::~KSyncProfile()
 {
@@ -67,9 +62,9 @@ KSyncProfile* KSyncProfile::clone()
     myClone->setSyncPrefs( mSyncPrefs);
     myClone->setIsLocalFileSync( mIsLocalFileSync );
     myClone->setIsPhoneSync( mIsPhoneSync );
     myClone->setName( "noName" );
-    myClone->setIdentifier( "noID" );
+    //myClone->setIdentifier( "noID" );
     return myClone;
 }
 
 
@@ -103,9 +98,9 @@ void KSyncProfile::readConfig(KConfig *config )
 {
   if (config)
   {
 
-    config->setGroup("SyncProfile_" + mIdentifier);
+    config->setGroup( mName );
 
     mName = config->readEntry( "Name", mName );
     mPreSyncCommand = config->readEntry( "PreSyncCommand",mPreSyncCommand  );
     mPostSyncCommand = config->readEntry( "PostSyncCommand", mPostSyncCommand );
@@ -139,14 +134,14 @@ void KSyncProfile::readConfig(KConfig *config )
 }
 
 void KSyncProfile::deleteConfig(KConfig *config )
 {
-	config->deleteGroup( "SyncProfile_" + mIdentifier );
+	config->deleteGroup( mName );
 }
 
 void KSyncProfile::writeConfig( KConfig * config )
 {
-    config->setGroup("SyncProfile_" + mIdentifier);
+    config->setGroup(mName);
 
     config->writeEntry( "Name", mName );
     config->writeEntry( "PreSyncCommand",mPreSyncCommand  );
     config->writeEntry( "PostSyncCommand", mPostSyncCommand );
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index 8995def..a0cfb71 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -45,19 +45,17 @@ class KConfig;
   have to register instances with the function KPrefs::addItem().
 */
 class KSyncProfile : public QObject {
   public:
-    KSyncProfile( const char * identifier = 0);
+    KSyncProfile();
     ~KSyncProfile() ;
 
     KSyncProfile* clone();
     void setDefault();
     void readConfig(KConfig *);
     void writeConfig(KConfig *);
 	void deleteConfig(KConfig *);
 
-    void setIdentifier( const QString& i ) {mIdentifier = i;}
-    QString getIdentifier( ) { return mIdentifier;}
     void setPreSyncCommand( const QString& n ) {mPreSyncCommand = n;}
     QString getPreSyncCommand( ) { return mPreSyncCommand; }
     void setPostSyncCommand( const QString& n ) {mPostSyncCommand = n;}
     QString getPostSyncCommand( ) { return mPostSyncCommand;}
@@ -111,9 +109,8 @@ class KSyncProfile : public QObject {
     void setIsPhoneSync( bool b ) { mIsPhoneSync= b;}
     bool getIsPhoneSync( ) { return mIsPhoneSync;}
   private:
     QString mName;
-    QString mIdentifier;
     QString mPreSyncCommand;
     QString mPostSyncCommand;
     QString mLocalTempFile;
     QString mRemoteFileName;