-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 | |||
@@ -4009,32 +4009,33 @@ void CalendarView::showDates(const DateList &selectedDates) | |||
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; | 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 | { |
4033 | return mFilterView; | 4034 | return mFilterView; |
4034 | } | 4035 | } |
4035 | void CalendarView::selectFilter( int fil ) | 4036 | void CalendarView::selectFilter( int fil ) |
4036 | { | 4037 | { |
4037 | mFilterView->setSelectedFilter( fil ); | 4038 | mFilterView->setSelectedFilter( fil ); |
4038 | } | 4039 | } |
4039 | void CalendarView::showFilter(bool visible) | 4040 | void CalendarView::showFilter(bool visible) |
4040 | { | 4041 | { |
@@ -4080,32 +4081,33 @@ void CalendarView::toggleFilerEnabled( ) | |||
4080 | void CalendarView::updateFilter() | 4081 | void CalendarView::updateFilter() |
4081 | { | 4082 | { |
4082 | CalFilter *filter = mFilterView->selectedFilter(); | 4083 | CalFilter *filter = mFilterView->selectedFilter(); |
4083 | if (filter) { | 4084 | if (filter) { |
4084 | QString mess; | 4085 | QString mess; |
4085 | if (mFilterView->filtersEnabled()) { | 4086 | if (mFilterView->filtersEnabled()) { |
4086 | mess = i18n("Filter selected: ")+filter->name(); | 4087 | mess = i18n("Filter selected: ")+filter->name(); |
4087 | filter->setEnabled(true); | 4088 | filter->setEnabled(true); |
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 | } |
4104 | 4106 | ||
4105 | 4107 | ||
4106 | void CalendarView::takeOverEvent() | 4108 | void CalendarView::takeOverEvent() |
4107 | { | 4109 | { |
4108 | Incidence *incidence = currentSelection(); | 4110 | Incidence *incidence = currentSelection(); |
4109 | 4111 | ||
4110 | if (!incidence) return; | 4112 | if (!incidence) return; |
4111 | 4113 | ||
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index d836fee..be18e8f 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -181,32 +181,33 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
181 | Emitted, when clipboard content changes. Parameter indicates if paste | 181 | Emitted, when clipboard content changes. Parameter indicates if paste |
182 | is possible or not. | 182 | is possible or not. |
183 | */ | 183 | */ |
184 | void pasteEnabled(bool); | 184 | void pasteEnabled(bool); |
185 | 185 | ||
186 | /** Emitted, when the number of incoming messages has changed. */ | 186 | /** Emitted, when the number of incoming messages has changed. */ |
187 | void numIncomingChanged(int); | 187 | void numIncomingChanged(int); |
188 | 188 | ||
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(); |
205 | void recheckTimerAlarm(); | 206 | void recheckTimerAlarm(); |
206 | void checkNextTimerAlarm(); | 207 | void checkNextTimerAlarm(); |
207 | void addAlarm(const QDateTime &qdt, const QString ¬i ); | 208 | void addAlarm(const QDateTime &qdt, const QString ¬i ); |
208 | void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); | 209 | void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); |
209 | void removeAlarm(const QDateTime &qdt, const QString ¬i ); | 210 | void removeAlarm(const QDateTime &qdt, const QString ¬i ); |
210 | 211 | ||
211 | /** options dialog made a changed to the configuration. we catch this | 212 | /** options dialog made a changed to the configuration. we catch this |
212 | * and notify all widgets which need to update their configuration. */ | 213 | * and notify all widgets which need to update their configuration. */ |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 472a978..13e186d 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1288,33 +1288,33 @@ void MainWindow::initActions() | |||
1288 | iconToolBar->setHorizontalStretchable (true ); | 1288 | iconToolBar->setHorizontalStretchable (true ); |
1289 | viewToolBar->setHorizontalStretchable (true ); | 1289 | viewToolBar->setHorizontalStretchable (true ); |
1290 | navigatorToolBar->setHorizontalStretchable (true ); | 1290 | navigatorToolBar->setHorizontalStretchable (true ); |
1291 | iconToolBar->setVerticalStretchable (true ); | 1291 | iconToolBar->setVerticalStretchable (true ); |
1292 | viewToolBar->setVerticalStretchable (true ); | 1292 | viewToolBar->setVerticalStretchable (true ); |
1293 | navigatorToolBar->setVerticalStretchable (true ); | 1293 | navigatorToolBar->setVerticalStretchable (true ); |
1294 | configureToolBarMenu->setItemChecked( 5, true ); | 1294 | configureToolBarMenu->setItemChecked( 5, true ); |
1295 | } | 1295 | } |
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 | { |
1313 | 1313 | ||
1314 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 1314 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
1315 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 1315 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
1316 | KOex2phonePrefs ex2phone; | 1316 | KOex2phonePrefs ex2phone; |
1317 | 1317 | ||
1318 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); | 1318 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); |
1319 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); | 1319 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); |
1320 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 1320 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); |