| -rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/kofilterview.h | 1 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 8 | ||||
| -rw-r--r-- | korganizer/komonthview.h | 3 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 9 |
5 files changed, 16 insertions, 7 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 678143d..5c88abd 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -2098,3 +2098,3 @@ bool CalendarView::checkFileVersion(QString fn) 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"), diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index 874fc6a..4322299 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h @@ -27,2 +27,3 @@ #include <qcheckbox.h> +#include <qapplication.h> #include <qradiobutton.h> diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 264cf28..4fc447e 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -1794,4 +1794,5 @@ void KOMonthView::setKeyBoardFocus() } - if ( shootAgain ) { - QTimer::singleShot( 0, this, SLOT ( setKeyBFocus() ) ); + --mKBFcounter; + if ( shootAgain && mKBFcounter > 0 ) { + QTimer::singleShot( 50, this, SLOT ( setKeyBoardFocus() ) ); } @@ -1801,2 +1802,3 @@ void KOMonthView::setKeyBFocus() //qDebug("KOMonthView::setKeyBFocus() "); + mKBFcounter = 10; QTimer::singleShot( 0, this, SLOT ( setKeyBoardFocus() ) ); @@ -1818,3 +1820,3 @@ void KOMonthView::slotComputeLayout() 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 @@ -280,3 +280,2 @@ class KOMonthView: public KOEventView void switchView(); - void setKeyBoardFocus(); void setKeyBFocus(); @@ -284,2 +283,3 @@ class KOMonthView: public KOEventView protected slots: + void setKeyBoardFocus(); void slotNewTodo(); @@ -304,2 +304,3 @@ class KOMonthView: public KOEventView private: + int mKBFcounter; QTimer* mComputeLayoutTimer; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 862d437..f68f032 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1914,2 +1914,3 @@ void MainWindow::save() { + if ( mView->viewManager()->journalView() ) @@ -1933,3 +1934,4 @@ 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!"); @@ -1941,3 +1943,6 @@ void MainWindow::save() 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 |