author | zautrix <zautrix> | 2004-09-22 02:03:15 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-22 02:03:15 (UTC) |
commit | 633522024e48efc423155a04b71083a03696211d (patch) (unidiff) | |
tree | c383ee8fa3489351450b948eb83a42b504752131 | |
parent | ed2feaa9f7e2064e5b26ff678a25eb79ceae599b (diff) | |
download | kdepimpi-633522024e48efc423155a04b71083a03696211d.zip kdepimpi-633522024e48efc423155a04b71083a03696211d.tar.gz kdepimpi-633522024e48efc423155a04b71083a03696211d.tar.bz2 |
global prefs integrated in kopi amd ompi
-rw-r--r-- | kmicromail/kmicromailE.pro | 4 | ||||
-rw-r--r-- | kmicromail/koprefsdialog.cpp | 16 | ||||
-rw-r--r-- | kmicromail/koprefsdialog.h | 3 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 12 | ||||
-rw-r--r-- | korganizer/koprefsdialog.h | 3 |
5 files changed, 34 insertions, 4 deletions
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro index 0d6cf86..75ba92f 100644 --- a/kmicromail/kmicromailE.pro +++ b/kmicromail/kmicromailE.pro | |||
@@ -54,8 +54,8 @@ INTERFACES = editaccountsui.ui \ | |||
54 | nntpgroupsui.ui | 54 | nntpgroupsui.ui |
55 | 55 | ||
56 | 56 | ||
57 | INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include | 57 | INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include |
58 | LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim | 58 | LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicroqtcompat -lmicrokdepim |
59 | LIBS += $(QTOPIALIB) | 59 | LIBS += $(QTOPIALIB) |
60 | #LIBS += -lqtopia | 60 | #LIBS += -lqtopia |
61 | #next line for Zaurus only | 61 | #next line for Zaurus only |
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp index 7d7bd2a..598d12f 100644 --- a/kmicromail/koprefsdialog.cpp +++ b/kmicromail/koprefsdialog.cpp | |||
@@ -60,6 +60,7 @@ | |||
60 | #include "koprefs.h" | 60 | #include "koprefs.h" |
61 | 61 | ||
62 | #include "koprefsdialog.h" | 62 | #include "koprefsdialog.h" |
63 | //#include <kprefswidget.h> | ||
63 | 64 | ||
64 | 65 | ||
65 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | 66 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : |
@@ -67,6 +68,7 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
67 | { | 68 | { |
68 | 69 | ||
69 | setCaption( i18n("Settings - some need a restart (nr)")); | 70 | setCaption( i18n("Settings - some need a restart (nr)")); |
71 | setupGlobalTab(); | ||
70 | setupMainTab(); | 72 | setupMainTab(); |
71 | setupMailTab();; | 73 | setupMailTab();; |
72 | setupFontsTab(); | 74 | setupFontsTab(); |
@@ -90,11 +92,20 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
90 | #endif | 92 | #endif |
91 | } | 93 | } |
92 | 94 | ||
95 | #include "kpimglobalprefs.h" | ||
93 | 96 | ||
94 | KOPrefsDialog::~KOPrefsDialog() | 97 | KOPrefsDialog::~KOPrefsDialog() |
95 | { | 98 | { |
96 | } | 99 | } |
100 | void KOPrefsDialog::setupGlobalTab() | ||
101 | { | ||
102 | QFrame *topFrame = addPage(i18n("Global"),0,0); | ||
103 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); | ||
104 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | ||
105 | topLayout->addWidget( kdelibcfg ); | ||
106 | |||
97 | 107 | ||
108 | } | ||
98 | void KOPrefsDialog::setupMainTab() | 109 | void KOPrefsDialog::setupMainTab() |
99 | { | 110 | { |
100 | QFrame *topFrame = addPage(i18n("General"),0,0); | 111 | QFrame *topFrame = addPage(i18n("General"),0,0); |
@@ -181,15 +192,16 @@ void KOPrefsDialog::setupFontsTab() | |||
181 | } | 192 | } |
182 | void KOPrefsDialog::usrReadConfig() | 193 | void KOPrefsDialog::usrReadConfig() |
183 | { | 194 | { |
184 | qDebug("read "); | 195 | |
185 | mNameEdit->setText(KOPrefs::instance()->mName); | 196 | mNameEdit->setText(KOPrefs::instance()->mName); |
186 | mEmailEdit->setText(KOPrefs::instance()->mEmail); | 197 | mEmailEdit->setText(KOPrefs::instance()->mEmail); |
198 | kdelibcfg->readConfig(); | ||
187 | } | 199 | } |
188 | void KOPrefsDialog::usrWriteConfig() | 200 | void KOPrefsDialog::usrWriteConfig() |
189 | { | 201 | { |
190 | qDebug("write "); | ||
191 | KOPrefs::instance()->mName = mNameEdit->text(); | 202 | KOPrefs::instance()->mName = mNameEdit->text(); |
192 | KOPrefs::instance()->mEmail = mEmailEdit->text(); | 203 | KOPrefs::instance()->mEmail = mEmailEdit->text(); |
204 | kdelibcfg->writeConfig(); | ||
193 | 205 | ||
194 | 206 | ||
195 | } | 207 | } |
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h index 4b6bd4b..615574b 100644 --- a/kmicromail/koprefsdialog.h +++ b/kmicromail/koprefsdialog.h | |||
@@ -32,6 +32,7 @@ | |||
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; |
@@ -56,9 +57,11 @@ protected: | |||
56 | void usrWriteConfig(); | 57 | void usrWriteConfig(); |
57 | 58 | ||
58 | void setupMainTab(); | 59 | void setupMainTab(); |
60 | void setupGlobalTab(); | ||
59 | void setupMailTab(); | 61 | void setupMailTab(); |
60 | void setupFontsTab(); | 62 | void setupFontsTab(); |
61 | private: | 63 | private: |
64 | KDEPIMConfigWidget* kdelibcfg; | ||
62 | QLineEdit *mNameEdit; | 65 | QLineEdit *mNameEdit; |
63 | QLineEdit *mEmailEdit; | 66 | QLineEdit *mEmailEdit; |
64 | QLabel *mNameLabel; | 67 | QLabel *mNameLabel; |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 1c30faa..7dafcd8 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -67,6 +67,7 @@ | |||
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) : |
@@ -78,6 +79,7 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
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(); |
@@ -97,7 +99,15 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
97 | KOPrefsDialog::~KOPrefsDialog() | 99 | KOPrefsDialog::~KOPrefsDialog() |
98 | { | 100 | { |
99 | } | 101 | } |
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 | |||
100 | 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); |
@@ -1321,6 +1331,7 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, | |||
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 | ||
@@ -1370,6 +1381,7 @@ void KOPrefsDialog::usrReadConfig() | |||
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(); |
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index 83dc1eb..e20969a 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h | |||
@@ -32,6 +32,7 @@ | |||
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; |
@@ -79,6 +80,7 @@ class KOPrefsDialog : public KPrefsDialog | |||
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(); |
@@ -99,6 +101,7 @@ class KOPrefsDialog : public KPrefsDialog | |||
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 | ||