-rw-r--r-- | kmicromail/koprefsdialog.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp index 7de7064..017f1f7 100644 --- a/kmicromail/koprefsdialog.cpp +++ b/kmicromail/koprefsdialog.cpp | |||
@@ -84,52 +84,49 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
84 | 84 | ||
85 | setupMainTab(); | 85 | setupMainTab(); |
86 | setupLocaleTab(); | 86 | setupLocaleTab(); |
87 | setupTimeZoneTab(); | 87 | setupTimeZoneTab(); |
88 | setupTimeTab(); | 88 | setupTimeTab(); |
89 | setupLocaleDateTab(); | 89 | setupLocaleDateTab(); |
90 | setupFontsTab(); | 90 | setupFontsTab(); |
91 | setupColorsTab(); | 91 | setupColorsTab(); |
92 | setupViewsTab(); | 92 | setupViewsTab(); |
93 | //setupSyncTab(); | 93 | //setupSyncTab(); |
94 | //setupSyncAlgTab(); | 94 | //setupSyncAlgTab(); |
95 | //setupPrinterTab(); | 95 | //setupPrinterTab(); |
96 | //setupGroupSchedulingTab(); | 96 | //setupGroupSchedulingTab(); |
97 | //setupGroupAutomationTab(); | 97 | //setupGroupAutomationTab(); |
98 | #endif | 98 | #endif |
99 | } | 99 | } |
100 | 100 | ||
101 | #include "kpimglobalprefs.h" | 101 | #include "kpimglobalprefs.h" |
102 | 102 | ||
103 | KOPrefsDialog::~KOPrefsDialog() | 103 | KOPrefsDialog::~KOPrefsDialog() |
104 | { | 104 | { |
105 | } | 105 | } |
106 | void KOPrefsDialog::setupGlobalTab() | 106 | void KOPrefsDialog::setupGlobalTab() |
107 | { | 107 | { |
108 | QFrame *topFrame = addPage(i18n("Global"),0,0); | 108 | |
109 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); | ||
110 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | ||
111 | topLayout->addWidget( kdelibcfg ); | ||
112 | 109 | ||
113 | 110 | ||
114 | } | 111 | } |
115 | void KOPrefsDialog::setupMainTab() | 112 | void KOPrefsDialog::setupMainTab() |
116 | { | 113 | { |
117 | QFrame *topFrame = addPage(i18n("General"),0,0); | 114 | QFrame *topFrame = addPage(i18n("General"),0,0); |
118 | 115 | ||
119 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 116 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
120 | topLayout->setSpacing(spacingHint()); | 117 | topLayout->setSpacing(spacingHint()); |
121 | topLayout->setMargin(marginHint()); | 118 | topLayout->setMargin(marginHint()); |
122 | 119 | ||
123 | 120 | ||
124 | mNameEdit = new QLineEdit(topFrame); | 121 | mNameEdit = new QLineEdit(topFrame); |
125 | mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); | 122 | mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); |
126 | topLayout->addWidget(mNameLabel,0,0); | 123 | topLayout->addWidget(mNameLabel,0,0); |
127 | topLayout->addWidget(mNameEdit,0,1); | 124 | topLayout->addWidget(mNameEdit,0,1); |
128 | 125 | ||
129 | mEmailEdit = new QLineEdit(topFrame); | 126 | mEmailEdit = new QLineEdit(topFrame); |
130 | mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); | 127 | mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); |
131 | topLayout->addWidget(mEmailLabel,1,0); | 128 | topLayout->addWidget(mEmailLabel,1,0); |
132 | topLayout->addWidget(mEmailEdit,1,1); | 129 | topLayout->addWidget(mEmailEdit,1,1); |
133 | QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame); | 130 | QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame); |
134 | topLayout->addMultiCellWidget(lab,2,2,0,1); | 131 | topLayout->addMultiCellWidget(lab,2,2,0,1); |
135 | KPrefsDialogWidBool* ttt = addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"), | 132 | KPrefsDialogWidBool* ttt = addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"), |
@@ -207,56 +204,54 @@ void KOPrefsDialog::setupFontsTab() | |||
207 | &(KOPrefs::instance()->mComposeFont),topFrame); | 204 | &(KOPrefs::instance()->mComposeFont),topFrame); |
208 | topLayout->addWidget(timeLabelsFont->label(),i,0); | 205 | topLayout->addWidget(timeLabelsFont->label(),i,0); |
209 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | 206 | topLayout->addWidget(timeLabelsFont->preview(),i,1); |
210 | topLayout->addWidget(timeLabelsFont->button(),i,2); | 207 | topLayout->addWidget(timeLabelsFont->button(),i,2); |
211 | ++i; | 208 | ++i; |
212 | 209 | ||
213 | KPrefsDialogWidFont *timeBarFont = | 210 | KPrefsDialogWidFont *timeBarFont = |
214 | addWidFont(i18n("Hello"),i18n("Read mail:"), | 211 | addWidFont(i18n("Hello"),i18n("Read mail:"), |
215 | &(KOPrefs::instance()->mReadFont),topFrame); | 212 | &(KOPrefs::instance()->mReadFont),topFrame); |
216 | topLayout->addWidget(timeBarFont->label(),i,0); | 213 | topLayout->addWidget(timeBarFont->label(),i,0); |
217 | topLayout->addWidget(timeBarFont->preview(),i,1); | 214 | topLayout->addWidget(timeBarFont->preview(),i,1); |
218 | topLayout->addWidget(timeBarFont->button(),i,2); | 215 | topLayout->addWidget(timeBarFont->button(),i,2); |
219 | ++i; | 216 | ++i; |
220 | 217 | ||
221 | topLayout->setColStretch(1,1); | 218 | topLayout->setColStretch(1,1); |
222 | topLayout->setRowStretch(4,1); | 219 | topLayout->setRowStretch(4,1); |
223 | 220 | ||
224 | } | 221 | } |
225 | void KOPrefsDialog::usrReadConfig() | 222 | void KOPrefsDialog::usrReadConfig() |
226 | { | 223 | { |
227 | 224 | ||
228 | mNameEdit->setText(KOPrefs::instance()->mName); | 225 | mNameEdit->setText(KOPrefs::instance()->mName); |
229 | mEmailEdit->setText(KOPrefs::instance()->mEmail); | 226 | mEmailEdit->setText(KOPrefs::instance()->mEmail); |
230 | //mCodecEdit->setText(KOPrefs::instance()->mSendCodec); | 227 | //mCodecEdit->setText(KOPrefs::instance()->mSendCodec); |
231 | kdelibcfg->readConfig(); | ||
232 | } | 228 | } |
233 | void KOPrefsDialog::usrWriteConfig() | 229 | void KOPrefsDialog::usrWriteConfig() |
234 | { | 230 | { |
235 | KOPrefs::instance()->mName = mNameEdit->text(); | 231 | KOPrefs::instance()->mName = mNameEdit->text(); |
236 | KOPrefs::instance()->mEmail = mEmailEdit->text(); | 232 | KOPrefs::instance()->mEmail = mEmailEdit->text(); |
237 | //KOPrefs::instance()->mSendCodec = mCodecEdit->text(); | 233 | //KOPrefs::instance()->mSendCodec = mCodecEdit->text(); |
238 | kdelibcfg->writeConfig(); | ||
239 | 234 | ||
240 | 235 | ||
241 | } | 236 | } |
242 | 237 | ||
243 | #if 0 | 238 | #if 0 |
244 | void KOPrefsDialog::setupLocaleDateTab() | 239 | void KOPrefsDialog::setupLocaleDateTab() |
245 | { | 240 | { |
246 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 241 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
247 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 242 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
248 | topLayout->setSpacing(spacingHint()); | 243 | topLayout->setSpacing(spacingHint()); |
249 | topLayout->setMargin(marginHint()); | 244 | topLayout->setMargin(marginHint()); |
250 | int iii = 0; | 245 | int iii = 0; |
251 | 246 | ||
252 | 247 | ||
253 | KPrefsWidRadios *syncPrefsGroup = | 248 | KPrefsWidRadios *syncPrefsGroup = |
254 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); | 249 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); |
255 | QString format; | 250 | QString format; |
256 | if ( QApplication::desktop()->width() < 480 ) | 251 | if ( QApplication::desktop()->width() < 480 ) |
257 | format = "(%d.%m.%Y)"; | 252 | format = "(%d.%m.%Y)"; |
258 | else | 253 | else |
259 | format = "(%d.%m.%Y|%A %d %B %Y)"; | 254 | format = "(%d.%m.%Y|%A %d %B %Y)"; |
260 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); | 255 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); |
261 | if ( QApplication::desktop()->width() < 480 ) | 256 | if ( QApplication::desktop()->width() < 480 ) |
262 | format = "(%m.%d.%Y)"; | 257 | format = "(%m.%d.%Y)"; |