-rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 3 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 322c0e6..0ebd853 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,14 +1,15 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | 3 | ||
4 | ********** VERSION 2.1.8 ************ | 4 | ********** VERSION 2.1.8 ************ |
5 | 5 | ||
6 | KO/Pi: | 6 | KO/Pi: |
7 | Added info about the completion sate of a todo in the ListView/Searchdialog. | 7 | Added info about the completion state of a todo in the ListView/Searchdialog. |
8 | If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. | 8 | If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. |
9 | Fixed some updating problems when changing the filter. | ||
9 | 10 | ||
10 | KA/Pi: | 11 | KA/Pi: |
11 | In the addressee selection dialog now the formatted name is shown, if not empty. | 12 | In the addressee selection dialog now the formatted name is shown, if not empty. |
12 | 13 | ||
13 | Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored. | 14 | Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored. |
14 | Fixed the sorting for size in the file selector on the Z. | 15 | Fixed the sorting for size in the file selector on the Z. |
@@ -20,13 +21,13 @@ Changed the color selection dialog on the Zaurus to a more user friendly version | |||
20 | KO/Pi: | 21 | KO/Pi: |
21 | Fixed several problems in the new Resource handling. | 22 | Fixed several problems in the new Resource handling. |
22 | Added more options to the search dialog. | 23 | Added more options to the search dialog. |
23 | Fixed a problem in the Month view. | 24 | Fixed a problem in the Month view. |
24 | Added more options to the dialog when setting a todo to stopped. | 25 | Added more options to the dialog when setting a todo to stopped. |
25 | 26 | ||
26 | Fixed two small problems in KO/PiAlarm applet. | 27 | Fixed two small problems in KO/Pi Alarm applet. |
27 | 28 | ||
28 | ********** VERSION 2.1.6 ************ | 29 | ********** VERSION 2.1.6 ************ |
29 | 30 | ||
30 | This release is for testing only. | 31 | This release is for testing only. |
31 | 32 | ||
32 | KO/Pi: | 33 | KO/Pi: |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index d25f632..08909ed 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -4014,13 +4014,12 @@ QPtrList<CalFilter> CalendarView::filters() | |||
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; | ||
4021 | filter = mFilters.next(); | 4020 | filter = mFilters.next(); |
4022 | } | 4021 | } |
4023 | 4022 | ||
4024 | mDialogManager->showFilterEditDialog(&mFilters); | 4023 | mDialogManager->showFilterEditDialog(&mFilters); |
4025 | updateFilter(); | 4024 | updateFilter(); |
4026 | } | 4025 | } |
@@ -4037,12 +4036,13 @@ KOFilterView *CalendarView::filterView() | |||
4037 | { | 4036 | { |
4038 | return mFilterView; | 4037 | return mFilterView; |
4039 | } | 4038 | } |
4040 | void CalendarView::selectFilter( int fil ) | 4039 | void CalendarView::selectFilter( int fil ) |
4041 | { | 4040 | { |
4042 | mFilterView->setSelectedFilter( fil ); | 4041 | mFilterView->setSelectedFilter( fil ); |
4042 | updateUnmanagedViews(); | ||
4043 | } | 4043 | } |
4044 | void CalendarView::showFilter(bool visible) | 4044 | void CalendarView::showFilter(bool visible) |
4045 | { | 4045 | { |
4046 | #if 1 | 4046 | #if 1 |
4047 | if (visible) { | 4047 | if (visible) { |
4048 | mCalEditView->readConfig(); | 4048 | mCalEditView->readConfig(); |
@@ -4077,12 +4077,13 @@ void CalendarView::showFilter(bool visible) | |||
4077 | } | 4077 | } |
4078 | void CalendarView::toggleFilerEnabled( ) | 4078 | void CalendarView::toggleFilerEnabled( ) |
4079 | { | 4079 | { |
4080 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); | 4080 | mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled() ); |
4081 | if ( !mFilterView->filtersEnabled() ) | 4081 | if ( !mFilterView->filtersEnabled() ) |
4082 | topLevelWidget()->setCaption( i18n("Filter disabled ") ); | 4082 | topLevelWidget()->setCaption( i18n("Filter disabled ") ); |
4083 | updateUnmanagedViews(); | ||
4083 | 4084 | ||
4084 | } | 4085 | } |
4085 | void CalendarView::updateFilter() | 4086 | void CalendarView::updateFilter() |
4086 | { | 4087 | { |
4087 | CalFilter *filter = mFilterView->selectedFilter(); | 4088 | CalFilter *filter = mFilterView->selectedFilter(); |
4088 | if (filter) { | 4089 | if (filter) { |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 0367bea..48320a5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -2082,13 +2082,13 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) | |||
2082 | 2082 | ||
2083 | 2083 | ||
2084 | default: | 2084 | default: |
2085 | e->ignore(); | 2085 | e->ignore(); |
2086 | } | 2086 | } |
2087 | if ( pro > 0 ) { | 2087 | if ( pro > 0 ) { |
2088 | mView->selectFilter( pro-1 ); | 2088 | selectFilter( pro+1 ); |
2089 | } | 2089 | } |
2090 | if ( showSelectedDates ) { | 2090 | if ( showSelectedDates ) { |
2091 | ;// setCaptionToDates(); | 2091 | ;// setCaptionToDates(); |
2092 | } | 2092 | } |
2093 | 2093 | ||
2094 | } | 2094 | } |