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 | |
parent | d2f00fc2034450bc9a3cd1d2c3510bef1758d3bc (diff) | |
download | kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.zip kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.tar.gz kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/kodialogmanager.cpp | 1 | ||||
-rw-r--r-- | korganizer/koeditordetails.cpp | 2 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 2 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 46 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 2 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 23 | ||||
-rw-r--r-- | korganizer/searchdialog.h | 3 |
7 files changed, 71 insertions, 8 deletions
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 3dfa344..5455098 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -92,32 +92,33 @@ void KODialogManager::showGlobalOptionsDialog( bool showSync ) | |||
92 | { | 92 | { |
93 | KPimPrefsGlobalDialog gc ( mMainView ); | 93 | KPimPrefsGlobalDialog gc ( mMainView ); |
94 | if ( showSync ) | 94 | if ( showSync ) |
95 | gc.showTZconfig(); | 95 | gc.showTZconfig(); |
96 | gc.exec(); | 96 | gc.exec(); |
97 | } | 97 | } |
98 | void KODialogManager::showOptionsDialog( bool showSync ) | 98 | void KODialogManager::showOptionsDialog( bool showSync ) |
99 | { | 99 | { |
100 | 100 | ||
101 | if (!mOptionsDialog) { | 101 | if (!mOptionsDialog) { |
102 | mOptionsDialog = new KOPrefsDialog(mMainView); | 102 | mOptionsDialog = new KOPrefsDialog(mMainView); |
103 | connect(mOptionsDialog,SIGNAL(configChanged()), | 103 | connect(mOptionsDialog,SIGNAL(configChanged()), |
104 | mMainView,SLOT(updateConfig())); | 104 | mMainView,SLOT(updateConfig())); |
105 | } | 105 | } |
106 | mOptionsDialog->readConfig(); | 106 | mOptionsDialog->readConfig(); |
107 | #ifndef DESKTOP_VERSION | 107 | #ifndef DESKTOP_VERSION |
108 | mOptionsDialog->hideButtons(); | ||
108 | mOptionsDialog->showMaximized(); | 109 | mOptionsDialog->showMaximized(); |
109 | #else | 110 | #else |
110 | mOptionsDialog->show(); | 111 | mOptionsDialog->show(); |
111 | #endif | 112 | #endif |
112 | 113 | ||
113 | mOptionsDialog->exec(); | 114 | mOptionsDialog->exec(); |
114 | delete mOptionsDialog; | 115 | delete mOptionsDialog; |
115 | mOptionsDialog = 0; | 116 | mOptionsDialog = 0; |
116 | } | 117 | } |
117 | void KODialogManager::showSyncOptions() | 118 | void KODialogManager::showSyncOptions() |
118 | { | 119 | { |
119 | showGlobalOptionsDialog( true ); | 120 | showGlobalOptionsDialog( true ); |
120 | 121 | ||
121 | } | 122 | } |
122 | void KODialogManager::showOutgoingDialog() | 123 | void KODialogManager::showOutgoingDialog() |
123 | { | 124 | { |
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index bdfc637..6ecf978 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp | |||
@@ -74,33 +74,33 @@ void CustomListViewItem<class Attendee *>::updateItem() | |||
74 | 74 | ||
75 | KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) | 75 | KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) |
76 | : QWidget( parent, name), mDisableItemUpdate( false ) | 76 | : QWidget( parent, name), mDisableItemUpdate( false ) |
77 | { | 77 | { |
78 | QGridLayout *topLayout = new QGridLayout(this); | 78 | QGridLayout *topLayout = new QGridLayout(this); |
79 | topLayout->setSpacing(spacing); | 79 | topLayout->setSpacing(spacing); |
80 | 80 | ||
81 | QString organizer = KOPrefs::instance()->email(); | 81 | QString organizer = KOPrefs::instance()->email(); |
82 | mOrganizerLabel = new QLabel(i18n("Organizer: %1").arg(organizer),this); | 82 | mOrganizerLabel = new QLabel(i18n("Organizer: %1").arg(organizer),this); |
83 | 83 | ||
84 | mListView = new KListView(this,"mListView"); | 84 | mListView = new KListView(this,"mListView"); |
85 | mListView->addColumn(i18n("Name"),180); | 85 | mListView->addColumn(i18n("Name"),180); |
86 | mListView->addColumn(i18n("Email"),180); | 86 | mListView->addColumn(i18n("Email"),180); |
87 | mListView->addColumn(i18n("Role"),60); | 87 | mListView->addColumn(i18n("Role"),60); |
88 | mListView->addColumn(i18n("Status"),100); | 88 | mListView->addColumn(i18n("Status"),100); |
89 | mListView->addColumn(i18n("RSVP"),35); | 89 | mListView->addColumn(i18n("RSVP"),35); |
90 | if ( QApplication::desktop()->width() <= 320 ) { | 90 | if ( QApplication::desktop()->width() <= 320 || QApplication::desktop()->height() <= 240) { |
91 | int hei = 80; | 91 | int hei = 80; |
92 | if ( QApplication::desktop()->height() <= 240 ) | 92 | if ( QApplication::desktop()->height() <= 240 ) |
93 | hei = 60; | 93 | hei = 60; |
94 | mListView->setFixedHeight(hei); | 94 | mListView->setFixedHeight(hei); |
95 | } | 95 | } |
96 | mListView->setAllColumnsShowFocus (true ); | 96 | mListView->setAllColumnsShowFocus (true ); |
97 | //mListView->setSingleClick( true ); | 97 | //mListView->setSingleClick( true ); |
98 | connect(mListView,SIGNAL(selectionChanged(QListViewItem *)), | 98 | connect(mListView,SIGNAL(selectionChanged(QListViewItem *)), |
99 | SLOT(updateAttendeeInput())); | 99 | SLOT(updateAttendeeInput())); |
100 | 100 | ||
101 | connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )), | 101 | connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )), |
102 | SLOT(itemClicked(QListViewItem * ,const QPoint& , int ))); | 102 | SLOT(itemClicked(QListViewItem * ,const QPoint& , int ))); |
103 | 103 | ||
104 | mRsvpButton = new QCheckBox(this); | 104 | mRsvpButton = new QCheckBox(this); |
105 | mRsvpButton->setText(i18n("Request response")); | 105 | mRsvpButton->setText(i18n("Request response")); |
106 | mAddressBookButton = new QPushButton(i18n("Address &Book..."),this); | 106 | mAddressBookButton = new QPushButton(i18n("Address &Book..."),this); |
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index bfe0aec..915c7ec 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -87,33 +87,33 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) | |||
87 | if ( QApplication::desktop()->width() > 320 ) | 87 | if ( QApplication::desktop()->width() > 320 ) |
88 | mSummaryEdit->setMaximumHeight( hei +6 ); | 88 | mSummaryEdit->setMaximumHeight( hei +6 ); |
89 | //qDebug("%d %d %d %d %d %d ", QSizePolicy::Fixed , QSizePolicy::Minimum , QSizePolicy:: Maximum , QSizePolicy:: Preferred , QSizePolicy:: MinimumExpanding , QSizePolicy::Expanding ); | 89 | //qDebug("%d %d %d %d %d %d ", QSizePolicy::Fixed , QSizePolicy::Minimum , QSizePolicy:: Maximum , QSizePolicy:: Preferred , QSizePolicy:: MinimumExpanding , QSizePolicy::Expanding ); |
90 | // SizeType { Fixed = 0, Minimum = MayGrow, Maximum = MayShrink, Preferred = MayGrow|MayShrink, MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink } | 90 | // SizeType { Fixed = 0, Minimum = MayGrow, Maximum = MayShrink, Preferred = MayGrow|MayShrink, MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink } |
91 | // mSummaryEdit = new QLineEdit(parent); | 91 | // mSummaryEdit = new QLineEdit(parent); |
92 | headerLayout->addWidget(mSummaryEdit,1,1); | 92 | headerLayout->addWidget(mSummaryEdit,1,1); |
93 | connect ( mSummaryEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); | 93 | connect ( mSummaryEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); |
94 | 94 | ||
95 | QLabel *locationLabel = new QLabel(i18n("Location:"),parent); | 95 | QLabel *locationLabel = new QLabel(i18n("Location:"),parent); |
96 | if ( QApplication::desktop()->height() < 320 ) | 96 | if ( QApplication::desktop()->height() < 320 ) |
97 | headerLayout->addWidget(locationLabel,1,2); | 97 | headerLayout->addWidget(locationLabel,1,2); |
98 | else | 98 | else |
99 | headerLayout->addWidget(locationLabel,2,0); | 99 | headerLayout->addWidget(locationLabel,2,0); |
100 | 100 | ||
101 | mLocationEdit = new KOLocationBox(TRUE,parent,10); | 101 | mLocationEdit = new KOLocationBox(TRUE,parent,10); |
102 | mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); | 102 | mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); |
103 | if ( QApplication::desktop()->width() > 320 ) | 103 | if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->height() > 240 ) |
104 | mLocationEdit->setMaximumHeight( hei + 6); | 104 | mLocationEdit->setMaximumHeight( hei + 6); |
105 | 105 | ||
106 | // mLocationEdit = new QLineEdit(parent); | 106 | // mLocationEdit = new QLineEdit(parent); |
107 | connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); | 107 | connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); |
108 | if ( QApplication::desktop()->height() < 320 ) { | 108 | if ( QApplication::desktop()->height() < 320 ) { |
109 | headerLayout->addWidget(mLocationEdit,1,3); | 109 | headerLayout->addWidget(mLocationEdit,1,3); |
110 | headerLayout->setColStretch( 1, 10); | 110 | headerLayout->setColStretch( 1, 10); |
111 | headerLayout->setColStretch( 3, 10); | 111 | headerLayout->setColStretch( 3, 10); |
112 | } | 112 | } |
113 | else { | 113 | else { |
114 | headerLayout->addWidget(mLocationEdit,2,1); | 114 | headerLayout->addWidget(mLocationEdit,2,1); |
115 | headerLayout->setColStretch( 1, 10); | 115 | headerLayout->setColStretch( 1, 10); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | void KOEditorGeneral::setFocusOn( int i ) | 118 | void KOEditorGeneral::setFocusOn( int i ) |
119 | { | 119 | { |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index b782bb1..3ee9a22 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -272,32 +272,39 @@ void KOPrefsDialog::setupMainTab() | |||
272 | &(KOPrefs::instance()->mToolBarMiniIcons),topFrame); | 272 | &(KOPrefs::instance()->mToolBarMiniIcons),topFrame); |
273 | topLayout->addMultiCellWidget( widbool->checkBox(), 3,3,0,1); | 273 | topLayout->addMultiCellWidget( widbool->checkBox(), 3,3,0,1); |
274 | 274 | ||
275 | 275 | ||
276 | KPrefsDialogWidBool *verticalScreen = | 276 | KPrefsDialogWidBool *verticalScreen = |
277 | addWidBool(i18n("Show vertical screen (Needs restart)"), | 277 | addWidBool(i18n("Show vertical screen (Needs restart)"), |
278 | &(KOPrefs::instance()->mVerticalScreen),topFrame); | 278 | &(KOPrefs::instance()->mVerticalScreen),topFrame); |
279 | //topLayout->addWidget(verticalScreen->checkBox(),ii++,0); | 279 | //topLayout->addWidget(verticalScreen->checkBox(),ii++,0); |
280 | topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1); | 280 | topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1); |
281 | 281 | ||
282 | 282 | ||
283 | int iii = 5; | 283 | int iii = 5; |
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 | ||
292 | topLayout->addMultiCellWidget(dummy,iii,iii,0,1); | 299 | topLayout->addMultiCellWidget(dummy,iii,iii,0,1); |
293 | 300 | ||
294 | ++iii; | 301 | ++iii; |
295 | 302 | ||
296 | 303 | ||
297 | // KPrefsDialogWidBool *bcc = | 304 | // KPrefsDialogWidBool *bcc = |
298 | // addWidBool(i18n("Send copy to owner when mailing events"), | 305 | // addWidBool(i18n("Send copy to owner when mailing events"), |
299 | // &(KOPrefs::instance()->mBcc),topFrame); | 306 | // &(KOPrefs::instance()->mBcc),topFrame); |
300 | // topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1); | 307 | // topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1); |
301 | 308 | ||
302 | 309 | ||
303 | // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame); | 310 | // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame); |
@@ -418,38 +425,45 @@ void KOPrefsDialog::setupTimeTab() | |||
418 | topLayout->addWidget(mStartTimeSpin,1,1); | 425 | topLayout->addWidget(mStartTimeSpin,1,1); |
419 | 426 | ||
420 | topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"), | 427 | topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"), |
421 | topFrame),2,0); | 428 | topFrame),2,0); |
422 | mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame); | 429 | mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame); |
423 | mDefaultDurationSpin->setSuffix(":00"); | 430 | mDefaultDurationSpin->setSuffix(":00"); |
424 | topLayout->addWidget(mDefaultDurationSpin,2,1); | 431 | topLayout->addWidget(mDefaultDurationSpin,2,1); |
425 | 432 | ||
426 | QStringList alarmList; | 433 | QStringList alarmList; |
427 | alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes") | 434 | alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes") |
428 | << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours") << i18n("24 hours") ; | 435 | << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours") << i18n("24 hours") ; |
429 | topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame), | 436 | topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame), |
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 ); |
444 | addWidTime(i18n("Daily starting hour:"), | 458 | addWidTime(i18n("Daily starting hour:"), |
445 | &(KOPrefs::instance()->mWorkingHoursStart),workStartBox); | 459 | &(KOPrefs::instance()->mWorkingHoursStart),workStartBox); |
446 | 460 | ||
447 | QHBox *workEndBox = new QHBox(workingHoursGroup); | 461 | QHBox *workEndBox = new QHBox(workingHoursGroup); |
448 | //workEndBox->setMargin( 0 ); | 462 | //workEndBox->setMargin( 0 ); |
449 | addWidTime(i18n("Daily ending hour:"), | 463 | addWidTime(i18n("Daily ending hour:"), |
450 | &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox); | 464 | &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox); |
451 | QVBox *excludeBox = new QVBox(workingHoursGroup); | 465 | QVBox *excludeBox = new QVBox(workingHoursGroup); |
452 | //excludeBox->setMargin( 0 ); | 466 | //excludeBox->setMargin( 0 ); |
453 | addWidBool(i18n("Exclude holidays"), | 467 | addWidBool(i18n("Exclude holidays"), |
454 | &(KOPrefs::instance()->mExcludeHolidays),excludeBox); | 468 | &(KOPrefs::instance()->mExcludeHolidays),excludeBox); |
455 | 469 | ||
@@ -689,32 +703,44 @@ void KOPrefsDialog::setupViewsTab() | |||
689 | &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame); | 703 | &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame); |
690 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 704 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
691 | dummy = | 705 | dummy = |
692 | addWidBool(i18n("Show Sat/Sun together"), | 706 | addWidBool(i18n("Show Sat/Sun together"), |
693 | &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); | 707 | &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); |
694 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 708 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
695 | 709 | ||
696 | KPrefsDialogWidBool *coloredCategoriesInMonthView = | 710 | KPrefsDialogWidBool *coloredCategoriesInMonthView = |
697 | addWidBool(i18n("Month view uses category colors"), | 711 | addWidBool(i18n("Month view uses category colors"), |
698 | &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); | 712 | &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); |
699 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); | 713 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); |
700 | 714 | ||
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); |
709 | 735 | ||
710 | KPrefsDialogWidColor *holidayColor = | 736 | KPrefsDialogWidColor *holidayColor = |
711 | addWidColor(i18n("Day color odd months"), | 737 | addWidColor(i18n("Day color odd months"), |
712 | &(KOPrefs::instance()->mMonthViewOddColor),topFrame); | 738 | &(KOPrefs::instance()->mMonthViewOddColor),topFrame); |
713 | topLayout->addWidget(holidayColor->label(),ii,0); | 739 | topLayout->addWidget(holidayColor->label(),ii,0); |
714 | topLayout->addWidget(holidayColor->button(),ii++,1); | 740 | topLayout->addWidget(holidayColor->button(),ii++,1); |
715 | 741 | ||
716 | holidayColor = | 742 | holidayColor = |
717 | addWidColor(i18n("Day color even months"), | 743 | addWidColor(i18n("Day color even months"), |
718 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); | 744 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); |
719 | topLayout->addWidget(holidayColor->label(),ii,0); | 745 | topLayout->addWidget(holidayColor->label(),ii,0); |
720 | topLayout->addWidget(holidayColor->button(),ii++,1); | 746 | topLayout->addWidget(holidayColor->button(),ii++,1); |
@@ -888,35 +914,39 @@ dummy = | |||
888 | &(KOPrefs::instance()->mWTshowChanged),topFrame); | 914 | &(KOPrefs::instance()->mWTshowChanged),topFrame); |
889 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 915 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
890 | 916 | ||
891 | 917 | ||
892 | topFrame = addPage(i18n("Alarm"),0,0); | 918 | topFrame = addPage(i18n("Alarm"),0,0); |
893 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 919 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
894 | 920 | ||
895 | topLayout = new QGridLayout(topFrame,2,1); | 921 | topLayout = new QGridLayout(topFrame,2,1); |
896 | topLayout->setSpacing(mSpacingHint); | 922 | topLayout->setSpacing(mSpacingHint); |
897 | topLayout->setMargin(mMarginHint); | 923 | topLayout->setMargin(mMarginHint); |
898 | int iii = 0; | 924 | int iii = 0; |
899 | 925 | ||
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); |
930 | |||
931 | if ( QApplication::desktop()->height() > 240 ) { | ||
932 | |||
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); | 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); |
905 | 934 | ||
906 | topLayout->addWidget(lab ,iii++,0); | 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); |
911 | lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); | 941 | lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); |
912 | #endif | 942 | #endif |
913 | 943 | ||
914 | QHBox* dummyBox = new QHBox(topFrame); | 944 | QHBox* dummyBox = new QHBox(topFrame); |
915 | new QLabel(i18n("Play beeps count:"),dummyBox); | 945 | new QLabel(i18n("Play beeps count:"),dummyBox); |
916 | mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox); | 946 | mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox); |
917 | topLayout->addWidget(dummyBox,iii++,0); | 947 | topLayout->addWidget(dummyBox,iii++,0); |
918 | 948 | ||
919 | dummyBox = new QHBox(topFrame); | 949 | dummyBox = new QHBox(topFrame); |
920 | new QLabel(i18n("Beeps interval in sec:"),dummyBox); | 950 | new QLabel(i18n("Beeps interval in sec:"),dummyBox); |
921 | mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox); | 951 | mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox); |
922 | topLayout->addWidget(dummyBox,iii++,0); | 952 | topLayout->addWidget(dummyBox,iii++,0); |
@@ -1151,32 +1181,44 @@ void KOPrefsDialog::setupColorsTab() | |||
1151 | &(KOPrefs::instance()->mHighlightColor),topFrame); | 1181 | &(KOPrefs::instance()->mHighlightColor),topFrame); |
1152 | topLayout->addWidget(highlightColor->label(),ii,0); | 1182 | topLayout->addWidget(highlightColor->label(),ii,0); |
1153 | topLayout->addWidget(highlightColor->button(),ii++,1); | 1183 | topLayout->addWidget(highlightColor->button(),ii++,1); |
1154 | 1184 | ||
1155 | // Event color | 1185 | // Event color |
1156 | KPrefsDialogWidColor *eventColor = | 1186 | KPrefsDialogWidColor *eventColor = |
1157 | addWidColor(i18n("Default event color:"), | 1187 | addWidColor(i18n("Default event color:"), |
1158 | &(KOPrefs::instance()->mEventColor),topFrame); | 1188 | &(KOPrefs::instance()->mEventColor),topFrame); |
1159 | topLayout->addWidget(eventColor->label(),ii,0); | 1189 | topLayout->addWidget(eventColor->label(),ii,0); |
1160 | topLayout->addWidget(eventColor->button(),ii++,1); | 1190 | topLayout->addWidget(eventColor->button(),ii++,1); |
1161 | eventColor = | 1191 | eventColor = |
1162 | addWidColor(i18n("Default todo done color:"), | 1192 | addWidColor(i18n("Default todo done color:"), |
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:"), |
1171 | &(KOPrefs::instance()->mAgendaBgColor),topFrame); | 1213 | &(KOPrefs::instance()->mAgendaBgColor),topFrame); |
1172 | topLayout->addWidget(agendaBgColor->label(),ii,0); | 1214 | topLayout->addWidget(agendaBgColor->label(),ii,0); |
1173 | topLayout->addWidget(agendaBgColor->button(),ii++,1); | 1215 | topLayout->addWidget(agendaBgColor->button(),ii++,1); |
1174 | 1216 | ||
1175 | // working hours color | 1217 | // working hours color |
1176 | KPrefsDialogWidColor *workingHoursColor = | 1218 | KPrefsDialogWidColor *workingHoursColor = |
1177 | addWidColor(i18n("Working hours color:"), | 1219 | addWidColor(i18n("Working hours color:"), |
1178 | &(KOPrefs::instance()->mWorkingHoursColor),topFrame); | 1220 | &(KOPrefs::instance()->mWorkingHoursColor),topFrame); |
1179 | topLayout->addWidget(workingHoursColor->label(),ii,0); | 1221 | topLayout->addWidget(workingHoursColor->label(),ii,0); |
1180 | topLayout->addWidget(workingHoursColor->button(),ii++,1); | 1222 | topLayout->addWidget(workingHoursColor->button(),ii++,1); |
1181 | 1223 | ||
1182 | KPrefsDialogWidBool *sb = | 1224 | KPrefsDialogWidBool *sb = |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 2c04852..0cb0bce 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -612,33 +612,33 @@ void MainWindow::initActions() | |||
612 | QPopupMenu *viewMenu = new QPopupMenu( this ); | 612 | QPopupMenu *viewMenu = new QPopupMenu( this ); |
613 | QPopupMenu *actionMenu = new QPopupMenu( this ); | 613 | QPopupMenu *actionMenu = new QPopupMenu( this ); |
614 | QPopupMenu *importMenu = new QPopupMenu( this ); | 614 | QPopupMenu *importMenu = new QPopupMenu( this ); |
615 | QPopupMenu *importMenu_X = new QPopupMenu( this ); | 615 | QPopupMenu *importMenu_X = new QPopupMenu( this ); |
616 | QPopupMenu *exportMenu_X = new QPopupMenu( this ); | 616 | QPopupMenu *exportMenu_X = new QPopupMenu( this ); |
617 | QPopupMenu *beamMenu_X = new QPopupMenu( this ); | 617 | QPopupMenu *beamMenu_X = new QPopupMenu( this ); |
618 | selectFilterMenu = new QPopupMenu( this ); | 618 | selectFilterMenu = new QPopupMenu( this ); |
619 | selectFilterMenu->setCheckable( true ); | 619 | selectFilterMenu->setCheckable( true ); |
620 | syncMenu = new QPopupMenu( this ); | 620 | syncMenu = new QPopupMenu( this ); |
621 | configureAgendaMenu = new QPopupMenu( this ); | 621 | configureAgendaMenu = new QPopupMenu( this ); |
622 | configureToolBarMenu = new QPopupMenu( this ); | 622 | configureToolBarMenu = new QPopupMenu( this ); |
623 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 623 | QPopupMenu *helpMenu = new QPopupMenu( this ); |
624 | QIconSet icon; | 624 | QIconSet icon; |
625 | int pixWid = 22, pixHei = 22; | 625 | int pixWid = 22, pixHei = 22; |
626 | QString pathString = ""; | 626 | QString pathString = ""; |
627 | if ( !p->mToolBarMiniIcons ) { | 627 | if ( !p->mToolBarMiniIcons ) { |
628 | if ( QApplication::desktop()->width() < 480 ) { | 628 | if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) { |
629 | pathString += "icons16/"; | 629 | pathString += "icons16/"; |
630 | pixWid = 18; pixHei = 16; | 630 | pixWid = 18; pixHei = 16; |
631 | } | 631 | } |
632 | } else { | 632 | } else { |
633 | pathString += "iconsmini/"; | 633 | pathString += "iconsmini/"; |
634 | pixWid = 18; pixHei = 16; | 634 | pixWid = 18; pixHei = 16; |
635 | } | 635 | } |
636 | if ( KOPrefs::instance()->mShowFullMenu ) { | 636 | if ( KOPrefs::instance()->mShowFullMenu ) { |
637 | QMenuBar *menuBar1; | 637 | QMenuBar *menuBar1; |
638 | menuBar1 = menuBar(); | 638 | menuBar1 = menuBar(); |
639 | menuBar1->insertItem( i18n("File"), importMenu ); | 639 | menuBar1->insertItem( i18n("File"), importMenu ); |
640 | menuBar1->insertItem( i18n("View"), viewMenu ); | 640 | menuBar1->insertItem( i18n("View"), viewMenu ); |
641 | menuBar1->insertItem( i18n("Actions"), actionMenu ); | 641 | menuBar1->insertItem( i18n("Actions"), actionMenu ); |
642 | #ifdef DESKTOP_VERSION | 642 | #ifdef DESKTOP_VERSION |
643 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); | 643 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); |
644 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 644 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index ef2fc1c..7b3b543 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -57,57 +57,62 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
57 | layout->addLayout(subLayout); | 57 | layout->addLayout(subLayout); |
58 | /* | 58 | /* |
59 | searchLabel = new QLabel(topFrame); | 59 | searchLabel = new QLabel(topFrame); |
60 | searchLabel->setText(i18n("Search for:")); | 60 | searchLabel->setText(i18n("Search for:")); |
61 | subLayout->addWidget(searchLabel); | 61 | subLayout->addWidget(searchLabel); |
62 | */ | 62 | */ |
63 | QPushButton *OkButton = new QPushButton( i18n("Search for:"), topFrame ); | 63 | QPushButton *OkButton = new QPushButton( i18n("Search for:"), topFrame ); |
64 | //OkButton->setDefault( true ); | 64 | //OkButton->setDefault( true ); |
65 | connect(OkButton,SIGNAL(clicked()),SLOT(doSearch())); | 65 | connect(OkButton,SIGNAL(clicked()),SLOT(doSearch())); |
66 | subLayout->addWidget(OkButton); | 66 | subLayout->addWidget(OkButton); |
67 | searchEdit = new KLineEdit(topFrame); | 67 | searchEdit = new KLineEdit(topFrame); |
68 | subLayout->addWidget(searchEdit); | 68 | subLayout->addWidget(searchEdit); |
69 | 69 | ||
70 | mAddItems = new QCheckBox(i18n("Add items"),topFrame); | 70 | mAddItems = new QCheckBox(i18n("Add items"),topFrame); |
71 | subLayout->addWidget(mAddItems); | 71 | subLayout->addWidget(mAddItems); |
72 | 72 | ||
73 | QPushButton *togButton = new QPushButton( "", topFrame ); | ||
74 | subLayout->addWidget(togButton); | ||
75 | connect(togButton,SIGNAL(clicked()),SLOT(toggleCheckboxes())); | ||
76 | togButton->setPixmap(SmallIcon("1updownarrow")); | ||
77 | togButton->setMinimumWidth( togButton->sizeHint().height() ); | ||
73 | searchEdit->setText("*"); // Find all events by default | 78 | searchEdit->setText("*"); // Find all events by default |
74 | searchEdit->setFocus(); | 79 | searchEdit->setFocus(); |
75 | connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); | 80 | connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); |
76 | connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch())); | 81 | connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch())); |
77 | // Subjects to search | 82 | // Subjects to search |
78 | // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), | 83 | // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), |
79 | // topFrame); | 84 | // topFrame); |
80 | 85 | ||
81 | QHBox *incidenceGroup = new QHBox( topFrame ); | 86 | incidenceGroup = new QHBox( topFrame ); |
82 | layout->addWidget(incidenceGroup); | 87 | layout->addWidget(incidenceGroup); |
83 | 88 | ||
84 | mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup); | 89 | mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup); |
85 | //mSearchEvent->setChecked(true); | 90 | //mSearchEvent->setChecked(true); |
86 | mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup); | 91 | mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup); |
87 | mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup); | 92 | mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup); |
88 | 93 | ||
89 | QHBox *subjectGroup = new QHBox( topFrame ); | 94 | subjectGroup = new QHBox( topFrame ); |
90 | layout->addWidget(subjectGroup); | 95 | layout->addWidget(subjectGroup); |
91 | 96 | ||
92 | mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup); | 97 | mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup); |
93 | mSummaryCheck->setChecked(true); | 98 | mSummaryCheck->setChecked(true); |
94 | mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup); | 99 | mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup); |
95 | mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup); | 100 | mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup); |
96 | 101 | ||
97 | QHBox *attendeeGroup = new QHBox( topFrame ); | 102 | attendeeGroup = new QHBox( topFrame ); |
98 | layout->addWidget(attendeeGroup ); | 103 | layout->addWidget(attendeeGroup ); |
99 | new QLabel( i18n("Attendee:"),attendeeGroup ); | 104 | new QLabel( i18n("Attendee:"),attendeeGroup ); |
100 | mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup ); | 105 | mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup ); |
101 | mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup ); | 106 | mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup ); |
102 | // Date range | 107 | // Date range |
103 | // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"), | 108 | // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"), |
104 | // topFrame); | 109 | // topFrame); |
105 | // layout->addWidget(rangeGroup); | 110 | // layout->addWidget(rangeGroup); |
106 | 111 | ||
107 | QWidget *rangeWidget = new QWidget(topFrame); | 112 | QWidget *rangeWidget = new QWidget(topFrame); |
108 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); | 113 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); |
109 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); | 114 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); |
110 | mStartDate = new KDateEdit(rangeWidget); | 115 | mStartDate = new KDateEdit(rangeWidget); |
111 | rangeLayout->addWidget(mStartDate); | 116 | rangeLayout->addWidget(mStartDate); |
112 | rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); | 117 | rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); |
113 | mEndDate = new KDateEdit(rangeWidget); | 118 | mEndDate = new KDateEdit(rangeWidget); |
@@ -123,32 +128,44 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
123 | //listView->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Expanding) ); | 128 | //listView->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Expanding) ); |
124 | //listView->setMaximumHeight( 50 ); | 129 | //listView->setMaximumHeight( 50 ); |
125 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); | 130 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); |
126 | connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList())); | 131 | connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList())); |
127 | 132 | ||
128 | setCaption( i18n("KO/Pi Find: ")); | 133 | setCaption( i18n("KO/Pi Find: ")); |
129 | #ifdef DESKTOP_VERSION | 134 | #ifdef DESKTOP_VERSION |
130 | OkButton = new QPushButton( i18n("Close"), this ); | 135 | OkButton = new QPushButton( i18n("Close"), this ); |
131 | connect(OkButton,SIGNAL(clicked()),SLOT(hide())); | 136 | connect(OkButton,SIGNAL(clicked()),SLOT(hide())); |
132 | #endif | 137 | #endif |
133 | } | 138 | } |
134 | 139 | ||
135 | SearchDialog::~SearchDialog() | 140 | SearchDialog::~SearchDialog() |
136 | { | 141 | { |
137 | 142 | ||
138 | } | 143 | } |
144 | void SearchDialog::toggleCheckboxes() | ||
145 | { | ||
146 | if ( incidenceGroup->isVisible() ) { | ||
147 | incidenceGroup->hide() ; | ||
148 | subjectGroup->hide() ; | ||
149 | attendeeGroup->hide() ; | ||
150 | } else { | ||
151 | incidenceGroup->show() ; | ||
152 | subjectGroup->show() ; | ||
153 | attendeeGroup->show() ; | ||
154 | } | ||
155 | } | ||
139 | void SearchDialog::raiseAndSelect() | 156 | void SearchDialog::raiseAndSelect() |
140 | { | 157 | { |
141 | 158 | ||
142 | static int currentState = 0; | 159 | static int currentState = 0; |
143 | 160 | ||
144 | if ( !mSearchJournal->isChecked() && !mSearchTodo->isChecked() && !mSearchEvent->isChecked() ) | 161 | if ( !mSearchJournal->isChecked() && !mSearchTodo->isChecked() && !mSearchEvent->isChecked() ) |
145 | currentState = 0; | 162 | currentState = 0; |
146 | int newState = 0; | 163 | int newState = 0; |
147 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { | 164 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { |
148 | newState = VIEW_J_VIEW; | 165 | newState = VIEW_J_VIEW; |
149 | } | 166 | } |
150 | else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { | 167 | else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { |
151 | newState = VIEW_T_VIEW; | 168 | newState = VIEW_T_VIEW; |
152 | } | 169 | } |
153 | else { | 170 | else { |
154 | newState = VIEW_A_VIEW; | 171 | newState = VIEW_A_VIEW; |
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h index 11ad2f0..b345b98 100644 --- a/korganizer/searchdialog.h +++ b/korganizer/searchdialog.h | |||
@@ -47,39 +47,42 @@ class SearchDialog : public QVBox | |||
47 | public: | 47 | public: |
48 | SearchDialog(Calendar *calendar,CalendarView *parent=0); | 48 | SearchDialog(Calendar *calendar,CalendarView *parent=0); |
49 | virtual ~SearchDialog(); | 49 | virtual ~SearchDialog(); |
50 | KOListView *listview(){ return listView;} | 50 | KOListView *listview(){ return listView;} |
51 | void updateView(); | 51 | void updateView(); |
52 | void raiseAndSelect(); | 52 | void raiseAndSelect(); |
53 | 53 | ||
54 | public slots: | 54 | public slots: |
55 | void changeEventDisplay(Event *, int) { updateView(); } | 55 | void changeEventDisplay(Event *, int) { updateView(); } |
56 | void updateConfig(); | 56 | void updateConfig(); |
57 | void updateList(); | 57 | void updateList(); |
58 | protected slots: | 58 | protected slots: |
59 | void setFocusToList(); | 59 | void setFocusToList(); |
60 | void accept(); | 60 | void accept(); |
61 | void doSearch(); | 61 | void doSearch(); |
62 | void searchTextChanged( const QString &_text ); | 62 | void searchTextChanged( const QString &_text ); |
63 | void toggleCheckboxes(); | ||
63 | 64 | ||
64 | signals: | 65 | signals: |
65 | void showEventSignal(Event *); | 66 | void showEventSignal(Event *); |
66 | void editEventSignal(Event *); | 67 | void editEventSignal(Event *); |
67 | void deleteEventSignal(Event *); | 68 | void deleteEventSignal(Event *); |
68 | 69 | ||
69 | private: | 70 | private: |
71 | |||
72 | QHBox *incidenceGroup ,*subjectGroup ,*attendeeGroup; | ||
70 | void search(const QRegExp &); | 73 | void search(const QRegExp &); |
71 | 74 | ||
72 | Calendar *mCalendar; | 75 | Calendar *mCalendar; |
73 | 76 | ||
74 | QPtrList<Event> mMatchedEvents; | 77 | QPtrList<Event> mMatchedEvents; |
75 | QPtrList<Todo> mMatchedTodos; | 78 | QPtrList<Todo> mMatchedTodos; |
76 | QPtrList<Journal> mMatchedJournals; | 79 | QPtrList<Journal> mMatchedJournals; |
77 | 80 | ||
78 | QLabel *searchLabel; | 81 | QLabel *searchLabel; |
79 | KLineEdit *searchEdit; | 82 | KLineEdit *searchEdit; |
80 | KOListView *listView; | 83 | KOListView *listView; |
81 | 84 | ||
82 | KDateEdit *mStartDate; | 85 | KDateEdit *mStartDate; |
83 | KDateEdit *mEndDate; | 86 | KDateEdit *mEndDate; |
84 | QCheckBox *mSummaryCheck; | 87 | QCheckBox *mSummaryCheck; |
85 | QCheckBox *mDescriptionCheck; | 88 | QCheckBox *mDescriptionCheck; |