-rw-r--r-- | korganizer/calendarview.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 753d81f..1024b4e 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -3895,98 +3895,101 @@ void CalendarView::showDates(const DateList &selectedDates) | |||
3895 | addString = i18n("Tomorrow"); | 3895 | addString = i18n("Tomorrow"); |
3896 | else if ( date == QDateTime::currentDateTime().date().addDays(-1) ) | 3896 | else if ( date == QDateTime::currentDateTime().date().addDays(-1) ) |
3897 | addString = i18n("Yesterday"); | 3897 | addString = i18n("Yesterday"); |
3898 | else if ( date == QDateTime::currentDateTime().date().addDays(-2) ) | 3898 | else if ( date == QDateTime::currentDateTime().date().addDays(-2) ) |
3899 | addString = i18n("Day before yesterday"); | 3899 | addString = i18n("Day before yesterday"); |
3900 | else if ( date == QDateTime::currentDateTime().date().addDays(2) ) | 3900 | else if ( date == QDateTime::currentDateTime().date().addDays(2) ) |
3901 | addString = i18n("Day after tomorrow"); | 3901 | addString = i18n("Day after tomorrow"); |
3902 | if ( !addString.isEmpty() ) { | 3902 | if ( !addString.isEmpty() ) { |
3903 | topLevelWidget()->setCaption( addString+", " + selDates ); | 3903 | topLevelWidget()->setCaption( addString+", " + selDates ); |
3904 | return; | 3904 | return; |
3905 | } | 3905 | } |
3906 | } | 3906 | } |
3907 | topLevelWidget()->setCaption( i18n("Dates: ") + selDates ); | 3907 | topLevelWidget()->setCaption( i18n("Dates: ") + selDates ); |
3908 | 3908 | ||
3909 | } | 3909 | } |
3910 | 3910 | ||
3911 | QPtrList<CalFilter> CalendarView::filters() | 3911 | QPtrList<CalFilter> CalendarView::filters() |
3912 | { | 3912 | { |
3913 | return mFilters; | 3913 | return mFilters; |
3914 | 3914 | ||
3915 | } | 3915 | } |
3916 | void CalendarView::editFilters() | 3916 | void CalendarView::editFilters() |
3917 | { | 3917 | { |
3918 | // kdDebug() << "CalendarView::editFilters()" << endl; | 3918 | // kdDebug() << "CalendarView::editFilters()" << endl; |
3919 | 3919 | ||
3920 | CalFilter *filter = mFilters.first(); | 3920 | CalFilter *filter = mFilters.first(); |
3921 | while(filter) { | 3921 | while(filter) { |
3922 | kdDebug() << " Filter: " << filter->name() << endl; | 3922 | kdDebug() << " Filter: " << filter->name() << endl; |
3923 | filter = mFilters.next(); | 3923 | filter = mFilters.next(); |
3924 | } | 3924 | } |
3925 | 3925 | ||
3926 | mDialogManager->showFilterEditDialog(&mFilters); | 3926 | mDialogManager->showFilterEditDialog(&mFilters); |
3927 | } | 3927 | } |
3928 | void CalendarView::toggleFilter() | 3928 | void CalendarView::toggleFilter() |
3929 | { | 3929 | { |
3930 | showFilter(! mFilterView->isVisible()); | 3930 | showFilter(! mFilterView->isVisible()); |
3931 | } | 3931 | } |
3932 | 3932 | ||
3933 | KOFilterView *CalendarView::filterView() | 3933 | KOFilterView *CalendarView::filterView() |
3934 | { | 3934 | { |
3935 | return mFilterView; | 3935 | return mFilterView; |
3936 | } | 3936 | } |
3937 | void CalendarView::selectFilter( int fil ) | 3937 | void CalendarView::selectFilter( int fil ) |
3938 | { | 3938 | { |
3939 | mFilterView->setSelectedFilter( fil ); | 3939 | mFilterView->setSelectedFilter( fil ); |
3940 | } | 3940 | } |
3941 | void CalendarView::showFilter(bool visible) | 3941 | void CalendarView::showFilter(bool visible) |
3942 | { | 3942 | { |
3943 | #if 0 | 3943 | #if 1 |
3944 | if (visible) mCalEditView->show(); | 3944 | if (visible) { |
3945 | mCalEditView->readConfig(); | ||
3946 | mCalEditView->show(); | ||
3947 | } | ||
3945 | else mCalEditView->hide(); | 3948 | else mCalEditView->hide(); |
3946 | #else | 3949 | #else |
3947 | if (visible) mFilterView->show(); | 3950 | if (visible) mFilterView->show(); |
3948 | else mFilterView->hide(); | 3951 | else mFilterView->hide(); |
3949 | #endif | 3952 | #endif |
3950 | } | 3953 | } |
3951 | void CalendarView::toggleFilerEnabled( ) | 3954 | void CalendarView::toggleFilerEnabled( ) |
3952 | { | 3955 | { |
3953 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); | 3956 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); |
3954 | if ( !mFilterView->filtersEnabled() ) | 3957 | if ( !mFilterView->filtersEnabled() ) |
3955 | topLevelWidget()->setCaption( i18n("Filter disabled ") ); | 3958 | topLevelWidget()->setCaption( i18n("Filter disabled ") ); |
3956 | 3959 | ||
3957 | } | 3960 | } |
3958 | void CalendarView::updateFilter() | 3961 | void CalendarView::updateFilter() |
3959 | { | 3962 | { |
3960 | CalFilter *filter = mFilterView->selectedFilter(); | 3963 | CalFilter *filter = mFilterView->selectedFilter(); |
3961 | if (filter) { | 3964 | if (filter) { |
3962 | QString mess; | 3965 | QString mess; |
3963 | if (mFilterView->filtersEnabled()) { | 3966 | if (mFilterView->filtersEnabled()) { |
3964 | mess = i18n("Filter selected: ")+filter->name(); | 3967 | mess = i18n("Filter selected: ")+filter->name(); |
3965 | filter->setEnabled(true); | 3968 | filter->setEnabled(true); |
3966 | } | 3969 | } |
3967 | else filter->setEnabled(false); | 3970 | else filter->setEnabled(false); |
3968 | mCalendar->setFilter(filter); | 3971 | mCalendar->setFilter(filter); |
3969 | updateView(); | 3972 | updateView(); |
3970 | if ( !mess.isEmpty() ) | 3973 | if ( !mess.isEmpty() ) |
3971 | topLevelWidget()->setCaption( mess ); | 3974 | topLevelWidget()->setCaption( mess ); |
3972 | 3975 | ||
3973 | } | 3976 | } |
3974 | } | 3977 | } |
3975 | 3978 | ||
3976 | void CalendarView::filterEdited() | 3979 | void CalendarView::filterEdited() |
3977 | { | 3980 | { |
3978 | mFilterView->updateFilters(); | 3981 | mFilterView->updateFilters(); |
3979 | updateFilter(); | 3982 | updateFilter(); |
3980 | writeSettings(); | 3983 | writeSettings(); |
3981 | } | 3984 | } |
3982 | 3985 | ||
3983 | 3986 | ||
3984 | void CalendarView::takeOverEvent() | 3987 | void CalendarView::takeOverEvent() |
3985 | { | 3988 | { |
3986 | Incidence *incidence = currentSelection(); | 3989 | Incidence *incidence = currentSelection(); |
3987 | 3990 | ||
3988 | if (!incidence) return; | 3991 | if (!incidence) return; |
3989 | 3992 | ||
3990 | incidence->setOrganizer(KOPrefs::instance()->email()); | 3993 | incidence->setOrganizer(KOPrefs::instance()->email()); |
3991 | incidence->recreate(); | 3994 | incidence->recreate(); |
3992 | incidence->setReadOnly(false); | 3995 | incidence->setReadOnly(false); |