-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 33 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 3 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 1 |
3 files changed, 32 insertions, 5 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 6eaf2f2..bbed38d 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -1,131 +1,133 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KdePim/Pi. | 2 | This file is part of KdePim/Pi. |
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <qlayout.h> | 31 | #include <qlayout.h> |
32 | #include <qtabwidget.h> | 32 | #include <qtabwidget.h> |
33 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
34 | #include <qgroupbox.h> | 34 | #include <qgroupbox.h> |
35 | #include <qlabel.h> | 35 | #include <qlabel.h> |
36 | #include <qlineedit.h> | 36 | #include <qlineedit.h> |
37 | #include <qbuttongroup.h> | 37 | #include <qbuttongroup.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
39 | #include <qvbox.h> | 39 | #include <qvbox.h> |
40 | #include <qdir.h> | 40 | #include <qdir.h> |
41 | #include <qregexp.h> | 41 | #include <qregexp.h> |
42 | 42 | ||
43 | #include <kdialog.h> | 43 | #include <kdialog.h> |
44 | #include <kprefsdialog.h> | ||
44 | #include <klocale.h> | 45 | #include <klocale.h> |
45 | #include <kdateedit.h> | 46 | #include <kdateedit.h> |
46 | #include <kglobal.h> | 47 | #include <kglobal.h> |
47 | #include <stdlib.h> | 48 | #include <stdlib.h> |
48 | 49 | ||
49 | /*US | 50 | /*US |
50 | #include <qcheckbox.h> | 51 | #include <qcheckbox.h> |
51 | #include <qframe.h> | 52 | #include <qframe.h> |
52 | #include <qpushbutton.h> | 53 | #include <qpushbutton.h> |
53 | #include <qcombobox.h> | 54 | #include <qcombobox.h> |
54 | #include <qlineedit.h> | 55 | #include <qlineedit.h> |
55 | #include <qlabel.h> | 56 | #include <qlabel.h> |
56 | #include <qfile.h> | 57 | #include <qfile.h> |
57 | 58 | ||
58 | #include <kconfig.h> | 59 | #include <kconfig.h> |
59 | #include <kdebug.h> | 60 | #include <kdebug.h> |
60 | #include <kdialog.h> | 61 | #include <kdialog.h> |
61 | #include <klistview.h> | 62 | #include <klistview.h> |
62 | #include <klocale.h> | 63 | #include <klocale.h> |
63 | #include <kglobal.h> | 64 | #include <kglobal.h> |
64 | #include <kmessagebox.h> | 65 | #include <kmessagebox.h> |
65 | #include <kstandarddirs.h> | 66 | #include <kstandarddirs.h> |
66 | 67 | ||
67 | #ifndef KAB_EMBEDDED | 68 | #ifndef KAB_EMBEDDED |
68 | #include <ktrader.h> | 69 | #include <ktrader.h> |
69 | #else // KAB_EMBEDDED | 70 | #else // KAB_EMBEDDED |
70 | #include <mergewidget.h> | 71 | #include <mergewidget.h> |
71 | #include <distributionlistwidget.h> | 72 | #include <distributionlistwidget.h> |
72 | #endif // KAB_EMBEDDED | 73 | #endif // KAB_EMBEDDED |
73 | 74 | ||
74 | #include "addresseewidget.h" | 75 | #include "addresseewidget.h" |
75 | #include "extensionconfigdialog.h" | 76 | #include "extensionconfigdialog.h" |
76 | #include "extensionwidget.h" | 77 | #include "extensionwidget.h" |
77 | */ | 78 | */ |
78 | 79 | ||
79 | #include "qapplication.h" | 80 | #include "qapplication.h" |
80 | 81 | ||
81 | #include "kpimglobalprefs.h" | 82 | #include "kpimglobalprefs.h" |
82 | 83 | ||
83 | #include "kdepimconfigwidget.h" | 84 | #include "kdepimconfigwidget.h" |
85 | #include <kprefs.h> | ||
84 | 86 | ||
85 | 87 | ||
86 | KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) | 88 | KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) |
87 | : KPrefsWidget(prefs, parent, name ) | 89 | : KPrefsWidget(prefs, parent, name ) |
88 | { | 90 | { |
89 | mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); | 91 | mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); |
90 | mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); | 92 | mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); |
91 | mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); | 93 | mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); |
92 | mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); | 94 | mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); |
93 | mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); | 95 | mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); |
94 | mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); | 96 | mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); |
95 | 97 | ||
96 | 98 | ||
97 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, | 99 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, |
98 | KDialog::spacingHint() ); | 100 | KDialog::spacingHint() ); |
99 | 101 | ||
100 | tabWidget = new QTabWidget( this ); | 102 | tabWidget = new QTabWidget( this ); |
101 | topLayout->addWidget( tabWidget ); | 103 | topLayout->addWidget( tabWidget ); |
102 | 104 | ||
103 | 105 | ||
104 | setupLocaleTab(); | 106 | setupLocaleTab(); |
105 | setupLocaleDateTab(); | 107 | setupLocaleDateTab(); |
106 | setupTimeZoneTab(); | 108 | setupTimeZoneTab(); |
107 | setupExternalAppTab(); | 109 | setupExternalAppTab(); |
108 | setupStoreTab(); | 110 | setupStoreTab(); |
109 | 111 | ||
110 | } | 112 | } |
111 | void KDEPIMConfigWidget::showTimeZoneTab() | 113 | void KDEPIMConfigWidget::showTimeZoneTab() |
112 | { | 114 | { |
113 | tabWidget->setCurrentPage ( 3 ) ; | 115 | tabWidget->setCurrentPage ( 3 ) ; |
114 | } | 116 | } |
115 | void KDEPIMConfigWidget::setupStoreTab() | 117 | void KDEPIMConfigWidget::setupStoreTab() |
116 | { | 118 | { |
117 | QVBox *storePage = new QVBox( this ); | 119 | QVBox *storePage = new QVBox( this ); |
118 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); | 120 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); |
119 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); | 121 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); |
120 | mStoreUrl = new KURLRequester( storePage ); | 122 | mStoreUrl = new KURLRequester( storePage ); |
121 | mStoreUrl->setURL( KGlobal::dirs()->localkdedir() ); | 123 | mStoreUrl->setURL( KGlobal::dirs()->localkdedir() ); |
122 | new QLabel( i18n("New dirs are created automatically"), storePage ); | 124 | new QLabel( i18n("New dirs are created automatically"), storePage ); |
123 | QHBox *bb = new QHBox( storePage ); | 125 | QHBox *bb = new QHBox( storePage ); |
124 | QPushButton * pb; | 126 | QPushButton * pb; |
125 | if ( QApplication::desktop()->width() < 640 ) | 127 | if ( QApplication::desktop()->width() < 640 ) |
126 | pb = new QPushButton ( i18n("Save"), bb ); | 128 | pb = new QPushButton ( i18n("Save"), bb ); |
127 | else | 129 | else |
128 | pb = new QPushButton ( i18n("Save settings"), bb ); | 130 | pb = new QPushButton ( i18n("Save settings"), bb ); |
129 | connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) ); | 131 | connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) ); |
130 | pb = new QPushButton ( i18n("Save standard"), bb ); | 132 | pb = new QPushButton ( i18n("Save standard"), bb ); |
131 | connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) ); | 133 | connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) ); |
@@ -303,169 +305,190 @@ void KDEPIMConfigWidget::setupLocaleTab() | |||
303 | topLayout->setSpacing(KDialog::spacingHint()); | 305 | topLayout->setSpacing(KDialog::spacingHint()); |
304 | topLayout->setMargin(KDialog::marginHint()); | 306 | topLayout->setMargin(KDialog::marginHint()); |
305 | int iii = 0; | 307 | int iii = 0; |
306 | KPrefsWidRadios *syncPrefsGroup = | 308 | KPrefsWidRadios *syncPrefsGroup = |
307 | addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame); | 309 | addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame); |
308 | syncPrefsGroup->addRadio(i18n("English")); | 310 | syncPrefsGroup->addRadio(i18n("English")); |
309 | syncPrefsGroup->addRadio(i18n("German")); | 311 | syncPrefsGroup->addRadio(i18n("German")); |
310 | syncPrefsGroup->addRadio(i18n("French")); | 312 | syncPrefsGroup->addRadio(i18n("French")); |
311 | syncPrefsGroup->addRadio(i18n("Italian")); | 313 | syncPrefsGroup->addRadio(i18n("Italian")); |
312 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); | 314 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); |
313 | if ( QApplication::desktop()->width() < 300 ) { | 315 | if ( QApplication::desktop()->width() < 300 ) { |
314 | syncPrefsGroup->groupBox()->layout()->setMargin( 5 ); | 316 | syncPrefsGroup->groupBox()->layout()->setMargin( 5 ); |
315 | syncPrefsGroup->groupBox()->layout()->setSpacing( 0 ); | 317 | syncPrefsGroup->groupBox()->layout()->setSpacing( 0 ); |
316 | } | 318 | } |
317 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); | 319 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); |
318 | ++iii; | 320 | ++iii; |
319 | 321 | ||
320 | 322 | ||
321 | tabWidget->addTab( topFrame, i18n( "Language" ) ); | 323 | tabWidget->addTab( topFrame, i18n( "Language" ) ); |
322 | topFrame = new QWidget( this ); | 324 | topFrame = new QWidget( this ); |
323 | topLayout = new QGridLayout(topFrame,4,2); | 325 | topLayout = new QGridLayout(topFrame,4,2); |
324 | 326 | ||
325 | topLayout->setSpacing(KDialog::spacingHint()); | 327 | topLayout->setSpacing(KDialog::spacingHint()); |
326 | topLayout->setMargin(KDialog::marginHint()); | 328 | topLayout->setMargin(KDialog::marginHint()); |
327 | iii = 0; | 329 | iii = 0; |
328 | syncPrefsGroup = | 330 | syncPrefsGroup = |
329 | addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame); | 331 | addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame); |
330 | if ( QApplication::desktop()->width() > 300 ) | 332 | if ( QApplication::desktop()->width() > 300 ) |
331 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); | 333 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); |
332 | syncPrefsGroup->addRadio(i18n("24:00")); | 334 | syncPrefsGroup->addRadio(i18n("24:00")); |
333 | syncPrefsGroup->addRadio(i18n("12:00am")); | 335 | syncPrefsGroup->addRadio(i18n("12:00am")); |
334 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); | 336 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); |
335 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | 337 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); |
336 | ++iii; | 338 | ++iii; |
337 | 339 | ||
338 | KPrefsWidBool *sb = addWidBool(i18n("Week starts on Sunday"), | 340 | KPrefsWidBool *sb = addWidBool(i18n("Week starts on Sunday"), |
339 | &(KPimGlobalPrefs::instance()->mWeekStartsOnSunday),topFrame); | 341 | &(KPimGlobalPrefs::instance()->mWeekStartsOnSunday),topFrame); |
340 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | 342 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); |
341 | ++iii; | 343 | ++iii; |
342 | 344 | ||
343 | 345 | ||
344 | tabWidget->addTab( topFrame, i18n( "Time Format" ) ); | 346 | tabWidget->addTab( topFrame, i18n( "Time Format" ) ); |
345 | 347 | ||
346 | } | 348 | } |
347 | 349 | ||
348 | 350 | ||
349 | void KDEPIMConfigWidget::setupTimeZoneTab() | 351 | void KDEPIMConfigWidget::setupTimeZoneTab() |
350 | { | 352 | { |
351 | QWidget *topFrame = new QWidget( this ); | 353 | QWidget *topFrame; |
352 | QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); | 354 | QGridLayout *topLayout ; |
355 | |||
356 | |||
357 | |||
358 | |||
359 | |||
360 | |||
361 | topFrame = new QWidget( this ); | ||
362 | topLayout = new QGridLayout( topFrame, 5, 2); | ||
353 | topLayout->setSpacing(KDialog::spacingHintSmall()); | 363 | topLayout->setSpacing(KDialog::spacingHintSmall()); |
354 | topLayout->setMargin(KDialog::marginHintSmall()); | 364 | topLayout->setMargin(KDialog::marginHintSmall()); |
355 | 365 | ||
356 | QHBox *timeZoneBox = new QHBox( topFrame ); | 366 | QHBox *timeZoneBox = new QHBox( topFrame ); |
357 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); | 367 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); |
358 | 368 | ||
359 | new QLabel( i18n("Timezone:"), timeZoneBox ); | 369 | new QLabel( i18n("Timezone:"), timeZoneBox ); |
360 | mTimeZoneCombo = new QComboBox( timeZoneBox ); | 370 | mTimeZoneCombo = new QComboBox( timeZoneBox ); |
361 | if ( QApplication::desktop()->width() < 300 ) { | 371 | if ( QApplication::desktop()->width() < 300 ) { |
362 | mTimeZoneCombo->setMaximumWidth(150); | 372 | mTimeZoneCombo->setMaximumWidth(150); |
363 | } | 373 | } |
364 | 374 | ||
365 | QStringList list; | 375 | QStringList list; |
366 | list = KGlobal::locale()->timeZoneList(); | 376 | list = KGlobal::locale()->timeZoneList(); |
367 | mTimeZoneCombo->insertStringList(list); | 377 | mTimeZoneCombo->insertStringList(list); |
368 | 378 | ||
369 | // find the currently set time zone and select it | 379 | // find the currently set time zone and select it |
370 | QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId; | 380 | QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId; |
371 | int nCurrentlySet = 11; | 381 | int nCurrentlySet = 11; |
372 | for (int i = 0; i < mTimeZoneCombo->count(); i++) | 382 | for (int i = 0; i < mTimeZoneCombo->count(); i++) |
373 | { | 383 | { |
374 | if (mTimeZoneCombo->text(i) == sCurrentlySet) | 384 | if (mTimeZoneCombo->text(i) == sCurrentlySet) |
375 | { | 385 | { |
376 | nCurrentlySet = i; | 386 | nCurrentlySet = i; |
377 | break; | 387 | break; |
378 | } | 388 | } |
379 | } | 389 | } |
380 | mTimeZoneCombo->setCurrentItem(nCurrentlySet); | 390 | mTimeZoneCombo->setCurrentItem(nCurrentlySet); |
381 | int iii = 1; | 391 | int iii = 1; |
382 | KPrefsWidBool *sb = | 392 | KPrefsWidBool *sb = |
383 | addWidBool(i18n("Add 30 min to selected Timezone"), | 393 | addWidBool(i18n("Add 30 min to selected Timezone"), |
384 | &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame); | 394 | &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame); |
385 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | 395 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); |
386 | ++iii; | 396 | ++iii; |
387 | sb = | 397 | sb = |
388 | addWidBool(i18n("Timezone has daylight saving"), | 398 | addWidBool(i18n("Timezone has daylight saving"), |
389 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); | 399 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); |
390 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | 400 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); |
391 | ++iii; | 401 | ++iii; |
392 | QLabel* lab; | 402 | QLabel* lab; |
393 | 403 | ||
394 | lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); | 404 | lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); |
395 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 405 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
396 | ++iii; | 406 | ++iii; |
397 | 407 | ||
398 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); | 408 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); |
399 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 409 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
400 | ++iii; | 410 | ++iii; |
401 | lab = new QLabel( i18n("Daylight start:"), topFrame ); | 411 | lab = new QLabel( i18n("Daylight start:"), topFrame ); |
402 | topLayout->addWidget(lab, iii,0); | 412 | topLayout->addWidget(lab, iii,0); |
403 | mStartDateSavingEdit = new KDateEdit(topFrame); | 413 | mStartDateSavingEdit = new KDateEdit(topFrame); |
404 | topLayout->addWidget(mStartDateSavingEdit, iii,1); | 414 | topLayout->addWidget(mStartDateSavingEdit, iii,1); |
405 | ++iii; | 415 | ++iii; |
406 | 416 | ||
407 | lab = new QLabel( i18n("Daylight end:"), topFrame ); | 417 | lab = new QLabel( i18n("Daylight end:"), topFrame ); |
408 | topLayout->addWidget(lab, iii,0); | 418 | topLayout->addWidget(lab, iii,0); |
409 | mEndDateSavingEdit = new KDateEdit(topFrame); | 419 | mEndDateSavingEdit = new KDateEdit(topFrame); |
410 | topLayout->addWidget(mEndDateSavingEdit, iii,1); | 420 | topLayout->addWidget(mEndDateSavingEdit, iii,1); |
411 | ++iii; | 421 | ++iii; |
412 | QDate current ( 2001, 1,1); | 422 | QDate current ( 2001, 1,1); |
413 | mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1)); | 423 | mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1)); |
414 | mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1)); | 424 | mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1)); |
415 | 425 | ||
416 | connect( mStartDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); | 426 | connect( mStartDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); |
417 | connect( mEndDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); | 427 | connect( mEndDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); |
418 | connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) ); | 428 | connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) ); |
419 | |||
420 | |||
421 | |||
422 | tabWidget->addTab( topFrame, i18n( "Time Zone" ) ); | 429 | tabWidget->addTab( topFrame, i18n( "Time Zone" ) ); |
423 | 430 | ||
431 | |||
432 | topFrame = new QWidget( this ); | ||
433 | topLayout = new QGridLayout( topFrame, 3, 2); | ||
434 | topLayout->setSpacing(KDialog::spacingHintSmall()); | ||
435 | topLayout->setMargin(KDialog::marginHintSmall()); | ||
436 | tabWidget->addTab( topFrame, i18n( "Fonts" ) ); | ||
437 | |||
438 | QLabel* labb = new QLabel( i18n("Global application font for all apps:"), topFrame ); | ||
439 | topLayout->addMultiCellWidget(labb,0,0,0,2); | ||
440 | int i = 1; | ||
441 | KPrefsWidFont *timeLabelsFont = | ||
442 | addWidFont(i18n("Kx/Pi"),i18n("Application Font"), | ||
443 | &(KPimGlobalPrefs::instance()->mApplicationFont),topFrame); | ||
444 | topLayout->addWidget(timeLabelsFont->label(),i,0); | ||
445 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | ||
446 | topLayout->addWidget(timeLabelsFont->button(),i,2); | ||
424 | } | 447 | } |
425 | 448 | ||
426 | void KDEPIMConfigWidget::externalapp_changed( int newApp ) | 449 | void KDEPIMConfigWidget::externalapp_changed( int newApp ) |
427 | { | 450 | { |
428 | // first store the current data | 451 | // first store the current data |
429 | saveEditFieldSettings(); | 452 | saveEditFieldSettings(); |
430 | 453 | ||
431 | // set mCurrentApp | 454 | // set mCurrentApp |
432 | mCurrentApp = (ExternalAppHandler::Types)newApp; | 455 | mCurrentApp = (ExternalAppHandler::Types)newApp; |
433 | 456 | ||
434 | // set mCurrentClient | 457 | // set mCurrentClient |
435 | switch(mCurrentApp) | 458 | switch(mCurrentApp) |
436 | { | 459 | { |
437 | case(ExternalAppHandler::EMAIL): | 460 | case(ExternalAppHandler::EMAIL): |
438 | mCurrentClient = mEmailClient; | 461 | mCurrentClient = mEmailClient; |
439 | break; | 462 | break; |
440 | case(ExternalAppHandler::PHONE): | 463 | case(ExternalAppHandler::PHONE): |
441 | mCurrentClient = mPhoneClient; | 464 | mCurrentClient = mPhoneClient; |
442 | break; | 465 | break; |
443 | case(ExternalAppHandler::SMS): | 466 | case(ExternalAppHandler::SMS): |
444 | mCurrentClient = mSMSClient; | 467 | mCurrentClient = mSMSClient; |
445 | break; | 468 | break; |
446 | case(ExternalAppHandler::FAX): | 469 | case(ExternalAppHandler::FAX): |
447 | mCurrentClient = mFaxClient; | 470 | mCurrentClient = mFaxClient; |
448 | break; | 471 | break; |
449 | case(ExternalAppHandler::PAGER): | 472 | case(ExternalAppHandler::PAGER): |
450 | mCurrentClient = mPagerClient; | 473 | mCurrentClient = mPagerClient; |
451 | break; | 474 | break; |
452 | case(ExternalAppHandler::SIP): | 475 | case(ExternalAppHandler::SIP): |
453 | mCurrentClient = mSipClient; | 476 | mCurrentClient = mSipClient; |
454 | break; | 477 | break; |
455 | default: | 478 | default: |
456 | return; | 479 | return; |
457 | } | 480 | } |
458 | 481 | ||
459 | // and at last update the widgets | 482 | // and at last update the widgets |
460 | updateClientWidgets(); | 483 | updateClientWidgets(); |
461 | } | 484 | } |
462 | 485 | ||
463 | 486 | ||
464 | 487 | ||
465 | void KDEPIMConfigWidget::client_changed( int newClient ) | 488 | void KDEPIMConfigWidget::client_changed( int newClient ) |
466 | { | 489 | { |
467 | if (newClient == mCurrentClient) | 490 | if (newClient == mCurrentClient) |
468 | return; | 491 | return; |
469 | 492 | ||
470 | // first store the current data | 493 | // first store the current data |
471 | saveEditFieldSettings(); | 494 | saveEditFieldSettings(); |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 81e3cb1..ac7d205 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -1,99 +1,102 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkdepim. | 2 | This file is part of libkdepim. |
3 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kconfig.h> | 32 | #include <kconfig.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | #include <kglobalsettings.h> | ||
35 | #include <kstaticdeleter.h> | 36 | #include <kstaticdeleter.h> |
36 | 37 | ||
37 | #include <qregexp.h> | 38 | #include <qregexp.h> |
38 | #include <qfile.h> | 39 | #include <qfile.h> |
39 | #include <stdlib.h> | 40 | #include <stdlib.h> |
40 | #include <qtextstream.h> | 41 | #include <qtextstream.h> |
41 | #include <qapplication.h> | 42 | #include <qapplication.h> |
42 | #include "kpimglobalprefs.h" | 43 | #include "kpimglobalprefs.h" |
43 | 44 | ||
44 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; | 45 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; |
45 | static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP; | 46 | static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP; |
46 | 47 | ||
47 | 48 | ||
48 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | 49 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) |
49 | : KPrefs("microkdeglobalrc") | 50 | : KPrefs("microkdeglobalrc") |
50 | { | 51 | { |
51 | mLocaleDict = 0; | 52 | mLocaleDict = 0; |
53 | KPrefs::setCurrentGroup("Fonts"); | ||
54 | addItemFont("ApplicationFont",&mApplicationFont,KGlobalSettings::generalFont() ); | ||
52 | KPrefs::setCurrentGroup("Locale"); | 55 | KPrefs::setCurrentGroup("Locale"); |
53 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); | 56 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); |
54 | addItemInt("PreferredTime",&mPreferredTime,0); | 57 | addItemInt("PreferredTime",&mPreferredTime,0); |
55 | addItemInt("PreferredDate",&mPreferredDate,0); | 58 | addItemInt("PreferredDate",&mPreferredDate,0); |
56 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); | 59 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); |
57 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); | 60 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); |
58 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); | 61 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); |
59 | 62 | ||
60 | KPrefs::setCurrentGroup("Time & Date"); | 63 | KPrefs::setCurrentGroup("Time & Date"); |
61 | 64 | ||
62 | addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") ); | 65 | addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") ); |
63 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); | 66 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); |
64 | addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false); | 67 | addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false); |
65 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); | 68 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); |
66 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); | 69 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); |
67 | 70 | ||
68 | KPrefs::setCurrentGroup( "ExternalApplications" ); | 71 | KPrefs::setCurrentGroup( "ExternalApplications" ); |
69 | 72 | ||
70 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); | 73 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); |
71 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); | 74 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); |
72 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); | 75 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); |
73 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); | 76 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); |
74 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); | 77 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); |
75 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); | 78 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); |
76 | 79 | ||
77 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); | 80 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); |
78 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); | 81 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); |
79 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); | 82 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); |
80 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); | 83 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); |
81 | 84 | ||
82 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); | 85 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); |
83 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); | 86 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); |
84 | addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" ); | 87 | addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" ); |
85 | addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); | 88 | addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); |
86 | 89 | ||
87 | addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); | 90 | addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); |
88 | addItemString( "SMSChannel", &mSMSOtherChannel, "" ); | 91 | addItemString( "SMSChannel", &mSMSOtherChannel, "" ); |
89 | addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); | 92 | addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); |
90 | addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); | 93 | addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); |
91 | 94 | ||
92 | addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); | 95 | addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); |
93 | addItemString( "PagerChannel", &mPagerOtherChannel, "" ); | 96 | addItemString( "PagerChannel", &mPagerOtherChannel, "" ); |
94 | addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); | 97 | addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); |
95 | addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); | 98 | addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); |
96 | 99 | ||
97 | addItemInt( "SIPChannelType", &mSipClient, KPPI_SIC ); | 100 | addItemInt( "SIPChannelType", &mSipClient, KPPI_SIC ); |
98 | addItemString( "SIPChannel", &mSipOtherChannel, "" ); | 101 | addItemString( "SIPChannel", &mSipOtherChannel, "" ); |
99 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); | 102 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); |
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index 5e27e85..bf17338 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h | |||
@@ -56,88 +56,89 @@ class KPimGlobalPrefs : public KPrefs | |||
56 | 56 | ||
57 | enum PhoneClients { | 57 | enum PhoneClients { |
58 | NONE_PHC = 0, | 58 | NONE_PHC = 0, |
59 | OTHER_PHC = 1, | 59 | OTHER_PHC = 1, |
60 | KPPI_PHC = 2 | 60 | KPPI_PHC = 2 |
61 | }; | 61 | }; |
62 | 62 | ||
63 | enum FaxClients { | 63 | enum FaxClients { |
64 | NONE_FAC = 0, | 64 | NONE_FAC = 0, |
65 | OTHER_FAC = 1 | 65 | OTHER_FAC = 1 |
66 | }; | 66 | }; |
67 | 67 | ||
68 | enum SMSClients { | 68 | enum SMSClients { |
69 | NONE_SMC = 0, | 69 | NONE_SMC = 0, |
70 | OTHER_SMC = 1 | 70 | OTHER_SMC = 1 |
71 | }; | 71 | }; |
72 | 72 | ||
73 | enum PagerClients { | 73 | enum PagerClients { |
74 | NONE_PAC = 0, | 74 | NONE_PAC = 0, |
75 | OTHER_PAC = 1 | 75 | OTHER_PAC = 1 |
76 | }; | 76 | }; |
77 | 77 | ||
78 | enum SIPClients { | 78 | enum SIPClients { |
79 | NONE_SIC = 0, | 79 | NONE_SIC = 0, |
80 | OTHER_SIC = 1, | 80 | OTHER_SIC = 1, |
81 | KPPI_SIC = 2 | 81 | KPPI_SIC = 2 |
82 | }; | 82 | }; |
83 | 83 | ||
84 | private: | 84 | private: |
85 | KPimGlobalPrefs( const QString &name = QString::null ); | 85 | KPimGlobalPrefs( const QString &name = QString::null ); |
86 | 86 | ||
87 | static KPimGlobalPrefs *sInstance; | 87 | static KPimGlobalPrefs *sInstance; |
88 | QDict<QString> *mLocaleDict; | 88 | QDict<QString> *mLocaleDict; |
89 | 89 | ||
90 | 90 | ||
91 | public: | 91 | public: |
92 | //US I copied the following "locale" settings from KOPrefs | 92 | //US I copied the following "locale" settings from KOPrefs |
93 | int mPreferredDate; | 93 | int mPreferredDate; |
94 | QString mUserDateFormatLong; | 94 | QString mUserDateFormatLong; |
95 | QString mUserDateFormatShort; | 95 | QString mUserDateFormatShort; |
96 | int mPreferredLanguage; | 96 | int mPreferredLanguage; |
97 | int mPreferredTime; | 97 | int mPreferredTime; |
98 | bool mWeekStartsOnSunday; | 98 | bool mWeekStartsOnSunday; |
99 | QString mTimeZoneId; | 99 | QString mTimeZoneId; |
100 | bool mUseDaylightsaving; | 100 | bool mUseDaylightsaving; |
101 | int mDaylightsavingStart; | 101 | int mDaylightsavingStart; |
102 | int mDaylightsavingEnd; | 102 | int mDaylightsavingEnd; |
103 | bool mTimeZoneAdd30min; | 103 | bool mTimeZoneAdd30min; |
104 | QFont mApplicationFont; | ||
104 | 105 | ||
105 | int mEmailClient; | 106 | int mEmailClient; |
106 | QString mEmailOtherChannel; | 107 | QString mEmailOtherChannel; |
107 | QString mEmailOtherMessage; | 108 | QString mEmailOtherMessage; |
108 | QString mEmailOtherMessageParameters; | 109 | QString mEmailOtherMessageParameters; |
109 | QString mEmailOtherMessage2; | 110 | QString mEmailOtherMessage2; |
110 | QString mEmailOtherMessageParameters2; | 111 | QString mEmailOtherMessageParameters2; |
111 | 112 | ||
112 | int mPhoneClient; | 113 | int mPhoneClient; |
113 | QString mPhoneOtherChannel; | 114 | QString mPhoneOtherChannel; |
114 | QString mPhoneOtherMessage; | 115 | QString mPhoneOtherMessage; |
115 | QString mPhoneOtherMessageParameters; | 116 | QString mPhoneOtherMessageParameters; |
116 | 117 | ||
117 | int mFaxClient; | 118 | int mFaxClient; |
118 | QString mFaxOtherChannel; | 119 | QString mFaxOtherChannel; |
119 | QString mFaxOtherMessage; | 120 | QString mFaxOtherMessage; |
120 | QString mFaxOtherMessageParameters; | 121 | QString mFaxOtherMessageParameters; |
121 | 122 | ||
122 | int mSMSClient; | 123 | int mSMSClient; |
123 | QString mSMSOtherChannel; | 124 | QString mSMSOtherChannel; |
124 | QString mSMSOtherMessage; | 125 | QString mSMSOtherMessage; |
125 | QString mSMSOtherMessageParameters; | 126 | QString mSMSOtherMessageParameters; |
126 | 127 | ||
127 | int mPagerClient; | 128 | int mPagerClient; |
128 | QString mPagerOtherChannel; | 129 | QString mPagerOtherChannel; |
129 | QString mPagerOtherMessage; | 130 | QString mPagerOtherMessage; |
130 | QString mPagerOtherMessageParameters; | 131 | QString mPagerOtherMessageParameters; |
131 | 132 | ||
132 | int mSipClient; | 133 | int mSipClient; |
133 | QString mSipOtherChannel; | 134 | QString mSipOtherChannel; |
134 | QString mSipOtherMessage; | 135 | QString mSipOtherMessage; |
135 | QString mSipOtherMessageParameters; | 136 | QString mSipOtherMessageParameters; |
136 | 137 | ||
137 | QString mEx2PhoneDevice; | 138 | QString mEx2PhoneDevice; |
138 | QString mEx2PhoneConnection; | 139 | QString mEx2PhoneConnection; |
139 | QString mEx2PhoneModel; | 140 | QString mEx2PhoneModel; |
140 | 141 | ||
141 | }; | 142 | }; |
142 | 143 | ||
143 | #endif | 144 | #endif |