author | zautrix <zautrix> | 2005-01-19 08:52:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-19 08:52:01 (UTC) |
commit | af56077eeeab7b46b98ad5159c6653114abf6602 (patch) (unidiff) | |
tree | b621bc3c2c8d283d0aec81b2b8276074082c951a /korganizer | |
parent | c626089f47244d0c0a9ba73bcd12f42927acb28f (diff) | |
download | kdepimpi-af56077eeeab7b46b98ad5159c6653114abf6602.zip kdepimpi-af56077eeeab7b46b98ad5159c6653114abf6602.tar.gz kdepimpi-af56077eeeab7b46b98ad5159c6653114abf6602.tar.bz2 |
kopi fixes
-rw-r--r-- | korganizer/calendarview.cpp | 10 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
-rw-r--r-- | korganizer/koprefs.h | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 12 |
4 files changed, 17 insertions, 8 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9c10ba6..12af655 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -340,5 +340,6 @@ void CalendarView::init() | |||
340 | leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); | 340 | leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); |
341 | } | 341 | } |
342 | 342 | if ( !KOPrefs::instance()->mShowDateNavigator) | |
343 | mDateNavigator->hide(); | ||
343 | //qDebug("Calendarview Size %d %d ", width(), height()); | 344 | //qDebug("Calendarview Size %d %d ", width(), height()); |
344 | #endif | 345 | #endif |
@@ -2169,8 +2170,8 @@ void CalendarView::updateView() | |||
2169 | DateList tmpList = mNavigator->selectedDates(); | 2170 | DateList tmpList = mNavigator->selectedDates(); |
2170 | 2171 | ||
2171 | // We assume that the navigator only selects consecutive days. | ||
2172 | updateView( tmpList.first(), tmpList.last() ); | ||
2173 | if ( KOPrefs::instance()->mHideNonStartedTodos ) | 2172 | if ( KOPrefs::instance()->mHideNonStartedTodos ) |
2174 | mTodoList->updateView(); | 2173 | mTodoList->updateView(); |
2174 | // We assume that the navigator only selects consecutive days. | ||
2175 | updateView( tmpList.first(), tmpList.last() ); | ||
2175 | } | 2176 | } |
2176 | 2177 | ||
@@ -3610,5 +3611,6 @@ KDateNavigator* CalendarView::dateNavigatorWidget() | |||
3610 | void CalendarView::toggleDateNavigatorWidget() | 3611 | void CalendarView::toggleDateNavigatorWidget() |
3611 | { | 3612 | { |
3612 | if (mDateNavigator->isVisible()) | 3613 | KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ; |
3614 | if (!KOPrefs::instance()->mShowDateNavigator ) | ||
3613 | mDateNavigator->hide(); | 3615 | mDateNavigator->hide(); |
3614 | else | 3616 | else |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 0a767b6..4b26058 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -215,4 +215,5 @@ KOPrefs::KOPrefs() : | |||
215 | 215 | ||
216 | KPrefs::setCurrentGroup("Views"); | 216 | KPrefs::setCurrentGroup("Views"); |
217 | addItemBool("Show Date Navigator",&mShowDateNavigator,true); | ||
217 | addItemInt("Hour Size",&mHourSize,8); | 218 | addItemInt("Hour Size",&mHourSize,8); |
218 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); | 219 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); |
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 69722a1..b3acda7 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -246,4 +246,6 @@ class KOPrefs : public KPimPrefs | |||
246 | bool mShortDateInViewer; | 246 | bool mShortDateInViewer; |
247 | 247 | ||
248 | bool mShowDateNavigator; | ||
249 | |||
248 | QStringList mLocationDefaults; | 250 | QStringList mLocationDefaults; |
249 | QStringList mEventSummaryUser; | 251 | QStringList mEventSummaryUser; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5ec7ddd..151b55b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1639,9 +1639,11 @@ void MainWindow::fillFilterMenu() | |||
1639 | selectFilterMenu->clear(); | 1639 | selectFilterMenu->clear(); |
1640 | bool disable = false; | 1640 | bool disable = false; |
1641 | selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 ); | ||
1642 | selectFilterMenu->insertSeparator(); | ||
1641 | if ( mView->filterView()->filtersEnabled() ) { | 1643 | if ( mView->filterView()->filtersEnabled() ) { |
1642 | selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 0 ); | 1644 | selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 1 ); |
1643 | } | 1645 | } |
1644 | else { | 1646 | else { |
1645 | selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 0 ); | 1647 | selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 1 ); |
1646 | disable = true; | 1648 | disable = true; |
1647 | } | 1649 | } |
@@ -1650,5 +1652,5 @@ void MainWindow::fillFilterMenu() | |||
1650 | CalFilter *curfilter = mView->filterView()->selectedFilter(); | 1652 | CalFilter *curfilter = mView->filterView()->selectedFilter(); |
1651 | CalFilter *filter = fili.first(); | 1653 | CalFilter *filter = fili.first(); |
1652 | int iii = 1; | 1654 | int iii = 2; |
1653 | while(filter) { | 1655 | while(filter) { |
1654 | selectFilterMenu->insertItem( filter->name(), iii ); | 1656 | selectFilterMenu->insertItem( filter->name(), iii ); |
@@ -1664,7 +1666,9 @@ void MainWindow::selectFilter( int fil ) | |||
1664 | { | 1666 | { |
1665 | if ( fil == 0 ) { | 1667 | if ( fil == 0 ) { |
1668 | mView->editFilters( ); | ||
1669 | } else if ( fil == 1 ){ | ||
1666 | mView->toggleFilerEnabled( ); | 1670 | mView->toggleFilerEnabled( ); |
1667 | } else { | 1671 | } else { |
1668 | mView->selectFilter( fil-1 ); | 1672 | mView->selectFilter( fil-2 ); |
1669 | } | 1673 | } |
1670 | } | 1674 | } |