author | zautrix <zautrix> | 2004-08-01 13:59:52 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-01 13:59:52 (UTC) |
commit | 43d6cf3619675856333d82ae2fcad6ce81d824b8 (patch) (unidiff) | |
tree | 40629720fce9e0840fc4ab50ab1ef746a7c07375 /korganizer/calendarview.cpp | |
parent | 47a3a79ddde4ab63d34ddb0ffaa92d65f04de8ad (diff) | |
download | kdepimpi-43d6cf3619675856333d82ae2fcad6ce81d824b8.zip kdepimpi-43d6cf3619675856333d82ae2fcad6ce81d824b8.tar.gz kdepimpi-43d6cf3619675856333d82ae2fcad6ce81d824b8.tar.bz2 |
fixed sync config
-rw-r--r-- | korganizer/calendarview.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 387b751..cfc6b10 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -676,33 +676,32 @@ QDate CalendarView::endDate() | |||
676 | void CalendarView::createPrinter() | 676 | void CalendarView::createPrinter() |
677 | { | 677 | { |
678 | #ifndef KORG_NOPRINTER | 678 | #ifndef KORG_NOPRINTER |
679 | if (!mCalPrinter) { | 679 | if (!mCalPrinter) { |
680 | mCalPrinter = new CalPrinter(this, mCalendar); | 680 | mCalPrinter = new CalPrinter(this, mCalendar); |
681 | connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); | 681 | connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); |
682 | } | 682 | } |
683 | #endif | 683 | #endif |
684 | } | 684 | } |
685 | 685 | ||
686 | void CalendarView::confSync() | 686 | void CalendarView::confSync() |
687 | { | 687 | { |
688 | static KSyncPrefsDialog* sp = 0; | 688 | static KSyncPrefsDialog* sp = 0; |
689 | if ( ! sp ) { | 689 | if ( ! sp ) { |
690 | sp = new KSyncPrefsDialog( this, "syncprefs", true ); | 690 | sp = new KSyncPrefsDialog( this, "syncprefs", true ); |
691 | } | 691 | } |
692 | sp->setLocalMachineName ( KOPrefs::instance()->mLocalMachineName ); | ||
693 | sp->usrReadConfig(); | 692 | sp->usrReadConfig(); |
694 | #ifndef DESKTOP_VERSION | 693 | #ifndef DESKTOP_VERSION |
695 | sp->showMaximized(); | 694 | sp->showMaximized(); |
696 | #else | 695 | #else |
697 | sp->show(); | 696 | sp->show(); |
698 | #endif | 697 | #endif |
699 | sp->exec(); | 698 | sp->exec(); |
700 | KOPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames(); | 699 | KOPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames(); |
701 | KOPrefs::instance()->mLocalMachineName = sp->getLocalMachineName (); | 700 | KOPrefs::instance()->mLocalMachineName = sp->getLocalMachineName (); |
702 | } | 701 | } |
703 | 702 | ||
704 | 703 | ||
705 | //KOPrefs::instance()->mWriteBackFile | 704 | //KOPrefs::instance()->mWriteBackFile |
706 | //KOPrefs::instance()->mWriteBackExistingOnly | 705 | //KOPrefs::instance()->mWriteBackExistingOnly |
707 | 706 | ||
708 | // 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); | 707 | // 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); |