summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-01 13:59:52 (UTC)
committer zautrix <zautrix>2004-08-01 13:59:52 (UTC)
commit43d6cf3619675856333d82ae2fcad6ce81d824b8 (patch) (side-by-side diff)
tree40629720fce9e0840fc4ab50ab1ef746a7c07375
parent47a3a79ddde4ab63d34ddb0ffaa92d65f04de8ad (diff)
downloadkdepimpi-43d6cf3619675856333d82ae2fcad6ce81d824b8.zip
kdepimpi-43d6cf3619675856333d82ae2fcad6ce81d824b8.tar.gz
kdepimpi-43d6cf3619675856333d82ae2fcad6ce81d824b8.tar.bz2
fixed sync config
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp1
-rw-r--r--korganizer/mainwindow.cpp4
-rw-r--r--libkdepim/ksyncprefsdialog.cpp5
3 files changed, 7 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 387b751..cfc6b10 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -684,17 +684,16 @@ void CalendarView::createPrinter()
}
void CalendarView::confSync()
{
static KSyncPrefsDialog* sp = 0;
if ( ! sp ) {
sp = new KSyncPrefsDialog( this, "syncprefs", true );
}
- sp->setLocalMachineName ( KOPrefs::instance()->mLocalMachineName );
sp->usrReadConfig();
#ifndef DESKTOP_VERSION
sp->showMaximized();
#else
sp->show();
#endif
sp->exec();
KOPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 589ab2d..d0d1f3b 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -816,29 +816,31 @@ void MainWindow::fillSyncMenu()
syncMenu->clear();
syncMenu->insertItem( i18n("Configure..."), 0 );
syncMenu->insertSeparator();
syncMenu->insertItem( i18n("Multiple sync"), 1 );
syncMenu->insertSeparator();
KConfig config ( locateLocal( "config","syncprofilesrc" ) );
config.setGroup("SyncProfiles");
QStringList prof = config.readListEntry("SyncProfileNames");
-
+ KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined");
if ( prof.count() < 3 ) {
prof.clear();
prof << i18n("Sharp-DTM");
prof << i18n("Local file");
prof << i18n("Last file");
KSyncProfile* temp = new KSyncProfile ();
temp->setName( prof[0] );
temp->writeConfig(&config);
temp->setName( prof[1] );
temp->writeConfig(&config);
temp->setName( prof[2] );
temp->writeConfig(&config);
+ config.setGroup("SyncProfiles");
+ config.writeEntry("SyncProfileNames",prof);
config.sync();
delete temp;
}
KOPrefs::instance()->mSyncProfileNames = prof;
int i;
for ( i = 0; i < prof.count(); ++i ) {
syncMenu->insertItem( prof[i], 1000+i );
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 8d610d8..3df2a3b 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -429,16 +429,17 @@ QStringList KSyncPrefsDialog::getSyncProfileNames()
return mSyncProfileNames;
}
void KSyncPrefsDialog::usrReadConfig()
{
//KConfig *config = KOGlobals::config();
KConfig config ( locateLocal( "config","syncprofilesrc" ) );
config.setGroup("SyncProfiles");
mSyncProfileNames =config.readListEntry("SyncProfileNames");
+ mMyMachineName->setText(config.readEntry("LocalMachineName","undefined"));
int i;
KSyncProfile* temp ;
mSyncProfiles.clear();
for ( i = 0; i < mSyncProfileNames.count();++i ) {
temp = new KSyncProfile ();
temp->setName( mSyncProfileNames[i] );
temp->readConfig( &config );
mSyncProfiles.append( temp );
@@ -458,11 +459,13 @@ void KSyncPrefsDialog::usrWriteConfig()
config.setGroup("SyncProfiles");
KSyncProfile* prof = mSyncProfiles.first();
while ( prof ) {
prof->writeConfig(&config);
prof = mSyncProfiles.next();
}
//KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
//KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
- config.writeEntry("SyncProfileNames",&mSyncProfileNames);
+ config.writeEntry("SyncProfileNames",mSyncProfileNames);
+ QString name = mMyMachineName->text();
+ config.writeEntry("LocalMachineName",name);
}