-rw-r--r-- | libkdepim/kcmconfigs/kcmkdepimconfig.cpp | 17 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kcmkdepimconfig.h | 2 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 313 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.h | 45 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 21 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 15 | ||||
-rw-r--r-- | libkdepim/kpimprefs.cpp | 6 | ||||
-rw-r--r-- | libkdepim/kpimprefs.h | 2 | ||||
-rw-r--r-- | libkdepim/kprefsdialog.cpp | 106 | ||||
-rw-r--r-- | libkdepim/kprefsdialog.h | 70 | ||||
-rw-r--r-- | libkdepim/libkdepimE.pro | 2 |
11 files changed, 410 insertions, 189 deletions
diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp index f26efe0..e77c5ab 100644 --- a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp +++ b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp | |||
@@ -46,4 +46,4 @@ extern "C" | |||
46 | { | 46 | { |
47 | KCModule *create_kabconfig( KPimGlobalPrefs* prefs, QWidget *parent, const char * ) { | 47 | KCModule *create_kabconfig(QWidget *parent, const char * ) { |
48 | return new KCMKdePimConfig( prefs, parent, "kcmkdepimconfig" ); | 48 | return new KCMKdePimConfig(parent, "kcmkdepimconfig" ); |
49 | } | 49 | } |
@@ -52,4 +52,4 @@ extern "C" | |||
52 | 52 | ||
53 | KCMKdePimConfig::KCMKdePimConfig( KPimGlobalPrefs* prefs, QWidget *parent, const char *name ) | 53 | KCMKdePimConfig::KCMKdePimConfig(QWidget *parent, const char *name ) |
54 | : KCModule( prefs, parent, name ) | 54 | : KCModule( KPimGlobalPrefs::instance(), parent, name ) |
55 | { | 55 | { |
@@ -57,3 +57,3 @@ KCMKdePimConfig::KCMKdePimConfig( KPimGlobalPrefs* prefs, QWidget *parent, const | |||
57 | QVBoxLayout *layout = new QVBoxLayout( this ); | 57 | QVBoxLayout *layout = new QVBoxLayout( this ); |
58 | mConfigWidget = new KDEPIMConfigWidget( this, "mConfigWidget" ); | 58 | mConfigWidget = new KDEPIMConfigWidget( (KPimGlobalPrefs*)getPreferences(), this, "KDEPIMConfigWidget" ); |
59 | layout->addWidget( mConfigWidget ); | 59 | layout->addWidget( mConfigWidget ); |
@@ -67,3 +67,3 @@ void KCMKdePimConfig::load() | |||
67 | { | 67 | { |
68 | mConfigWidget->restoreSettings((KPimGlobalPrefs*)getPreferences()); | 68 | mConfigWidget->readConfig(); |
69 | } | 69 | } |
@@ -72,3 +72,3 @@ void KCMKdePimConfig::save() | |||
72 | { | 72 | { |
73 | mConfigWidget->saveSettings((KPimGlobalPrefs*)getPreferences()); | 73 | mConfigWidget->writeConfig(); |
74 | } | 74 | } |
@@ -77,3 +77,4 @@ void KCMKdePimConfig::defaults() | |||
77 | { | 77 | { |
78 | mConfigWidget->defaults((KPimGlobalPrefs*)getPreferences()); | 78 | qDebug("KCMKdePimConfig::defaults()"); |
79 | mConfigWidget->setDefaults(); | ||
79 | } | 80 | } |
diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.h b/libkdepim/kcmconfigs/kcmkdepimconfig.h index fa96eda..b471e53 100644 --- a/libkdepim/kcmconfigs/kcmkdepimconfig.h +++ b/libkdepim/kcmconfigs/kcmkdepimconfig.h | |||
@@ -43,3 +43,3 @@ class KCMKdePimConfig : public KCModule | |||
43 | public: | 43 | public: |
44 | KCMKdePimConfig( KPimGlobalPrefs* prefs, QWidget *parent = 0, const char *name = 0 ); | 44 | KCMKdePimConfig( QWidget *parent = 0, const char *name = 0 ); |
45 | 45 | ||
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 703aeb1..00a07d9 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -36,2 +36,3 @@ $Id$ | |||
36 | #include <qlineedit.h> | 36 | #include <qlineedit.h> |
37 | #include <qbuttongroup.h> | ||
37 | #include <qfile.h> | 38 | #include <qfile.h> |
@@ -40,3 +41,4 @@ $Id$ | |||
40 | #include <klocale.h> | 41 | #include <klocale.h> |
41 | 42 | #include <kdateedit.h> | |
43 | #include <kglobal.h> | ||
42 | #include <stdlib.h> | 44 | #include <stdlib.h> |
@@ -73,2 +75,4 @@ $Id$ | |||
73 | 75 | ||
76 | #include "qapplication.h" | ||
77 | |||
74 | #include "kpimglobalprefs.h" | 78 | #include "kpimglobalprefs.h" |
@@ -78,4 +82,4 @@ $Id$ | |||
78 | 82 | ||
79 | KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) | 83 | KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) |
80 | : QWidget( parent, name ) | 84 | : KPrefsWidget(prefs, parent, name ) |
81 | { | 85 | { |
@@ -92,3 +96,3 @@ KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) | |||
92 | 96 | ||
93 | QTabWidget *tabWidget = new QTabWidget( this ); | 97 | tabWidget = new QTabWidget( this ); |
94 | topLayout->addWidget( tabWidget ); | 98 | topLayout->addWidget( tabWidget ); |
@@ -96,4 +100,11 @@ KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) | |||
96 | 100 | ||
101 | setupLocaleTab(); | ||
102 | setupLocaleDateTab(); | ||
103 | setupTimeZoneTab(); | ||
104 | setupExternalAppTab(); | ||
105 | |||
106 | } | ||
97 | 107 | ||
98 | // mailclient page | 108 | void KDEPIMConfigWidget::setupExternalAppTab() |
109 | { | ||
99 | QWidget *externalAppsPage = new QWidget( this ); | 110 | QWidget *externalAppsPage = new QWidget( this ); |
@@ -114,4 +125,2 @@ KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) | |||
114 | 125 | ||
115 | |||
116 | |||
117 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); | 126 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); |
@@ -170,3 +179,2 @@ KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) | |||
170 | 179 | ||
171 | |||
172 | layout->addWidget( mExternalAppGroupBox ); | 180 | layout->addWidget( mExternalAppGroupBox ); |
@@ -176,2 +184,173 @@ KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) | |||
176 | 184 | ||
185 | |||
186 | void KDEPIMConfigWidget::setupLocaleDateTab() | ||
187 | { | ||
188 | QWidget *topFrame = new QWidget( this ); | ||
189 | QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2); | ||
190 | |||
191 | topLayout->setSpacing(KDialog::spacingHint()); | ||
192 | topLayout->setMargin(KDialog::marginHint()); | ||
193 | int iii = 0; | ||
194 | |||
195 | |||
196 | KPrefsWidRadios *syncPrefsGroup = | ||
197 | addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame); | ||
198 | QString format; | ||
199 | if ( QApplication::desktop()->width() < 480 ) | ||
200 | format = "(%d.%m.%Y)"; | ||
201 | else | ||
202 | format = "(%d.%m.%Y|%A %d %B %Y)"; | ||
203 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); | ||
204 | if ( QApplication::desktop()->width() < 480 ) | ||
205 | format = "(%m.%d.%Y)"; | ||
206 | else | ||
207 | format = "(%m.%d.%Y|%A %B %d %Y)"; | ||
208 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); | ||
209 | if ( QApplication::desktop()->width() < 480 ) | ||
210 | format = "(%Y-%m-%d)"; | ||
211 | else | ||
212 | format = "(%Y-%m-%d|%A %Y %B %d)"; | ||
213 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); | ||
214 | syncPrefsGroup->addRadio(i18n("User defined")); | ||
215 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); | ||
216 | ++iii; | ||
217 | ++iii; | ||
218 | QLabel * lab; | ||
219 | mUserDateFormatLong = new QLineEdit(topFrame); | ||
220 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); | ||
221 | topLayout->addWidget(lab ,iii,0); | ||
222 | topLayout->addWidget(mUserDateFormatLong,iii,1); | ||
223 | ++iii; | ||
224 | mUserDateFormatShort = new QLineEdit(topFrame); | ||
225 | lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); | ||
226 | topLayout->addWidget(lab ,iii,0); | ||
227 | topLayout->addWidget(mUserDateFormatShort,iii,1); | ||
228 | ++iii; | ||
229 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); | ||
230 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | ||
231 | ++iii; | ||
232 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); | ||
233 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | ||
234 | ++iii; | ||
235 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); | ||
236 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | ||
237 | ++iii; | ||
238 | |||
239 | connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | ||
240 | connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | ||
241 | |||
242 | |||
243 | tabWidget->addTab( topFrame, i18n( "Date Format" ) ); | ||
244 | } | ||
245 | |||
246 | void KDEPIMConfigWidget::setupLocaleTab() | ||
247 | { | ||
248 | |||
249 | QWidget *topFrame = new QWidget( this ); | ||
250 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); | ||
251 | |||
252 | topLayout->setSpacing(KDialog::spacingHint()); | ||
253 | topLayout->setMargin(KDialog::marginHint()); | ||
254 | int iii = 0; | ||
255 | KPrefsWidRadios *syncPrefsGroup = | ||
256 | addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame); | ||
257 | syncPrefsGroup->addRadio(i18n("English")); | ||
258 | syncPrefsGroup->addRadio(i18n("German")); | ||
259 | syncPrefsGroup->addRadio(i18n("French")); | ||
260 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); | ||
261 | if ( QApplication::desktop()->width() < 300 ) | ||
262 | ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); | ||
263 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); | ||
264 | ++iii; | ||
265 | |||
266 | syncPrefsGroup = | ||
267 | addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame); | ||
268 | if ( QApplication::desktop()->width() > 300 ) | ||
269 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); | ||
270 | syncPrefsGroup->addRadio(i18n("24:00")); | ||
271 | syncPrefsGroup->addRadio(i18n("12:00am")); | ||
272 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); | ||
273 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | ||
274 | ++iii; | ||
275 | |||
276 | KPrefsWidBool *sb = addWidBool(i18n("Week starts on Sunday"), | ||
277 | &(KPimGlobalPrefs::instance()->mWeekStartsOnSunday),topFrame); | ||
278 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | ||
279 | ++iii; | ||
280 | |||
281 | |||
282 | tabWidget->addTab( topFrame, i18n( "Locale" ) ); | ||
283 | |||
284 | } | ||
285 | |||
286 | |||
287 | void KDEPIMConfigWidget::setupTimeZoneTab() | ||
288 | { | ||
289 | QWidget *topFrame = new QWidget( this ); | ||
290 | QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); | ||
291 | topLayout->setSpacing(KDialog::spacingHint()); | ||
292 | topLayout->setMargin(KDialog::marginHint()); | ||
293 | |||
294 | QHBox *timeZoneBox = new QHBox( topFrame ); | ||
295 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); | ||
296 | |||
297 | new QLabel( i18n("Timezone:"), timeZoneBox ); | ||
298 | mTimeZoneCombo = new QComboBox( timeZoneBox ); | ||
299 | if ( QApplication::desktop()->width() < 300 ) { | ||
300 | mTimeZoneCombo->setMaximumWidth(150); | ||
301 | } | ||
302 | |||
303 | QStringList list; | ||
304 | list = KGlobal::locale()->timeZoneList(); | ||
305 | mTimeZoneCombo->insertStringList(list); | ||
306 | |||
307 | // find the currently set time zone and select it | ||
308 | QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId; | ||
309 | int nCurrentlySet = 11; | ||
310 | for (int i = 0; i < mTimeZoneCombo->count(); i++) | ||
311 | { | ||
312 | if (mTimeZoneCombo->text(i) == sCurrentlySet) | ||
313 | { | ||
314 | nCurrentlySet = i; | ||
315 | break; | ||
316 | } | ||
317 | } | ||
318 | mTimeZoneCombo->setCurrentItem(nCurrentlySet); | ||
319 | int iii = 1; | ||
320 | KPrefsWidBool *sb = | ||
321 | addWidBool(i18n("Timezone has daylight saving"), | ||
322 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); | ||
323 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | ||
324 | ++iii; | ||
325 | QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); | ||
326 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | ||
327 | ++iii; | ||
328 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); | ||
329 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | ||
330 | ++iii; | ||
331 | lab = new QLabel( i18n("Daylight start:"), topFrame ); | ||
332 | topLayout->addWidget(lab, iii,0); | ||
333 | mStartDateSavingEdit = new KDateEdit(topFrame); | ||
334 | topLayout->addWidget(mStartDateSavingEdit, iii,1); | ||
335 | ++iii; | ||
336 | |||
337 | lab = new QLabel( i18n("Daylight end:"), topFrame ); | ||
338 | topLayout->addWidget(lab, iii,0); | ||
339 | mEndDateSavingEdit = new KDateEdit(topFrame); | ||
340 | topLayout->addWidget(mEndDateSavingEdit, iii,1); | ||
341 | ++iii; | ||
342 | QDate current ( 2001, 1,1); | ||
343 | mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1)); | ||
344 | mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1)); | ||
345 | |||
346 | connect( mStartDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); | ||
347 | connect( mEndDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); | ||
348 | connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) ); | ||
349 | |||
350 | |||
351 | |||
352 | tabWidget->addTab( topFrame, i18n( "Time Zone" ) ); | ||
353 | |||
354 | } | ||
355 | |||
177 | void KDEPIMConfigWidget::externalapp_changed( int newApp ) | 356 | void KDEPIMConfigWidget::externalapp_changed( int newApp ) |
@@ -230,3 +409,3 @@ void KDEPIMConfigWidget::client_changed( int newClient ) | |||
230 | 409 | ||
231 | modified(); | 410 | KPrefsWidget::modified(); |
232 | } | 411 | } |
@@ -446,7 +625,6 @@ void KDEPIMConfigWidget::updateClientWidgets() | |||
446 | 625 | ||
447 | 626 | void KDEPIMConfigWidget::usrReadConfig() | |
448 | |||
449 | |||
450 | void KDEPIMConfigWidget::restoreSettings(KPimGlobalPrefs* prefs) | ||
451 | { | 627 | { |
628 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); | ||
629 | |||
452 | bool blocked = signalsBlocked(); | 630 | bool blocked = signalsBlocked(); |
@@ -454,2 +632,15 @@ void KDEPIMConfigWidget::restoreSettings(KPimGlobalPrefs* prefs) | |||
454 | 632 | ||
633 | QString dummy = prefs->mUserDateFormatLong; | ||
634 | mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); | ||
635 | dummy = prefs->mUserDateFormatShort; | ||
636 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); | ||
637 | |||
638 | QDate current ( 2001, 1,1); | ||
639 | mStartDateSavingEdit->setDate(current.addDays(prefs->mDaylightsavingStart-1)); | ||
640 | mEndDateSavingEdit->setDate(current.addDays(prefs->mDaylightsavingEnd-1)); | ||
641 | setCombo(mTimeZoneCombo,i18n(prefs->mTimeZoneId)); | ||
642 | |||
643 | |||
644 | |||
645 | |||
455 | mEmailClient = prefs->mEmailClient; | 646 | mEmailClient = prefs->mEmailClient; |
@@ -493,10 +684,29 @@ void KDEPIMConfigWidget::restoreSettings(KPimGlobalPrefs* prefs) | |||
493 | 684 | ||
494 | emit changed( false ); | ||
495 | |||
496 | } | 685 | } |
497 | 686 | ||
498 | void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs) | 687 | void KDEPIMConfigWidget::usrWriteConfig() |
499 | { | 688 | { |
689 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); | ||
690 | |||
500 | saveEditFieldSettings(); | 691 | saveEditFieldSettings(); |
501 | 692 | ||
693 | |||
694 | prefs->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); | ||
695 | prefs->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); | ||
696 | |||
697 | prefs->mTimeZoneId = mTimeZoneCombo->currentText(); | ||
698 | QDate date; | ||
699 | date = mStartDateSavingEdit->date(); | ||
700 | int sub = 0; | ||
701 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | ||
702 | sub = 1; | ||
703 | prefs->mDaylightsavingStart = date.dayOfYear()-sub; | ||
704 | date = mEndDateSavingEdit->date(); | ||
705 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | ||
706 | sub = 1; | ||
707 | else | ||
708 | sub = 0; | ||
709 | prefs->mDaylightsavingEnd = date.dayOfYear()-sub; | ||
710 | |||
711 | |||
502 | prefs->mEmailClient = mEmailClient; | 712 | prefs->mEmailClient = mEmailClient; |
@@ -534,4 +744,2 @@ void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs) | |||
534 | 744 | ||
535 | prefs->writeConfig(); | ||
536 | |||
537 | //release the cache that other views can access the changed values instantanious | 745 | //release the cache that other views can access the changed values instantanious |
@@ -539,63 +747,22 @@ void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs) | |||
539 | 747 | ||
540 | emit changed( false ); | ||
541 | } | 748 | } |
542 | 749 | ||
543 | void KDEPIMConfigWidget::defaults(KPimGlobalPrefs* prefs) | ||
544 | { | ||
545 | |||
546 | DefaultAppItem* dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC); | ||
547 | |||
548 | mEmailClient = dai->_id; | ||
549 | mEmailOtherChannel = dai->_channel; | ||
550 | mEmailOtherMessage = dai->_message; | ||
551 | mEmailOtherMessageParameters = dai->_parameters; | ||
552 | mEmailOtherMessage2 = dai->_message2; | ||
553 | mEmailOtherMessageParameters2 = dai->_parameters2; | ||
554 | |||
555 | |||
556 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::NONE_PHC); | ||
557 | |||
558 | mPhoneClient = dai->_id; | ||
559 | mPhoneOtherChannel = dai->_channel; | ||
560 | mPhoneOtherMessage = dai->_message; | ||
561 | mPhoneOtherMessageParameters = dai->_parameters; | ||
562 | |||
563 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::FAX, KPimGlobalPrefs::NONE_FAC); | ||
564 | |||
565 | mFaxClient = dai->_id; | ||
566 | mFaxOtherChannel = dai->_channel; | ||
567 | mFaxOtherMessage = dai->_message; | ||
568 | mFaxOtherMessageParameters = dai->_parameters; | ||
569 | 750 | ||
570 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::SMS, KPimGlobalPrefs::NONE_SMC); | 751 | void KDEPIMConfigWidget::setCombo(QComboBox *combo, const QString & text, |
571 | 752 | const QStringList *tags) | |
572 | mSMSClient = dai->_id; | ||
573 | mSMSOtherChannel = dai->_channel; | ||
574 | mSMSOtherMessage = dai->_message; | ||
575 | mSMSOtherMessageParameters = dai->_parameters; | ||
576 | |||
577 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC); | ||
578 | |||
579 | mPagerClient = dai->_id; | ||
580 | mPagerOtherChannel = dai->_channel; | ||
581 | mPagerOtherMessage = dai->_message; | ||
582 | mPagerOtherMessageParameters = dai->_parameters; | ||
583 | |||
584 | |||
585 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::SIP, KPimGlobalPrefs::NONE_SIC); | ||
586 | |||
587 | mSipClient = dai->_id; | ||
588 | mSipOtherChannel = dai->_channel; | ||
589 | mSipOtherMessage = dai->_message; | ||
590 | mSipOtherMessageParameters = dai->_parameters; | ||
591 | |||
592 | |||
593 | emit changed( true ); | ||
594 | } | ||
595 | |||
596 | void KDEPIMConfigWidget::modified() | ||
597 | { | 753 | { |
598 | emit changed( true ); | 754 | if (tags) { |
755 | int i = tags->findIndex(text); | ||
756 | if (i > 0) combo->setCurrentItem(i); | ||
757 | } else { | ||
758 | for(int i=0;i<combo->count();++i) { | ||
759 | if (combo->text(i) == text) { | ||
760 | combo->setCurrentItem(i); | ||
761 | break; | ||
762 | } | ||
763 | } | ||
764 | } | ||
599 | } | 765 | } |
600 | 766 | ||
767 | |||
601 | void KDEPIMConfigWidget::textChanged( const QString& text ) | 768 | void KDEPIMConfigWidget::textChanged( const QString& text ) |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h index e3cfd81..6f26513 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.h +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h | |||
@@ -33,3 +33,3 @@ $Id$ | |||
33 | 33 | ||
34 | #include <qwidget.h> | 34 | #include <kprefswidget.h> |
35 | #include <qmap.h> | 35 | #include <qmap.h> |
@@ -39,8 +39,2 @@ $Id$ | |||
39 | 39 | ||
40 | /* | ||
41 | class QCheckBox; | ||
42 | class QListViewItem; | ||
43 | class QPushButton; | ||
44 | class KListView; | ||
45 | */ | ||
46 | class QComboBox; | 40 | class QComboBox; |
@@ -49,4 +43,6 @@ class KPimGlobalPrefs; | |||
49 | class QGroupBox; | 43 | class QGroupBox; |
44 | class QTabWidget; | ||
45 | class KDateEdit; | ||
50 | 46 | ||
51 | class KDEPIMConfigWidget : public QWidget | 47 | class KDEPIMConfigWidget : public KPrefsWidget |
52 | { | 48 | { |
@@ -55,16 +51,12 @@ class KDEPIMConfigWidget : public QWidget | |||
55 | public: | 51 | public: |
56 | KDEPIMConfigWidget( QWidget *parent, const char *name = 0 ); | 52 | KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name = 0 ); |
57 | |||
58 | void restoreSettings(KPimGlobalPrefs* prefs); | ||
59 | void saveSettings(KPimGlobalPrefs* prefs); | ||
60 | void defaults(KPimGlobalPrefs* prefs); | ||
61 | |||
62 | signals: | ||
63 | void changed( bool ); | ||
64 | |||
65 | 53 | ||
66 | public slots: | 54 | public slots: |
67 | void modified(); | ||
68 | void textChanged( const QString& text ); | 55 | void textChanged( const QString& text ); |
69 | 56 | ||
57 | protected: | ||
58 | /** Implement this to read custom configuration widgets. */ | ||
59 | virtual void usrReadConfig(); | ||
60 | /** Implement this to write custom configuration widgets. */ | ||
61 | virtual void usrWriteConfig(); | ||
70 | 62 | ||
@@ -79,2 +71,10 @@ class KDEPIMConfigWidget : public QWidget | |||
79 | private: | 71 | private: |
72 | void setupExternalAppTab(); | ||
73 | void setupLocaleDateTab(); | ||
74 | void setupLocaleTab(); | ||
75 | void setupTimeZoneTab(); | ||
76 | |||
77 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); | ||
78 | |||
79 | |||
80 | void saveEditFieldSettings(); | 80 | void saveEditFieldSettings(); |
@@ -82,2 +82,11 @@ class KDEPIMConfigWidget : public QWidget | |||
82 | 82 | ||
83 | QTabWidget *tabWidget; | ||
84 | |||
85 | |||
86 | QLineEdit* mUserDateFormatShort; | ||
87 | QLineEdit* mUserDateFormatLong; | ||
88 | QComboBox* mTimeZoneCombo; | ||
89 | KDateEdit* mStartDateSavingEdit; | ||
90 | KDateEdit* mEndDateSavingEdit; | ||
91 | |||
83 | // void restoreExtensionSettings(); | 92 | // void restoreExtensionSettings(); |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index eb8f1de..12a503d 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -45,2 +45,23 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | |||
45 | { | 45 | { |
46 | |||
47 | KPrefs::setCurrentGroup("Locale"); | ||
48 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); | ||
49 | addItemInt("PreferredTime",&mPreferredTime,0); | ||
50 | addItemInt("PreferredDate",&mPreferredDate,0); | ||
51 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); | ||
52 | //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); | ||
53 | // addItemBool("ShortDateInViewer",&mShortDateInViewer,false); | ||
54 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); | ||
55 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); | ||
56 | |||
57 | KPrefs::setCurrentGroup("Time & Date"); | ||
58 | |||
59 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); | ||
60 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); | ||
61 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); | ||
62 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); | ||
63 | |||
64 | |||
65 | |||
66 | |||
46 | KPrefs::setCurrentGroup( "ExternalApplications" ); | 67 | KPrefs::setCurrentGroup( "ExternalApplications" ); |
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index 8bd543d..dad78e6 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h | |||
@@ -86,2 +86,17 @@ class KPimGlobalPrefs : public KPrefs | |||
86 | public: | 86 | public: |
87 | //US I copied the following "locale" settings from KOPrefs | ||
88 | int mPreferredDate; | ||
89 | QString mUserDateFormatLong; | ||
90 | QString mUserDateFormatShort; | ||
91 | int mPreferredLanguage; | ||
92 | int mPreferredTime; | ||
93 | bool mWeekStartsOnSunday; | ||
94 | QString mTimeZoneId; | ||
95 | bool mUseDaylightsaving; | ||
96 | int mDaylightsavingStart; | ||
97 | int mDaylightsavingEnd; | ||
98 | |||
99 | |||
100 | |||
101 | |||
87 | int mEmailClient; | 102 | int mEmailClient; |
diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp index 140a286..a9ea330 100644 --- a/libkdepim/kpimprefs.cpp +++ b/libkdepim/kpimprefs.cpp | |||
@@ -66 +66,7 @@ void KPimPrefs::usrWriteConfig() | |||
66 | } | 66 | } |
67 | |||
68 | void KPimPrefs::setCategoryDefaults() | ||
69 | { | ||
70 | // empty implementation | ||
71 | } | ||
72 | |||
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h index 9bd9466..860665b 100644 --- a/libkdepim/kpimprefs.h +++ b/libkdepim/kpimprefs.h | |||
@@ -60,3 +60,3 @@ class KPimPrefs : public KPrefs | |||
60 | protected: | 60 | protected: |
61 | virtual void setCategoryDefaults() = 0; | 61 | virtual void setCategoryDefaults(); |
62 | }; | 62 | }; |
diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp index 205c526..dd9a602 100644 --- a/libkdepim/kprefsdialog.cpp +++ b/libkdepim/kprefsdialog.cpp | |||
@@ -59,3 +59,3 @@ | |||
59 | 59 | ||
60 | KPrefsWidBool::KPrefsWidBool(const QString &text,bool *reference, | 60 | KPrefsDialogWidBool::KPrefsDialogWidBool(const QString &text,bool *reference, |
61 | QWidget *parent) | 61 | QWidget *parent) |
@@ -67,3 +67,3 @@ KPrefsWidBool::KPrefsWidBool(const QString &text,bool *reference, | |||
67 | 67 | ||
68 | void KPrefsWidBool::readConfig() | 68 | void KPrefsDialogWidBool::readConfig() |
69 | { | 69 | { |
@@ -72,3 +72,3 @@ void KPrefsWidBool::readConfig() | |||
72 | 72 | ||
73 | void KPrefsWidBool::writeConfig() | 73 | void KPrefsDialogWidBool::writeConfig() |
74 | { | 74 | { |
@@ -77,3 +77,3 @@ void KPrefsWidBool::writeConfig() | |||
77 | 77 | ||
78 | QCheckBox *KPrefsWidBool::checkBox() | 78 | QCheckBox *KPrefsDialogWidBool::checkBox() |
79 | { | 79 | { |
@@ -83,3 +83,3 @@ QCheckBox *KPrefsWidBool::checkBox() | |||
83 | 83 | ||
84 | KPrefsWidColor::KPrefsWidColor(const QString &text,QColor *reference, | 84 | KPrefsDialogWidColor::KPrefsDialogWidColor(const QString &text,QColor *reference, |
85 | QWidget *parent) | 85 | QWidget *parent) |
@@ -95,8 +95,8 @@ KPrefsWidColor::KPrefsWidColor(const QString &text,QColor *reference, | |||
95 | 95 | ||
96 | KPrefsWidColor::~KPrefsWidColor() | 96 | KPrefsDialogWidColor::~KPrefsDialogWidColor() |
97 | { | 97 | { |
98 | // kdDebug(5300) << "KPrefsWidColor::~KPrefsWidColor()" << endl; | 98 | // kdDebug(5300) << "KPrefsDialogWidColor::~KPrefsDialogWidColor()" << endl; |
99 | } | 99 | } |
100 | 100 | ||
101 | void KPrefsWidColor::readConfig() | 101 | void KPrefsDialogWidColor::readConfig() |
102 | { | 102 | { |
@@ -105,3 +105,3 @@ void KPrefsWidColor::readConfig() | |||
105 | 105 | ||
106 | void KPrefsWidColor::writeConfig() | 106 | void KPrefsDialogWidColor::writeConfig() |
107 | { | 107 | { |
@@ -110,3 +110,3 @@ void KPrefsWidColor::writeConfig() | |||
110 | 110 | ||
111 | QLabel *KPrefsWidColor::label() | 111 | QLabel *KPrefsDialogWidColor::label() |
112 | { | 112 | { |
@@ -115,3 +115,3 @@ QLabel *KPrefsWidColor::label() | |||
115 | 115 | ||
116 | KColorButton *KPrefsWidColor::button() | 116 | KColorButton *KPrefsDialogWidColor::button() |
117 | { | 117 | { |
@@ -120,3 +120,3 @@ KColorButton *KPrefsWidColor::button() | |||
120 | 120 | ||
121 | KPrefsWidFont::KPrefsWidFont(const QString &sampleText,const QString &labelText, | 121 | KPrefsDialogWidFont::KPrefsDialogWidFont(const QString &sampleText,const QString &labelText, |
122 | QFont *reference,QWidget *parent) | 122 | QFont *reference,QWidget *parent) |
@@ -136,3 +136,3 @@ KPrefsWidFont::KPrefsWidFont(const QString &sampleText,const QString &labelText, | |||
136 | 136 | ||
137 | KPrefsWidFont::~KPrefsWidFont() | 137 | KPrefsDialogWidFont::~KPrefsDialogWidFont() |
138 | { | 138 | { |
@@ -140,3 +140,3 @@ KPrefsWidFont::~KPrefsWidFont() | |||
140 | 140 | ||
141 | void KPrefsWidFont::readConfig() | 141 | void KPrefsDialogWidFont::readConfig() |
142 | { | 142 | { |
@@ -145,3 +145,3 @@ void KPrefsWidFont::readConfig() | |||
145 | 145 | ||
146 | void KPrefsWidFont::writeConfig() | 146 | void KPrefsDialogWidFont::writeConfig() |
147 | { | 147 | { |
@@ -150,3 +150,3 @@ void KPrefsWidFont::writeConfig() | |||
150 | 150 | ||
151 | QLabel *KPrefsWidFont::label() | 151 | QLabel *KPrefsDialogWidFont::label() |
152 | { | 152 | { |
@@ -155,3 +155,3 @@ QLabel *KPrefsWidFont::label() | |||
155 | 155 | ||
156 | QLabel *KPrefsWidFont::preview() | 156 | QLabel *KPrefsDialogWidFont::preview() |
157 | { | 157 | { |
@@ -160,3 +160,3 @@ QLabel *KPrefsWidFont::preview() | |||
160 | 160 | ||
161 | QPushButton *KPrefsWidFont::button() | 161 | QPushButton *KPrefsDialogWidFont::button() |
162 | { | 162 | { |
@@ -165,3 +165,3 @@ QPushButton *KPrefsWidFont::button() | |||
165 | 165 | ||
166 | void KPrefsWidFont::selectFont() | 166 | void KPrefsDialogWidFont::selectFont() |
167 | { | 167 | { |
@@ -176,3 +176,3 @@ void KPrefsWidFont::selectFont() | |||
176 | 176 | ||
177 | KPrefsWidTime::KPrefsWidTime(const QString &text,int *reference, | 177 | KPrefsDialogWidTime::KPrefsDialogWidTime(const QString &text,int *reference, |
178 | QWidget *parent) | 178 | QWidget *parent) |
@@ -186,3 +186,3 @@ KPrefsWidTime::KPrefsWidTime(const QString &text,int *reference, | |||
186 | 186 | ||
187 | void KPrefsWidTime::readConfig() | 187 | void KPrefsDialogWidTime::readConfig() |
188 | { | 188 | { |
@@ -191,3 +191,3 @@ void KPrefsWidTime::readConfig() | |||
191 | 191 | ||
192 | void KPrefsWidTime::writeConfig() | 192 | void KPrefsDialogWidTime::writeConfig() |
193 | { | 193 | { |
@@ -196,3 +196,3 @@ void KPrefsWidTime::writeConfig() | |||
196 | 196 | ||
197 | QLabel *KPrefsWidTime::label() | 197 | QLabel *KPrefsDialogWidTime::label() |
198 | { | 198 | { |
@@ -201,3 +201,3 @@ QLabel *KPrefsWidTime::label() | |||
201 | 201 | ||
202 | QSpinBox *KPrefsWidTime::spinBox() | 202 | QSpinBox *KPrefsDialogWidTime::spinBox() |
203 | { | 203 | { |
@@ -207,3 +207,3 @@ QSpinBox *KPrefsWidTime::spinBox() | |||
207 | 207 | ||
208 | KPrefsWidRadios::KPrefsWidRadios(const QString &text,int *reference, | 208 | KPrefsDialogWidRadios::KPrefsDialogWidRadios(const QString &text,int *reference, |
209 | QWidget *parent) | 209 | QWidget *parent) |
@@ -215,3 +215,3 @@ KPrefsWidRadios::KPrefsWidRadios(const QString &text,int *reference, | |||
215 | 215 | ||
216 | KPrefsWidRadios::~KPrefsWidRadios() | 216 | KPrefsDialogWidRadios::~KPrefsDialogWidRadios() |
217 | { | 217 | { |
@@ -219,3 +219,3 @@ KPrefsWidRadios::~KPrefsWidRadios() | |||
219 | 219 | ||
220 | void KPrefsWidRadios::addRadio(const QString &text) | 220 | void KPrefsDialogWidRadios::addRadio(const QString &text) |
221 | { | 221 | { |
@@ -224,3 +224,3 @@ void KPrefsWidRadios::addRadio(const QString &text) | |||
224 | 224 | ||
225 | QButtonGroup *KPrefsWidRadios::groupBox() | 225 | QButtonGroup *KPrefsDialogWidRadios::groupBox() |
226 | { | 226 | { |
@@ -229,3 +229,3 @@ QButtonGroup *KPrefsWidRadios::groupBox() | |||
229 | 229 | ||
230 | void KPrefsWidRadios::readConfig() | 230 | void KPrefsDialogWidRadios::readConfig() |
231 | { | 231 | { |
@@ -234,3 +234,3 @@ void KPrefsWidRadios::readConfig() | |||
234 | 234 | ||
235 | void KPrefsWidRadios::writeConfig() | 235 | void KPrefsDialogWidRadios::writeConfig() |
236 | { | 236 | { |
@@ -240,3 +240,3 @@ void KPrefsWidRadios::writeConfig() | |||
240 | 240 | ||
241 | KPrefsWidString::KPrefsWidString(const QString &text,QString *reference, | 241 | KPrefsDialogWidString::KPrefsDialogWidString(const QString &text,QString *reference, |
242 | QWidget *parent, QLineEdit::EchoMode echomode) | 242 | QWidget *parent, QLineEdit::EchoMode echomode) |
@@ -250,3 +250,3 @@ KPrefsWidString::KPrefsWidString(const QString &text,QString *reference, | |||
250 | 250 | ||
251 | KPrefsWidString::~KPrefsWidString() | 251 | KPrefsDialogWidString::~KPrefsDialogWidString() |
252 | { | 252 | { |
@@ -254,3 +254,3 @@ KPrefsWidString::~KPrefsWidString() | |||
254 | 254 | ||
255 | void KPrefsWidString::readConfig() | 255 | void KPrefsDialogWidString::readConfig() |
256 | { | 256 | { |
@@ -259,3 +259,3 @@ void KPrefsWidString::readConfig() | |||
259 | 259 | ||
260 | void KPrefsWidString::writeConfig() | 260 | void KPrefsDialogWidString::writeConfig() |
261 | { | 261 | { |
@@ -264,3 +264,3 @@ void KPrefsWidString::writeConfig() | |||
264 | 264 | ||
265 | QLabel *KPrefsWidString::label() | 265 | QLabel *KPrefsDialogWidString::label() |
266 | { | 266 | { |
@@ -269,3 +269,3 @@ QLabel *KPrefsWidString::label() | |||
269 | 269 | ||
270 | QLineEdit *KPrefsWidString::lineEdit() | 270 | QLineEdit *KPrefsDialogWidString::lineEdit() |
271 | { | 271 | { |
@@ -293,3 +293,3 @@ KPrefsDialog::~KPrefsDialog() | |||
293 | 293 | ||
294 | void KPrefsDialog::addWid(KPrefsWid *wid) | 294 | void KPrefsDialog::addWid(KPrefsDialogWid *wid) |
295 | { | 295 | { |
@@ -298,5 +298,5 @@ void KPrefsDialog::addWid(KPrefsWid *wid) | |||
298 | 298 | ||
299 | KPrefsWidBool *KPrefsDialog::addWidBool(const QString &text,bool *reference,QWidget *parent) | 299 | KPrefsDialogWidBool *KPrefsDialog::addWidBool(const QString &text,bool *reference,QWidget *parent) |
300 | { | 300 | { |
301 | KPrefsWidBool *w = new KPrefsWidBool(text,reference,parent); | 301 | KPrefsDialogWidBool *w = new KPrefsDialogWidBool(text,reference,parent); |
302 | addWid(w); | 302 | addWid(w); |
@@ -305,5 +305,5 @@ KPrefsWidBool *KPrefsDialog::addWidBool(const QString &text,bool *reference,QWid | |||
305 | 305 | ||
306 | KPrefsWidTime *KPrefsDialog::addWidTime(const QString &text,int *reference,QWidget *parent) | 306 | KPrefsDialogWidTime *KPrefsDialog::addWidTime(const QString &text,int *reference,QWidget *parent) |
307 | { | 307 | { |
308 | KPrefsWidTime *w = new KPrefsWidTime(text,reference,parent); | 308 | KPrefsDialogWidTime *w = new KPrefsDialogWidTime(text,reference,parent); |
309 | addWid(w); | 309 | addWid(w); |
@@ -312,5 +312,5 @@ KPrefsWidTime *KPrefsDialog::addWidTime(const QString &text,int *reference,QWidg | |||
312 | 312 | ||
313 | KPrefsWidColor *KPrefsDialog::addWidColor(const QString &text,QColor *reference,QWidget *parent) | 313 | KPrefsDialogWidColor *KPrefsDialog::addWidColor(const QString &text,QColor *reference,QWidget *parent) |
314 | { | 314 | { |
315 | KPrefsWidColor *w = new KPrefsWidColor(text,reference,parent); | 315 | KPrefsDialogWidColor *w = new KPrefsDialogWidColor(text,reference,parent); |
316 | addWid(w); | 316 | addWid(w); |
@@ -319,5 +319,5 @@ KPrefsWidColor *KPrefsDialog::addWidColor(const QString &text,QColor *reference, | |||
319 | 319 | ||
320 | KPrefsWidRadios *KPrefsDialog::addWidRadios(const QString &text,int *reference,QWidget *parent) | 320 | KPrefsDialogWidRadios *KPrefsDialog::addWidRadios(const QString &text,int *reference,QWidget *parent) |
321 | { | 321 | { |
322 | KPrefsWidRadios *w = new KPrefsWidRadios(text,reference,parent); | 322 | KPrefsDialogWidRadios *w = new KPrefsDialogWidRadios(text,reference,parent); |
323 | addWid(w); | 323 | addWid(w); |
@@ -326,5 +326,5 @@ KPrefsWidRadios *KPrefsDialog::addWidRadios(const QString &text,int *reference,Q | |||
326 | 326 | ||
327 | KPrefsWidString *KPrefsDialog::addWidString(const QString &text,QString *reference,QWidget *parent) | 327 | KPrefsDialogWidString *KPrefsDialog::addWidString(const QString &text,QString *reference,QWidget *parent) |
328 | { | 328 | { |
329 | KPrefsWidString *w = new KPrefsWidString(text,reference,parent); | 329 | KPrefsDialogWidString *w = new KPrefsDialogWidString(text,reference,parent); |
330 | addWid(w); | 330 | addWid(w); |
@@ -333,5 +333,5 @@ KPrefsWidString *KPrefsDialog::addWidString(const QString &text,QString *referen | |||
333 | 333 | ||
334 | KPrefsWidString *KPrefsDialog::addWidPassword(const QString &text,QString *reference,QWidget *parent) | 334 | KPrefsDialogWidString *KPrefsDialog::addWidPassword(const QString &text,QString *reference,QWidget *parent) |
335 | { | 335 | { |
336 | KPrefsWidString *w = new KPrefsWidString(text,reference,parent,QLineEdit::Password); | 336 | KPrefsDialogWidString *w = new KPrefsDialogWidString(text,reference,parent,QLineEdit::Password); |
337 | addWid(w); | 337 | addWid(w); |
@@ -340,6 +340,6 @@ KPrefsWidString *KPrefsDialog::addWidPassword(const QString &text,QString *refer | |||
340 | 340 | ||
341 | KPrefsWidFont *KPrefsDialog::addWidFont(const QString &sampleText,const QString &buttonText, | 341 | KPrefsDialogWidFont *KPrefsDialog::addWidFont(const QString &sampleText,const QString &buttonText, |
342 | QFont *reference,QWidget *parent) | 342 | QFont *reference,QWidget *parent) |
343 | { | 343 | { |
344 | KPrefsWidFont *w = new KPrefsWidFont(sampleText,buttonText,reference,parent); | 344 | KPrefsDialogWidFont *w = new KPrefsDialogWidFont(sampleText,buttonText,reference,parent); |
345 | addWid(w); | 345 | addWid(w); |
@@ -359,3 +359,3 @@ void KPrefsDialog::readConfig() | |||
359 | 359 | ||
360 | KPrefsWid *wid; | 360 | KPrefsDialogWid *wid; |
361 | for(wid = mPrefsWids.first();wid;wid=mPrefsWids.next()) { | 361 | for(wid = mPrefsWids.first();wid;wid=mPrefsWids.next()) { |
@@ -371,3 +371,3 @@ void KPrefsDialog::writeConfig() | |||
371 | 371 | ||
372 | KPrefsWid *wid; | 372 | KPrefsDialogWid *wid; |
373 | for(wid = mPrefsWids.first();wid;wid=mPrefsWids.next()) { | 373 | for(wid = mPrefsWids.first();wid;wid=mPrefsWids.next()) { |
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h index dceab01..ad13b78 100644 --- a/libkdepim/kprefsdialog.h +++ b/libkdepim/kprefsdialog.h | |||
@@ -48,3 +48,3 @@ class QButtonGroup; | |||
48 | */ | 48 | */ |
49 | class KPrefsWid | 49 | class KPrefsDialogWid |
50 | { | 50 | { |
@@ -69,3 +69,3 @@ class KPrefsWid | |||
69 | */ | 69 | */ |
70 | class KPrefsWidBool : public KPrefsWid | 70 | class KPrefsDialogWidBool : public KPrefsDialogWid |
71 | { | 71 | { |
@@ -79,3 +79,3 @@ class KPrefsWidBool : public KPrefsWid | |||
79 | */ | 79 | */ |
80 | KPrefsWidBool(const QString &text,bool *reference,QWidget *parent); | 80 | KPrefsDialogWidBool(const QString &text,bool *reference,QWidget *parent); |
81 | 81 | ||
@@ -101,3 +101,3 @@ class KPrefsWidBool : public KPrefsWid | |||
101 | */ | 101 | */ |
102 | class KPrefsWidTime : public KPrefsWid | 102 | class KPrefsDialogWidTime : public KPrefsDialogWid |
103 | { | 103 | { |
@@ -111,3 +111,3 @@ class KPrefsWidTime : public KPrefsWid | |||
111 | */ | 111 | */ |
112 | KPrefsWidTime(const QString &text,int *reference,QWidget *parent); | 112 | KPrefsDialogWidTime(const QString &text,int *reference,QWidget *parent); |
113 | 113 | ||
@@ -138,3 +138,3 @@ class KPrefsWidTime : public KPrefsWid | |||
138 | */ | 138 | */ |
139 | class KPrefsWidColor : public QObject, public KPrefsWid | 139 | class KPrefsDialogWidColor : public QObject, public KPrefsDialogWid |
140 | { | 140 | { |
@@ -150,3 +150,3 @@ class KPrefsWidColor : public QObject, public KPrefsWid | |||
150 | */ | 150 | */ |
151 | KPrefsWidColor(const QString &text,QColor *reference,QWidget *parent); | 151 | KPrefsDialogWidColor(const QString &text,QColor *reference,QWidget *parent); |
152 | /** | 152 | /** |
@@ -154,3 +154,3 @@ class KPrefsWidColor : public QObject, public KPrefsWid | |||
154 | */ | 154 | */ |
155 | ~KPrefsWidColor(); | 155 | ~KPrefsDialogWidColor(); |
156 | 156 | ||
@@ -181,3 +181,3 @@ class KPrefsWidColor : public QObject, public KPrefsWid | |||
181 | */ | 181 | */ |
182 | class KPrefsWidFont : public QObject, public KPrefsWid | 182 | class KPrefsDialogWidFont : public QObject, public KPrefsDialogWid |
183 | { | 183 | { |
@@ -193,3 +193,3 @@ class KPrefsWidFont : public QObject, public KPrefsWid | |||
193 | */ | 193 | */ |
194 | KPrefsWidFont(const QString &sampleText,const QString &labelText, | 194 | KPrefsDialogWidFont(const QString &sampleText,const QString &labelText, |
195 | QFont *reference,QWidget *parent); | 195 | QFont *reference,QWidget *parent); |
@@ -198,3 +198,3 @@ class KPrefsWidFont : public QObject, public KPrefsWid | |||
198 | */ | 198 | */ |
199 | ~KPrefsWidFont(); | 199 | ~KPrefsDialogWidFont(); |
200 | 200 | ||
@@ -237,3 +237,3 @@ class KPrefsWidFont : public QObject, public KPrefsWid | |||
237 | */ | 237 | */ |
238 | class KPrefsWidRadios : public KPrefsWid | 238 | class KPrefsDialogWidRadios : public KPrefsDialogWid |
239 | { | 239 | { |
@@ -248,4 +248,4 @@ class KPrefsWidRadios : public KPrefsWid | |||
248 | */ | 248 | */ |
249 | KPrefsWidRadios(const QString &text,int *reference,QWidget *parent); | 249 | KPrefsDialogWidRadios(const QString &text,int *reference,QWidget *parent); |
250 | virtual ~KPrefsWidRadios(); | 250 | virtual ~KPrefsDialogWidRadios(); |
251 | 251 | ||
@@ -279,3 +279,3 @@ class KPrefsWidRadios : public KPrefsWid | |||
279 | */ | 279 | */ |
280 | class KPrefsWidString : public KPrefsWid | 280 | class KPrefsDialogWidString : public KPrefsDialogWid |
281 | { | 281 | { |
@@ -289,3 +289,3 @@ class KPrefsWidString : public KPrefsWid | |||
289 | */ | 289 | */ |
290 | KPrefsWidString(const QString &text,QString *reference,QWidget *parent,QLineEdit::EchoMode echomode=QLineEdit::Normal); | 290 | KPrefsDialogWidString(const QString &text,QString *reference,QWidget *parent,QLineEdit::EchoMode echomode=QLineEdit::Normal); |
291 | /** | 291 | /** |
@@ -293,3 +293,3 @@ class KPrefsWidString : public KPrefsWid | |||
293 | */ | 293 | */ |
294 | virtual ~KPrefsWidString(); | 294 | virtual ~KPrefsDialogWidString(); |
295 | 295 | ||
@@ -322,3 +322,3 @@ class KPrefsWidString : public KPrefsWid | |||
322 | 322 | ||
323 | KPrefsDialog provides functions to add subclasses of @ref KPrefsWid. For | 323 | KPrefsDialog provides functions to add subclasses of @ref KPrefsDialogWid. For |
324 | these widgets the reading, writing and setting to default values is handled | 324 | these widgets the reading, writing and setting to default values is handled |
@@ -346,7 +346,7 @@ class KPrefsDialog : public KDialogBase | |||
346 | /** | 346 | /** |
347 | Register a custom KPrefsWid object. | 347 | Register a custom KPrefsDialogWid object. |
348 | */ | 348 | */ |
349 | void addWid(KPrefsWid *); | 349 | void addWid(KPrefsDialogWid *); |
350 | /** | 350 | /** |
351 | Register a @ref KPrefsWidBool object. | 351 | Register a @ref KPrefsDialogWidBool object. |
352 | 352 | ||
@@ -356,5 +356,5 @@ class KPrefsDialog : public KDialogBase | |||
356 | */ | 356 | */ |
357 | KPrefsWidBool *addWidBool(const QString &text,bool *reference,QWidget *parent); | 357 | KPrefsDialogWidBool *addWidBool(const QString &text,bool *reference,QWidget *parent); |
358 | /** | 358 | /** |
359 | Register a @ref KPrefsWidTime object. | 359 | Register a @ref KPrefsDialogWidTime object. |
360 | 360 | ||
@@ -364,5 +364,5 @@ class KPrefsDialog : public KDialogBase | |||
364 | */ | 364 | */ |
365 | KPrefsWidTime *addWidTime(const QString &text,int *reference,QWidget *parent); | 365 | KPrefsDialogWidTime *addWidTime(const QString &text,int *reference,QWidget *parent); |
366 | /** | 366 | /** |
367 | Register a @ref KPrefsWidColor object. | 367 | Register a @ref KPrefsDialogWidColor object. |
368 | 368 | ||
@@ -372,5 +372,5 @@ class KPrefsDialog : public KDialogBase | |||
372 | */ | 372 | */ |
373 | KPrefsWidColor *addWidColor(const QString &text,QColor *reference,QWidget *parent); | 373 | KPrefsDialogWidColor *addWidColor(const QString &text,QColor *reference,QWidget *parent); |
374 | /** | 374 | /** |
375 | Register a @ref KPrefsWidRadios object. | 375 | Register a @ref KPrefsDialogWidRadios object. |
376 | 376 | ||
@@ -380,5 +380,5 @@ class KPrefsDialog : public KDialogBase | |||
380 | */ | 380 | */ |
381 | KPrefsWidRadios *addWidRadios(const QString &text,int *reference,QWidget *parent); | 381 | KPrefsDialogWidRadios *addWidRadios(const QString &text,int *reference,QWidget *parent); |
382 | /** | 382 | /** |
383 | Register a @ref KPrefsWidString object. | 383 | Register a @ref KPrefsDialogWidString object. |
384 | 384 | ||
@@ -388,5 +388,5 @@ class KPrefsDialog : public KDialogBase | |||
388 | */ | 388 | */ |
389 | KPrefsWidString *addWidString(const QString &text,QString *reference,QWidget *parent); | 389 | KPrefsDialogWidString *addWidString(const QString &text,QString *reference,QWidget *parent); |
390 | /** | 390 | /** |
391 | Register a password @ref KPrefsWidString object, with echomode set to QLineEdit::Password. | 391 | Register a password @ref KPrefsDialogWidString object, with echomode set to QLineEdit::Password. |
392 | 392 | ||
@@ -396,5 +396,5 @@ class KPrefsDialog : public KDialogBase | |||
396 | */ | 396 | */ |
397 | KPrefsWidString *addWidPassword (const QString &text,QString *reference,QWidget *parent); | 397 | KPrefsDialogWidString *addWidPassword (const QString &text,QString *reference,QWidget *parent); |
398 | /** | 398 | /** |
399 | Register a @ref KPrefsWidFont object. | 399 | Register a @ref KPrefsDialogWidFont object. |
400 | 400 | ||
@@ -405,3 +405,3 @@ class KPrefsDialog : public KDialogBase | |||
405 | */ | 405 | */ |
406 | KPrefsWidFont *addWidFont(const QString &sampleText,const QString &buttonText, | 406 | KPrefsDialogWidFont *addWidFont(const QString &sampleText,const QString &buttonText, |
407 | QFont *reference,QWidget *parent); | 407 | QFont *reference,QWidget *parent); |
@@ -442,3 +442,3 @@ class KPrefsDialog : public KDialogBase | |||
442 | 442 | ||
443 | QPtrList<KPrefsWid> mPrefsWids; | 443 | QPtrList<KPrefsDialogWid> mPrefsWids; |
444 | }; | 444 | }; |
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro index 69980e3..2a30ee8 100644 --- a/libkdepim/libkdepimE.pro +++ b/libkdepim/libkdepimE.pro | |||
@@ -26,2 +26,3 @@ HEADERS = \ | |||
26 | kprefsdialog.h \ | 26 | kprefsdialog.h \ |
27 | kprefswidget.h \ | ||
27 | ksyncprofile.h \ | 28 | ksyncprofile.h \ |
@@ -45,2 +46,3 @@ SOURCES = \ | |||
45 | kprefsdialog.cpp \ | 46 | kprefsdialog.cpp \ |
47 | kprefswidget.cpp \ | ||
46 | ksyncprofile.cpp \ | 48 | ksyncprofile.cpp \ |