summaryrefslogtreecommitdiffabout
path: root/libkdepim
Unidiff
Diffstat (limited to 'libkdepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncprefsdialog.cpp9
-rw-r--r--libkdepim/ksyncprofile.cpp8
2 files changed, 8 insertions, 9 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 2f38c83..59c8418 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -534,66 +534,65 @@ QString KSyncPrefsDialog::getLocalMachineName ( )
534{ 534{
535 return mMyMachineName->text(); 535 return mMyMachineName->text();
536} 536}
537 537
538QStringList KSyncPrefsDialog::getSyncProfileNames() 538QStringList KSyncPrefsDialog::getSyncProfileNames()
539{ 539{
540 return mSyncProfileNames; 540 return mSyncProfileNames;
541} 541}
542void KSyncPrefsDialog::usrReadConfig() 542void KSyncPrefsDialog::usrReadConfig()
543{ 543{
544 //KConfig *config = KOGlobals::config(); 544 //KConfig *config = KOGlobals::config();
545 KConfig config ( locateLocal( "config","syncprofilesrc" ) ); 545 KConfig config ( locateLocal( "config","syncprofilesrc" ) );
546 config.setGroup("SyncProfiles"); 546 config.setGroup("General");
547 mSyncProfileNames =config.readListEntry("SyncProfileNames"); 547 mSyncProfileNames =config.readListEntry("SyncProfileNames");
548 mMyMachineName->setText(config.readEntry("LocalMachineName","undefined")); 548 mMyMachineName->setText(config.readEntry("LocalMachineName","undefined"));
549 int i; 549 int i;
550 KSyncProfile* temp ; 550 KSyncProfile* temp ;
551 mSyncProfiles.clear(); 551 mSyncProfiles.clear();
552 for ( i = 0; i < mSyncProfileNames.count();++i ) { 552 for ( i = 0; i < mSyncProfileNames.count();++i ) {
553 temp = new KSyncProfile (); 553 temp = new KSyncProfile ();
554 temp->setName( mSyncProfileNames[i] ); 554 temp->setName( mSyncProfileNames[i] );
555 temp->readConfig( &config ); 555 temp->readConfig( &config );
556 mSyncProfiles.append( temp ); 556 mSyncProfiles.append( temp );
557 } 557 }
558 insertProfiles(); 558 insertProfiles();
559 //mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName ); 559 //mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName );
560} 560}
561 561
562 562
563void KSyncPrefsDialog::usrWriteConfig() 563void KSyncPrefsDialog::usrWriteConfig()
564{ 564{
565 saveProfile(); 565 saveProfile();
566 if ( currentSelection >= 0 ) 566 if ( currentSelection >= 0 )
567 profileChanged(currentSelection); 567 profileChanged(currentSelection);
568 //KConfig *config = KOGlobals::config(); 568 //KConfig *config = KOGlobals::config();
569 KConfig config ( locateLocal( "config","syncprofilesrc" ) ); 569 KConfig config ( locateLocal( "config","syncprofilesrc" ) );
570 config.setGroup("SyncProfiles");
571 KSyncProfile* prof = mSyncProfiles.first(); 570 KSyncProfile* prof = mSyncProfiles.first();
572 while ( prof ) { 571 while ( prof ) {
573 prof->writeConfig(&config); 572 prof->writeConfig(&config);
574 prof = mSyncProfiles.next(); 573 prof = mSyncProfiles.next();
575 } 574 }
576 //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames; 575 //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
577 //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text(); 576 //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
577 config.setGroup("General");
578 config.writeEntry("SyncProfileNames",mSyncProfileNames); 578 config.writeEntry("SyncProfileNames",mSyncProfileNames);
579 QString name = mMyMachineName->text(); 579 config.writeEntry("LocalMachineName",mMyMachineName->text());
580 config.writeEntry("LocalMachineName",name);
581} 580}
582 581
583void KSyncPrefsDialog::helpDevice() 582void KSyncPrefsDialog::helpDevice()
584{ 583{
585 QString hint = i18n("Insert device where\nphone is connected. E.g.:\n"); 584 QString hint = i18n("Insert device where\nphone is connected. E.g.:\n");
586#ifdef _WIN32_ 585#ifdef _WIN32_
587 hint += "leave empty for Irda\n" 586 hint += "Leave empty for Irda.\n"
588 "com1:\n(first serial port)\n" 587 "com1:\n(first serial port)\n"
589 "usb not supported\n" 588 "usb not supported\n"
590 "???\n(bluetooth device address)\n"; 589 "???\n(bluetooth device address)\n";
591 590
592#else 591#else
593 hint += "/dev/ircomm\n(Irda)\n" 592 hint += "/dev/ircomm\n(Irda)\n"
594 "/dev/ttyS0\n(first serial port)\n" 593 "/dev/ttyS0\n(first serial port)\n"
595 "/dev/ttyUSB0\n(first device usb port)\n" 594 "/dev/ttyUSB0\n(first device usb port)\n"
596 "???\n(bluetooth device address)\n"; 595 "???\n(bluetooth device address)\n";
597#endif 596#endif
598 KMessageBox::information(this,hint,i18n("KDE-Pim sync config")); 597 KMessageBox::information(this,hint,i18n("KDE-Pim sync config"));
599} 598}
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 425285e..fcbb326 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -87,26 +87,26 @@ void KSyncProfile::setDefault()
87 mIncludeInRingSync = false; 87 mIncludeInRingSync = false;
88 mIncludeInRingSyncAB = false; 88 mIncludeInRingSyncAB = false;
89 mSyncPrefs = SYNC_PREF_ASK; 89 mSyncPrefs = SYNC_PREF_ASK;
90 mIsLocalFileSync = true; 90 mIsLocalFileSync = true;
91 mIsPhoneSync = false; 91 mIsPhoneSync = false;
92 mPhoneDevice = "/dev/ircomm"; 92 mPhoneDevice = "/dev/ircomm";
93 mPhoneConnection = "irda"; 93 mPhoneConnection = "irda";
94 mPhoneModel = "6310i"; 94 mPhoneModel = "6310i";
95 95
96} 96}
97void KSyncProfile::readConfig(KConfig *config ) 97void KSyncProfile::readConfig(KConfig *config )
98{ 98{
99 config->setGroup("SyncProfiles"); 99 config->setGroup(mName);
100 QString prefix = "Profile_"+mName+"_"; 100 QString prefix = "";
101 //mName = config->readEntry( prefix+ "Name", mName ); 101 //mName = config->readEntry( prefix+ "Name", mName );
102 mPreSyncCommand = config->readEntry( prefix+ "PreSyncCommand",mPreSyncCommand ); 102 mPreSyncCommand = config->readEntry( prefix+ "PreSyncCommand",mPreSyncCommand );
103 mPostSyncCommand = config->readEntry( prefix+ "PostSyncCommand", mPostSyncCommand );; 103 mPostSyncCommand = config->readEntry( prefix+ "PostSyncCommand", mPostSyncCommand );;
104 mLocalTempFile = config->readEntry( prefix+ "LocalTempFile", mLocalTempFile ); 104 mLocalTempFile = config->readEntry( prefix+ "LocalTempFile", mLocalTempFile );
105 mRemoteFileName = config->readEntry( prefix+ "RemoteFileName", mRemoteFileName ); 105 mRemoteFileName = config->readEntry( prefix+ "RemoteFileName", mRemoteFileName );
106 106
107 mPreSyncCommandAB = config->readEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB ); 107 mPreSyncCommandAB = config->readEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB );
108 mPostSyncCommandAB = config->readEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB ); 108 mPostSyncCommandAB = config->readEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB );
109 mLocalTempFileAB = config->readEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB ); 109 mLocalTempFileAB = config->readEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB );
110 mRemoteFileNameAB = config->readEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB ); 110 mRemoteFileNameAB = config->readEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB );
111 111
112 112
@@ -118,26 +118,26 @@ void KSyncProfile::readConfig(KConfig *config )
118 mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB ); 118 mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB );
119 mShowSummaryAfterSync = config->readBoolEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync ); 119 mShowSummaryAfterSync = config->readBoolEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync );
120 mAskForPreferences = config->readBoolEntry( prefix+ "AskForPreferences",mAskForPreferences ); 120 mAskForPreferences = config->readBoolEntry( prefix+ "AskForPreferences",mAskForPreferences );
121 mWriteBackExisting = config->readBoolEntry( prefix+ "WriteBackExisting",mWriteBackExisting ); 121 mWriteBackExisting = config->readBoolEntry( prefix+ "WriteBackExisting",mWriteBackExisting );
122 mWriteBackFuture = config->readBoolEntry( prefix+ "WriteBackFuture",mWriteBackFuture ); 122 mWriteBackFuture = config->readBoolEntry( prefix+ "WriteBackFuture",mWriteBackFuture );
123 mSyncPrefs = config->readNumEntry( prefix+ "SyncPrefs", mSyncPrefs ); 123 mSyncPrefs = config->readNumEntry( prefix+ "SyncPrefs", mSyncPrefs );
124 mWriteBackFutureWeeks = config->readNumEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks ); 124 mWriteBackFutureWeeks = config->readNumEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks );
125 mIsLocalFileSync= config->readBoolEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync ); 125 mIsLocalFileSync= config->readBoolEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync );
126 mIsPhoneSync= config->readBoolEntry( prefix+ "IsPhoneSync", mIsPhoneSync ); 126 mIsPhoneSync= config->readBoolEntry( prefix+ "IsPhoneSync", mIsPhoneSync );
127} 127}
128void KSyncProfile::writeConfig( KConfig * config ) 128void KSyncProfile::writeConfig( KConfig * config )
129{ 129{
130 config->setGroup("SyncProfiles"); 130 config->setGroup(mName );
131 QString prefix = "Profile_"+mName+"_"; 131 QString prefix = "";
132 // config->writeEntry( prefix+ "Name", mName ); 132 // config->writeEntry( prefix+ "Name", mName );
133 config->writeEntry( prefix+ "PreSyncCommand",mPreSyncCommand ); 133 config->writeEntry( prefix+ "PreSyncCommand",mPreSyncCommand );
134 config->writeEntry( prefix+ "PostSyncCommand", mPostSyncCommand ); 134 config->writeEntry( prefix+ "PostSyncCommand", mPostSyncCommand );
135 config->writeEntry( prefix+ "LocalTempFile", mLocalTempFile ); 135 config->writeEntry( prefix+ "LocalTempFile", mLocalTempFile );
136 config->writeEntry( prefix+ "RemoteFileName", mRemoteFileName ); 136 config->writeEntry( prefix+ "RemoteFileName", mRemoteFileName );
137 137
138 config->writeEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB ); 138 config->writeEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB );
139 config->writeEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB ); 139 config->writeEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB );
140 config->writeEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB ); 140 config->writeEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB );
141 config->writeEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB ); 141 config->writeEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB );
142 142
143 config->writeEntry( prefix+ "PhoneDevice", mPhoneDevice ); 143 config->writeEntry( prefix+ "PhoneDevice", mPhoneDevice );