summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-16 11:32:35 (UTC)
committer zautrix <zautrix>2005-06-16 11:32:35 (UTC)
commitc0384f1ed99f108d7b2120900ff7d7f090ad6250 (patch) (unidiff)
tree9a02c76a023c6dd94273b21dc9d3621549790d55
parent9f60da2b6768e94d2aeb2f94a4479b6678f2aa76 (diff)
downloadkdepimpi-c0384f1ed99f108d7b2120900ff7d7f090ad6250.zip
kdepimpi-c0384f1ed99f108d7b2120900ff7d7f090ad6250.tar.gz
kdepimpi-c0384f1ed99f108d7b2120900ff7d7f090ad6250.tar.bz2
fixxxx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp2
-rw-r--r--korganizer/calendarview.h1
-rw-r--r--korganizer/mainwindow.cpp2
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
@@ -4019,12 +4019,13 @@ void CalendarView::editFilters()
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}
4026void CalendarView::toggleFilter() 4027void CalendarView::toggleFilter()
4027{ 4028{
4028 showFilter(! mCalEditView->isVisible()); 4029 showFilter(! mCalEditView->isVisible());
4029} 4030}
4030 4031
@@ -4090,12 +4091,13 @@ void CalendarView::updateFilter()
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
4098void CalendarView::filterEdited() 4100void CalendarView::filterEdited()
4099{ 4101{
4100 mFilterView->updateFilters(); 4102 mFilterView->updateFilters();
4101 updateFilter(); 4103 updateFilter();
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index d836fee..be18e8f 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -191,12 +191,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
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();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 472a978..13e186d 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1298,13 +1298,13 @@ void MainWindow::initActions()
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