-rw-r--r-- | korganizer/koprefsdialog.cpp | 102 |
1 files changed, 59 insertions, 43 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 7dafcd8..b4b3b27 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -72,28 +72,28 @@ | |||
72 | 72 | ||
73 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | 73 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : |
74 | KPrefsDialog(KOPrefs::instance(),parent,name,true) | 74 | KPrefsDialog(KOPrefs::instance(),parent,name,true) |
75 | { | 75 | { |
76 | 76 | ||
77 | setCaption( i18n("Preferences - some settings need a restart (nr)")); | 77 | setCaption( i18n("Preferences - some settings need a restart (nr)")); |
78 | mCategoryDict.setAutoDelete(true); | 78 | mCategoryDict.setAutoDelete(true); |
79 | 79 | ||
80 | KGlobal::locale()->insertCatalogue("timezones"); | 80 | KGlobal::locale()->insertCatalogue("timezones"); |
81 | 81 | ||
82 | setupGlobalTab(); | 82 | setupGlobalTab(); |
83 | setupMainTab(); | 83 | setupMainTab(); |
84 | setupLocaleTab(); | 84 | // setupLocaleTab(); |
85 | setupTimeZoneTab(); | 85 | //setupTimeZoneTab(); |
86 | setupTimeTab(); | 86 | setupTimeTab(); |
87 | setupLocaleDateTab(); | 87 | //setupLocaleDateTab(); |
88 | setupFontsTab(); | 88 | setupFontsTab(); |
89 | setupColorsTab(); | 89 | setupColorsTab(); |
90 | setupViewsTab(); | 90 | setupViewsTab(); |
91 | //setupSyncTab(); | 91 | //setupSyncTab(); |
92 | //setupSyncAlgTab(); | 92 | //setupSyncAlgTab(); |
93 | //setupPrinterTab(); | 93 | //setupPrinterTab(); |
94 | //setupGroupSchedulingTab(); | 94 | //setupGroupSchedulingTab(); |
95 | //setupGroupAutomationTab(); | 95 | //setupGroupAutomationTab(); |
96 | } | 96 | } |
97 | 97 | ||
98 | 98 | ||
99 | KOPrefsDialog::~KOPrefsDialog() | 99 | KOPrefsDialog::~KOPrefsDialog() |
@@ -101,24 +101,25 @@ KOPrefsDialog::~KOPrefsDialog() | |||
101 | } | 101 | } |
102 | void KOPrefsDialog::setupGlobalTab() | 102 | void KOPrefsDialog::setupGlobalTab() |
103 | { | 103 | { |
104 | QFrame *topFrame = addPage(i18n("Global"),0,0); | 104 | QFrame *topFrame = addPage(i18n("Global"),0,0); |
105 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); | 105 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); |
106 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | 106 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); |
107 | topLayout->addWidget( kdelibcfg ); | 107 | topLayout->addWidget( kdelibcfg ); |
108 | 108 | ||
109 | 109 | ||
110 | } | 110 | } |
111 | void KOPrefsDialog::setupLocaleDateTab() | 111 | void KOPrefsDialog::setupLocaleDateTab() |
112 | { | 112 | { |
113 | #if 0 | ||
113 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 114 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
114 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 115 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
115 | topLayout->setSpacing(spacingHint()); | 116 | topLayout->setSpacing(spacingHint()); |
116 | topLayout->setMargin(marginHint()); | 117 | topLayout->setMargin(marginHint()); |
117 | int iii = 0; | 118 | int iii = 0; |
118 | 119 | ||
119 | 120 | ||
120 | KPrefsDialogWidRadios *syncPrefsGroup = | 121 | KPrefsDialogWidRadios *syncPrefsGroup = |
121 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); | 122 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); |
122 | QString format; | 123 | QString format; |
123 | if ( QApplication::desktop()->width() < 480 ) | 124 | if ( QApplication::desktop()->width() < 480 ) |
124 | format = "(%d.%m.%Y)"; | 125 | format = "(%d.%m.%Y)"; |
@@ -150,29 +151,31 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0); | |||
150 | topLayout->addWidget(lab ,iii,0); | 151 | topLayout->addWidget(lab ,iii,0); |
151 | topLayout->addWidget(mUserDateFormatShort,iii,1); | 152 | topLayout->addWidget(mUserDateFormatShort,iii,1); |
152 | ++iii; | 153 | ++iii; |
153 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); | 154 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); |
154 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 155 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
155 | ++iii; | 156 | ++iii; |
156 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); | 157 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); |
157 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 158 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
158 | ++iii; | 159 | ++iii; |
159 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); | 160 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); |
160 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 161 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
161 | ++iii; | 162 | ++iii; |
163 | #endif | ||
162 | 164 | ||
163 | } | 165 | } |
164 | 166 | ||
165 | void KOPrefsDialog::setupLocaleTab() | 167 | void KOPrefsDialog::setupLocaleTab() |
166 | { | 168 | { |
169 | #if 0 | ||
167 | QFrame *topFrame = addPage(i18n("Locale"),0,0); | 170 | QFrame *topFrame = addPage(i18n("Locale"),0,0); |
168 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); | 171 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); |
169 | topLayout->setSpacing(spacingHint()); | 172 | topLayout->setSpacing(spacingHint()); |
170 | topLayout->setMargin(marginHint()); | 173 | topLayout->setMargin(marginHint()); |
171 | int iii = 0; | 174 | int iii = 0; |
172 | KPrefsDialogWidRadios *syncPrefsGroup = | 175 | KPrefsDialogWidRadios *syncPrefsGroup = |
173 | addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); | 176 | addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); |
174 | syncPrefsGroup->addRadio(i18n("English")); | 177 | syncPrefsGroup->addRadio(i18n("English")); |
175 | syncPrefsGroup->addRadio(i18n("German")); | 178 | syncPrefsGroup->addRadio(i18n("German")); |
176 | syncPrefsGroup->addRadio(i18n("French")); | 179 | syncPrefsGroup->addRadio(i18n("French")); |
177 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); | 180 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); |
178 | if ( QApplication::desktop()->width() < 300 ) | 181 | if ( QApplication::desktop()->width() < 300 ) |
@@ -214,24 +217,25 @@ void KOPrefsDialog::setupLocaleTab() | |||
214 | hbLayout->addWidget(sb->checkBox() ); | 217 | hbLayout->addWidget(sb->checkBox() ); |
215 | topLayout->addMultiCellWidget(hb, iii,iii,0,1); | 218 | topLayout->addMultiCellWidget(hb, iii,iii,0,1); |
216 | 219 | ||
217 | } | 220 | } |
218 | // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION | 221 | // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION |
219 | #if 0 | 222 | #if 0 |
220 | ++iii; | 223 | ++iii; |
221 | sb = | 224 | sb = |
222 | addWidBool(i18n("Quick load/save (w/o Unicode)"), | 225 | addWidBool(i18n("Quick load/save (w/o Unicode)"), |
223 | &(KOPrefs::instance()->mUseQuicksave),topFrame); | 226 | &(KOPrefs::instance()->mUseQuicksave),topFrame); |
224 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 227 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
225 | #endif | 228 | #endif |
229 | #endif | ||
226 | } | 230 | } |
227 | void KOPrefsDialog::showSyncPage() | 231 | void KOPrefsDialog::showSyncPage() |
228 | { | 232 | { |
229 | showPage ( 2 ) ; | 233 | showPage ( 2 ) ; |
230 | 234 | ||
231 | } | 235 | } |
232 | void KOPrefsDialog::setupSyncAlgTab() | 236 | void KOPrefsDialog::setupSyncAlgTab() |
233 | { | 237 | { |
234 | #if 0 | 238 | #if 0 |
235 | QLabel * lab; | 239 | QLabel * lab; |
236 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); | 240 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); |
237 | mSetupSyncAlgTab = topFrame; | 241 | mSetupSyncAlgTab = topFrame; |
@@ -614,39 +618,24 @@ void KOPrefsDialog::setupViewsTab() | |||
614 | KPrefsDialogWidBool *weeklyRecur = | 618 | KPrefsDialogWidBool *weeklyRecur = |
615 | addWidBool(i18n("Show ev. that recur weekly in date nav."), | 619 | addWidBool(i18n("Show ev. that recur weekly in date nav."), |
616 | &(KOPrefs::instance()->mWeeklyRecur),topFrame); | 620 | &(KOPrefs::instance()->mWeeklyRecur),topFrame); |
617 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); | 621 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); |
618 | if ( QApplication::desktop()->width() > 640 ) { | 622 | if ( QApplication::desktop()->width() > 640 ) { |
619 | 623 | ||
620 | KPrefsDialogWidBool *enableToolTips = | 624 | KPrefsDialogWidBool *enableToolTips = |
621 | addWidBool(i18n("Enable tooltips displaying summary of ev."), | 625 | addWidBool(i18n("Enable tooltips displaying summary of ev."), |
622 | &(KOPrefs::instance()->mEnableToolTips),topFrame); | 626 | &(KOPrefs::instance()->mEnableToolTips),topFrame); |
623 | topLayout->addWidget(enableToolTips->checkBox(),ii++,0); | 627 | topLayout->addWidget(enableToolTips->checkBox(),ii++,0); |
624 | 628 | ||
625 | } | 629 | } |
626 | KPrefsDialogWidBool *passwdk = | ||
627 | addWidBool(i18n("Show parent To-Do's in What's Next view"), | ||
628 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); | ||
629 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
630 | |||
631 | passwdk = | ||
632 | addWidBool(i18n("Show location in What's Next view"), | ||
633 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); | ||
634 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
635 | |||
636 | passwdk = | ||
637 | addWidBool(i18n("Show Sync Events in WN/Agenda view"), | ||
638 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); | ||
639 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
640 | |||
641 | 630 | ||
642 | KPrefsDialogWidBool *marcusBainsEnabled = | 631 | KPrefsDialogWidBool *marcusBainsEnabled = |
643 | addWidBool(i18n("Show Marcus Bains line"), | 632 | addWidBool(i18n("Show Marcus Bains line"), |
644 | &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); | 633 | &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); |
645 | topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); | 634 | topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); |
646 | 635 | ||
647 | 636 | ||
648 | // topLayout->addWidget(hourSizeGroup,ii++,0); | 637 | // topLayout->addWidget(hourSizeGroup,ii++,0); |
649 | // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); | 638 | // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); |
650 | //topLayout->setRowStretch(11,1); | 639 | //topLayout->setRowStretch(11,1); |
651 | 640 | ||
652 | 641 | ||
@@ -790,24 +779,50 @@ void KOPrefsDialog::setupViewsTab() | |||
790 | holidayColor = | 779 | holidayColor = |
791 | addWidColor(i18n("Day color even months"), | 780 | addWidColor(i18n("Day color even months"), |
792 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); | 781 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); |
793 | topLayout->addWidget(holidayColor->label(),ii,0); | 782 | topLayout->addWidget(holidayColor->label(),ii,0); |
794 | topLayout->addWidget(holidayColor->button(),ii++,1); | 783 | topLayout->addWidget(holidayColor->button(),ii++,1); |
795 | 784 | ||
796 | 785 | ||
797 | holidayColor = | 786 | holidayColor = |
798 | addWidColor(i18n("Color for Sundays + category \"Holiday\""), | 787 | addWidColor(i18n("Color for Sundays + category \"Holiday\""), |
799 | &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); | 788 | &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); |
800 | topLayout->addWidget(holidayColor->label(),ii,0); | 789 | topLayout->addWidget(holidayColor->label(),ii,0); |
801 | topLayout->addWidget(holidayColor->button(),ii++,1); | 790 | topLayout->addWidget(holidayColor->button(),ii++,1); |
791 | // *********************** What'sNext View | ||
792 | topFrame = addPage(i18n("What's Next View"),0,0); | ||
793 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | ||
794 | |||
795 | topLayout = new QGridLayout(topFrame,4,1); | ||
796 | topLayout->setSpacing(spacingHint()); | ||
797 | topLayout->setMargin(marginHint()); | ||
798 | ii = 0; | ||
799 | KPrefsDialogWidBool *passwdk = | ||
800 | addWidBool(i18n("Show parent To-Do's in What's Next view"), | ||
801 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); | ||
802 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
803 | |||
804 | passwdk = | ||
805 | addWidBool(i18n("Show location in What's Next view"), | ||
806 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); | ||
807 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
808 | |||
809 | passwdk = | ||
810 | addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"), | ||
811 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); | ||
812 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
813 | passwdk = | ||
814 | addWidBool(i18n("Use short date in \nWhat's Next/Event view"), | ||
815 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); | ||
816 | topLayout->addMultiCellWidget(passwdk->checkBox(), ii,ii,0,1); | ||
802 | 817 | ||
803 | // *********************** Todo View | 818 | // *********************** Todo View |
804 | 819 | ||
805 | topFrame = addPage(i18n("Todo View"),0,0); | 820 | topFrame = addPage(i18n("Todo View"),0,0); |
806 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 821 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
807 | 822 | ||
808 | topLayout = new QGridLayout(topFrame,4,1); | 823 | topLayout = new QGridLayout(topFrame,4,1); |
809 | topLayout->setSpacing(spacingHint()); | 824 | topLayout->setSpacing(spacingHint()); |
810 | topLayout->setMargin(marginHint()); | 825 | topLayout->setMargin(marginHint()); |
811 | ii = 0; | 826 | ii = 0; |
812 | 827 | ||
813 | KPrefsDialogWidBool *showCompletedTodo = | 828 | KPrefsDialogWidBool *showCompletedTodo = |
@@ -1327,28 +1342,28 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, | |||
1327 | } | 1342 | } |
1328 | } | 1343 | } |
1329 | } | 1344 | } |
1330 | } | 1345 | } |
1331 | 1346 | ||
1332 | void KOPrefsDialog::usrReadConfig() | 1347 | void KOPrefsDialog::usrReadConfig() |
1333 | { | 1348 | { |
1334 | kdelibcfg->readConfig(); | 1349 | kdelibcfg->readConfig(); |
1335 | mNameEdit->setText(KOPrefs::instance()->fullName()); | 1350 | mNameEdit->setText(KOPrefs::instance()->fullName()); |
1336 | mEmailEdit->setText(KOPrefs::instance()->email()); | 1351 | mEmailEdit->setText(KOPrefs::instance()->email()); |
1337 | 1352 | ||
1338 | mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); | 1353 | mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); |
1339 | QDate current ( 2001, 1,1); | 1354 | // QDate current ( 2001, 1,1); |
1340 | mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); | 1355 | //mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); |
1341 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); | 1356 | //mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); |
1342 | setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); | 1357 | //setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); |
1343 | //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); | 1358 | //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); |
1344 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); | 1359 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); |
1345 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); | 1360 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); |
1346 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); | 1361 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); |
1347 | // if (KOPrefs::instance()->mAllDaySize > 47 ) | 1362 | // if (KOPrefs::instance()->mAllDaySize > 47 ) |
1348 | // KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2; | 1363 | // KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2; |
1349 | //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize); | 1364 | //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize); |
1350 | 1365 | ||
1351 | mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays); | 1366 | mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays); |
1352 | mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays); | 1367 | mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays); |
1353 | mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios); | 1368 | mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios); |
1354 | // mAMails->clear(); | 1369 | // mAMails->clear(); |
@@ -1357,68 +1372,68 @@ void KOPrefsDialog::usrReadConfig() | |||
1357 | // QListViewItem *item = new QListViewItem(mAMails); | 1372 | // QListViewItem *item = new QListViewItem(mAMails); |
1358 | // item->setText(0,*it); | 1373 | // item->setText(0,*it); |
1359 | // mAMails->insertItem(item); | 1374 | // mAMails->insertItem(item); |
1360 | // } | 1375 | // } |
1361 | 1376 | ||
1362 | // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP); | 1377 | // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP); |
1363 | //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser); | 1378 | //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser); |
1364 | //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd); | 1379 | //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd); |
1365 | //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile); | 1380 | //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile); |
1366 | 1381 | ||
1367 | //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); | 1382 | //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); |
1368 | mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); | 1383 | mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); |
1369 | QString dummy = KOPrefs::instance()->mUserDateFormatLong; | 1384 | //QString dummy = KOPrefs::instance()->mUserDateFormatLong; |
1370 | mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); | 1385 | //mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); |
1371 | dummy = KOPrefs::instance()->mUserDateFormatShort; | 1386 | //dummy = KOPrefs::instance()->mUserDateFormatShort; |
1372 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); | 1387 | //mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); |
1373 | updateCategories(); | 1388 | updateCategories(); |
1374 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); | 1389 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); |
1375 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); | 1390 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); |
1376 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); | 1391 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); |
1377 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); | 1392 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); |
1378 | } | 1393 | } |
1379 | 1394 | ||
1380 | 1395 | ||
1381 | void KOPrefsDialog::usrWriteConfig() | 1396 | void KOPrefsDialog::usrWriteConfig() |
1382 | { | 1397 | { |
1383 | 1398 | ||
1384 | kdelibcfg->writeConfig(); | 1399 | kdelibcfg->writeConfig(); |
1385 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); | 1400 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); |
1386 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); | 1401 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); |
1387 | //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); | 1402 | //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); |
1388 | //KOPrefs::instance()->mRemoteFile= mRemoteFile->text(); | 1403 | //KOPrefs::instance()->mRemoteFile= mRemoteFile->text(); |
1389 | //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); | 1404 | //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); |
1390 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); | 1405 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); |
1391 | 1406 | ||
1392 | KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); | 1407 | //KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); |
1393 | KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); | 1408 | //KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); |
1394 | KOPrefs::instance()->setFullName(mNameEdit->text()); | 1409 | KOPrefs::instance()->setFullName(mNameEdit->text()); |
1395 | KOPrefs::instance()->setEmail(mEmailEdit->text()); | 1410 | KOPrefs::instance()->setEmail(mEmailEdit->text()); |
1396 | 1411 | ||
1397 | KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); | 1412 | KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); |
1398 | 1413 | ||
1399 | KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText(); | 1414 | // KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText(); |
1400 | QDate date; | 1415 | //QDate date; |
1401 | date = mStartDateSavingEdit->date(); | 1416 | //date = mStartDateSavingEdit->date(); |
1402 | int sub = 0; | 1417 | //int sub = 0; |
1403 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | 1418 | //if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) |
1404 | sub = 1; | 1419 | // sub = 1; |
1405 | KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub; | 1420 | // KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub; |
1406 | date = mEndDateSavingEdit->date(); | 1421 | // date = mEndDateSavingEdit->date(); |
1407 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | 1422 | // if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) |
1408 | sub = 1; | 1423 | // sub = 1; |
1409 | else | 1424 | // else |
1410 | sub = 0; | 1425 | // sub = 0; |
1411 | KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub; | 1426 | // KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub; |
1412 | // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value(); | 1427 | // // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value(); |
1413 | 1428 | ||
1414 | KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); | 1429 | KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); |
1415 | KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value(); | 1430 | KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value(); |
1416 | KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem(); | 1431 | KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem(); |
1417 | 1432 | ||
1418 | //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value(); | 1433 | //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value(); |
1419 | 1434 | ||
1420 | QDictIterator<QColor> it(mCategoryDict); | 1435 | QDictIterator<QColor> it(mCategoryDict); |
1421 | while (it.current()) { | 1436 | while (it.current()) { |
1422 | KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); | 1437 | KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); |
1423 | ++it; | 1438 | ++it; |
1424 | } | 1439 | } |
@@ -1548,24 +1563,25 @@ void KOPrefsDialog::updateTimezoneOffset( int index ) | |||
1548 | mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); | 1563 | mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); |
1549 | 1564 | ||
1550 | } else { | 1565 | } else { |
1551 | mTimezoneOffsetSpin->setEnabled ( false ); | 1566 | mTimezoneOffsetSpin->setEnabled ( false ); |
1552 | mTimezoneOffsetSpin->setValue( 0 ); | 1567 | mTimezoneOffsetSpin->setValue( 0 ); |
1553 | } | 1568 | } |
1554 | } | 1569 | } |
1555 | */ | 1570 | */ |
1556 | } | 1571 | } |
1557 | 1572 | ||
1558 | void KOPrefsDialog::setupTimeZoneTab() | 1573 | void KOPrefsDialog::setupTimeZoneTab() |
1559 | { | 1574 | { |
1575 | #if 0 | ||
1560 | QFrame *topFrame = addPage(i18n("Time Zone"),0,0); | 1576 | QFrame *topFrame = addPage(i18n("Time Zone"),0,0); |
1561 | // DesktopIcon("clock",KIcon::SizeMedium)); | 1577 | // DesktopIcon("clock",KIcon::SizeMedium)); |
1562 | 1578 | ||
1563 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); | 1579 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); |
1564 | topLayout->setSpacing(spacingHint()); | 1580 | topLayout->setSpacing(spacingHint()); |
1565 | topLayout->setMargin(marginHint()); | 1581 | topLayout->setMargin(marginHint()); |
1566 | 1582 | ||
1567 | QHBox *timeZoneBox = new QHBox( topFrame ); | 1583 | QHBox *timeZoneBox = new QHBox( topFrame ); |
1568 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); | 1584 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); |
1569 | 1585 | ||
1570 | new QLabel( i18n("Timezone:"), timeZoneBox ); | 1586 | new QLabel( i18n("Timezone:"), timeZoneBox ); |
1571 | mTimeZoneCombo = new QComboBox( timeZoneBox ); | 1587 | mTimeZoneCombo = new QComboBox( timeZoneBox ); |
@@ -1606,16 +1622,16 @@ void KOPrefsDialog::setupTimeZoneTab() | |||
1606 | mStartDateSavingEdit = new KDateEdit(topFrame); | 1622 | mStartDateSavingEdit = new KDateEdit(topFrame); |
1607 | topLayout->addWidget(mStartDateSavingEdit, iii,1); | 1623 | topLayout->addWidget(mStartDateSavingEdit, iii,1); |
1608 | ++iii; | 1624 | ++iii; |
1609 | 1625 | ||
1610 | lab = new QLabel( i18n("Daylight end:"), topFrame ); | 1626 | lab = new QLabel( i18n("Daylight end:"), topFrame ); |
1611 | topLayout->addWidget(lab, iii,0); | 1627 | topLayout->addWidget(lab, iii,0); |
1612 | mEndDateSavingEdit = new KDateEdit(topFrame); | 1628 | mEndDateSavingEdit = new KDateEdit(topFrame); |
1613 | topLayout->addWidget(mEndDateSavingEdit, iii,1); | 1629 | topLayout->addWidget(mEndDateSavingEdit, iii,1); |
1614 | ++iii; | 1630 | ++iii; |
1615 | QDate current ( 2001, 1,1); | 1631 | QDate current ( 2001, 1,1); |
1616 | mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); | 1632 | mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); |
1617 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); | 1633 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); |
1618 | 1634 | #endif | |
1619 | 1635 | ||
1620 | } | 1636 | } |
1621 | 1637 | ||