author | zautrix <zautrix> | 2004-10-08 13:31:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-08 13:31:08 (UTC) |
commit | ec5bc1b8c708b55884f1e03861204123de097129 (patch) (unidiff) | |
tree | 0c5c8a341fd69ed9b45a22a42b9445da8b56a5e8 | |
parent | 38e390e51967b34d53e19bd275efd1760572cdfb (diff) | |
download | kdepimpi-ec5bc1b8c708b55884f1e03861204123de097129.zip kdepimpi-ec5bc1b8c708b55884f1e03861204123de097129.tar.gz kdepimpi-ec5bc1b8c708b55884f1e03861204123de097129.tar.bz2 |
cleanup
-rw-r--r-- | korganizer/calendarview.cpp | 38 | ||||
-rw-r--r-- | korganizer/calendarview.h | 4 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 |
3 files changed, 13 insertions, 33 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 04051a2..0c35bb3 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -698,11 +698,6 @@ void CalendarView::createPrinter() | |||
698 | #endif | 698 | #endif |
699 | } | 699 | } |
700 | 700 | ||
701 | void CalendarView::confSync() | ||
702 | { | ||
703 | //DELETE | ||
704 | } | ||
705 | |||
706 | 701 | ||
707 | //KOPrefs::instance()->mWriteBackFile | 702 | //KOPrefs::instance()->mWriteBackFile |
708 | //KOPrefs::instance()->mWriteBackExistingOnly | 703 | //KOPrefs::instance()->mWriteBackExistingOnly |
@@ -1201,6 +1196,7 @@ void CalendarView::setSyncName( QString s ) | |||
1201 | } | 1196 | } |
1202 | bool CalendarView::syncCalendar(QString filename, int mode) | 1197 | bool CalendarView::syncCalendar(QString filename, int mode) |
1203 | { | 1198 | { |
1199 | //qDebug("syncCalendar %s ", filename.latin1()); | ||
1204 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 1200 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
1205 | CalendarLocal* calendar = new CalendarLocal(); | 1201 | CalendarLocal* calendar = new CalendarLocal(); |
1206 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1202 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
@@ -1227,10 +1223,7 @@ bool CalendarView::syncCalendar(QString filename, int mode) | |||
1227 | updateView(); | 1223 | updateView(); |
1228 | return syncOK; | 1224 | return syncOK; |
1229 | } | 1225 | } |
1230 | void CalendarView::syncPhone() | 1226 | |
1231 | { | ||
1232 | //DELETE | ||
1233 | } | ||
1234 | void CalendarView::syncExternal( int mode ) | 1227 | void CalendarView::syncExternal( int mode ) |
1235 | { | 1228 | { |
1236 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 1229 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
@@ -1313,12 +1306,6 @@ void CalendarView::syncExternal( int mode ) | |||
1313 | return ;//syncOK; | 1306 | return ;//syncOK; |
1314 | 1307 | ||
1315 | } | 1308 | } |
1316 | void CalendarView::syncSharp() | ||
1317 | { | ||
1318 | //DELETE | ||
1319 | |||
1320 | } | ||
1321 | |||
1322 | 1309 | ||
1323 | bool CalendarView::importBday() | 1310 | bool CalendarView::importBday() |
1324 | { | 1311 | { |
@@ -1589,10 +1576,13 @@ bool CalendarView::openCalendar(QString filename, bool merge) | |||
1589 | setSyncEventsReadOnly(); | 1576 | setSyncEventsReadOnly(); |
1590 | updateUnmanagedViews(); | 1577 | updateUnmanagedViews(); |
1591 | updateView(); | 1578 | updateView(); |
1592 | setLoadedFileVersion( QDateTime::currentDateTime().addSecs( -1 )); | ||
1593 | if ( filename != MainWindow::defaultFileName() ) { | 1579 | if ( filename != MainWindow::defaultFileName() ) { |
1594 | saveCalendar( MainWindow::defaultFileName() ); | 1580 | saveCalendar( MainWindow::defaultFileName() ); |
1595 | watchSavedFile(); | 1581 | } else { |
1582 | QFileInfo finf ( MainWindow::defaultFileName()); | ||
1583 | if ( finf.exists() ) { | ||
1584 | setLoadedFileVersion( finf.lastModified () ); | ||
1585 | } | ||
1596 | } | 1586 | } |
1597 | return true; | 1587 | return true; |
1598 | } else { | 1588 | } else { |
@@ -1689,8 +1679,8 @@ bool CalendarView::saveCalendar( QString filename ) | |||
1689 | if ( mViewManager->currentView() ) | 1679 | if ( mViewManager->currentView() ) |
1690 | mViewManager->currentView()->flushView(); | 1680 | mViewManager->currentView()->flushView(); |
1691 | 1681 | ||
1692 | //mStorage->setFileName( filename ); | 1682 | |
1693 | 1683 | QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); | |
1694 | mStorage->setSaveFormat( new ICalFormat() ); | 1684 | mStorage->setSaveFormat( new ICalFormat() ); |
1695 | mStorage->setFileName( filename ); | 1685 | mStorage->setFileName( filename ); |
1696 | bool success; | 1686 | bool success; |
@@ -1698,7 +1688,10 @@ bool CalendarView::saveCalendar( QString filename ) | |||
1698 | if ( !success ) { | 1688 | if ( !success ) { |
1699 | return false; | 1689 | return false; |
1700 | } | 1690 | } |
1701 | 1691 | if ( filename == MainWindow::defaultFileName() ) { | |
1692 | setLoadedFileVersion( lfv ); | ||
1693 | watchSavedFile(); | ||
1694 | } | ||
1702 | return true; | 1695 | return true; |
1703 | } | 1696 | } |
1704 | 1697 | ||
@@ -2182,11 +2175,6 @@ void CalendarView::edit_options() | |||
2182 | mDialogManager->showOptionsDialog(); | 2175 | mDialogManager->showOptionsDialog(); |
2183 | //writeSettings(); | 2176 | //writeSettings(); |
2184 | } | 2177 | } |
2185 | void CalendarView::edit_sync_options() | ||
2186 | { | ||
2187 | // DELETE | ||
2188 | |||
2189 | } | ||
2190 | 2178 | ||
2191 | void CalendarView::slotSelectPickerDate( QDate d) | 2179 | void CalendarView::slotSelectPickerDate( QDate d) |
2192 | { | 2180 | { |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 751b8d9..660cce7 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -320,7 +320,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
320 | 320 | ||
321 | /** edit viewing and configuration options. */ | 321 | /** edit viewing and configuration options. */ |
322 | void edit_options(); | 322 | void edit_options(); |
323 | void edit_sync_options(); | ||
324 | /** | 323 | /** |
325 | Functions for printing, previewing a print, and setting up printing | 324 | Functions for printing, previewing a print, and setting up printing |
326 | parameters. | 325 | parameters. |
@@ -436,8 +435,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
436 | bool importQtopia( const QString &categoriesFile, | 435 | bool importQtopia( const QString &categoriesFile, |
437 | const QString &datebookFile, | 436 | const QString &datebookFile, |
438 | const QString &tasklistFile ); | 437 | const QString &tasklistFile ); |
439 | void syncSharp( ); | ||
440 | void syncPhone( ); | ||
441 | void syncExternal( int mode ); | 438 | void syncExternal( int mode ); |
442 | void slotSelectPickerDate( QDate ) ; | 439 | void slotSelectPickerDate( QDate ) ; |
443 | void showDatePicker( ) ; | 440 | void showDatePicker( ) ; |
@@ -466,7 +463,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
466 | virtual bool sync(KSyncManager* manager, QString filename, int mode); | 463 | virtual bool sync(KSyncManager* manager, QString filename, int mode); |
467 | 464 | ||
468 | virtual bool syncExternal(KSyncManager* manager, QString resource); | 465 | virtual bool syncExternal(KSyncManager* manager, QString resource); |
469 | void confSync(); | ||
470 | void setSyncManager(KSyncManager* manager); | 466 | void setSyncManager(KSyncManager* manager); |
471 | void setLoadedFileVersion(QDateTime); | 467 | void setLoadedFileVersion(QDateTime); |
472 | bool checkFileVersion(QString fn); | 468 | bool checkFileVersion(QString fn); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index c7ce8cb..2d17986 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1384,11 +1384,9 @@ void MainWindow::save() | |||
1384 | QTime neededSaveTime = QDateTime::currentDateTime().time(); | 1384 | QTime neededSaveTime = QDateTime::currentDateTime().time(); |
1385 | setCaption(i18n("KO/Pi:Saving Data to File ..." )); | 1385 | setCaption(i18n("KO/Pi:Saving Data to File ..." )); |
1386 | qDebug("KO: Start saving data to file!"); | 1386 | qDebug("KO: Start saving data to file!"); |
1387 | mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | ||
1388 | mView->saveCalendar( defaultFileName() ); | 1387 | mView->saveCalendar( defaultFileName() ); |
1389 | 1388 | ||
1390 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); | 1389 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); |
1391 | mView->watchSavedFile(); | ||
1392 | qDebug("KO: Needed %d ms for saving.",msNeeded ); | 1390 | qDebug("KO: Needed %d ms for saving.",msNeeded ); |
1393 | QString savemes; | 1391 | QString savemes; |
1394 | savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 ); | 1392 | savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 ); |
@@ -1821,10 +1819,8 @@ void MainWindow::getFile( bool success ) | |||
1821 | setCaption( i18n("Error receiving file. Nothing changed!") ); | 1819 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
1822 | return; | 1820 | return; |
1823 | } | 1821 | } |
1824 | mView->watchSavedFile(); | ||
1825 | mView->openCalendar( defaultFileName() ); | 1822 | mView->openCalendar( defaultFileName() ); |
1826 | setCaption( i18n("Pi-Sync successful!") ); | 1823 | setCaption( i18n("Pi-Sync successful!") ); |
1827 | |||
1828 | } | 1824 | } |
1829 | 1825 | ||
1830 | void MainWindow::printSel( ) | 1826 | void MainWindow::printSel( ) |