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 | 18 | ||||
-rw-r--r-- | kmicromail/koprefsdialog.h | 3 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 14 | ||||
-rw-r--r-- | korganizer/koprefsdialog.h | 3 |
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 | |||
@@ -45,26 +45,26 @@ INTERFACES = editaccountsui.ui \ | |||
45 | imapconfigui.ui \ | 45 | imapconfigui.ui \ |
46 | pop3configui.ui \ | 46 | pop3configui.ui \ |
47 | nntpconfigui.ui \ | 47 | nntpconfigui.ui \ |
48 | smtpconfigui.ui \ | 48 | smtpconfigui.ui \ |
49 | composemailui.ui \ | 49 | composemailui.ui \ |
50 | settingsdialogui.ui \ | 50 | settingsdialogui.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 | ||
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 |
62 | #LIBS += -luuid | 62 | #LIBS += -luuid |
63 | 63 | ||
64 | # | 64 | # |
65 | OBJECTS_DIR = obj/$(PLATFORM) | 65 | OBJECTS_DIR = obj/$(PLATFORM) |
66 | MOC_DIR = moc/$(PLATFORM) | 66 | MOC_DIR = moc/$(PLATFORM) |
67 | DESTDIR=$(QPEDIR)/bin | 67 | DESTDIR=$(QPEDIR)/bin |
68 | TARGET = ompi | 68 | TARGET = ompi |
69 | 69 | ||
70 | 70 | ||
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp index 7d7bd2a..598d12f 100644 --- a/kmicromail/koprefsdialog.cpp +++ b/kmicromail/koprefsdialog.cpp | |||
@@ -51,59 +51,70 @@ | |||
51 | #include <kmessagebox.h> | 51 | #include <kmessagebox.h> |
52 | #include <kcolordialog.h> | 52 | #include <kcolordialog.h> |
53 | #include <kiconloader.h> | 53 | #include <kiconloader.h> |
54 | #include <kemailsettings.h> | 54 | #include <kemailsettings.h> |
55 | #include <kstandarddirs.h> | 55 | #include <kstandarddirs.h> |
56 | 56 | ||
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 | ||
65 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | 66 | KOPrefsDialog::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 |
76 | 78 | ||
77 | setupMainTab(); | 79 | setupMainTab(); |
78 | setupLocaleTab(); | 80 | setupLocaleTab(); |
79 | setupTimeZoneTab(); | 81 | setupTimeZoneTab(); |
80 | setupTimeTab(); | 82 | setupTimeTab(); |
81 | setupLocaleDateTab(); | 83 | setupLocaleDateTab(); |
82 | setupFontsTab(); | 84 | setupFontsTab(); |
83 | setupColorsTab(); | 85 | setupColorsTab(); |
84 | setupViewsTab(); | 86 | setupViewsTab(); |
85 | //setupSyncTab(); | 87 | //setupSyncTab(); |
86 | //setupSyncAlgTab(); | 88 | //setupSyncAlgTab(); |
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 | ||
94 | KOPrefsDialog::~KOPrefsDialog() | 97 | KOPrefsDialog::~KOPrefsDialog() |
95 | { | 98 | { |
96 | } | 99 | } |
97 | 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 | |||
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); |
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()); |
104 | topLayout->setMargin(marginHint()); | 115 | topLayout->setMargin(marginHint()); |
105 | 116 | ||
106 | 117 | ||
107 | mNameEdit = new QLineEdit(topFrame); | 118 | mNameEdit = new QLineEdit(topFrame); |
108 | mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); | 119 | mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); |
109 | topLayout->addWidget(mNameLabel,0,0); | 120 | topLayout->addWidget(mNameLabel,0,0); |
@@ -172,33 +183,34 @@ void KOPrefsDialog::setupFontsTab() | |||
172 | &(KOPrefs::instance()->mReadFont),topFrame); | 183 | &(KOPrefs::instance()->mReadFont),topFrame); |
173 | topLayout->addWidget(timeBarFont->label(),i,0); | 184 | topLayout->addWidget(timeBarFont->label(),i,0); |
174 | topLayout->addWidget(timeBarFont->preview(),i,1); | 185 | topLayout->addWidget(timeBarFont->preview(),i,1); |
175 | topLayout->addWidget(timeBarFont->button(),i,2); | 186 | topLayout->addWidget(timeBarFont->button(),i,2); |
176 | ++i; | 187 | ++i; |
177 | 188 | ||
178 | topLayout->setColStretch(1,1); | 189 | topLayout->setColStretch(1,1); |
179 | topLayout->setRowStretch(4,1); | 190 | topLayout->setRowStretch(4,1); |
180 | 191 | ||
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 | } |
196 | 208 | ||
197 | #if 0 | 209 | #if 0 |
198 | void KOPrefsDialog::setupLocaleDateTab() | 210 | void KOPrefsDialog::setupLocaleDateTab() |
199 | { | 211 | { |
200 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 212 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
201 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 213 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
202 | topLayout->setSpacing(spacingHint()); | 214 | topLayout->setSpacing(spacingHint()); |
203 | topLayout->setMargin(marginHint()); | 215 | topLayout->setMargin(marginHint()); |
204 | int iii = 0; | 216 | int iii = 0; |
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h index 4b6bd4b..615574b 100644 --- a/kmicromail/koprefsdialog.h +++ b/kmicromail/koprefsdialog.h | |||
@@ -23,51 +23,54 @@ | |||
23 | #ifndef _KOPREFSDIALOG_H | 23 | #ifndef _KOPREFSDIALOG_H |
24 | #define _KOPREFSDIALOG_H | 24 | #define _KOPREFSDIALOG_H |
25 | 25 | ||
26 | #include <qframe.h> | 26 | #include <qframe.h> |
27 | #include <qdict.h> | 27 | #include <qdict.h> |
28 | #include <qcolor.h> | 28 | #include <qcolor.h> |
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 | ||
36 | class KColorButton; | 37 | class KColorButton; |
37 | class QSpinBox; | 38 | class QSpinBox; |
38 | class QSlider; | 39 | class QSlider; |
39 | class KURLRequester; | 40 | class KURLRequester; |
40 | class QComboBox; | 41 | class QComboBox; |
41 | class QLineEdit; | 42 | class QLineEdit; |
42 | class QStringList; | 43 | class QStringList; |
43 | 44 | ||
44 | /** Dialog to change the korganizer configuration. | 45 | /** Dialog to change the korganizer configuration. |
45 | */ | 46 | */ |
46 | class KOPrefsDialog : public KPrefsDialog | 47 | class KOPrefsDialog : public KPrefsDialog |
47 | { | 48 | { |
48 | Q_OBJECT | 49 | Q_OBJECT |
49 | public: | 50 | public: |
50 | /** Initialize dialog and pages */ | 51 | /** Initialize dialog and pages */ |
51 | KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false); | 52 | KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false); |
52 | ~KOPrefsDialog(); | 53 | ~KOPrefsDialog(); |
53 | 54 | ||
54 | protected: | 55 | protected: |
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 | /* |
68 | public slots: | 71 | public slots: |
69 | void showPrinterTab(); | 72 | void showPrinterTab(); |
70 | 73 | ||
71 | 74 | ||
72 | void updateCategories(); | 75 | void updateCategories(); |
73 | void showSyncPage(); | 76 | void showSyncPage(); |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 1c30faa..7dafcd8 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -58,55 +58,65 @@ | |||
58 | #include <klineedit.h> | 58 | #include <klineedit.h> |
59 | 59 | ||
60 | #if defined(USE_SOLARIS) | 60 | #if defined(USE_SOLARIS) |
61 | #include <sys/param.h> | 61 | #include <sys/param.h> |
62 | 62 | ||
63 | #define ZONEINFODIR "/usr/share/lib/zoneinfo" | 63 | #define ZONEINFODIR "/usr/share/lib/zoneinfo" |
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 | ||
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) |
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(); |
87 | setupColorsTab(); | 89 | setupColorsTab(); |
88 | setupViewsTab(); | 90 | setupViewsTab(); |
89 | //setupSyncTab(); | 91 | //setupSyncTab(); |
90 | //setupSyncAlgTab(); | 92 | //setupSyncAlgTab(); |
91 | //setupPrinterTab(); | 93 | //setupPrinterTab(); |
92 | //setupGroupSchedulingTab(); | 94 | //setupGroupSchedulingTab(); |
93 | //setupGroupAutomationTab(); | 95 | //setupGroupAutomationTab(); |
94 | } | 96 | } |
95 | 97 | ||
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); |
105 | topLayout->setSpacing(spacingHint()); | 115 | topLayout->setSpacing(spacingHint()); |
106 | topLayout->setMargin(marginHint()); | 116 | topLayout->setMargin(marginHint()); |
107 | int iii = 0; | 117 | int iii = 0; |
108 | 118 | ||
109 | 119 | ||
110 | KPrefsDialogWidRadios *syncPrefsGroup = | 120 | KPrefsDialogWidRadios *syncPrefsGroup = |
111 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); | 121 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); |
112 | QString format; | 122 | QString format; |
@@ -1312,24 +1322,25 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, | |||
1312 | } else { | 1322 | } else { |
1313 | for(int i=0;i<combo->count();++i) { | 1323 | for(int i=0;i<combo->count();++i) { |
1314 | if (combo->text(i) == text) { | 1324 | if (combo->text(i) == text) { |
1315 | combo->setCurrentItem(i); | 1325 | combo->setCurrentItem(i); |
1316 | break; | 1326 | break; |
1317 | } | 1327 | } |
1318 | } | 1328 | } |
1319 | } | 1329 | } |
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); |
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)); |
1330 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); | 1341 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); |
1331 | setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); | 1342 | setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); |
1332 | //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); | 1343 | //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); |
1333 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); | 1344 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); |
1334 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); | 1345 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); |
1335 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); | 1346 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); |
@@ -1361,24 +1372,25 @@ void KOPrefsDialog::usrReadConfig() | |||
1361 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); | 1372 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); |
1362 | updateCategories(); | 1373 | updateCategories(); |
1363 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); | 1374 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); |
1364 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); | 1375 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); |
1365 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); | 1376 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); |
1366 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); | 1377 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); |
1367 | } | 1378 | } |
1368 | 1379 | ||
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(); |
1377 | //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); | 1389 | //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); |
1378 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); | 1390 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); |
1379 | 1391 | ||
1380 | KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); | 1392 | KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); |
1381 | KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); | 1393 | KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); |
1382 | KOPrefs::instance()->setFullName(mNameEdit->text()); | 1394 | KOPrefs::instance()->setFullName(mNameEdit->text()); |
1383 | KOPrefs::instance()->setEmail(mEmailEdit->text()); | 1395 | KOPrefs::instance()->setEmail(mEmailEdit->text()); |
1384 | 1396 | ||
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index 83dc1eb..e20969a 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h | |||
@@ -23,24 +23,25 @@ | |||
23 | #ifndef _KOPREFSDIALOG_H | 23 | #ifndef _KOPREFSDIALOG_H |
24 | #define _KOPREFSDIALOG_H | 24 | #define _KOPREFSDIALOG_H |
25 | 25 | ||
26 | #include <qframe.h> | 26 | #include <qframe.h> |
27 | #include <qdict.h> | 27 | #include <qdict.h> |
28 | #include <qcolor.h> | 28 | #include <qcolor.h> |
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 | ||
36 | class KColorButton; | 37 | class KColorButton; |
37 | class QSpinBox; | 38 | class QSpinBox; |
38 | class QSlider; | 39 | class QSlider; |
39 | class KURLRequester; | 40 | class KURLRequester; |
40 | class QComboBox; | 41 | class QComboBox; |
41 | class QLineEdit; | 42 | class QLineEdit; |
42 | class QStringList; | 43 | class QStringList; |
43 | 44 | ||
44 | /** Dialog to change the korganizer configuration. | 45 | /** Dialog to change the korganizer configuration. |
45 | */ | 46 | */ |
46 | class KOPrefsDialog : public KPrefsDialog | 47 | class KOPrefsDialog : public KPrefsDialog |
@@ -70,44 +71,46 @@ class KOPrefsDialog : public KPrefsDialog | |||
70 | 71 | ||
71 | void toggleEmailSettings(bool); | 72 | void toggleEmailSettings(bool); |
72 | 73 | ||
73 | //additional emails | 74 | //additional emails |
74 | void addItem(); | 75 | void addItem(); |
75 | void removeItem(); | 76 | void removeItem(); |
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(); |
88 | void setupFontsTab(); | 90 | void setupFontsTab(); |
89 | void setupColorsTab(); | 91 | void setupColorsTab(); |
90 | void setupViewsTab(); | 92 | void setupViewsTab(); |
91 | void setupDisplayTab(); | 93 | void setupDisplayTab(); |
92 | void setupPrinterTab(); | 94 | void setupPrinterTab(); |
93 | void setupGroupSchedulingTab(); | 95 | void setupGroupSchedulingTab(); |
94 | void setupGroupAutomationTab(); | 96 | void setupGroupAutomationTab(); |
95 | void setupSyncTab(); | 97 | void setupSyncTab(); |
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; |
108 | QLineEdit *emailEdit; | 111 | QLineEdit *emailEdit; |
109 | 112 | ||
110 | QComboBox *timeCombo; | 113 | QComboBox *timeCombo; |
111 | QComboBox *tzCombo; | 114 | QComboBox *tzCombo; |
112 | 115 | ||
113 | // widgets holding preferences data | 116 | // widgets holding preferences data |