| -rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/kofilterview.h | 1 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 6 | ||||
| -rw-r--r-- | korganizer/komonthview.h | 3 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 5 |
5 files changed, 13 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 678143d..5c88abd 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -2095,9 +2095,9 @@ bool CalendarView::checkFileVersion(QString fn) 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 ) diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index 874fc6a..4322299 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h @@ -24,8 +24,9 @@ #define KOFILTERVIEW_H #include <qstring.h> #include <qcheckbox.h> +#include <qapplication.h> #include <qradiobutton.h> #include <qlayout.h> #include <qlabel.h> #include <qdialog.h> diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 264cf28..4fc447e 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -1791,15 +1791,17 @@ void KOMonthView::setKeyBoardFocus() 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) { diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 0bd6b1c..a41eb54 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -277,12 +277,12 @@ 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(); void slotComputeLayout(); @@ -301,8 +301,9 @@ class KOMonthView: public KOEventView void viewChanged(); void updateDayLabels(); private: + int mKBFcounter; QTimer* mComputeLayoutTimer; NavigatorBar* mNavigatorBar; int currentWeek(); bool clPending; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 862d437..f68f032 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1911,8 +1911,9 @@ void MainWindow::backupAllFiles() // 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."); @@ -1930,17 +1931,21 @@ void MainWindow::save() } ; // KPimGlobalPrefs::instance()->mLastBackupDate } QTime neededSaveTime = QDateTime::currentDateTime().time(); + 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 ); + if ( !isMinimized () ) setCaption(savemes); + else + qDebug(savemes); } else setCaption(i18n("Saving cancelled!")); mSyncManager->setBlockSave( false ); } |