-rw-r--r-- | korganizer/calendarview.cpp | 1 | ||||
-rw-r--r-- | korganizer/kodialogmanager.cpp | 23 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 286 | ||||
-rw-r--r-- | korganizer/koprefsdialog.h | 12 |
4 files changed, 20 insertions, 302 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 4794414..2a55127 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2522,24 +2522,25 @@ void CalendarView::edit_paste() | |||
2522 | } | 2522 | } |
2523 | void CalendarView::edit_global_options() | 2523 | void CalendarView::edit_global_options() |
2524 | { | 2524 | { |
2525 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; | 2525 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; |
2526 | emit save(); | 2526 | emit save(); |
2527 | emit saveStopTimer(); | 2527 | emit saveStopTimer(); |
2528 | mDialogManager->showGlobalOptionsDialog(); | 2528 | mDialogManager->showGlobalOptionsDialog(); |
2529 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { | 2529 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { |
2530 | emit saveStopTimer(); | 2530 | emit saveStopTimer(); |
2531 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"), | 2531 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"), |
2532 | i18n("Timezone settings"),i18n("Reload"))) { | 2532 | i18n("Timezone settings"),i18n("Reload"))) { |
2533 | qDebug("KO: TZ reload cancelled "); | 2533 | qDebug("KO: TZ reload cancelled "); |
2534 | mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); | ||
2534 | return; | 2535 | return; |
2535 | } | 2536 | } |
2536 | qDebug("KO: Timezone change "); | 2537 | qDebug("KO: Timezone change "); |
2537 | openCalendar( MainWindow::defaultFileName() ); | 2538 | openCalendar( MainWindow::defaultFileName() ); |
2538 | setModified(true); | 2539 | setModified(true); |
2539 | } | 2540 | } |
2540 | else | 2541 | else |
2541 | qDebug("KO: No tz change "); | 2542 | qDebug("KO: No tz change "); |
2542 | } | 2543 | } |
2543 | void CalendarView::edit_options() | 2544 | void CalendarView::edit_options() |
2544 | { | 2545 | { |
2545 | mDialogManager->showOptionsDialog(); | 2546 | mDialogManager->showOptionsDialog(); |
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index aa30c52..3dfa344 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -81,57 +81,44 @@ OutgoingDialog *KODialogManager::outgoingDialog() | |||
81 | void KODialogManager::createOutgoingDialog() | 81 | void KODialogManager::createOutgoingDialog() |
82 | { | 82 | { |
83 | if (!mOutgoingDialog) { | 83 | if (!mOutgoingDialog) { |
84 | mOutgoingDialog = new OutgoingDialog(mMainView->calendar(),mMainView); | 84 | mOutgoingDialog = new OutgoingDialog(mMainView->calendar(),mMainView); |
85 | if (mIncomingDialog) mIncomingDialog->setOutgoingDialog(mOutgoingDialog); | 85 | if (mIncomingDialog) mIncomingDialog->setOutgoingDialog(mOutgoingDialog); |
86 | connect(mOutgoingDialog,SIGNAL(numMessagesChanged(int)), | 86 | connect(mOutgoingDialog,SIGNAL(numMessagesChanged(int)), |
87 | mMainView,SIGNAL(numOutgoingChanged(int))); | 87 | mMainView,SIGNAL(numOutgoingChanged(int))); |
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
91 | void KODialogManager::showGlobalOptionsDialog( bool showSync ) | 91 | void KODialogManager::showGlobalOptionsDialog( bool showSync ) |
92 | { | 92 | { |
93 | if (!mOptionsDialog) { | 93 | KPimPrefsGlobalDialog gc ( mMainView ); |
94 | mOptionsDialog = new KOPrefsDialog(0); | 94 | if ( showSync ) |
95 | connect(mOptionsDialog,SIGNAL(configChanged()), | 95 | gc.showTZconfig(); |
96 | mMainView,SLOT(updateConfig())); | 96 | gc.exec(); |
97 | } | ||
98 | mOptionsDialog->readConfig(); | ||
99 | #ifndef DESKTOP_VERSION | ||
100 | mOptionsDialog->showMaximized(); | ||
101 | #else | ||
102 | mOptionsDialog->show(); | ||
103 | #endif | ||
104 | if ( showSync ) | ||
105 | mOptionsDialog->showSyncPage(); | ||
106 | mOptionsDialog->exec(); | ||
107 | delete mOptionsDialog; | ||
108 | mOptionsDialog = 0; | ||
109 | } | 97 | } |
110 | void KODialogManager::showOptionsDialog( bool showSync ) | 98 | void KODialogManager::showOptionsDialog( bool showSync ) |
111 | { | 99 | { |
112 | 100 | ||
113 | if (!mOptionsDialog) { | 101 | if (!mOptionsDialog) { |
114 | mOptionsDialog = new KOPrefsDialog(mMainView); | 102 | mOptionsDialog = new KOPrefsDialog(mMainView); |
115 | connect(mOptionsDialog,SIGNAL(configChanged()), | 103 | connect(mOptionsDialog,SIGNAL(configChanged()), |
116 | mMainView,SLOT(updateConfig())); | 104 | mMainView,SLOT(updateConfig())); |
117 | } | 105 | } |
118 | mOptionsDialog->readConfig(); | 106 | mOptionsDialog->readConfig(); |
119 | #ifndef DESKTOP_VERSION | 107 | #ifndef DESKTOP_VERSION |
120 | mOptionsDialog->showMaximized(); | 108 | mOptionsDialog->showMaximized(); |
121 | #else | 109 | #else |
122 | mOptionsDialog->show(); | 110 | mOptionsDialog->show(); |
123 | #endif | 111 | #endif |
124 | if ( showSync ) | 112 | |
125 | mOptionsDialog->showSyncPage(); | ||
126 | mOptionsDialog->exec(); | 113 | mOptionsDialog->exec(); |
127 | delete mOptionsDialog; | 114 | delete mOptionsDialog; |
128 | mOptionsDialog = 0; | 115 | mOptionsDialog = 0; |
129 | } | 116 | } |
130 | void KODialogManager::showSyncOptions() | 117 | void KODialogManager::showSyncOptions() |
131 | { | 118 | { |
132 | showGlobalOptionsDialog( true ); | 119 | showGlobalOptionsDialog( true ); |
133 | 120 | ||
134 | } | 121 | } |
135 | void KODialogManager::showOutgoingDialog() | 122 | void KODialogManager::showOutgoingDialog() |
136 | { | 123 | { |
137 | createOutgoingDialog(); | 124 | createOutgoingDialog(); |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 4b5b66a..b782bb1 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -77,56 +77,49 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
77 | 77 | ||
78 | setFont( KGlobalSettings::generalMaxFont() ); | 78 | setFont( KGlobalSettings::generalMaxFont() ); |
79 | setCaption( i18n("Preferences - some settings need a restart (nr)")); | 79 | setCaption( i18n("Preferences - some settings need a restart (nr)")); |
80 | mCategoryDict.setAutoDelete(true); | 80 | mCategoryDict.setAutoDelete(true); |
81 | 81 | ||
82 | KGlobal::locale()->insertCatalogue("timezones"); | 82 | KGlobal::locale()->insertCatalogue("timezones"); |
83 | mSpacingHint = spacingHintSmall(); | 83 | mSpacingHint = spacingHintSmall(); |
84 | mMarginHint = marginHintSmall(); | 84 | mMarginHint = marginHintSmall(); |
85 | #ifndef DESKTOP_VERSION | 85 | #ifndef DESKTOP_VERSION |
86 | if ( QApplication::desktop()->height() == 480 ) | 86 | if ( QApplication::desktop()->height() == 480 ) |
87 | hideButtons(); | 87 | hideButtons(); |
88 | #endif | 88 | #endif |
89 | kdelibcfg = 0; | 89 | |
90 | if ( !parent ) | ||
91 | setupGlobalTab(); | ||
92 | else { | ||
93 | setupMainTab(); | 90 | setupMainTab(); |
94 | // setupLocaleTab(); | 91 | // setupLocaleTab(); |
95 | //setupTimeZoneTab(); | 92 | //setupTimeZoneTab(); |
96 | setupTimeTab(); | 93 | setupTimeTab(); |
97 | //setupLocaleDateTab(); | 94 | //setupLocaleDateTab(); |
98 | setupFontsTab(); | 95 | setupFontsTab(); |
99 | setupColorsTab(); | 96 | setupColorsTab(); |
100 | setupViewsTab(); | 97 | setupViewsTab(); |
101 | //setupSyncTab(); | 98 | //setupSyncTab(); |
102 | //setupSyncAlgTab(); | 99 | //setupSyncAlgTab(); |
103 | //setupPrinterTab(); | 100 | //setupPrinterTab(); |
104 | //setupGroupSchedulingTab(); | 101 | //setupGroupSchedulingTab(); |
105 | //setupGroupAutomationTab(); | 102 | //setupGroupAutomationTab(); |
106 | } | 103 | |
107 | 104 | ||
108 | } | 105 | } |
109 | 106 | ||
110 | 107 | ||
111 | KOPrefsDialog::~KOPrefsDialog() | 108 | KOPrefsDialog::~KOPrefsDialog() |
112 | { | 109 | { |
113 | } | 110 | } |
114 | void KOPrefsDialog::setupGlobalTab() | 111 | void KOPrefsDialog::setupGlobalTab() |
115 | { | 112 | { |
116 | //QFrame *topFrame = addPage(i18n("Global"),0,0); | 113 | |
117 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), this, "KCMKdeLibConfig" ); | ||
118 | setMainWidget( kdelibcfg ); | ||
119 | setCaption( i18n("KDE-Pim Global Settings")); | ||
120 | |||
121 | 114 | ||
122 | } | 115 | } |
123 | void KOPrefsDialog::setupLocaleDateTab() | 116 | void KOPrefsDialog::setupLocaleDateTab() |
124 | { | 117 | { |
125 | #if 0 | 118 | #if 0 |
126 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 119 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
127 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 120 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
128 | topLayout->setSpacing(mSpacingHint); | 121 | topLayout->setSpacing(mSpacingHint); |
129 | topLayout->setMargin(mMarginHint); | 122 | topLayout->setMargin(mMarginHint); |
130 | int iii = 0; | 123 | int iii = 0; |
131 | 124 | ||
132 | 125 | ||
@@ -231,121 +224,24 @@ void KOPrefsDialog::setupLocaleTab() | |||
231 | 224 | ||
232 | } | 225 | } |
233 | // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION | 226 | // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION |
234 | #if 0 | 227 | #if 0 |
235 | ++iii; | 228 | ++iii; |
236 | sb = | 229 | sb = |
237 | addWidBool(i18n("Quick load/save (w/o Unicode)"), | 230 | addWidBool(i18n("Quick load/save (w/o Unicode)"), |
238 | &(KOPrefs::instance()->mUseQuicksave),topFrame); | 231 | &(KOPrefs::instance()->mUseQuicksave),topFrame); |
239 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 232 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
240 | #endif | 233 | #endif |
241 | #endif | 234 | #endif |
242 | } | 235 | } |
243 | void KOPrefsDialog::showSyncPage() | ||
244 | { | ||
245 | // showPage ( 0 ) ; | ||
246 | kdelibcfg->showTimeZoneTab() ; | ||
247 | |||
248 | } | ||
249 | void KOPrefsDialog::setupSyncAlgTab() | ||
250 | { | ||
251 | #if 0 | ||
252 | QLabel * lab; | ||
253 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); | ||
254 | mSetupSyncAlgTab = topFrame; | ||
255 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | ||
256 | topLayout->setSpacing(mSpacingHint); | ||
257 | topLayout->setMargin(mMarginHint); | ||
258 | int iii = 0; | ||
259 | |||
260 | KPrefsDialogWidBool *sb = | ||
261 | addWidBool(i18n("Ask for preferences before syncing"), | ||
262 | &(KOPrefs::instance()->mAskForPreferences),topFrame); | ||
263 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | ||
264 | |||
265 | ++iii; | ||
266 | |||
267 | KPrefsDialogWidRadios *syncPrefsGroup = | ||
268 | addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs), | ||
269 | topFrame); | ||
270 | syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); | ||
271 | syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); | ||
272 | syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); | ||
273 | syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); | ||
274 | syncPrefsGroup->addRadio(i18n("Force take local entry always")); | ||
275 | syncPrefsGroup->addRadio(i18n("Force take remote entry always")); | ||
276 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | ||
277 | ++iii; | ||
278 | sb = | ||
279 | addWidBool(i18n("Show summary after syncing"), | ||
280 | &(KOPrefs::instance()->mShowSyncSummary),topFrame); | ||
281 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | ||
282 | |||
283 | ++iii; | ||
284 | #endif | ||
285 | |||
286 | |||
287 | |||
288 | } | ||
289 | |||
290 | |||
291 | void KOPrefsDialog::setupSyncTab() | ||
292 | { | ||
293 | #if 0 | ||
294 | QLabel * lab; | ||
295 | QFrame *topFrame = addPage(i18n("Sync Network"),0,0); | ||
296 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | ||
297 | topLayout->setSpacing(mSpacingHint); | ||
298 | topLayout->setMargin(mMarginHint); | ||
299 | lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame); | ||
300 | int iii = 0; | ||
301 | topLayout->addMultiCellWidget(lab , iii,iii,0,1); | ||
302 | ++iii; | ||
303 | |||
304 | mRemoteIPEdit = new QLineEdit(topFrame); | ||
305 | lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame); | ||
306 | topLayout->addWidget(lab ,iii,0); | ||
307 | topLayout->addWidget(mRemoteIPEdit,iii,1); | ||
308 | ++iii; | ||
309 | mRemoteUser = new QLineEdit(topFrame); | ||
310 | lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame); | ||
311 | topLayout->addWidget(lab ,iii,0); | ||
312 | topLayout->addWidget(mRemoteUser, iii,1); | ||
313 | ++iii; | ||
314 | |||
315 | mRemoteFile = new QLineEdit(topFrame); | ||
316 | lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame); | ||
317 | topLayout->addWidget(lab ,iii,0); | ||
318 | topLayout->addWidget(mRemoteFile,iii,1); | ||
319 | ++iii; | ||
320 | |||
321 | mLocalTempFile = new QLineEdit(topFrame); | ||
322 | lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame); | ||
323 | topLayout->addWidget(lab ,iii,0); | ||
324 | topLayout->addWidget(mLocalTempFile,iii,1); | ||
325 | ++iii; | ||
326 | |||
327 | KPrefsDialogWidBool *wb = | ||
328 | addWidBool(i18n("Write back synced file"), | ||
329 | &(KOPrefs::instance()->mWriteBackFile),topFrame); | ||
330 | topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); | ||
331 | ++iii; | ||
332 | wb = | ||
333 | addWidBool(i18n("Write back existing entries only"), | ||
334 | &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame); | ||
335 | topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); | ||
336 | ++iii; | ||
337 | |||
338 | #endif | ||
339 | } | ||
340 | 236 | ||
341 | void KOPrefsDialog::setupMainTab() | 237 | void KOPrefsDialog::setupMainTab() |
342 | { | 238 | { |
343 | QFrame *topFrame = addPage(i18n("General"),0,0); | 239 | QFrame *topFrame = addPage(i18n("General"),0,0); |
344 | // DesktopIcon("identity",KIcon::SizeMedium)); | 240 | // DesktopIcon("identity",KIcon::SizeMedium)); |
345 | 241 | ||
346 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); | 242 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); |
347 | topLayout->setSpacing(mSpacingHint); | 243 | topLayout->setSpacing(mSpacingHint); |
348 | topLayout->setMargin(mMarginHint); | 244 | topLayout->setMargin(mMarginHint); |
349 | 245 | ||
350 | // KPrefsDialogWidBool *emailControlCenter = | 246 | // KPrefsDialogWidBool *emailControlCenter = |
351 | // addWidBool(i18n("&Use email settings from Control Center"), | 247 | // addWidBool(i18n("&Use email settings from Control Center"), |
@@ -1451,170 +1347,102 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, | |||
1451 | } else { | 1347 | } else { |
1452 | for(int i=0;i<combo->count();++i) { | 1348 | for(int i=0;i<combo->count();++i) { |
1453 | if (combo->text(i) == text) { | 1349 | if (combo->text(i) == text) { |
1454 | combo->setCurrentItem(i); | 1350 | combo->setCurrentItem(i); |
1455 | break; | 1351 | break; |
1456 | } | 1352 | } |
1457 | } | 1353 | } |
1458 | } | 1354 | } |
1459 | } | 1355 | } |
1460 | 1356 | ||
1461 | void KOPrefsDialog::usrReadConfig() | 1357 | void KOPrefsDialog::usrReadConfig() |
1462 | { | 1358 | { |
1463 | if ( kdelibcfg ) | 1359 | |
1464 | kdelibcfg->readConfig(); | ||
1465 | else { | ||
1466 | mNameEdit->setText(KOPrefs::instance()->fullName()); | 1360 | mNameEdit->setText(KOPrefs::instance()->fullName()); |
1467 | mEmailEdit->setText(KOPrefs::instance()->email()); | 1361 | mEmailEdit->setText(KOPrefs::instance()->email()); |
1468 | 1362 | ||
1469 | mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); | 1363 | mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); |
1470 | // QDate current ( 2001, 1,1); | 1364 | |
1471 | //mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); | ||
1472 | //mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); | ||
1473 | //setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); | ||
1474 | //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); | ||
1475 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); | 1365 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); |
1476 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); | 1366 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); |
1477 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); | 1367 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); |
1478 | // if (KOPrefs::instance()->mAllDaySize > 47 ) | ||
1479 | // KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2; | ||
1480 | //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize); | ||
1481 | 1368 | ||
1482 | mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays); | 1369 | mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays); |
1483 | mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays); | 1370 | mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays); |
1484 | mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios); | 1371 | mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios); |
1485 | // mAMails->clear(); | 1372 | // mAMails->clear(); |
1486 | // for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin(); | 1373 | // for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin(); |
1487 | // it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) { | 1374 | // it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) { |
1488 | // QListViewItem *item = new QListViewItem(mAMails); | 1375 | // QListViewItem *item = new QListViewItem(mAMails); |
1489 | // item->setText(0,*it); | 1376 | // item->setText(0,*it); |
1490 | // mAMails->insertItem(item); | 1377 | // mAMails->insertItem(item); |
1491 | // } | 1378 | // } |
1492 | 1379 | ||
1493 | // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP); | ||
1494 | //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser); | ||
1495 | //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd); | ||
1496 | //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile); | ||
1497 | |||
1498 | //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); | 1380 | //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); |
1499 | mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); | 1381 | mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); |
1500 | //QString dummy = KOPrefs::instance()->mUserDateFormatLong; | ||
1501 | //mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); | ||
1502 | //dummy = KOPrefs::instance()->mUserDateFormatShort; | ||
1503 | //mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); | ||
1504 | updateCategories(); | 1382 | updateCategories(); |
1505 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); | 1383 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); |
1506 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); | 1384 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); |
1507 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); | 1385 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); |
1508 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); | 1386 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); |
1509 | } | 1387 | |
1510 | } | 1388 | } |
1511 | 1389 | ||
1512 | 1390 | ||
1513 | void KOPrefsDialog::usrWriteConfig() | 1391 | void KOPrefsDialog::usrWriteConfig() |
1514 | { | 1392 | { |
1515 | if ( kdelibcfg ) | 1393 | |
1516 | kdelibcfg->writeConfig(); | 1394 | |
1517 | else { | ||
1518 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); | ||
1519 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); | ||
1520 | //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); | ||
1521 | //KOPrefs::instance()->mRemoteFile= mRemoteFile->text(); | ||
1522 | //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); | ||
1523 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); | 1395 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); |
1524 | |||
1525 | //KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); | ||
1526 | //KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); | ||
1527 | KOPrefs::instance()->setFullName(mNameEdit->text()); | 1396 | KOPrefs::instance()->setFullName(mNameEdit->text()); |
1528 | KOPrefs::instance()->setEmail(mEmailEdit->text()); | 1397 | KOPrefs::instance()->setEmail(mEmailEdit->text()); |
1529 | 1398 | ||
1530 | KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); | 1399 | KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); |
1531 | |||
1532 | // KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText(); | ||
1533 | //QDate date; | ||
1534 | //date = mStartDateSavingEdit->date(); | ||
1535 | //int sub = 0; | ||
1536 | //if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | ||
1537 | // sub = 1; | ||
1538 | // KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub; | ||
1539 | // date = mEndDateSavingEdit->date(); | ||
1540 | // if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | ||
1541 | // sub = 1; | ||
1542 | // else | ||
1543 | // sub = 0; | ||
1544 | // KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub; | ||
1545 | // // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value(); | ||
1546 | |||
1547 | KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); | 1400 | KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); |
1548 | KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value(); | 1401 | KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value(); |
1549 | KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem(); | 1402 | KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem(); |
1550 | 1403 | ||
1551 | //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value(); | ||
1552 | |||
1553 | QDictIterator<QColor> it(mCategoryDict); | 1404 | QDictIterator<QColor> it(mCategoryDict); |
1554 | while (it.current()) { | 1405 | while (it.current()) { |
1555 | KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); | 1406 | KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); |
1556 | ++it; | 1407 | ++it; |
1557 | } | 1408 | } |
1558 | 1409 | ||
1559 | KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value(); | 1410 | KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value(); |
1560 | KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value(); | 1411 | KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value(); |
1561 | KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value(); | 1412 | KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value(); |
1562 | 1413 | ||
1563 | KOPrefs::instance()->mAdditionalMails.clear(); | 1414 | KOPrefs::instance()->mAdditionalMails.clear(); |
1564 | // QListViewItem *item; | 1415 | // QListViewItem *item; |
1565 | // item = mAMails->firstChild(); | 1416 | // item = mAMails->firstChild(); |
1566 | // while (item) | 1417 | // while (item) |
1567 | // { | 1418 | // { |
1568 | // KOPrefs::instance()->mAdditionalMails.append( item->text(0) ); | 1419 | // KOPrefs::instance()->mAdditionalMails.append( item->text(0) ); |
1569 | // item = item->nextSibling(); | 1420 | // item = item->nextSibling(); |
1570 | // } | 1421 | // } |
1571 | KOPrefs::instance()->mAlarmPlayBeeps = mAlarmPlayBeeps->value(); | 1422 | KOPrefs::instance()->mAlarmPlayBeeps = mAlarmPlayBeeps->value(); |
1572 | KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ; | 1423 | KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ; |
1573 | KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ; | 1424 | KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ; |
1574 | KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ; | 1425 | KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ; |
1575 | } | 1426 | |
1576 | } | 1427 | } |
1577 | 1428 | ||
1578 | void KOPrefsDialog::updateCategories() | 1429 | void KOPrefsDialog::updateCategories() |
1579 | { | 1430 | { |
1580 | mCategoryCombo->clear(); | 1431 | mCategoryCombo->clear(); |
1581 | mCategoryDict.clear(); | 1432 | mCategoryDict.clear(); |
1582 | mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); | 1433 | mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); |
1583 | updateCategoryColor(); | 1434 | updateCategoryColor(); |
1584 | } | 1435 | } |
1585 | 1436 | ||
1586 | void KOPrefsDialog::warningGroupScheduling() | ||
1587 | { | ||
1588 | warningExperimental(mEnableGroupScheduling->checkBox()->isChecked()); | ||
1589 | } | ||
1590 | |||
1591 | void KOPrefsDialog::warningProjectView() | ||
1592 | { | ||
1593 | warningExperimental(mEnableProjectView->checkBox()->isChecked()); | ||
1594 | } | ||
1595 | |||
1596 | void KOPrefsDialog::warningExperimental(bool on) | ||
1597 | { | ||
1598 | if (on) { | ||
1599 | KMessageBox::information(this,i18n("This is an experimental feature. " | ||
1600 | "It may not work, it may do nothing useful and it may cause data loss. " | ||
1601 | "Use with care.\n" | ||
1602 | "You have to restart KOrganizer for this setting to take effect.")); | ||
1603 | } else { | ||
1604 | KMessageBox::information(this, | ||
1605 | i18n("You have to restart KOrganizer for this setting to take effect.")); | ||
1606 | } | ||
1607 | } | ||
1608 | |||
1609 | void KOPrefsDialog::toggleEmailSettings(bool on) | 1437 | void KOPrefsDialog::toggleEmailSettings(bool on) |
1610 | { | 1438 | { |
1611 | if (on) { | 1439 | if (on) { |
1612 | mEmailEdit->setEnabled(false); | 1440 | mEmailEdit->setEnabled(false); |
1613 | mNameEdit->setEnabled(false); | 1441 | mNameEdit->setEnabled(false); |
1614 | mEmailLabel->setEnabled(false); | 1442 | mEmailLabel->setEnabled(false); |
1615 | mNameLabel->setEnabled(false); | 1443 | mNameLabel->setEnabled(false); |
1616 | 1444 | ||
1617 | KEMailSettings settings; | 1445 | KEMailSettings settings; |
1618 | mNameEdit->setText(settings.getSetting(KEMailSettings::RealName)); | 1446 | mNameEdit->setText(settings.getSetting(KEMailSettings::RealName)); |
1619 | mEmailEdit->setText(settings.getSetting(KEMailSettings::EmailAddress)); | 1447 | mEmailEdit->setText(settings.getSetting(KEMailSettings::EmailAddress)); |
1620 | } else { | 1448 | } else { |
@@ -1657,99 +1485,13 @@ void KOPrefsDialog::updateItem() | |||
1657 | // if (!item) return; | 1485 | // if (!item) return; |
1658 | // item->setText(0,aEmailsEdit->text()); | 1486 | // item->setText(0,aEmailsEdit->text()); |
1659 | } | 1487 | } |
1660 | 1488 | ||
1661 | void KOPrefsDialog::updateInput() | 1489 | void KOPrefsDialog::updateInput() |
1662 | { | 1490 | { |
1663 | // QListViewItem *item; | 1491 | // QListViewItem *item; |
1664 | // item = mAMails->selectedItem(); | 1492 | // item = mAMails->selectedItem(); |
1665 | // if (!item) return; | 1493 | // if (!item) return; |
1666 | // aEmailsEdit->setEnabled(true); | 1494 | // aEmailsEdit->setEnabled(true); |
1667 | // aEmailsEdit->setText(item->text(0)); | 1495 | // aEmailsEdit->setText(item->text(0)); |
1668 | } | 1496 | } |
1669 | void KOPrefsDialog::updateTimezoneOffset( int index ) | ||
1670 | { | ||
1671 | /* | ||
1672 | qDebug("updateTimezoneOffset %d ", index); | ||
1673 | if ( index < 24 ) { | ||
1674 | mTimezoneOffsetSpin->setEnabled ( false ); | ||
1675 | mTimezoneOffsetSpin->setValue( ( index-11 ) * 60 ); | ||
1676 | |||
1677 | |||
1678 | } else { | ||
1679 | if ( index == 24 ) { | ||
1680 | mTimezoneOffsetSpin->setEnabled ( true ); | ||
1681 | mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); | ||
1682 | |||
1683 | } else { | ||
1684 | mTimezoneOffsetSpin->setEnabled ( false ); | ||
1685 | mTimezoneOffsetSpin->setValue( 0 ); | ||
1686 | } | ||
1687 | } | ||
1688 | */ | ||
1689 | } | ||
1690 | |||
1691 | void KOPrefsDialog::setupTimeZoneTab() | ||
1692 | { | ||
1693 | #if 0 | ||
1694 | QFrame *topFrame = addPage(i18n("Time Zone"),0,0); | ||
1695 | // DesktopIcon("clock",KIcon::SizeMedium)); | ||
1696 | |||
1697 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); | ||
1698 | topLayout->setSpacing(mSpacingHint); | ||
1699 | topLayout->setMargin(mMarginHint); | ||
1700 | |||
1701 | QHBox *timeZoneBox = new QHBox( topFrame ); | ||
1702 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); | ||
1703 | |||
1704 | new QLabel( i18n("Timezone:"), timeZoneBox ); | ||
1705 | mTimeZoneCombo = new QComboBox( timeZoneBox ); | ||
1706 | if ( QApplication::desktop()->width() < 300 ) { | ||
1707 | mTimeZoneCombo->setMaximumWidth(150); | ||
1708 | } | ||
1709 | |||
1710 | QStringList list; | ||
1711 | list = KGlobal::locale()->timeZoneList(); | ||
1712 | mTimeZoneCombo->insertStringList(list); | ||
1713 | |||
1714 | // find the currently set time zone and select it | ||
1715 | QString sCurrentlySet = KOPrefs::instance()->mTimeZoneId; | ||
1716 | int nCurrentlySet = 11; | ||
1717 | for (int i = 0; i < mTimeZoneCombo->count(); i++) | ||
1718 | { | ||
1719 | if (mTimeZoneCombo->text(i) == sCurrentlySet) | ||
1720 | { | ||
1721 | nCurrentlySet = i; | ||
1722 | break; | ||
1723 | } | ||
1724 | } | ||
1725 | mTimeZoneCombo->setCurrentItem(nCurrentlySet); | ||
1726 | int iii = 1; | ||
1727 | KPrefsDialogWidBool *sb = | ||
1728 | addWidBool(i18n("Timezone has daylight saving"), | ||
1729 | &(KOPrefs::instance()->mUseDaylightsaving),topFrame); | ||
1730 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | ||
1731 | ++iii; | ||
1732 | QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); | ||
1733 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | ||
1734 | ++iii; | ||
1735 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); | ||
1736 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | ||
1737 | ++iii; | ||
1738 | lab = new QLabel( i18n("Daylight start:"), topFrame ); | ||
1739 | topLayout->addWidget(lab, iii,0); | ||
1740 | mStartDateSavingEdit = new KDateEdit(topFrame); | ||
1741 | topLayout->addWidget(mStartDateSavingEdit, iii,1); | ||
1742 | ++iii; | ||
1743 | |||
1744 | lab = new QLabel( i18n("Daylight end:"), topFrame ); | ||
1745 | topLayout->addWidget(lab, iii,0); | ||
1746 | mEndDateSavingEdit = new KDateEdit(topFrame); | ||
1747 | topLayout->addWidget(mEndDateSavingEdit, iii,1); | ||
1748 | ++iii; | ||
1749 | QDate current ( 2001, 1,1); | ||
1750 | mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); | ||
1751 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); | ||
1752 | #endif | ||
1753 | |||
1754 | } | ||
1755 | 1497 | ||
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index 6892028..80d6545 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h | |||
@@ -48,69 +48,57 @@ class KOPrefsDialog : public KPrefsDialog | |||
48 | { | 48 | { |
49 | Q_OBJECT | 49 | Q_OBJECT |
50 | public: | 50 | public: |
51 | /** Initialize dialog and pages */ | 51 | /** Initialize dialog and pages */ |
52 | KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false); | 52 | KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false); |
53 | ~KOPrefsDialog(); | 53 | ~KOPrefsDialog(); |
54 | 54 | ||
55 | public slots: | 55 | public slots: |
56 | void showPrinterTab(); | 56 | void showPrinterTab(); |
57 | 57 | ||
58 | /** Update controls for categories */ | 58 | /** Update controls for categories */ |
59 | void updateCategories(); | 59 | void updateCategories(); |
60 | void showSyncPage(); | ||
61 | protected slots: | 60 | protected slots: |
62 | void selectSoundFile(); | 61 | void selectSoundFile(); |
63 | void setCategoryColor(); | 62 | void setCategoryColor(); |
64 | void updateCategoryColor(); | 63 | void updateCategoryColor(); |
65 | void updateTimezoneOffset( int ); | ||
66 | |||
67 | |||
68 | void warningExperimental(bool on); | ||
69 | void warningGroupScheduling(); | ||
70 | void warningProjectView(); | ||
71 | |||
72 | void toggleEmailSettings(bool); | 64 | void toggleEmailSettings(bool); |
73 | 65 | ||
74 | //additional emails | 66 | //additional emails |
75 | void addItem(); | 67 | void addItem(); |
76 | void removeItem(); | 68 | void removeItem(); |
77 | void updateItem(); | 69 | void updateItem(); |
78 | void updateInput(); | 70 | void updateInput(); |
79 | 71 | ||
80 | protected: | 72 | protected: |
81 | void usrReadConfig(); | 73 | void usrReadConfig(); |
82 | void usrWriteConfig(); | 74 | void usrWriteConfig(); |
83 | void setupGlobalTab(); | 75 | void setupGlobalTab(); |
84 | 76 | ||
85 | void setupMainTab(); | 77 | void setupMainTab(); |
86 | void setupTimeTab(); | 78 | void setupTimeTab(); |
87 | void setupTimeZoneTab(); | ||
88 | void setupLocaleTab(); | 79 | void setupLocaleTab(); |
89 | void setupLocaleDateTab(); | 80 | void setupLocaleDateTab(); |
90 | void setupFontsTab(); | 81 | void setupFontsTab(); |
91 | void setupColorsTab(); | 82 | void setupColorsTab(); |
92 | void setupViewsTab(); | 83 | void setupViewsTab(); |
93 | void setupDisplayTab(); | 84 | void setupDisplayTab(); |
94 | void setupPrinterTab(); | 85 | void setupPrinterTab(); |
95 | void setupGroupSchedulingTab(); | 86 | void setupGroupSchedulingTab(); |
96 | void setupGroupAutomationTab(); | 87 | void setupGroupAutomationTab(); |
97 | void setupSyncTab(); | ||
98 | void setupSyncAlgTab(); | ||
99 | 88 | ||
100 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); | 89 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); |
101 | 90 | ||
102 | 91 | ||
103 | private: | 92 | private: |
104 | KDEPIMConfigWidget* kdelibcfg; | ||
105 | KPrefsDialogWidBool *mEnableGroupScheduling; | 93 | KPrefsDialogWidBool *mEnableGroupScheduling; |
106 | KPrefsDialogWidBool *mEnableProjectView; | 94 | KPrefsDialogWidBool *mEnableProjectView; |
107 | 95 | ||
108 | QFrame *mPrinterTab; | 96 | QFrame *mPrinterTab; |
109 | 97 | ||
110 | QLineEdit *nameEdit; | 98 | QLineEdit *nameEdit; |
111 | QLineEdit *emailEdit; | 99 | QLineEdit *emailEdit; |
112 | 100 | ||
113 | QComboBox *timeCombo; | 101 | QComboBox *timeCombo; |
114 | QComboBox *tzCombo; | 102 | QComboBox *tzCombo; |
115 | 103 | ||
116 | // widgets holding preferences data | 104 | // widgets holding preferences data |