-rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
-rw-r--r-- | bin/kdepim/kopiemail/germantranslation.txt | 6 | ||||
-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 |
6 files changed, 25 insertions, 11 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index c0078be..23ff53c 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -2,2 +2,7 @@ Info about the changes in new versions of KDE-Pim/Pi | |||
2 | 2 | ||
3 | ********** VERSION 1.9.19 ************ | ||
4 | |||
5 | Added a lot of missing translations to KA/Pi, | ||
6 | added some missing translations to KO/Pi and OM/Pi. | ||
7 | |||
3 | ********** VERSION 1.9.18 ************ | 8 | ********** VERSION 1.9.18 ************ |
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt index 5037f5f..6ebaafe 100644 --- a/bin/kdepim/kopiemail/germantranslation.txt +++ b/bin/kdepim/kopiemail/germantranslation.txt | |||
@@ -187,5 +187,5 @@ | |||
187 | { "Delete folder","Lösche Verzeichnis" }, | 187 | { "Delete folder","Lösche Verzeichnis" }, |
188 | { "Refresh folder list","Aktualisiere Verzeichnis Liste" }, | 188 | { "Refresh folder list","Aktualisiere Liste" }, |
189 | { "Create new folder","Neues Verzeichnis" }, | 189 | { "Create new folder","Neues Verzeichnis" }, |
190 | { "Disconnect","Disconnect" }, | 190 | { "Disconnect","Diskonnect" }, |
191 | { "Set offline","Gehe offline" }, | 191 | { "Set offline","Gehe offline" }, |
@@ -254,3 +254,3 @@ | |||
254 | { "userdefined","benutzerdefiniert" }, | 254 | { "userdefined","benutzerdefiniert" }, |
255 | { "","" }, | 255 | { "Reply to this mail","Beantworte diese Mail" }, |
256 | { "","" }, | 256 | { "","" }, |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9c10ba6..12af655 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -341,3 +341,4 @@ void CalendarView::init() | |||
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()); |
@@ -2170,6 +2171,6 @@ void CalendarView::updateView() | |||
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 | } |
@@ -3611,3 +3612,4 @@ 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(); |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 0a767b6..4b26058 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -216,2 +216,3 @@ KOPrefs::KOPrefs() : | |||
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); |
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 69722a1..b3acda7 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -247,2 +247,4 @@ class KOPrefs : public KPimPrefs | |||
247 | 247 | ||
248 | bool mShowDateNavigator; | ||
249 | |||
248 | QStringList mLocationDefaults; | 250 | QStringList mLocationDefaults; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5ec7ddd..151b55b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1640,7 +1640,9 @@ void MainWindow::fillFilterMenu() | |||
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; |
@@ -1651,3 +1653,3 @@ void MainWindow::fillFilterMenu() | |||
1651 | CalFilter *filter = fili.first(); | 1653 | CalFilter *filter = fili.first(); |
1652 | int iii = 1; | 1654 | int iii = 2; |
1653 | while(filter) { | 1655 | while(filter) { |
@@ -1665,5 +1667,7 @@ void MainWindow::selectFilter( int fil ) | |||
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 | } |