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,50 +1,58 @@
 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 ************
 
 KO/Pi:
 Because we can have many calendars now in KO/Pi we can have more than one journal entry per day.
 Added features to handle (and add ) more than one journal entry per day.
 Added option for a journal title.
 
 Added info about the calendar, the item belongs to, to the event/todo/journal viewer. 
 Fixed a problem of the alarm of completed recurring todos.
 Added to the event/todo editor to set quickly the category of an item.
 
 
 Fixed some problems when calling KO/Pi or KA/Pi from the alarm applet.
 
 Added KA/Pi multi sync to the multi sync called from the alarm applet.
  
 ********** VERSION 2.1.10 ************
 
 KO/Pi:
 Importing Birthdays will now create another file resource "Birthdays" and import the birthday data from KA/Pi into that file.
 When a multidayevent is selected in monthview all occurences of this event in the monthview are now hightlighted.
 Fixed a bug in searching for a small timerange, i.e. one day.
 
 KA/Pi:
 Fixed two problems in csv export.
 Fixed problems when calling the contact selection dialog from KO/Pi or OM/Pi.
 
 ********** VERSION 2.1.9 ************
 
 KO/Pi:
 Fixed some problems of the new search options in the search dialog.
 Fixed some problems in the new resource config options.
 Changed the recurrence edit of events and todos such that the recurrence edit page now is notified about a change of the start date on the first page.
 Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown:
 Now you can click on the bottom/top of an allday agenda item or on the left/right side of an agenda item to get the "new todo/new event" popup.
 
 Fixed a problem in recurrence range in syncing with DTM.
 
 KA/Pi:
 Made it posiible to show in the contact overview the details of all data available for that contact( e.g. office, spouse, children, nickname ...)
 
 PwM/Pi:
 Added "sec" to the timeout config settings to make it clear the timeout values are seconds.
 
 ********** VERSION 2.1.8 ************
 
 KO/Pi:
 Added info about the completion state of a todo in the ListView/Searchdialog.
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
@@ -700,97 +700,96 @@
 { "Local file:","Lokale Datei:" },
 { "Post sync (upload) command:","Nach Sync (upload) Kommando:" },
 { "Fill in default values for:","Setze Beispiel Werte ein für:" },
 { "Hint: Use $PWD$ for placeholder of password!","Hinweis: Benutze $PWD$ als Platzhalter für ein Passwort!" },
 { "Synchronization Preferences","Einstellungen der Synchronisationsprofile"},
 { "Device","Gerät:" },
 { "Sync with file \n...%1\nfrom:\n%2\n","Sync mit Datei \n...%1\nvom:\n%2\n" },
 { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n","Synchronisationsübersicht:\n\n %d items lokal hinzugefügt\n %d items entfernt hinzugefügt\n %d items lokal geändert\n %d items entfernt geändert\n %d items lokal gelöscht\n %d items entfernt gelöscht\n" },
 { "Synchronization successful","Synchronisation erfolgreich" },
 { "Sync cancelled or failed. Nothing synced.","Sync abgebrochen oder fehlgeschlagen. Nichts wurde gesynced." },
 { "Sync file \n...%1\ndoes not exist!\nNothing synced!\n","Sync Datei \n...%1\nexistiert nicht!\nNichts wurde gesynced!\n" },
 { "Sync filename(*.ics/*.vcs)","Sync Dateiname(*.ics/*.vcs)" },
 { "Enter password","Passwort eingeben" },
 { "Do you really want\nto remote sync\nwith profile \n","Wollen Sie wirklich\nmit dem entfernten\nProfil syncen: \n" },
 { "Copy remote file to local machine...","Kopiere entfernte Datei auf lokalen Rechner..." },
 { "Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n","Sorry, das Kopierkommando schlug fehl!\nKommando war:\n%1\n \nVersuche Kommando von Kosole um\nDetails für das Fehlschlagen\nzu erfahren.\n" },
 { "Writing back file result: ","Resultat des Dateizurückschreibens: " },
 { "Syncronization sucessfully completed","Synchronisation erfolgreich abgeschlossen" },
 { "Edit Calendar Filters","Editiere Kalendar Filter" },
 { "Enter filter name:","Neuer Filter Name:" },
 { "Add Filter","Filter hinzufügen" },
 { "Question","Frage" },
 { "Filter position: ","Filter Position: " },
 { "Month View","Monatsansicht" },
 { "This profil cannot be deleted!\n","Dieses Profil kann\nnicht gelöscht werden!" },
 { "KO/Pi config error","KO/Pi Konfig. Fehler" },
 { "Local device name undefined!\nPlease define device name!","Name dieses Gerätes undefiniert!\nBitte Namen angeben!" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile haben denselben Namen!\nBitte unterschiedliche Namen wählen!" },
 { "Access: ","Zugriff: " },
 { "Needs Action","Aktion notwendig" },
 { "Accepted","Akzeptiert" },
 { "Declined","Abgelehnt" },
 { "Tentative","Vorläufig" },
 { "Delegated","Beauftragt" },
 { "Completed","Vollständig" },
 { "In Process","In Bearbeitung" },
 { "Participant","Teilnehmer" },
 { "Optional Participant","Möglicher Teilnehmer" },
 { "Observer","Beobachter" },
 { "Chair","Vorsitzender" },
 { "Not supported \non desktop!\n","" },
 { "Nothing selected!\n\nThis prints the full width of the Agenda view as you see it!\n\nTo determine the vertical range of the printing, please select\na vertical range (with the left mouse button down) in one column. ","Es ist nichts selektiert!\nDieses druckt die volle Breite der Agenda View, so wie man sie sieht.\nUm die vertikale Auswahl zum Drucken zu bestimmen,\nbitte einen vertikalen Zeitraum (mit gedrückter linker Maustaste)\nin einer Spalte auswählen.\n(Es wird danach direkt der Termin Dialog angezeigt\n  -  dort bitte auf Abbrechen klicken) " },
 { "Date range: ","Datums Zeitspanne: " },
 { "Not supported \non  PDA!\n","Nicht verfügbar\nauf dem PDA. " },
 { "Syncing - close to abort!","Syncing-schließe um abzubrechen." },
 { "Add / remove events","Add./entferne Termine" },
 { "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" },
 { "Default","Standard" },
 { " Categories added to list! "," Kategorien zur Liste hinzugefügt! " },
 { "  %d items?","  %d Einträge?" },
 { "\nThis event recurs\nover multiple dates.\nAre you sure you want\nto delete this event\nand all its recurrences?","\nDieses ist ein\nwiederholender Termin!.\nSind Sie sicher, dass Sie\ndiesen Termin und alle\nWiederholungen löschen möchten?" },
 { " ?\n\nDelete:\n"," ?\n\nLösche:\n" },
 { "Current","Aktuelle" },
 { "\nThis event recurs\nover multiple dates.\nDo you want to delete\nall it's recurrences,\nor only the current one on:\n","\nDieses ist ein\nwiederholender Termin!\nMöchten sie alle Wiederholungen\nlöschen, oder nur die aktuelle am:\n" }, 
 { "All","Alle" },
 { "Data Loss Warning","Datenverlust Warnung" },
 { "Proceed","Weitermachen" },
 { "The journal entries can not be\nexported to a vCalendar file.","Die Journal Einträge können\nnicht in eine vCalendar\nDatei exportiert werden!" },
 { "Filter disabled ","Filter abgeschaltet" },
 { "Filter selected: ","Gewählter Filter: " },
 { "Toggle Cancel","Gecancelt ändern" },
 { "&Toggle Cancel","Gecancel&t ändern" },
 { "Configure Toolbar","Konfiguriere Toolbar" },
 { "Stretched TB","Gedehnte TB" },
 { "Import file \n...%1\ndoes not exist!\nNothing imported!\n","Import Datei \n...%1\nexistiert nicht!\nNichts importiert!\n" },
 { "Import filename(*.ics/*.vcs)","Import Dateiname(*.ics/*.vcs)" },
 { "When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing","Wenn ein Kalender doppelt importiert\nwird, werden doppelte Einträge ignoriert!\nSie können eine Backup Datei anlegen unter\nDatei - Speichere Kalender Backup\num den Import rückgängig machen zu können.\n" },
 { "Not supported \non desktop!\n","Nur verfügbar auf PDA!" },
 { "Imported file successfully","Datei erfolgreich importiert" },
 { "Error importing file","Fehler beim Importieren der Datei" },
 { "Export vcal filename(*.vcs)","Export vcal Dateiname(*.vcs)" },
 { "Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n","Zu speichernde Datei\existiert bereits!\nExist. Datei vom:\n%1\nÜberschreiben?\n" },
 { "Overwrite!","Überschreiben!" },
 { "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n","Import Datei \n...%1\nvom:\n%2\nDuplizierte Einträge\nwerden nicht importiert!\n" },
 { "Load backup filename","Lade Backup Dateiname" },
 { "Backup file\ndoes not exist!\nNothing loaded!","Backup Datei\nexistiert nicht!\nNichts geladen!" },
 { "KO/Pi:Loaded %1","KO/Pi:Geladen %1" },
 { "Save backup filename","Speichere Backup Dateiname" },
 { "Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n","Backup Datei\nexistiert bereits!\nAlte Backup Datei vom:\n%1\nÜberschreiben?\n" },
 { "KO/Pi:Saved %1","KO/Pi:Gespeichert %1" },
 { "Details of attendee","Teilnehmerdetails" },
 { "Work phone:\n","Telefon Arbeit:\n" },
 { "Work mobile phone:\n","Mobiltelefon Arbeit:\n" },
 { "Home phone:\n","Telefon privat:\n" },
 { "Mobile home phone:\n","Mobiltelefon privat:\n" },
 { "Email:\n","Email:\n" },
 { "Alarm disabled for this item","Alarm deaktiviert für dieses Item" },
 { "Audio Al.: ","Audio Al.: " },
 { "Proc.Al.: ","Proz.Al.: " },
 { "No sound set","Kein Sound definiert" },
 { "*.wav|Wav Files","*.wav|Wav Dateien" },
 { "No program set","Kein Programm definiert" },
 { "Running '%1'","Ausführen '%1'" },
@@ -1443,55 +1442,55 @@
 { "male","männlich" },
 { "female","weiblich" },
 { "Hide!","Verbergen!" },
 { "Show!","Anzeigen!" },
 { "Details","Details" },
 { "Profession","Beruf" },
 { "Children","Kinder" },
 { "Department","Abteilung" },
 { "Backup cancelled","Backup abgebrochen" },
 { "Backup globally disabled","Backup global abgeschaltet" },
 { "Backup succesfully finished","Backup erfolgreich beendet" },
 { "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" },
 { "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" },
 { "Birthdays","Geburtstage" },
 { "KO/Pi import information!","KO/Pi Import Information!" },
 { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" },
 { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, 
 { "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" },
 { "Reload","Neu laden" },
 { "Timezone settings","Zeitzoneneinstellung" },
 { "Title: ","Titel: " },
 { "Journal from: ","Journal vom: " },
 { "Journal: %1 from ","Journal: %1 vom " },
 { "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" },
 { "Selected Item","Ausgewähltes Item" },
 { "Select Date...","Wähle Datum..." },
 { "After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:","Nach dem Importieren/Laden/Syncen kann es neue Kategorien in den Terminen oder Todos geben, die nicht automatisch der Kategorieliste hinzugefügt werden. Bitte wählen Sie, was <b>jetzt</b> passieren soll:" },
 { "Change category list now!","Ändere Kategorieliste jetzt!" },
 { "Edit category list...","Ändere Kategorieliste..." },
 { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" },
 { "Filepath: ","Dateipfad: " },
 { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" },
 { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" },
 { "Pending Suspend Alarm","Laufender Suspend Alarm" },
 { "Error loading calendar %1","Fehler beim Laden von Kalender %1" },
 { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" },
 { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" },
 { "Alarm Options","Alarm Einstellungen" },
 { "Delete selected...","Lösche Ausgewählte..." },
 { "None","Nichts" },
 { "Selection","Auswahl" },
 { "Set categories","Setze Kategorien" },
 { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" },
 { "Reset","Neu setzen" },
 { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" },
 { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" },
 { "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" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
-{ "","" },
\ 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
@@ -2051,97 +2051,97 @@ void CalendarView::watchSavedFile()
   QDateTime dt = finf.lastModified ();
   if ( dt < loadedFileVersion ) {
       //qDebug("watch %s %s ",  dt.toString().latin1(), loadedFileVersion.toString().latin1());
     QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile()  ) );
     return;
   }
   loadedFileVersion = dt;
 }
 bool CalendarView::checkAllFileVersions()
 {
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     mCalendar->setDefaultCalendar( 1 ); 
     mCalendar->setDefaultCalendarEnabledOnly();
     if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
         if ( !checkFileVersion(MainWindow::defaultFileName())) {
             restoreCalendarSettings();
             return false;
         }
     }
     cal = calendars.next();
     QDateTime storeTemp = loadedFileVersion;
     while ( cal ) {
         if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
             mCalendar->setDefaultCalendar( cal->mCalNumber ); 
             mCalendar->setDefaultCalendarEnabledOnly();
             loadedFileVersion = cal->mLoadDt.addSecs( 15 );
             if ( !checkFileVersion(cal->mFileName )) {
                 loadedFileVersion = storeTemp;
                 restoreCalendarSettings();
                 return false;
             }
         }
         cal = calendars.next();
     }
     loadedFileVersion = storeTemp;
     return true;
 }
 bool CalendarView::checkFileVersion(QString fn)
 {
     QFileInfo finf ( fn );  
     if ( !finf.exists() )
         return true;
     QDateTime dt = finf.lastModified ();
     qDebug("loaded file version %s %s", fn.latin1(), loadedFileVersion.toString().latin1());
     qDebug("file on disk version  %s %s", fn.latin1(),dt.toString().latin1());
     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"));
    
    if ( km ==  KMessageBox::Cancel )
        return false;
    if ( km ==  KMessageBox::Yes )
        return true;
 
     setSyncDevice("deleteaftersync" );
     mSyncManager->mAskForPreferences = true;
     mSyncManager->mSyncAlgoPrefs = 3;
     mSyncManager->mWriteBackFile = false;
     mSyncManager->mWriteBackExistingOnly = false;
     mSyncManager->mShowSyncSummary = false;
     syncCalendar( fn, 3 );
     Event * e = getLastSyncEvent();
     if ( e )
         mCalendar->deleteEvent( e );
     return true;
 }
 bool CalendarView::saveCalendars()
 {
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     mCalendar->setDefaultCalendar( 1 ); 
     mCalendar->setDefaultCalendarEnabledOnly();
     saveCalendar( MainWindow::defaultFileName() );
     cal = calendars.next();
     while ( cal ) {
         if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
             mCalendar->setDefaultCalendar( cal->mCalNumber ); 
             mCalendar->setDefaultCalendarEnabledOnly();
             if ( saveCalendar( cal->mFileName ) )
                 cal->mLoadDt = QDateTime::currentDateTime();
         }
         cal = calendars.next();
     }
     restoreCalendarSettings();
     return true;
 }
 bool CalendarView::saveCalendar( QString filename )
 {
  
     // Store back all unsaved data into calendar object
     // qDebug("file %s %d ",  filename.latin1()           , mViewManager->currentView()         );
     if ( mViewManager->currentView() )
         mViewManager->currentView()->flushView();
 
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 874fc6a..4322299 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -1,75 +1,76 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KOFILTERVIEW_H
 #define KOFILTERVIEW_H
 
 #include <qstring.h>
 #include <qcheckbox.h>
+#include <qapplication.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qscrollview.h>
 #include <qpushbutton.h>
 #include <kconfig.h>
 #include "kofilterview_base.h"
 
 #include <libkcal/calfilter.h>
 
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
 class QGridLayout;
 
 using namespace KCal;
 
 class KONewCalPrefs : public QDialog
 {
     Q_OBJECT 
   public:
     KONewCalPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Add new Calendar") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("<b>Name of new calendar:</b>"), this );
         lay->addWidget( lab ); 
         nameE = new KLineEdit( this );
         lay->addWidget( nameE ); 
         lab = new QLabel( i18n("<b>Local ical (*.ics) file:</b>"), this );
         lay->addWidget( lab ); 
         url = new KURLRequester ( this );
         lay->addWidget( url ); 
         QPushButton * ok = new QPushButton( i18n("OK"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( checkValid() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         int minwid = 220;
         if ( QApplication::desktop()->width() >= 320 ) minwid = 300;
         setMinimumWidth(  minwid );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 264cf28..4fc447e 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1747,121 +1747,123 @@ void KOMonthView::updateView()
         //insertTodo( todo );
         if ( todo->hasDueDate() ) {
             int day = mStartDate.daysTo( todo->dtDue().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
                 (*cells)[day]->insertTodo( todo );
             }
         }
     }
 
     for( i = 0; i < timeSpan+1; ++i ) {
         (*cells)[i]->finishUpdateCell();
     }
     processSelectionChange();
     //qApp->processEvents();
      for( i = 0; i < timeSpan+1; ++i ) {
          //(*cells)[i]->repaintfinishUpdateCell();
          QTimer::singleShot( 0, (*cells)[i], SLOT ( repaintfinishUpdateCell() ) );
     }
      setKeyBFocus();
 #else
     // old code
     //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
     int i;
     for( i = 0; i < (*cells).count(); ++i ) {
         (*cells)[i]->updateCell();
     }
  
     //qDebug("KOMonthView::updateView() ");
     processSelectionChange();
     // qDebug("---------------------------------------------------------------------+ ");
     (*cells)[0]->setFocus();
 #endif
 
     //qDebug("update time %d ", ti.elapsed());
 }
 
 void KOMonthView::setKeyBoardFocus()
 {
     //qDebug("KOMonthView::setKeyBoardFocus() ");
     bool shootAgain = false;
     if ( mShowWeekView ) {
         shootAgain = !mWeekLabelsW[1]->hasFocus();
          mWeekLabelsW[1]->setFocus();
     }
     else {
         shootAgain = !mWeekLabels[mNumWeeks]->hasFocus();
          mWeekLabels[mNumWeeks]->setFocus();
     }
-    if ( shootAgain ) {
-      QTimer::singleShot( 0, this, SLOT ( setKeyBFocus() ) );
+    --mKBFcounter;
+    if ( shootAgain && mKBFcounter > 0 ) {
+      QTimer::singleShot( 50, this, SLOT ( setKeyBoardFocus() ) );
     }
 }
 void KOMonthView::setKeyBFocus()
 {
     //qDebug("KOMonthView::setKeyBFocus() ");
+    mKBFcounter = 10;
     QTimer::singleShot( 0, this, SLOT ( setKeyBoardFocus() ) );
 }
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
     if ( isVisible() ) {
         //qDebug("KOMonthView::isVisible ");
         slotComputeLayout();
     } else
         mComputeLayoutTimer->start( 100 );
 }
 
 void KOMonthView::slotComputeLayout()
 {
     mComputeLayoutTimer->stop();
     //qDebug("KOMonthView::Post - resizeEvent %d %d ", width(), height() );
     computeLayout();
-    clPending = true;  
+    clPending = true;
     setKeyBFocus();
 }
 void KOMonthView::computeLayoutWeek()
 {
     static int lastWid = 0;
     static int lastHei = 0;
     int daysToShow;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
 
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
         return;
      
     if ( lastWid == width() && lastHei == height() ) {
         //qDebug("KOListWeekView::No compute layout needed ");
         return;
     }
     lastWid = width();
     lastHei = height();
 
 
     if ( wid < hei )
         daysToShow = 2;
     else
         daysToShow = 3;
     mShowSatSunComp = true;
     combinedSatSun  = true;
         
     //qDebug("KOMonthView::computeLayout() WWW ------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabelsW[0]->sizeHint().height();
     int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1;
     //qDebug("rowmod %d ", rowModulo);
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 0bd6b1c..a41eb54 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -233,113 +233,114 @@ public slots:
 
 
 class KOMonthView: public KOEventView
 {
     Q_OBJECT
   public:
     KOMonthView(Calendar *cal, QWidget *parent = 0, const char *name = 0 );
     ~KOMonthView();
 
     /** Returns maximum number of days supported by the komonthview */
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
     virtual int currentDateCount();
 
     /** returns the currently selected events */
     virtual QPtrList<Incidence> selectedIncidences();
 
     /** returns dates of the currently selected events */
     virtual DateList selectedDates();
 
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
     bool isMonthView() { return !mShowWeekView; }
     bool isUpdatePossible() { return updatePossible; }
 
     MonthViewCell * selectedCell();
     bool skipResize; 
     NavigatorBar* navigatorBar() { return mNavigatorBar ;}
     void clearList();
   public slots:
     void incidenceHighlighted( Incidence *, MonthViewCell*, int );
     void nextCell();
     void prevCell();
     virtual void updateView();
     virtual void updateConfig();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
 
     void clearSelection();
 
     void showContextMenu( Incidence * );
 
     void setSelectedCell( MonthViewCell * );
     void setPopupCell( MonthViewCell * );
     void switchView();
-    void setKeyBoardFocus();
     void setKeyBFocus();
 
   protected slots:
+    void setKeyBoardFocus();
     void slotNewTodo();
     void slotNewEvent();
     void slotEditJournal();
     void slotComputeLayout();
     void selectInternalWeekNum ( int );
     void processSelectionChange();
  signals:
     void nextMonth();
     void prevMonth();
     void selectWeekNum ( int );
     void selectMonth ();
     void showDaySignal( QDate );
     void newTodoSignal( QDateTime, bool );
     void showJournalSignal( int,QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
 
   private:
+    int mKBFcounter;
     QTimer* mComputeLayoutTimer;
     NavigatorBar* mNavigatorBar;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
     int mNumCells;
     //bool mWeekStartsMonday;
     bool mShowSatSunComp;
     void computeLayout();
     void computeLayoutWeek();
 
     QPtrVector<MonthViewCell> mCells;
     QPtrVector<QLabel> mDayLabels;
     QPtrVector<KOWeekButton> mWeekLabels;
     QPtrVector<MonthViewCell> mCellsW;
     QPtrVector<QLabel> mDayLabelsW;
     QPtrVector<KOWeekButton> mWeekLabelsW;
 
     bool mShortDayLabelsM;
     bool mShortDayLabelsW;
     int mWidthLongDayLabel;
 
     QDate mStartDate;
 
     MonthViewCell *mSelectedCell;
     MonthViewCell *mPopupCell;
     bool mFlagKeyPressed;
     KOEventPopupMenu *mContextMenu;
     QPopupMenu *mNewItemMenu;
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
 
 };
 
 #endif
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 862d437..f68f032 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1867,124 +1867,129 @@ void MainWindow::slotModifiedChanged( bool )
     mSaveTimer.start( msec, true ); // 1 minute
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
 }
 void MainWindow::backupAllFiles()
 {
     QDate reference ( 2000,1,1);
     int daysTo = reference.daysTo ( QDate::currentDate() );
     setCaption(i18n("Creating backup ... please wait ..." ));
     qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate);
     // we need the file path, the backup dir and the number of bups as param
     QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
     if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
         bupDir = KGlobalSettings::backupDataDir();
     int retval =  KApplication::createBackup(  defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
     if ( retval == 0 ) {
         setCaption(i18n("Backup cancelled" ));
         qDebug("KO: Backup cancelled. Will try again tomorrow ");
         // retval == 0 : backup skipped for today, try again tomorrow
         KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
     } else if ( retval == 1 ){
         qDebug("KO: Backup created.");
         // backup ok
         QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
         KopiCalendarFile * cal = calendars.first();
         cal = calendars.next();
         while ( cal ) {
             if ( !cal->mErrorOnLoad ) {
                 KApplication::createBackup(  cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );  
             }
             cal = calendars.next();
         }
         KOPrefs::instance()->mLastBackupDate =  daysTo;
         setCaption(i18n("Backup succesfully finished" ));
     } else if ( retval == 2 ){
         setCaption(i18n("Backup globally disabled" ));
         qDebug("KO: Backup globally cancelled.");
         // backup globally cancelled
         KPimGlobalPrefs::instance()->mBackupEnabled = false;
     }
     // retval == 3: do nothing, try again later
 }
 void MainWindow::save()
 {
+
     if ( mView->viewManager()->journalView() )
         mView->viewManager()->journalView()->checkModified();
     if ( !mCalendarModifiedFlag ) {
         qDebug("KO: Calendar not modified. Nothing saved.");
         return;
     }
     if ( mSyncManager->blockSave() )
         return;
     mSyncManager->setBlockSave(true);
     if ( mView->checkAllFileVersions() ) {
         if ( KPimGlobalPrefs::instance()->mBackupEnabled ){
             QDate reference ( 2000,1,1);
             int daysTo = reference.daysTo ( QDate::currentDate() );
             if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) {
                 backupAllFiles();
             }
             ; //  KPimGlobalPrefs::instance()->mLastBackupDate
         }
         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();
         mCalendarModifiedFlag = false;
         int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
         qDebug("KO: Needed %d ms for saving.",msNeeded );
         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!"));
     mSyncManager->setBlockSave( false );
 }
 
 void MainWindow::keyReleaseEvent ( QKeyEvent * e)
 {
     if ( !e->isAutoRepeat() ) {
         mFlagKeyPressed = false;
     }
 }
 void MainWindow::keyPressEvent ( QKeyEvent * e )
 {
     qApp->processEvents();
     if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
         e->ignore();
         // qDebug("  ignore  %d",e->isAutoRepeat()  );
         return;
     }
     if (! e->isAutoRepeat() )
         mFlagKeyPressed = true;
     KOPrefs *p = KOPrefs::instance();
     bool showSelectedDates = false;
     int size;
     int pro = 0;
     //qDebug("MainWindow::keyPressEvent ");
     switch ( e->key() ) {
     case Qt::Key_Right:
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
             mView->goNextMonth();
         else
             mView->goNext();
         showSelectedDates = true;
         break;
     case Qt::Key_Left:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->goPreviousMonth();
         else
             mView->goPrevious();
         showSelectedDates = true;
         break;
     case Qt::Key_Down:
         mView->viewManager()->agendaView()->scrollOneHourDown();
         break;
     case Qt::Key_Up:
         mView->viewManager()->agendaView()->scrollOneHourUp();
         break;
     case Qt::Key_K: