-rw-r--r-- | korganizer/calendarview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index eac2f29..d25f632 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -3981,96 +3981,100 @@ void CalendarView::showDates(const DateList &selectedDates) | |||
3981 | return; | 3981 | return; |
3982 | } | 3982 | } |
3983 | 3983 | ||
3984 | QString selDates; | 3984 | QString selDates; |
3985 | selDates = KGlobal::locale()->formatDate( date, true); | 3985 | selDates = KGlobal::locale()->formatDate( date, true); |
3986 | if (selectedDates.first() < selectedDates.last() ) | 3986 | if (selectedDates.first() < selectedDates.last() ) |
3987 | selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true); | 3987 | selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true); |
3988 | else { | 3988 | else { |
3989 | QString addString; | 3989 | QString addString; |
3990 | if ( date == QDateTime::currentDateTime().date() ) | 3990 | if ( date == QDateTime::currentDateTime().date() ) |
3991 | addString = i18n("Today"); | 3991 | addString = i18n("Today"); |
3992 | else if ( date == QDateTime::currentDateTime().date().addDays(1) ) | 3992 | else if ( date == QDateTime::currentDateTime().date().addDays(1) ) |
3993 | addString = i18n("Tomorrow"); | 3993 | addString = i18n("Tomorrow"); |
3994 | else if ( date == QDateTime::currentDateTime().date().addDays(-1) ) | 3994 | else if ( date == QDateTime::currentDateTime().date().addDays(-1) ) |
3995 | addString = i18n("Yesterday"); | 3995 | addString = i18n("Yesterday"); |
3996 | else if ( date == QDateTime::currentDateTime().date().addDays(-2) ) | 3996 | else if ( date == QDateTime::currentDateTime().date().addDays(-2) ) |
3997 | addString = i18n("Day before yesterday"); | 3997 | addString = i18n("Day before yesterday"); |
3998 | else if ( date == QDateTime::currentDateTime().date().addDays(2) ) | 3998 | else if ( date == QDateTime::currentDateTime().date().addDays(2) ) |
3999 | addString = i18n("Day after tomorrow"); | 3999 | addString = i18n("Day after tomorrow"); |
4000 | if ( !addString.isEmpty() ) { | 4000 | if ( !addString.isEmpty() ) { |
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 | updateFilter(); |
4026 | } | 4026 | } |
4027 | void CalendarView::toggleFilter() | 4027 | void CalendarView::toggleFilter() |
4028 | { | 4028 | { |
4029 | if ( mLeftFrame->isHidden() ) { | ||
4030 | toggleExpand(); | ||
4031 | showFilter( true ); | ||
4032 | } else | ||
4029 | showFilter(! mCalEditView->isVisible()); | 4033 | showFilter(! mCalEditView->isVisible()); |
4030 | } | 4034 | } |
4031 | 4035 | ||
4032 | KOFilterView *CalendarView::filterView() | 4036 | KOFilterView *CalendarView::filterView() |
4033 | { | 4037 | { |
4034 | return mFilterView; | 4038 | return mFilterView; |
4035 | } | 4039 | } |
4036 | void CalendarView::selectFilter( int fil ) | 4040 | void CalendarView::selectFilter( int fil ) |
4037 | { | 4041 | { |
4038 | mFilterView->setSelectedFilter( fil ); | 4042 | mFilterView->setSelectedFilter( fil ); |
4039 | } | 4043 | } |
4040 | void CalendarView::showFilter(bool visible) | 4044 | void CalendarView::showFilter(bool visible) |
4041 | { | 4045 | { |
4042 | #if 1 | 4046 | #if 1 |
4043 | if (visible) { | 4047 | if (visible) { |
4044 | mCalEditView->readConfig(); | 4048 | mCalEditView->readConfig(); |
4045 | mCalEditView->show(); | 4049 | mCalEditView->show(); |
4046 | QValueList<int> sizes; | 4050 | QValueList<int> sizes; |
4047 | sizes = mLeftFrame->sizes(); | 4051 | sizes = mLeftFrame->sizes(); |
4048 | if ( sizes.count() == 4 && sizes[3] < 20 ) { | 4052 | if ( sizes.count() == 4 && sizes[3] < 20 ) { |
4049 | sizes.clear(); | 4053 | sizes.clear(); |
4050 | sizes << 100; | 4054 | sizes << 100; |
4051 | sizes << 0; | 4055 | sizes << 0; |
4052 | sizes << 0; | 4056 | sizes << 0; |
4053 | sizes << 100; | 4057 | sizes << 100; |
4054 | mLeftFrame->setSizes(sizes); | 4058 | mLeftFrame->setSizes(sizes); |
4055 | } | 4059 | } |
4056 | #if 0 | 4060 | #if 0 |
4057 | sizes = mLeftFrame->sizes(); | 4061 | sizes = mLeftFrame->sizes(); |
4058 | int ccc = 0; | 4062 | int ccc = 0; |
4059 | while ( ccc < sizes.count()) { | 4063 | while ( ccc < sizes.count()) { |
4060 | qDebug("size %d %d ", ccc, sizes[ccc]); | 4064 | qDebug("size %d %d ", ccc, sizes[ccc]); |
4061 | ++ccc; | 4065 | ++ccc; |
4062 | } | 4066 | } |
4063 | #endif | 4067 | #endif |
4064 | 4068 | ||
4065 | } | 4069 | } |
4066 | else { | 4070 | else { |
4067 | mCalEditView->hide(); | 4071 | mCalEditView->hide(); |
4068 | } | 4072 | } |
4069 | #else | 4073 | #else |
4070 | if (visible) mFilterView->show(); | 4074 | if (visible) mFilterView->show(); |
4071 | else mFilterView->hide(); | 4075 | else mFilterView->hide(); |
4072 | #endif | 4076 | #endif |
4073 | } | 4077 | } |
4074 | void CalendarView::toggleFilerEnabled( ) | 4078 | void CalendarView::toggleFilerEnabled( ) |
4075 | { | 4079 | { |
4076 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); | 4080 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); |