From 58a4e6e5dcc24e2f5c17ef9f0e6879d625b5f764 Mon Sep 17 00:00:00 2001 From: zautrix Date: Sat, 02 Jul 2005 07:02:47 +0000 Subject: fixes --- 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,5 +1,13 @@ 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: 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 @@ -745,7 +745,6 @@ { "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" }, @@ -1488,10 +1487,10 @@ { "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 @@ -2096,7 +2096,7 @@ bool CalendarView::checkFileVersion(QString fn) 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")); diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index 874fc6a..4322299 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 264cf28..4fc447e 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -1792,13 +1792,15 @@ void KOMonthView::setKeyBoardFocus() 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) @@ -1816,7 +1818,7 @@ void KOMonthView::slotComputeLayout() mComputeLayoutTimer->stop(); //qDebug("KOMonthView::Post - resizeEvent %d %d ", width(), height() ); computeLayout(); - clPending = true; + clPending = true; setKeyBFocus(); } void KOMonthView::computeLayoutWeek() diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 0bd6b1c..a41eb54 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -278,10 +278,10 @@ class KOMonthView: public KOEventView void setSelectedCell( MonthViewCell * ); void setPopupCell( MonthViewCell * ); void switchView(); - void setKeyBoardFocus(); void setKeyBFocus(); protected slots: + void setKeyBoardFocus(); void slotNewTodo(); void slotNewEvent(); void slotEditJournal(); @@ -302,6 +302,7 @@ class KOMonthView: public KOEventView void updateDayLabels(); private: + int mKBFcounter; QTimer* mComputeLayoutTimer; NavigatorBar* mNavigatorBar; int currentWeek(); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 862d437..f68f032 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1912,6 +1912,7 @@ void MainWindow::backupAllFiles() } void MainWindow::save() { + if ( mView->viewManager()->journalView() ) mView->viewManager()->journalView()->checkModified(); if ( !mCalendarModifiedFlag ) { @@ -1931,7 +1932,8 @@ void MainWindow::save() ; // 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; @@ -1939,7 +1941,10 @@ void MainWindow::save() 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 ); -- cgit v0.9.0.2