-rw-r--r-- | korganizer/koprefsdialog.cpp | 14 | ||||
-rw-r--r-- | korganizer/koprefsdialog.h | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 1c30faa..7dafcd8 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -66,8 +66,9 @@ | |||
66 | 66 | ||
67 | #include "koprefs.h" | 67 | #include "koprefs.h" |
68 | 68 | ||
69 | #include "koprefsdialog.h" | 69 | #include "koprefsdialog.h" |
70 | #include "kpimglobalprefs.h" | ||
70 | 71 | ||
71 | 72 | ||
72 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | 73 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : |
73 | KPrefsDialog(KOPrefs::instance(),parent,name,true) | 74 | KPrefsDialog(KOPrefs::instance(),parent,name,true) |
@@ -77,8 +78,9 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
77 | mCategoryDict.setAutoDelete(true); | 78 | mCategoryDict.setAutoDelete(true); |
78 | 79 | ||
79 | KGlobal::locale()->insertCatalogue("timezones"); | 80 | KGlobal::locale()->insertCatalogue("timezones"); |
80 | 81 | ||
82 | setupGlobalTab(); | ||
81 | setupMainTab(); | 83 | setupMainTab(); |
82 | setupLocaleTab(); | 84 | setupLocaleTab(); |
83 | setupTimeZoneTab(); | 85 | setupTimeZoneTab(); |
84 | setupTimeTab(); | 86 | setupTimeTab(); |
@@ -96,9 +98,17 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
96 | 98 | ||
97 | KOPrefsDialog::~KOPrefsDialog() | 99 | KOPrefsDialog::~KOPrefsDialog() |
98 | { | 100 | { |
99 | } | 101 | } |
100 | 102 | void KOPrefsDialog::setupGlobalTab() | |
103 | { | ||
104 | QFrame *topFrame = addPage(i18n("Global"),0,0); | ||
105 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); | ||
106 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | ||
107 | topLayout->addWidget( kdelibcfg ); | ||
108 | |||
109 | |||
110 | } | ||
101 | void KOPrefsDialog::setupLocaleDateTab() | 111 | void KOPrefsDialog::setupLocaleDateTab() |
102 | { | 112 | { |
103 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 113 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
104 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 114 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
@@ -1320,8 +1330,9 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, | |||
1320 | } | 1330 | } |
1321 | 1331 | ||
1322 | void KOPrefsDialog::usrReadConfig() | 1332 | void KOPrefsDialog::usrReadConfig() |
1323 | { | 1333 | { |
1334 | kdelibcfg->readConfig(); | ||
1324 | mNameEdit->setText(KOPrefs::instance()->fullName()); | 1335 | mNameEdit->setText(KOPrefs::instance()->fullName()); |
1325 | mEmailEdit->setText(KOPrefs::instance()->email()); | 1336 | mEmailEdit->setText(KOPrefs::instance()->email()); |
1326 | 1337 | ||
1327 | mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); | 1338 | mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); |
@@ -1369,8 +1380,9 @@ void KOPrefsDialog::usrReadConfig() | |||
1369 | 1380 | ||
1370 | void KOPrefsDialog::usrWriteConfig() | 1381 | void KOPrefsDialog::usrWriteConfig() |
1371 | { | 1382 | { |
1372 | 1383 | ||
1384 | kdelibcfg->writeConfig(); | ||
1373 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); | 1385 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); |
1374 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); | 1386 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); |
1375 | //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); | 1387 | //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); |
1376 | //KOPrefs::instance()->mRemoteFile= mRemoteFile->text(); | 1388 | //KOPrefs::instance()->mRemoteFile= mRemoteFile->text(); |
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index 83dc1eb..e20969a 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h | |||
@@ -31,8 +31,9 @@ | |||
31 | #include <kdialogbase.h> | 31 | #include <kdialogbase.h> |
32 | 32 | ||
33 | #include <libkdepim/kprefsdialog.h> | 33 | #include <libkdepim/kprefsdialog.h> |
34 | #include <libkdepim/kdateedit.h> | 34 | #include <libkdepim/kdateedit.h> |
35 | #include <kcmconfigs/kdepimconfigwidget.h> | ||
35 | 36 | ||
36 | class KColorButton; | 37 | class KColorButton; |
37 | class QSpinBox; | 38 | class QSpinBox; |
38 | class QSlider; | 39 | class QSlider; |
@@ -78,8 +79,9 @@ class KOPrefsDialog : public KPrefsDialog | |||
78 | 79 | ||
79 | protected: | 80 | protected: |
80 | void usrReadConfig(); | 81 | void usrReadConfig(); |
81 | void usrWriteConfig(); | 82 | void usrWriteConfig(); |
83 | void setupGlobalTab(); | ||
82 | 84 | ||
83 | void setupMainTab(); | 85 | void setupMainTab(); |
84 | void setupTimeTab(); | 86 | void setupTimeTab(); |
85 | void setupTimeZoneTab(); | 87 | void setupTimeZoneTab(); |
@@ -98,8 +100,9 @@ class KOPrefsDialog : public KPrefsDialog | |||
98 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); | 100 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); |
99 | 101 | ||
100 | 102 | ||
101 | private: | 103 | private: |
104 | KDEPIMConfigWidget* kdelibcfg; | ||
102 | KPrefsDialogWidBool *mEnableGroupScheduling; | 105 | KPrefsDialogWidBool *mEnableGroupScheduling; |
103 | KPrefsDialogWidBool *mEnableProjectView; | 106 | KPrefsDialogWidBool *mEnableProjectView; |
104 | 107 | ||
105 | QFrame *mPrinterTab; | 108 | QFrame *mPrinterTab; |