-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | korganizer/calendarview.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 2012e92..eac2f29 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -4017,16 +4017,17 @@ void CalendarView::editFilters() | |||
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 | { |
@@ -4088,16 +4089,17 @@ void CalendarView::updateFilter() | |||
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 | } |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index d836fee..be18e8f 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -189,16 +189,17 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
189 | /** Emitted, when the number of outgoing messages has changed. */ | 189 | /** Emitted, when the number of outgoing messages has changed. */ |
190 | void numOutgoingChanged(int); | 190 | void numOutgoingChanged(int); |
191 | 191 | ||
192 | /** Send status message, which can e.g. be displayed in the status bar. */ | 192 | /** Send status message, which can e.g. be displayed in the status bar. */ |
193 | void statusMessage(const QString &); | 193 | void statusMessage(const QString &); |
194 | 194 | ||
195 | void calendarViewExpanded( bool ); | 195 | void calendarViewExpanded( bool ); |
196 | void updateSearchDialog(); | 196 | void updateSearchDialog(); |
197 | void filtersUpdated(); | ||
197 | 198 | ||
198 | 199 | ||
199 | public slots: | 200 | public slots: |
200 | void checkAlarms(); | 201 | void checkAlarms(); |
201 | void slotprintSelInc(); | 202 | void slotprintSelInc(); |
202 | void showNextAlarms(); | 203 | void showNextAlarms(); |
203 | void showOpenError(); | 204 | void showOpenError(); |
204 | void watchSavedFile(); | 205 | void watchSavedFile(); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 472a978..13e186d 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1296,17 +1296,17 @@ void MainWindow::initActions() | |||
1296 | if (p-> mShowIconFilter) | 1296 | if (p-> mShowIconFilter) |
1297 | configureToolBarMenu->setItemChecked( 7, true ); | 1297 | configureToolBarMenu->setItemChecked( 7, true ); |
1298 | if (p-> mShowIconOnetoolbar) | 1298 | if (p-> mShowIconOnetoolbar) |
1299 | configureToolBarMenu->setItemChecked( 6, true ); | 1299 | configureToolBarMenu->setItemChecked( 6, true ); |
1300 | 1300 | ||
1301 | 1301 | ||
1302 | if ( filterMenubar ) { | 1302 | if ( filterMenubar ) { |
1303 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); | 1303 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); |
1304 | connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); | 1304 | connect( mView, SIGNAL( filtersUpdated() ), SLOT( updateFilterToolbar() ) ); |
1305 | } | 1305 | } |
1306 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); | 1306 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); |
1307 | configureAgenda( p->mHourSize ); | 1307 | configureAgenda( p->mHourSize ); |
1308 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 1308 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
1309 | } | 1309 | } |
1310 | 1310 | ||
1311 | void MainWindow::exportToPhone( int mode ) | 1311 | void MainWindow::exportToPhone( int mode ) |
1312 | { | 1312 | { |