-rw-r--r-- | korganizer/calendarview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 2012e92..eac2f29 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -4001,48 +4001,49 @@ void CalendarView::showDates(const DateList &selectedDates) | |||
4001 | topLevelWidget()->setCaption( addString+", " + selDates ); | 4001 | topLevelWidget()->setCaption( addString+", " + selDates ); |
4002 | return; | 4002 | return; |
4003 | } | 4003 | } |
4004 | } | 4004 | } |
4005 | topLevelWidget()->setCaption( i18n("Dates: ") + selDates ); | 4005 | topLevelWidget()->setCaption( i18n("Dates: ") + selDates ); |
4006 | 4006 | ||
4007 | } | 4007 | } |
4008 | 4008 | ||
4009 | QPtrList<CalFilter> CalendarView::filters() | 4009 | QPtrList<CalFilter> CalendarView::filters() |
4010 | { | 4010 | { |
4011 | return mFilters; | 4011 | return mFilters; |
4012 | 4012 | ||
4013 | } | 4013 | } |
4014 | void CalendarView::editFilters() | 4014 | void CalendarView::editFilters() |
4015 | { | 4015 | { |
4016 | // kdDebug() << "CalendarView::editFilters()" << endl; | 4016 | // kdDebug() << "CalendarView::editFilters()" << endl; |
4017 | 4017 | ||
4018 | CalFilter *filter = mFilters.first(); | 4018 | CalFilter *filter = mFilters.first(); |
4019 | while(filter) { | 4019 | while(filter) { |
4020 | kdDebug() << " Filter: " << filter->name() << endl; | 4020 | kdDebug() << " Filter: " << filter->name() << endl; |
4021 | filter = mFilters.next(); | 4021 | filter = mFilters.next(); |
4022 | } | 4022 | } |
4023 | 4023 | ||
4024 | mDialogManager->showFilterEditDialog(&mFilters); | 4024 | mDialogManager->showFilterEditDialog(&mFilters); |
4025 | updateFilter(); | ||
4025 | } | 4026 | } |
4026 | void CalendarView::toggleFilter() | 4027 | void CalendarView::toggleFilter() |
4027 | { | 4028 | { |
4028 | showFilter(! mCalEditView->isVisible()); | 4029 | showFilter(! mCalEditView->isVisible()); |
4029 | } | 4030 | } |
4030 | 4031 | ||
4031 | KOFilterView *CalendarView::filterView() | 4032 | KOFilterView *CalendarView::filterView() |
4032 | { | 4033 | { |
4033 | return mFilterView; | 4034 | return mFilterView; |
4034 | } | 4035 | } |
4035 | void CalendarView::selectFilter( int fil ) | 4036 | void CalendarView::selectFilter( int fil ) |
4036 | { | 4037 | { |
4037 | mFilterView->setSelectedFilter( fil ); | 4038 | mFilterView->setSelectedFilter( fil ); |
4038 | } | 4039 | } |
4039 | void CalendarView::showFilter(bool visible) | 4040 | void CalendarView::showFilter(bool visible) |
4040 | { | 4041 | { |
4041 | #if 1 | 4042 | #if 1 |
4042 | if (visible) { | 4043 | if (visible) { |
4043 | mCalEditView->readConfig(); | 4044 | mCalEditView->readConfig(); |
4044 | mCalEditView->show(); | 4045 | mCalEditView->show(); |
4045 | QValueList<int> sizes; | 4046 | QValueList<int> sizes; |
4046 | sizes = mLeftFrame->sizes(); | 4047 | sizes = mLeftFrame->sizes(); |
4047 | if ( sizes.count() == 4 && sizes[3] < 20 ) { | 4048 | if ( sizes.count() == 4 && sizes[3] < 20 ) { |
4048 | sizes.clear(); | 4049 | sizes.clear(); |
@@ -4072,48 +4073,49 @@ void CalendarView::showFilter(bool visible) | |||
4072 | } | 4073 | } |
4073 | void CalendarView::toggleFilerEnabled( ) | 4074 | void CalendarView::toggleFilerEnabled( ) |
4074 | { | 4075 | { |
4075 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); | 4076 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); |
4076 | if ( !mFilterView->filtersEnabled() ) | 4077 | if ( !mFilterView->filtersEnabled() ) |
4077 | topLevelWidget()->setCaption( i18n("Filter disabled ") ); | 4078 | topLevelWidget()->setCaption( i18n("Filter disabled ") ); |
4078 | 4079 | ||
4079 | } | 4080 | } |
4080 | void CalendarView::updateFilter() | 4081 | void CalendarView::updateFilter() |
4081 | { | 4082 | { |
4082 | CalFilter *filter = mFilterView->selectedFilter(); | 4083 | CalFilter *filter = mFilterView->selectedFilter(); |
4083 | if (filter) { | 4084 | if (filter) { |
4084 | QString mess; | 4085 | QString mess; |
4085 | if (mFilterView->filtersEnabled()) { | 4086 | if (mFilterView->filtersEnabled()) { |
4086 | mess = i18n("Filter selected: ")+filter->name(); | 4087 | mess = i18n("Filter selected: ")+filter->name(); |
4087 | filter->setEnabled(true); | 4088 | filter->setEnabled(true); |
4088 | } | 4089 | } |
4089 | else filter->setEnabled(false); | 4090 | else filter->setEnabled(false); |
4090 | mCalendar->setFilter(filter); | 4091 | mCalendar->setFilter(filter); |
4091 | updateView(); | 4092 | updateView(); |
4092 | if ( !mess.isEmpty() ) | 4093 | if ( !mess.isEmpty() ) |
4093 | topLevelWidget()->setCaption( mess ); | 4094 | topLevelWidget()->setCaption( mess ); |
4094 | 4095 | ||
4095 | } | 4096 | } |
4097 | emit filtersUpdated(); | ||
4096 | } | 4098 | } |
4097 | 4099 | ||
4098 | void CalendarView::filterEdited() | 4100 | void CalendarView::filterEdited() |
4099 | { | 4101 | { |
4100 | mFilterView->updateFilters(); | 4102 | mFilterView->updateFilters(); |
4101 | updateFilter(); | 4103 | updateFilter(); |
4102 | writeSettings(); | 4104 | writeSettings(); |
4103 | } | 4105 | } |
4104 | 4106 | ||
4105 | 4107 | ||
4106 | void CalendarView::takeOverEvent() | 4108 | void CalendarView::takeOverEvent() |
4107 | { | 4109 | { |
4108 | Incidence *incidence = currentSelection(); | 4110 | Incidence *incidence = currentSelection(); |
4109 | 4111 | ||
4110 | if (!incidence) return; | 4112 | if (!incidence) return; |
4111 | 4113 | ||
4112 | incidence->setOrganizer(KOPrefs::instance()->email()); | 4114 | incidence->setOrganizer(KOPrefs::instance()->email()); |
4113 | incidence->recreate(); | 4115 | incidence->recreate(); |
4114 | incidence->setReadOnly(false); | 4116 | incidence->setReadOnly(false); |
4115 | 4117 | ||
4116 | updateView(); | 4118 | updateView(); |
4117 | } | 4119 | } |
4118 | 4120 | ||
4119 | void CalendarView::takeOverCalendar() | 4121 | void CalendarView::takeOverCalendar() |