summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-01 19:29:37 (UTC)
committer zautrix <zautrix>2004-08-01 19:29:37 (UTC)
commit062113379f93ed645d2f246183c89eb8b6814834 (patch) (unidiff)
tree34e3a96d06b40d24c19c4e6814a65f290734563d
parent3bdbe8154381abc3fca2aaf5c055b59c2f8637a2 (diff)
downloadkdepimpi-062113379f93ed645d2f246183c89eb8b6814834.zip
kdepimpi-062113379f93ed645d2f246183c89eb8b6814834.tar.gz
kdepimpi-062113379f93ed645d2f246183c89eb8b6814834.tar.bz2
sync dialog fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp10
-rw-r--r--libkdepim/ksyncprefsdialog.cpp9
-rw-r--r--libkdepim/ksyncprofile.cpp8
3 files changed, 13 insertions, 14 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 298fa82..44b1264 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -820,12 +820,12 @@ void MainWindow::fillSyncMenu()
820 syncMenu->insertSeparator(); 820 syncMenu->insertSeparator();
821 KConfig config ( locateLocal( "config","syncprofilesrc" ) ); 821 KConfig config ( locateLocal( "config","syncprofilesrc" ) );
822 config.setGroup("SyncProfiles"); 822 config.setGroup("General");
823 QStringList prof = config.readListEntry("SyncProfileNames"); 823 QStringList prof = config.readListEntry("SyncProfileNames");
824 KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined"); 824 KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined");
825 if ( prof.count() < 3 ) { 825 if ( prof.count() < 3 ) {
826 prof.clear(); 826 prof.clear();
827 prof << i18n("Sharp-DTM"); 827 prof << i18n("Sharp_DTM");
828 prof << i18n("Local file"); 828 prof << i18n("Local_file");
829 prof << i18n("Last file"); 829 prof << i18n("Last_file");
830 KSyncProfile* temp = new KSyncProfile (); 830 KSyncProfile* temp = new KSyncProfile ();
831 temp->setName( prof[0] ); 831 temp->setName( prof[0] );
@@ -835,5 +835,5 @@ void MainWindow::fillSyncMenu()
835 temp->setName( prof[2] ); 835 temp->setName( prof[2] );
836 temp->writeConfig(&config); 836 temp->writeConfig(&config);
837 config.setGroup("SyncProfiles"); 837 config.setGroup("General");
838 config.writeEntry("SyncProfileNames",prof); 838 config.writeEntry("SyncProfileNames",prof);
839 config.sync(); 839 config.sync();
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 2f38c83..59c8418 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -544,5 +544,5 @@ void KSyncPrefsDialog::usrReadConfig()
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"));
@@ -568,5 +568,4 @@ void KSyncPrefsDialog::usrWriteConfig()
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 ) {
@@ -576,7 +575,7 @@ void KSyncPrefsDialog::usrWriteConfig()
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
@@ -585,5 +584,5 @@ void KSyncPrefsDialog::helpDevice()
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"
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 425285e..fcbb326 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -97,6 +97,6 @@ void KSyncProfile::setDefault()
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 );
@@ -128,6 +128,6 @@ void KSyncProfile::readConfig(KConfig *config )
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 );