author | zautrix <zautrix> | 2005-06-18 20:16:48 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-18 20:16:48 (UTC) |
commit | a2e963324e6db541f322002c307b40f24747e036 (patch) (unidiff) | |
tree | 5b09ee8c176e0709bb48bd2446fe90d2f3d90c68 | |
parent | 15e5fcb111968950032089219185ae4322e88f06 (diff) | |
download | kdepimpi-a2e963324e6db541f322002c307b40f24747e036.zip kdepimpi-a2e963324e6db541f322002c307b40f24747e036.tar.gz kdepimpi-a2e963324e6db541f322002c307b40f24747e036.tar.bz2 |
filter change update fix
-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,50 +1,51 @@ | |||
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. |
15 | 16 | ||
16 | Changed the color selection dialog on the Zaurus to a more user friendly version. | 17 | Changed the color selection dialog on the Zaurus to a more user friendly version. |
17 | 18 | ||
18 | ********** VERSION 2.1.7 ************ | 19 | ********** VERSION 2.1.7 ************ |
19 | 20 | ||
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: |
33 | Added to the list view (the list view is used in search dialog as well) the possibility to print it. | 34 | Added to the list view (the list view is used in search dialog as well) the possibility to print it. |
34 | Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. | 35 | Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. |
35 | Added to the list view the possibility to add all subtodos of selected todos to an export/beam. | 36 | Added to the list view the possibility to add all subtodos of selected todos to an export/beam. |
36 | Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout. | 37 | Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout. |
37 | Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus. | 38 | Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus. |
38 | Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly. | 39 | Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly. |
39 | 40 | ||
40 | Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars. | 41 | Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars. |
41 | In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later. | 42 | In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later. |
42 | Now on every sync the set of calendars is synced which are enabled in the resource view. | 43 | Now on every sync the set of calendars is synced which are enabled in the resource view. |
43 | 44 | ||
44 | A calendar is enabled in the resource view if the "eye" column is checked. | 45 | A calendar is enabled in the resource view if the "eye" column is checked. |
45 | You can set a calendar to be the default for new items( "+" column ). | 46 | You can set a calendar to be the default for new items( "+" column ). |
46 | You can tell KO/Pi to ignore all alarm of a calendar ( "bell" column ) and you can set it readonly. | 47 | You can tell KO/Pi to ignore all alarm of a calendar ( "bell" column ) and you can set it readonly. |
47 | To find out how to add a new calendar and how to remove a calendar is left as an exercise to the reader ... | 48 | To find out how to add a new calendar and how to remove a calendar is left as an exercise to the reader ... |
48 | 49 | ||
49 | 50 | ||
50 | ********** VERSION 2.1.5 ************ | 51 | ********** VERSION 2.1.5 ************ |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index d25f632..08909ed 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -3996,111 +3996,112 @@ void CalendarView::showDates(const DateList &selectedDates) | |||
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; | ||
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 | } |
4027 | void CalendarView::toggleFilter() | 4026 | void CalendarView::toggleFilter() |
4028 | { | 4027 | { |
4029 | if ( mLeftFrame->isHidden() ) { | 4028 | if ( mLeftFrame->isHidden() ) { |
4030 | toggleExpand(); | 4029 | toggleExpand(); |
4031 | showFilter( true ); | 4030 | showFilter( true ); |
4032 | } else | 4031 | } else |
4033 | showFilter(! mCalEditView->isVisible()); | 4032 | showFilter(! mCalEditView->isVisible()); |
4034 | } | 4033 | } |
4035 | 4034 | ||
4036 | KOFilterView *CalendarView::filterView() | 4035 | 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(); |
4049 | mCalEditView->show(); | 4049 | mCalEditView->show(); |
4050 | QValueList<int> sizes; | 4050 | QValueList<int> sizes; |
4051 | sizes = mLeftFrame->sizes(); | 4051 | sizes = mLeftFrame->sizes(); |
4052 | if ( sizes.count() == 4 && sizes[3] < 20 ) { | 4052 | if ( sizes.count() == 4 && sizes[3] < 20 ) { |
4053 | sizes.clear(); | 4053 | sizes.clear(); |
4054 | sizes << 100; | 4054 | sizes << 100; |
4055 | sizes << 0; | 4055 | sizes << 0; |
4056 | sizes << 0; | 4056 | sizes << 0; |
4057 | sizes << 100; | 4057 | sizes << 100; |
4058 | mLeftFrame->setSizes(sizes); | 4058 | mLeftFrame->setSizes(sizes); |
4059 | } | 4059 | } |
4060 | #if 0 | 4060 | #if 0 |
4061 | sizes = mLeftFrame->sizes(); | 4061 | sizes = mLeftFrame->sizes(); |
4062 | int ccc = 0; | 4062 | int ccc = 0; |
4063 | while ( ccc < sizes.count()) { | 4063 | while ( ccc < sizes.count()) { |
4064 | qDebug("size %d %d ", ccc, sizes[ccc]); | 4064 | qDebug("size %d %d ", ccc, sizes[ccc]); |
4065 | ++ccc; | 4065 | ++ccc; |
4066 | } | 4066 | } |
4067 | #endif | 4067 | #endif |
4068 | 4068 | ||
4069 | } | 4069 | } |
4070 | else { | 4070 | else { |
4071 | mCalEditView->hide(); | 4071 | mCalEditView->hide(); |
4072 | } | 4072 | } |
4073 | #else | 4073 | #else |
4074 | if (visible) mFilterView->show(); | 4074 | if (visible) mFilterView->show(); |
4075 | else mFilterView->hide(); | 4075 | else mFilterView->hide(); |
4076 | #endif | 4076 | #endif |
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) { |
4089 | QString mess; | 4090 | QString mess; |
4090 | if (mFilterView->filtersEnabled()) { | 4091 | if (mFilterView->filtersEnabled()) { |
4091 | mess = i18n("Filter selected: ")+filter->name(); | 4092 | mess = i18n("Filter selected: ")+filter->name(); |
4092 | filter->setEnabled(true); | 4093 | filter->setEnabled(true); |
4093 | } | 4094 | } |
4094 | else filter->setEnabled(false); | 4095 | else filter->setEnabled(false); |
4095 | mCalendar->setFilter(filter); | 4096 | mCalendar->setFilter(filter); |
4096 | updateView(); | 4097 | updateView(); |
4097 | if ( !mess.isEmpty() ) | 4098 | if ( !mess.isEmpty() ) |
4098 | topLevelWidget()->setCaption( mess ); | 4099 | topLevelWidget()->setCaption( mess ); |
4099 | 4100 | ||
4100 | } | 4101 | } |
4101 | emit filtersUpdated(); | 4102 | emit filtersUpdated(); |
4102 | } | 4103 | } |
4103 | 4104 | ||
4104 | void CalendarView::filterEdited() | 4105 | void CalendarView::filterEdited() |
4105 | { | 4106 | { |
4106 | mFilterView->updateFilters(); | 4107 | mFilterView->updateFilters(); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 0367bea..48320a5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -2064,49 +2064,49 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) | |||
2064 | break; | 2064 | break; |
2065 | // case Qt::Key_Return: | 2065 | // case Qt::Key_Return: |
2066 | case Qt::Key_E: | 2066 | case Qt::Key_E: |
2067 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 2067 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) |
2068 | mView->newEvent(); | 2068 | mView->newEvent(); |
2069 | else | 2069 | else |
2070 | mView->editIncidence(); | 2070 | mView->editIncidence(); |
2071 | break; | 2071 | break; |
2072 | case Qt::Key_Plus: | 2072 | case Qt::Key_Plus: |
2073 | size = p->mHourSize +2; | 2073 | size = p->mHourSize +2; |
2074 | if ( size <= 22 ) | 2074 | if ( size <= 22 ) |
2075 | configureAgenda( size ); | 2075 | configureAgenda( size ); |
2076 | break; | 2076 | break; |
2077 | case Qt::Key_Minus: | 2077 | case Qt::Key_Minus: |
2078 | size = p->mHourSize - 2; | 2078 | size = p->mHourSize - 2; |
2079 | if ( size >= 4 ) | 2079 | if ( size >= 4 ) |
2080 | configureAgenda( size ); | 2080 | configureAgenda( size ); |
2081 | break; | 2081 | break; |
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 | } |
2095 | void MainWindow::fillFilterMenuTB() | 2095 | void MainWindow::fillFilterMenuTB() |
2096 | { | 2096 | { |
2097 | selectFilterMenuTB->clear(); | 2097 | selectFilterMenuTB->clear(); |
2098 | selectFilterMenuTB->insertItem(i18n ( "Edit Filters" ), 0 ); | 2098 | selectFilterMenuTB->insertItem(i18n ( "Edit Filters" ), 0 ); |
2099 | selectFilterMenuTB->insertSeparator(); | 2099 | selectFilterMenuTB->insertSeparator(); |
2100 | selectFilterMenuTB->insertItem(i18n ( "No Filter" ), 1 ); | 2100 | selectFilterMenuTB->insertItem(i18n ( "No Filter" ), 1 ); |
2101 | 2101 | ||
2102 | selectFilterMenuTB->insertSeparator(); | 2102 | selectFilterMenuTB->insertSeparator(); |
2103 | QPtrList<CalFilter> fili = mView->filters(); | 2103 | QPtrList<CalFilter> fili = mView->filters(); |
2104 | CalFilter *curfilter = mView->filterView()->selectedFilter(); | 2104 | CalFilter *curfilter = mView->filterView()->selectedFilter(); |
2105 | CalFilter *filter = fili.first(); | 2105 | CalFilter *filter = fili.first(); |
2106 | int iii = 2; | 2106 | int iii = 2; |
2107 | bool checkitem = mView->filterView()->filtersEnabled(); | 2107 | bool checkitem = mView->filterView()->filtersEnabled(); |
2108 | while(filter) { | 2108 | while(filter) { |
2109 | selectFilterMenuTB->insertItem( filter->name(), iii ); | 2109 | selectFilterMenuTB->insertItem( filter->name(), iii ); |
2110 | if ( filter == curfilter) | 2110 | if ( filter == curfilter) |
2111 | selectFilterMenuTB->setItemChecked( iii, checkitem ); | 2111 | selectFilterMenuTB->setItemChecked( iii, checkitem ); |
2112 | filter = fili.next(); | 2112 | filter = fili.next(); |