| -rw-r--r-- | korganizer/mainwindow.cpp | 75 | ||||
| -rw-r--r-- | korganizer/mainwindow.h | 4 |
2 files changed, 62 insertions, 17 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index c597138..66bb19b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -167,12 +167,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : p.drawRect( 0,0,11,11); p.drawLine( 2,3,5,3); p.drawLine( 2,5,8,5); p.drawLine( 2,7,6,7); } } + mAutoSaveDisabled = false; mClosed = false; //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; QString confFile = locateLocal("config","korganizerrc"); QFileInfo finf ( confFile ); bool showWarning = !finf.exists(); setIcon(SmallIcon( "ko24" ) ); @@ -534,39 +535,57 @@ bool MainWindow::askForQuitOnSaveError() break; default: break; } return retval; } - +bool MainWindow::checkAutosave() +{ + bool savedata = true; + if ( mAutoSaveDisabled && mCalendarModifiedFlag ) { + switch( QMessageBox::information( this, "KO/Pi", + i18n("Calendar is modified\nbut Autosave is disabled!\nDo you want\nto save the data?"), + i18n("Yes, Save!"), i18n("No"), + 0, 0 ) ) { + case 1: + case 2: + savedata = false; + break; + default: + break; + } + } + return savedata; +} void MainWindow::closeEvent( QCloseEvent* ce ) { - - - if ( ! KOPrefs::instance()->mAskForQuit ) { - saveOnClose(); - if ( mCalendarModifiedFlag && !askForQuitOnSaveError() ) { - ce->ignore(); - return; + if ( checkAutosave() ) { + saveOnClose(); + if ( mCalendarModifiedFlag && !askForQuitOnSaveError() ) { + ce->ignore(); + return; + } } mClosed = true; ce->accept(); return; } switch( QMessageBox::information( this, "KO/Pi", i18n("Do you really want\nto close KO/Pi?"), i18n("Close"), i18n("No"), 0, 0 ) ) { - case 0: - saveOnClose(); - if ( mCalendarModifiedFlag && !askForQuitOnSaveError() ) { - ce->ignore(); - return; + case 0: + if ( checkAutosave() ) { + saveOnClose(); + if ( mCalendarModifiedFlag && !askForQuitOnSaveError() ) { + ce->ignore(); + return; + } } mClosed = true; ce->accept(); break; case 1: ce->ignore(); @@ -1654,12 +1673,13 @@ void MainWindow::keyBindings() { QString cap = i18n("KO/Pi Keys + Colors"); QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") + i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") + + i18n("<p><b>C+ctrl</b>: Dis/enable automatic saving</p>\n") + i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ i18n("<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n")+ i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+ @@ -1969,31 +1989,43 @@ void MainWindow::saveOnClose() void MainWindow::slotModifiedChanged( bool ) { if ( mBlockAtStartup ) return; int msec; + if ( mAutoSaveDisabled ) { + QTimer::singleShot( 0, this , SLOT ( autoSaveWarning() ) ); + qDebug("KO: Autosave disabled (data change deteced)!"); + } if ( mCalendarModifiedFlag ) { //qDebug(" MainWindow timer is running "); return; } + mCalendarModifiedFlag = true; + if ( mAutoSaveDisabled ) { + return; + } // we store the changes after 1 minute, // and for safety reasons after 10 minutes again if ( !mSyncManager->blockSave() ) msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000; else msec = 1000 * 600; mSaveTimer.start( msec, true ); // 1 minute mSaveTimerStart = QDateTime::currentDateTime(); mSaveDelay = msec/1000; qDebug("KO: Saving File in %d secs!", msec/1000); - mCalendarModifiedFlag = true; +} +void MainWindow::autoSaveWarning() +{ + setCaption(i18n("Autosave disabled!" )); } void MainWindow::saveStopTimer() { mSaveTimer.stop(); + mSaveDelay = 0; } void MainWindow::backupAllFiles() { QDate reference ( 2000,1,1); int daysTo = reference.daysTo ( QDate::currentDate() ); setCaption(i18n("Creating backup ... please wait ..." )); @@ -2204,14 +2236,25 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) case Qt::Key_N: mView->viewManager()->showNextView(); break; case Qt::Key_V: mView->viewManager()->showTodoView(); break; - case Qt::Key_C: - mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() ); + case Qt::Key_C: + if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) { + if ( mAutoSaveDisabled ) { + mAutoSaveDisabled = false; + setCaption(i18n("Autosave enabled!" )); + return; + } else { + mAutoSaveDisabled = true; + saveStopTimer(); + setCaption(i18n("Autosave disabled! Save timer stopped!" )); + } + } else + mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() ); break; case Qt::Key_P: mView->showDatePicker( ); break; case Qt::Key_F: mView->editFilters(); diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 71c069b..d8018b6 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -49,12 +49,13 @@ class MainWindow : public QMainWindow void updateFilterToolbar(); virtual void showMaximized (); void configureAgenda( int ); void recieve( const QCString& msg, const QByteArray& data ); void receiveStart( const QCString& msg, const QByteArray& data ); protected slots: + void autoSaveWarning(); void loadDataAfterStart(); void calHint(); void startMultiSync(); void setCaptionToDates(); void weekAction(); void about(); @@ -118,13 +119,14 @@ class MainWindow : public QMainWindow QString sentSyncFile(); void displayText( QString, QString); void enableIncidenceActions( bool ); bool askForQuitOnSaveError(); private: - + bool mAutoSaveDisabled; + bool checkAutosave(); QCString mCStringMess; QByteArray mByteData; //void setMenuBar( QMenuBar * ); bool mBRdisabled; #ifndef DESKTOP_VERSION |