kopi fixes

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,8 +1,13 @@
 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.
 Please read the changelog of VERSION 1.9.17 as well.
 
 Cleaned up the syncing config dialog.
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
@@ -182,15 +182,15 @@
 { "<p>Do you really want to delete this mail? <br><br>","<p>Wollen Sie diese Mail wirklich löschen? <br><br>" },
 { "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" },
 { "Move/Copie all mails","Verschiebe/kopiere alle Mails" },
 { "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>" },
 { "Folder:","Verzeichnis:" },
 { "Account:","Zugang:" },
 { "Prefix will prepend, do not enter","Pfad-Prefix wird vorangestellt" },
@@ -249,12 +249,12 @@
 { "Save settings","Speichere Einstellungen" },
 { "Save standard","Speichere Standard" },
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
 { "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
@@ -336,13 +336,14 @@ void CalendarView::init()
         mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() );
         leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() );
     } else {
         mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() );
         leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() );
     }
- 
+    if ( !KOPrefs::instance()->mShowDateNavigator)
+        mDateNavigator->hide();
     //qDebug("Calendarview Size %d %d ", width(), height());
 #endif
  
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( showDates( const KCal::DateList & ) ) );
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
@@ -2165,16 +2166,16 @@ void CalendarView::updateView(const QDate &start, const QDate &end)
 }
 
 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()
 {
     mDateNavigator->updateDayMatrix();
 }
@@ -3606,13 +3607,14 @@ DateNavigator *CalendarView::dateNavigator()
 KDateNavigator* CalendarView::dateNavigatorWidget()
 {
     return mDateNavigator;
 }
 void CalendarView::toggleDateNavigatorWidget()
 {
-    if (mDateNavigator->isVisible())
+    KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ;
+    if (!KOPrefs::instance()->mShowDateNavigator )
         mDateNavigator->hide();
     else
         mDateNavigator->show();
 }
 void CalendarView::addView(KOrg::BaseView *view)
 {
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 0a767b6..4b26058 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -211,12 +211,13 @@ KOPrefs::KOPrefs() :
   addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
   addItemBool("UseAppColors",&mUseAppColors,false); 
 
   
 
   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);
   addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
   addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
   addItemBool("ShowShortMonthName",&mMonthShowShort,false);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 69722a1..b3acda7 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -242,12 +242,14 @@ class KOPrefs : public KPimPrefs
     bool mTodoViewUsesForegroundColor;
     bool mMonthViewUsesForegroundColor;
 
     bool mHightlightDateTimeEdit;
     bool mShortDateInViewer;
 
+    bool mShowDateNavigator;
+
     QStringList mLocationDefaults;
     QStringList mEventSummaryUser;
     QStringList mTodoSummaryUser;
 
     bool mUseInternalAlarmNotification;
     int mAlarmPlayBeeps;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 5ec7ddd..151b55b 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1635,24 +1635,26 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
 }
 
 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)
             selectFilterMenu->setItemChecked( iii, true );
         if ( disable )
             selectFilterMenu->setItemEnabled( iii, false );
@@ -1660,15 +1662,17 @@ void MainWindow::fillFilterMenu()
         ++iii;
     }
 }
 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  )
 {
 
     configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );