From c6e493d4e5b9eafcc3402c39e30c4283ce8cc8e5 Mon Sep 17 00:00:00 2001 From: zautrix Date: Sun, 18 Sep 2005 13:50:46 +0000 Subject: delay --- diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 2c0d626..6f76c7e 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -139,7 +139,7 @@ { "Deselect all","Deselektiere Alle" }, { "Details","Details" }, { "Dinner","Abendessen" }, -{ "Do you really want\nto close KO/Pi?","Möchten Sie wirklich\nKO/PI verlassen?" }, +{ "Do you really want\nto close KO/Pi?","Möchten Sie wirklich\nKO/PI beenden?" }, { "Due Date","Fällig am" }, { "Due: ","Fällig: "}, { "Due Time","Fällig um" }, @@ -769,6 +769,7 @@ { "Imported file successfully","Datei erfolgreich importiert" }, { "Error importing file","Fehler beim Importieren der Datei" }, { "Export vcal filename(*.vcs)","Export vcal Dateiname(*.vcs)" }, +{ "Export iCal filename(*.ics)","Export iCal Dateiname(*.ics)" }, { "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" }, @@ -1558,9 +1559,9 @@ { "Show multiday allday ev. in date nav.","Zeige Multi-Ganzt.Term.in Datums Nav." }, { "Include events which "show as free"","Inklusive Termine mit "Zeige Zeit als frei"" }, { "Conflict detection checks an edited event with other events for overlapping.","Konflikterkennung prüft einen bearbeiteten Termin auf Überschneidungen mit anderen Terminen." }, -{ "","" }, -{ "","" }, -{ "","" }, +{ " Yes, close "," Ja, beenden " }, +{ "Export All Data","Exportiere alle Daten" }, +{ "You can save all data\nto another file via\nFile->Export->Export All Data","Sie können alle Daten in\neine andere Datei speichern unter\nDatei->Exportiere->Exportiere alle Daten" }, { "","" }, { "","" }, { "","" }, diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index 2acfacf..a0ac232 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp @@ -67,14 +67,6 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent ) mPopUp->insertSeparator(); mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) ); mTimerPopUp = new QPopupMenu( this ); - QFont fon = mTimerPopUp->font(); - int points = 16; - if ( QApplication::desktop()->width() < 480 ) - points = 12; - fon.setPointSize( points ); - //qDebug("point s %d ", fon.pointSize()); - mTimerPopUp->setFont( fon ); - mPopUp->setFont( fon ); mBeepPopUp = new QPopupMenu( this ); mSoundPopUp = new QPopupMenu( this ); mPausePopUp = new QPopupMenu( this ); diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 79fb727..2ba8528 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -2547,6 +2547,7 @@ bool CalendarView::saveCalendars() cal = calendars.next(); } restoreCalendarSettings(); + //saveError = "test error"; if ( !saveError.isEmpty() ) { saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError; KMessageBox::error(this, saveError, i18n("Error saving data")); @@ -4463,16 +4464,18 @@ void CalendarView::printPreview() tmpDateList.last()); #endif } - -void CalendarView::exportICalendar() +bool CalendarView::exportICalendar( QString filename ) { - QString filename = KFileDialog::getSaveFileName("icalout.ics",i18n("*.ics|ICalendars"),this); - // Force correct extension if (filename.right(4) != ".ics") filename += ".ics"; FileStorage storage( mCalendar, filename, new ICalFormat() ); - storage.save(); + return storage.save(); +} + +bool CalendarView::exportICalendar() +{ + return exportICalendar( KFileDialog::getSaveFileName("icalout.ics",i18n("*.ics|ICalendars"),this) ); } bool CalendarView::exportVCalendar( QString filename ) diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index b223315..8670832 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -376,7 +376,8 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser void printPreview(); /** Export as iCalendar file */ - void exportICalendar(); + bool exportICalendar(); + bool exportICalendar( QString fn ); /** Export as vCalendar file */ bool exportVCalendar( QString fn); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 2af605f..98d3e35 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -523,6 +523,25 @@ void MainWindow::showMaximized () QWidget::showMaximized () ; mClosed = false; } + +bool MainWindow::askForQuitOnSaveError() +{ + bool retval = false; + switch( QMessageBox::information( this, "KO/Pi", + i18n("Error saving data") + "!\n" + + i18n("You can save all data\nto another file via\nFile->Export->Export All Data") + "!\n" + + i18n("Do you really want\nto close KO/Pi?"), + i18n(" Yes, close "), i18n("No"), + 0, 1 ) ) { + case 0: + retval = true; + break; + default: + break; + } + return retval; +} + void MainWindow::closeEvent( QCloseEvent* ce ) { @@ -530,7 +549,7 @@ void MainWindow::closeEvent( QCloseEvent* ce ) if ( ! KOPrefs::instance()->mAskForQuit ) { saveOnClose(); - if ( mCalendarModifiedFlag ) { + if ( mCalendarModifiedFlag && !askForQuitOnSaveError() ) { ce->ignore(); return; } @@ -546,7 +565,7 @@ void MainWindow::closeEvent( QCloseEvent* ce ) 0, 0 ) ) { case 0: saveOnClose(); - if ( mCalendarModifiedFlag ) { + if ( mCalendarModifiedFlag && !askForQuitOnSaveError() ) { ce->ignore(); return; } @@ -1165,6 +1184,10 @@ void MainWindow::initActions() importMenu->insertSeparator(); importMenu->insertItem( i18n("Import"), importMenu_X ); //importMenu->insertSeparator(); + action = new QAction( "export ical", i18n("Export All Data"), 0, + this ); + action->addTo( exportMenu_X ); + connect( action, SIGNAL( activated() ), SLOT( exportICalendar() ) ); action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, this ); action->addTo( exportMenu_X ); @@ -1967,7 +1990,7 @@ void MainWindow::slotModifiedChanged( bool ) else msec = 1000 * 600; mSaveTimer.start( msec, true ); // 1 minute - mSaveTime.restart(); + mSaveTimerStart = QDateTime::currentDateTime(); mSaveDelay = msec/1000; qDebug("KO: Saving File in %d secs!", msec/1000); mCalendarModifiedFlag = true; @@ -2017,12 +2040,14 @@ void MainWindow::backupAllFiles() void MainWindow::save() { if ( mSaveDelay ) { - if ( mSaveDelay + 60 < mSaveTime.elapsed()/1000 ) { - qDebug("KO: Save delay %d. Elapsed save time %d ", mSaveDelay, mSaveTime.elapsed()/1000 ); - qDebug("KO: Restarting save timer"); - int msec = 10000; - mSaveTimer.start( msec, true ); // 1 minute - mSaveTime.restart(); + int elapsed = mSaveTimerStart.secsTo( QDateTime::currentDateTime() ); + if ( mSaveDelay < elapsed ) { + qDebug("KO: Pending save after wakeup from suspend detected."); + qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed ); + qDebug("KO: Restarting save timer to save in 15 sec."); + int msec = 15000; + mSaveTimer.start( msec, true ); + mSaveTimerStart = QDateTime::currentDateTime(); mSaveDelay = msec/1000; return; } @@ -2575,11 +2600,15 @@ void MainWindow::importIcal() importFile( fn, true ); } - -void MainWindow::exportVCalendar() +void MainWindow::exportCalendar( bool iCalFormat ) { QString fn = KOPrefs::instance()->mLastVcalFile; - fn = KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this ); + if ( iCalFormat ) { + fn = QDir::homeDirPath()+"/kopiexport.ics"; + fn = KFileDialog::getSaveFileName( fn, i18n("Export iCal filename(*.ics)"), this ); + } + else + fn = KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this ); if ( fn == "" ) return; QFileInfo info; @@ -2596,8 +2625,12 @@ void MainWindow::exportVCalendar() } } if ( createbup ) { - if ( mView->exportVCalendar( fn ) ) { - KOPrefs::instance()->mLastVcalFile = fn; + bool success = false; + if ( iCalFormat ) + success = mView->exportICalendar( fn ); + else + success = mView->exportVCalendar( fn ); + if ( success ) { if ( fn.length() > 20 ) mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ; else @@ -2607,6 +2640,14 @@ void MainWindow::exportVCalendar() } } +void MainWindow::exportICalendar() +{ + exportCalendar( true ); +} +void MainWindow::exportVCalendar() +{ + exportCalendar( false ); +} QString MainWindow::sentSyncFile() { #ifdef DESKTOP_VERSION diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 657c0a8..71c069b 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -93,6 +93,8 @@ class MainWindow : public QMainWindow void saveCalendar(); void loadCalendar(); void exportVCalendar(); + void exportICalendar(); + void exportCalendar( bool ); void fillFilterMenu(); void fillFilterMenuTB(); void selectFilter( int ); @@ -116,6 +118,7 @@ class MainWindow : public QMainWindow QString sentSyncFile(); void displayText( QString, QString); void enableIncidenceActions( bool ); + bool askForQuitOnSaveError(); private: @@ -174,7 +177,7 @@ class MainWindow : public QMainWindow void closeEvent( QCloseEvent* ce ); QTimer mSaveTimer; - QTime mSaveTime; + QDateTime mSaveTimerStart; int mSaveDelay; //bool mBlockSaveFlag; bool mCalendarModifiedFlag; -- cgit v0.9.0.2