7 files changed, 25 insertions, 9 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 352ab63..30bb856 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,4 +1,12 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.1.12 ************
+
+KO/Pi:
+Many small usability fixes, e.g. rearranged the popup menus such that they are better to use on the Zaurus.
+Fixed a problem with the month view when file was saved but KO/Pi was not the active window.
+Fixed some problems in the resource config dialog (e.g. added a warning if you set all calendars to read-only).
+Fixed some other small problems.
+
 ********** VERSION 2.1.11 ************
 
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 9c22730..5fece5b 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -746,5 +746,4 @@
 { "File does not exist:\n '%1'.","Datei existiert nicht:\n '%1'." },
 { "Couldn't load calendar\n '%1'.","Kann Kalender nicht laden:\n '%1'." },
-{ "\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie gepeicherte Datei wurde verändert!\nDatei Grösse: %1 Bytes.\nZuletzt geändert: %2\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
 { "Overwrite","Überschreiben" },
 { "Sync+save","Syncen+speichern" },
@@ -1489,4 +1488,5 @@
 { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" },
 { "\nNO\n WRITEABLE\n   CALENDAR\n      FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n  SCHREIBBARER\n    KALENDER\n      GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" },
+{ "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
 { "","" },
 { "","" },
@@ -1495,3 +1495,2 @@
 { "","" },
 { "","" },
-{ "","" },
\ No newline at end of file
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 678143d..5c88abd 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2097,5 +2097,5 @@ bool CalendarView::checkFileVersion(QString fn)
     if ( dt <= loadedFileVersion )
         return true;
-    int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file\n%1\n on disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg(fn).arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
+    int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg(KGlobal::formatMessage(fn,0)).arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
                                                  i18n("KO/Pi Warning"),i18n("Overwrite"),
                                                  i18n("Sync+save"));
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 874fc6a..4322299 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -26,4 +26,5 @@
 #include <qstring.h>
 #include <qcheckbox.h>
+#include <qapplication.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 264cf28..4fc447e 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1793,6 +1793,7 @@ void KOMonthView::setKeyBoardFocus()
          mWeekLabels[mNumWeeks]->setFocus();
     }
-    if ( shootAgain ) {
-      QTimer::singleShot( 0, this, SLOT ( setKeyBFocus() ) );
+    --mKBFcounter;
+    if ( shootAgain && mKBFcounter > 0 ) {
+      QTimer::singleShot( 50, this, SLOT ( setKeyBoardFocus() ) );
     }
 }
@@ -1800,4 +1801,5 @@ void KOMonthView::setKeyBFocus()
 {
     //qDebug("KOMonthView::setKeyBFocus() ");
+    mKBFcounter = 10;
     QTimer::singleShot( 0, this, SLOT ( setKeyBoardFocus() ) );
 }
@@ -1817,5 +1819,5 @@ void KOMonthView::slotComputeLayout()
     //qDebug("KOMonthView::Post - resizeEvent %d %d ", width(), height() );
     computeLayout();
-    clPending = true;  
+    clPending = true;
     setKeyBFocus();
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 0bd6b1c..a41eb54 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -279,8 +279,8 @@ class KOMonthView: public KOEventView
     void setPopupCell( MonthViewCell * );
     void switchView();
-    void setKeyBoardFocus();
     void setKeyBFocus();
 
   protected slots:
+    void setKeyBoardFocus();
     void slotNewTodo();
     void slotNewEvent();
@@ -303,4 +303,5 @@ class KOMonthView: public KOEventView
 
   private:
+    int mKBFcounter;
     QTimer* mComputeLayoutTimer;
     NavigatorBar* mNavigatorBar;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 862d437..f68f032 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1913,4 +1913,5 @@ void MainWindow::backupAllFiles()
 void MainWindow::save()
 {
+
     if ( mView->viewManager()->journalView() )
         mView->viewManager()->journalView()->checkModified();
@@ -1932,5 +1933,6 @@ void MainWindow::save()
         }
         QTime neededSaveTime = QDateTime::currentDateTime().time();
-        setCaption(i18n("KO/Pi:Saving Data to File ..." ));
+        if ( !isMinimized () )
+            setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
         mView->saveCalendars();
@@ -1940,5 +1942,8 @@ void MainWindow::save()
         QString savemes;
         savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
-        setCaption(savemes);
+        if ( !isMinimized () )
+            setCaption(savemes);
+        else
+            qDebug(savemes);
     } else
         setCaption(i18n("Saving cancelled!"));