summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-22 02:03:15 (UTC)
committer zautrix <zautrix>2004-09-22 02:03:15 (UTC)
commit633522024e48efc423155a04b71083a03696211d (patch) (unidiff)
treec383ee8fa3489351450b948eb83a42b504752131
parented2feaa9f7e2064e5b26ff678a25eb79ceae599b (diff)
downloadkdepimpi-633522024e48efc423155a04b71083a03696211d.zip
kdepimpi-633522024e48efc423155a04b71083a03696211d.tar.gz
kdepimpi-633522024e48efc423155a04b71083a03696211d.tar.bz2
global prefs integrated in kopi amd ompi
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/kmicromailE.pro4
-rw-r--r--kmicromail/koprefsdialog.cpp18
-rw-r--r--kmicromail/koprefsdialog.h3
-rw-r--r--korganizer/koprefsdialog.cpp14
-rw-r--r--korganizer/koprefsdialog.h3
5 files changed, 36 insertions, 6 deletions
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 0d6cf86..75ba92f 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -51,14 +51,14 @@ INTERFACES = editaccountsui.ui \
51 statuswidgetui.ui \ 51 statuswidgetui.ui \
52 newmaildirui.ui \ 52 newmaildirui.ui \
53 selectstoreui.ui \ 53 selectstoreui.ui \
54 nntpgroupsui.ui 54 nntpgroupsui.ui
55 55
56 56
57INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include 57INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
58LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim 58LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicroqtcompat -lmicrokdepim
59LIBS += $(QTOPIALIB) 59LIBS += $(QTOPIALIB)
60#LIBS += -lqtopia 60#LIBS += -lqtopia
61#next line for Zaurus only 61#next line for Zaurus only
62#LIBS += -luuid 62#LIBS += -luuid
63 63
64# 64#
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 7d7bd2a..598d12f 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -57,19 +57,21 @@
57#include <klineedit.h> 57#include <klineedit.h>
58 58
59 59
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
65KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : 66KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
66 KPrefsDialog(KOPrefs::instance(),parent,name,true) 67 KPrefsDialog(KOPrefs::instance(),parent,name,true)
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();
73 readConfig(); 75 readConfig();
74 76
75#if 0 77#if 0
@@ -87,17 +89,26 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
87 //setupPrinterTab(); 89 //setupPrinterTab();
88 //setupGroupSchedulingTab(); 90 //setupGroupSchedulingTab();
89 //setupGroupAutomationTab(); 91 //setupGroupAutomationTab();
90#endif 92#endif
91} 93}
92 94
95#include "kpimglobalprefs.h"
93 96
94KOPrefsDialog::~KOPrefsDialog() 97KOPrefsDialog::~KOPrefsDialog()
95{ 98{
96} 99}
97 100void 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
107
108}
98void KOPrefsDialog::setupMainTab() 109void KOPrefsDialog::setupMainTab()
99{ 110{
100 QFrame *topFrame = addPage(i18n("General"),0,0); 111 QFrame *topFrame = addPage(i18n("General"),0,0);
101 112
102 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 113 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
103 topLayout->setSpacing(spacingHint()); 114 topLayout->setSpacing(spacingHint());
@@ -178,21 +189,22 @@ void KOPrefsDialog::setupFontsTab()
178 topLayout->setColStretch(1,1); 189 topLayout->setColStretch(1,1);
179 topLayout->setRowStretch(4,1); 190 topLayout->setRowStretch(4,1);
180 191
181} 192}
182void KOPrefsDialog::usrReadConfig() 193void 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}
188void KOPrefsDialog::usrWriteConfig() 200void 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}
196 208
197#if 0 209#if 0
198void KOPrefsDialog::setupLocaleDateTab() 210void KOPrefsDialog::setupLocaleDateTab()
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h
index 4b6bd4b..615574b 100644
--- a/kmicromail/koprefsdialog.h
+++ b/kmicromail/koprefsdialog.h
@@ -29,12 +29,13 @@
29#include <qlistview.h> 29#include <qlistview.h>
30 30
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
36class KColorButton; 37class KColorButton;
37class QSpinBox; 38class QSpinBox;
38class QSlider; 39class QSlider;
39class KURLRequester; 40class KURLRequester;
40class QComboBox; 41class QComboBox;
@@ -53,15 +54,17 @@ class KOPrefsDialog : public KPrefsDialog
53 54
54protected: 55protected:
55 void usrReadConfig(); 56 void usrReadConfig();
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;
65 QLabel *mEmailLabel; 68 QLabel *mEmailLabel;
66#if 0 69#if 0
67 /* 70 /*
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 1c30faa..7dafcd8 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -64,23 +64,25 @@
64#define INITFILE "/etc/default/init" 64#define INITFILE "/etc/default/init"
65#endif 65#endif
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
72KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : 73KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
73 KPrefsDialog(KOPrefs::instance(),parent,name,true) 74 KPrefsDialog(KOPrefs::instance(),parent,name,true)
74{ 75{
75 76
76 setCaption( i18n("Preferences - some settings need a restart (nr)")); 77 setCaption( i18n("Preferences - some settings need a restart (nr)"));
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();
85 setupLocaleDateTab(); 87 setupLocaleDateTab();
86 setupFontsTab(); 88 setupFontsTab();
@@ -94,13 +96,21 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
94} 96}
95 97
96 98
97KOPrefsDialog::~KOPrefsDialog() 99KOPrefsDialog::~KOPrefsDialog()
98{ 100{
99} 101}
100 102void 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}
101void KOPrefsDialog::setupLocaleDateTab() 111void KOPrefsDialog::setupLocaleDateTab()
102{ 112{
103QFrame *topFrame = addPage(i18n("Date Format"),0,0); 113QFrame *topFrame = addPage(i18n("Date Format"),0,0);
104 QGridLayout *topLayout = new QGridLayout(topFrame,3,2); 114 QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
105 topLayout->setSpacing(spacingHint()); 115 topLayout->setSpacing(spacingHint());
106 topLayout->setMargin(marginHint()); 116 topLayout->setMargin(marginHint());
@@ -1318,12 +1328,13 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
1318 } 1328 }
1319 } 1329 }
1320} 1330}
1321 1331
1322void KOPrefsDialog::usrReadConfig() 1332void 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);
1328 QDate current ( 2001, 1,1); 1339 QDate current ( 2001, 1,1);
1329 mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); 1340 mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
@@ -1367,12 +1378,13 @@ void KOPrefsDialog::usrReadConfig()
1367} 1378}
1368 1379
1369 1380
1370void KOPrefsDialog::usrWriteConfig() 1381void 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();
1377 //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); 1389 //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text();
1378 KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); 1390 KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text();
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index 83dc1eb..e20969a 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -29,12 +29,13 @@
29#include <qlistview.h> 29#include <qlistview.h>
30 30
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
36class KColorButton; 37class KColorButton;
37class QSpinBox; 38class QSpinBox;
38class QSlider; 39class QSlider;
39class KURLRequester; 40class KURLRequester;
40class QComboBox; 41class QComboBox;
@@ -76,12 +77,13 @@ class KOPrefsDialog : public KPrefsDialog
76 void updateItem(); 77 void updateItem();
77 void updateInput(); 78 void updateInput();
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();
86 void setupLocaleTab(); 88 void setupLocaleTab();
87 void setupLocaleDateTab(); 89 void setupLocaleDateTab();
@@ -96,12 +98,13 @@ class KOPrefsDialog : public KPrefsDialog
96 void setupSyncAlgTab(); 98 void setupSyncAlgTab();
97 99
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;
106 109
107 QLineEdit *nameEdit; 110 QLineEdit *nameEdit;