author | zautrix <zautrix> | 2005-06-10 13:54:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-10 13:54:08 (UTC) |
commit | 31fed261955dcb25d06052a8154ac4cc630b0f7d (patch) (unidiff) | |
tree | ef2b4fe35255f9bf387407b6756c112a67088ad6 /korganizer/koprefsdialog.cpp | |
parent | d2f00fc2034450bc9a3cd1d2c3510bef1758d3bc (diff) | |
download | kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.zip kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.tar.gz kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.tar.bz2 |
fixxx
Diffstat (limited to 'korganizer/koprefsdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koprefsdialog.cpp | 50 |
1 files changed, 46 insertions, 4 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index b782bb1..3ee9a22 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -284,8 +284,15 @@ void KOPrefsDialog::setupMainTab() | |||
284 | widbool = addWidBool(i18n("Block popup until mouse button release"), | 284 | widbool = addWidBool(i18n("Block popup until mouse button release"), |
285 | &(KOPrefs::instance()->mBlockPopupMenu),topFrame); | 285 | &(KOPrefs::instance()->mBlockPopupMenu),topFrame); |
286 | topLayout->addMultiCellWidget( widbool->checkBox(), iii,iii,0,1); | 286 | topLayout->addMultiCellWidget( widbool->checkBox(), iii,iii,0,1); |
287 | ++iii; | 287 | ++iii; |
288 | if ( QApplication::desktop()->height() <= 240 ) { | ||
289 | topFrame = addPage(i18n("General") +" 2",0,0); | ||
290 | topLayout = new QGridLayout(topFrame,4,2); | ||
291 | topLayout->setSpacing(2); | ||
292 | topLayout->setMargin(3); | ||
293 | iii = 0; | ||
294 | } | ||
288 | QHBox *dummy = new QHBox(topFrame); | 295 | QHBox *dummy = new QHBox(topFrame); |
289 | new QLabel(i18n("Days in Next-X-Days:"),dummy); | 296 | new QLabel(i18n("Days in Next-X-Days:"),dummy); |
290 | mNextXDaysSpin = new QSpinBox(2,14,1,dummy); | 297 | mNextXDaysSpin = new QSpinBox(2,14,1,dummy); |
291 | 298 | ||
@@ -430,14 +437,21 @@ void KOPrefsDialog::setupTimeTab() | |||
430 | 3,0); | 437 | 3,0); |
431 | mAlarmTimeCombo = new QComboBox(topFrame); | 438 | mAlarmTimeCombo = new QComboBox(topFrame); |
432 | mAlarmTimeCombo->insertStringList(alarmList); | 439 | mAlarmTimeCombo->insertStringList(alarmList); |
433 | topLayout->addWidget(mAlarmTimeCombo,3,1); | 440 | topLayout->addWidget(mAlarmTimeCombo,3,1); |
434 | 441 | int iii = 4; | |
442 | if ( QApplication::desktop()->height() <= 240 ) { | ||
443 | topFrame = addPage(i18n("Time") +" 2",0,0); | ||
444 | topLayout = new QGridLayout(topFrame,1,2); | ||
445 | topLayout->setSpacing(2); | ||
446 | topLayout->setMargin(3); | ||
447 | iii = 0; | ||
448 | } | ||
435 | 449 | ||
436 | QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, | 450 | QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, |
437 | i18n("Working Hours"), | 451 | i18n("Working Hours"), |
438 | topFrame); | 452 | topFrame); |
439 | topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1); | 453 | topLayout->addMultiCellWidget(workingHoursGroup,iii,iii,0,1); |
440 | workingHoursGroup->layout()->setSpacing( 0 ); | 454 | workingHoursGroup->layout()->setSpacing( 0 ); |
441 | workingHoursGroup->layout()->setMargin( 4 ); | 455 | workingHoursGroup->layout()->setMargin( 4 ); |
442 | QHBox *workStartBox = new QHBox(workingHoursGroup); | 456 | QHBox *workStartBox = new QHBox(workingHoursGroup); |
443 | // workStartBox->setMargin( 0 ); | 457 | // workStartBox->setMargin( 0 ); |
@@ -701,8 +715,20 @@ void KOPrefsDialog::setupViewsTab() | |||
701 | dummy = | 715 | dummy = |
702 | addWidBool(i18n("Category colors are applied to text"), | 716 | addWidBool(i18n("Category colors are applied to text"), |
703 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); | 717 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); |
704 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 718 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
719 | |||
720 | |||
721 | |||
722 | if ( QApplication::desktop()->height() <= 240 ) { | ||
723 | topFrame = addPage(i18n("Month View") +" 2",0,0); | ||
724 | topLayout = new QGridLayout(topFrame,4,1); | ||
725 | topLayout->setSpacing(2); | ||
726 | topLayout->setMargin(1); | ||
727 | ii = 0; | ||
728 | } | ||
729 | |||
730 | |||
705 | coloredCategoriesInMonthView = | 731 | coloredCategoriesInMonthView = |
706 | addWidBool(i18n("Month view uses day colors"), | 732 | addWidBool(i18n("Month view uses day colors"), |
707 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); | 733 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); |
708 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); | 734 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); |
@@ -900,11 +926,15 @@ dummy = | |||
900 | dummy = | 926 | dummy = |
901 | addWidBool(i18n("Use internal alarm notification"), | 927 | addWidBool(i18n("Use internal alarm notification"), |
902 | &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); | 928 | &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); |
903 | topLayout->addWidget(dummy->checkBox(),iii++,0); | 929 | topLayout->addWidget(dummy->checkBox(),iii++,0); |
904 | lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame); | ||
905 | 930 | ||
906 | topLayout->addWidget(lab ,iii++,0); | 931 | if ( QApplication::desktop()->height() > 240 ) { |
932 | |||
933 | lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame); | ||
934 | |||
935 | topLayout->addWidget(lab ,iii++,0); | ||
936 | } | ||
907 | #ifndef DESKTOP_VERSION | 937 | #ifndef DESKTOP_VERSION |
908 | lab->setAlignment( AlignLeft|WordBreak|AlignTop); | 938 | lab->setAlignment( AlignLeft|WordBreak|AlignTop); |
909 | #else | 939 | #else |
910 | lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); | 940 | lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); |
@@ -1163,8 +1193,20 @@ void KOPrefsDialog::setupColorsTab() | |||
1163 | &(KOPrefs::instance()->mTodoDoneColor),topFrame); | 1193 | &(KOPrefs::instance()->mTodoDoneColor),topFrame); |
1164 | topLayout->addWidget(eventColor->label(),ii,0); | 1194 | topLayout->addWidget(eventColor->label(),ii,0); |
1165 | topLayout->addWidget(eventColor->button(),ii++,1); | 1195 | topLayout->addWidget(eventColor->button(),ii++,1); |
1166 | 1196 | ||
1197 | if ( QApplication::desktop()->height() <= 240 ) { | ||
1198 | topFrame = addPage(i18n("Colors") +" 2",0,0); | ||
1199 | // DesktopIcon("colorize",KIcon::SizeMedium)); | ||
1200 | |||
1201 | topLayout = new QGridLayout(topFrame,5,2); | ||
1202 | // topLayout->setSpacing(mSpacingHint); | ||
1203 | // topLayout->setMargin(mMarginHint); | ||
1204 | |||
1205 | topLayout->setSpacing(2); | ||
1206 | topLayout->setMargin(3); | ||
1207 | } | ||
1208 | |||
1167 | 1209 | ||
1168 | // agenda view background color | 1210 | // agenda view background color |
1169 | KPrefsDialogWidColor *agendaBgColor = | 1211 | KPrefsDialogWidColor *agendaBgColor = |
1170 | addWidColor(i18n("Agenda view background color:"), | 1212 | addWidColor(i18n("Agenda view background color:"), |