| -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 @@ -1,5 +1,10 @@ Info about the changes in new versions of KDE-Pim/Pi +********** VERSION 1.9.19 ************ + +Added a lot of missing translations to KA/Pi, +added some missing translations to KO/Pi and OM/Pi. + ********** VERSION 1.9.18 ************ FYI: The VERSION 1.9.17 was a testing release only. 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 @@ -185,9 +185,9 @@ { "Delete all mails","Lösche alle Mails" }, { "Create new subfolder","Neues Unterverzeichnis" }, { "Delete folder","Lösche Verzeichnis" }, -{ "Refresh folder list","Aktualisiere Verzeichnis Liste" }, +{ "Refresh folder list","Aktualisiere Liste" }, { "Create new folder","Neues Verzeichnis" }, -{ "Disconnect","Disconnect" }, +{ "Disconnect","Diskonnect" }, { "Set offline","Gehe offline" }, { "Select target box","Wähle Ziel Box" }, { "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" }, @@ -252,7 +252,7 @@ { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, { "Data storage path","Daten Speicherpfad" }, { "userdefined","benutzerdefiniert" }, -{ "","" }, +{ "Reply to this mail","Beantworte diese Mail" }, { "","" }, { "","" }, { "","" }, diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9c10ba6..12af655 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -339,7 +339,8 @@ void CalendarView::init() mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); } - + if ( !KOPrefs::instance()->mShowDateNavigator) + mDateNavigator->hide(); //qDebug("Calendarview Size %d %d ", width(), height()); #endif @@ -2168,10 +2169,10 @@ void CalendarView::updateView() { DateList tmpList = mNavigator->selectedDates(); - // We assume that the navigator only selects consecutive days. - updateView( tmpList.first(), tmpList.last() ); if ( KOPrefs::instance()->mHideNonStartedTodos ) mTodoList->updateView(); + // We assume that the navigator only selects consecutive days. + updateView( tmpList.first(), tmpList.last() ); } void CalendarView::updateUnmanagedViews() @@ -3609,7 +3610,8 @@ KDateNavigator* CalendarView::dateNavigatorWidget() } void CalendarView::toggleDateNavigatorWidget() { - if (mDateNavigator->isVisible()) + KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ; + if (!KOPrefs::instance()->mShowDateNavigator ) mDateNavigator->hide(); else mDateNavigator->show(); diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 0a767b6..4b26058 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -214,6 +214,7 @@ KOPrefs::KOPrefs() : KPrefs::setCurrentGroup("Views"); + addItemBool("Show Date Navigator",&mShowDateNavigator,true); addItemInt("Hour Size",&mHourSize,8); addItemBool("Show Daily Recurrences",&mDailyRecur,true); addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 69722a1..b3acda7 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -245,6 +245,8 @@ class KOPrefs : public KPimPrefs bool mHightlightDateTimeEdit; bool mShortDateInViewer; + bool mShowDateNavigator; + QStringList mLocationDefaults; QStringList mEventSummaryUser; QStringList mTodoSummaryUser; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5ec7ddd..151b55b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1638,18 +1638,20 @@ void MainWindow::fillFilterMenu() { selectFilterMenu->clear(); bool disable = false; + selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 ); + selectFilterMenu->insertSeparator(); if ( mView->filterView()->filtersEnabled() ) { - selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 0 ); + selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 1 ); } else { - selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 0 ); + selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 1 ); disable = true; } selectFilterMenu->insertSeparator(); QPtrList<CalFilter> fili = mView->filters(); CalFilter *curfilter = mView->filterView()->selectedFilter(); CalFilter *filter = fili.first(); - int iii = 1; + int iii = 2; while(filter) { selectFilterMenu->insertItem( filter->name(), iii ); if ( filter == curfilter) @@ -1663,9 +1665,11 @@ void MainWindow::fillFilterMenu() void MainWindow::selectFilter( int fil ) { if ( fil == 0 ) { + mView->editFilters( ); + } else if ( fil == 1 ){ mView->toggleFilerEnabled( ); } else { - mView->selectFilter( fil-1 ); + mView->selectFilter( fil-2 ); } } void MainWindow::configureToolBar( int item ) |