summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-08 13:31:08 (UTC)
committer zautrix <zautrix>2004-10-08 13:31:08 (UTC)
commitec5bc1b8c708b55884f1e03861204123de097129 (patch) (side-by-side diff)
tree0c5c8a341fd69ed9b45a22a42b9445da8b56a5e8
parent38e390e51967b34d53e19bd275efd1760572cdfb (diff)
downloadkdepimpi-ec5bc1b8c708b55884f1e03861204123de097129.zip
kdepimpi-ec5bc1b8c708b55884f1e03861204123de097129.tar.gz
kdepimpi-ec5bc1b8c708b55884f1e03861204123de097129.tar.bz2
cleanup
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp38
-rw-r--r--korganizer/calendarview.h4
-rw-r--r--korganizer/mainwindow.cpp4
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()
#endif
}
-void CalendarView::confSync()
-{
- //DELETE
-}
-
//KOPrefs::instance()->mWriteBackFile
//KOPrefs::instance()->mWriteBackExistingOnly
@@ -1201,6 +1196,7 @@ void CalendarView::setSyncName( QString s )
}
bool CalendarView::syncCalendar(QString filename, int mode)
{
+ //qDebug("syncCalendar %s ", filename.latin1());
mGlobalSyncMode = SYNC_MODE_NORMAL;
CalendarLocal* calendar = new CalendarLocal();
calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
@@ -1227,10 +1223,7 @@ bool CalendarView::syncCalendar(QString filename, int mode)
updateView();
return syncOK;
}
-void CalendarView::syncPhone()
-{
- //DELETE
-}
+
void CalendarView::syncExternal( int mode )
{
mGlobalSyncMode = SYNC_MODE_EXTERNAL;
@@ -1313,12 +1306,6 @@ void CalendarView::syncExternal( int mode )
return ;//syncOK;
}
-void CalendarView::syncSharp()
-{
- //DELETE
-
-}
-
bool CalendarView::importBday()
{
@@ -1589,10 +1576,13 @@ bool CalendarView::openCalendar(QString filename, bool merge)
setSyncEventsReadOnly();
updateUnmanagedViews();
updateView();
- setLoadedFileVersion( QDateTime::currentDateTime().addSecs( -1 ));
if ( filename != MainWindow::defaultFileName() ) {
saveCalendar( MainWindow::defaultFileName() );
- watchSavedFile();
+ } else {
+ QFileInfo finf ( MainWindow::defaultFileName());
+ if ( finf.exists() ) {
+ setLoadedFileVersion( finf.lastModified () );
+ }
}
return true;
} else {
@@ -1689,8 +1679,8 @@ bool CalendarView::saveCalendar( QString filename )
if ( mViewManager->currentView() )
mViewManager->currentView()->flushView();
- //mStorage->setFileName( filename );
-
+
+ QDateTime lfv = QDateTime::currentDateTime().addSecs( -2);
mStorage->setSaveFormat( new ICalFormat() );
mStorage->setFileName( filename );
bool success;
@@ -1698,7 +1688,10 @@ bool CalendarView::saveCalendar( QString filename )
if ( !success ) {
return false;
}
-
+ if ( filename == MainWindow::defaultFileName() ) {
+ setLoadedFileVersion( lfv );
+ watchSavedFile();
+ }
return true;
}
@@ -2182,11 +2175,6 @@ void CalendarView::edit_options()
mDialogManager->showOptionsDialog();
//writeSettings();
}
-void CalendarView::edit_sync_options()
-{
- // DELETE
-
-}
void CalendarView::slotSelectPickerDate( QDate d)
{
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
/** edit viewing and configuration options. */
void edit_options();
- void edit_sync_options();
/**
Functions for printing, previewing a print, and setting up printing
parameters.
@@ -436,8 +435,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
bool importQtopia( const QString &categoriesFile,
const QString &datebookFile,
const QString &tasklistFile );
- void syncSharp( );
- void syncPhone( );
void syncExternal( int mode );
void slotSelectPickerDate( QDate ) ;
void showDatePicker( ) ;
@@ -466,7 +463,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
virtual bool sync(KSyncManager* manager, QString filename, int mode);
virtual bool syncExternal(KSyncManager* manager, QString resource);
- void confSync();
void setSyncManager(KSyncManager* manager);
void setLoadedFileVersion(QDateTime);
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()
QTime neededSaveTime = QDateTime::currentDateTime().time();
setCaption(i18n("KO/Pi:Saving Data to File ..." ));
qDebug("KO: Start saving data to file!");
- mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
mView->saveCalendar( defaultFileName() );
int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
- mView->watchSavedFile();
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 );
@@ -1821,10 +1819,8 @@ void MainWindow::getFile( bool success )
setCaption( i18n("Error receiving file. Nothing changed!") );
return;
}
- mView->watchSavedFile();
mView->openCalendar( defaultFileName() );
setCaption( i18n("Pi-Sync successful!") );
-
}
void MainWindow::printSel( )