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 | 36 | ||||
-rw-r--r-- | korganizer/calendarview.h | 4 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 |
3 files changed, 12 insertions, 32 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 04051a2..0c35bb3 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -693,21 +693,16 @@ void CalendarView::createPrinter() | |||
693 | #ifndef KORG_NOPRINTER | 693 | #ifndef KORG_NOPRINTER |
694 | if (!mCalPrinter) { | 694 | if (!mCalPrinter) { |
695 | mCalPrinter = new CalPrinter(this, mCalendar); | 695 | mCalPrinter = new CalPrinter(this, mCalendar); |
696 | connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); | 696 | connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig())); |
697 | } | 697 | } |
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 |
709 | 704 | ||
710 | // 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); | 705 | // 0 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); |
711 | // 1 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); | 706 | // 1 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); |
712 | // 2 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); | 707 | // 2 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); |
713 | // 3 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); | 708 | // 3 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); |
@@ -1196,16 +1191,17 @@ void CalendarView::setSyncDevice( QString s ) | |||
1196 | mCurrentSyncDevice= s; | 1191 | mCurrentSyncDevice= s; |
1197 | } | 1192 | } |
1198 | void CalendarView::setSyncName( QString s ) | 1193 | void CalendarView::setSyncName( QString s ) |
1199 | { | 1194 | { |
1200 | mCurrentSyncName= s; | 1195 | mCurrentSyncName= 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); |
1207 | FileStorage* storage = new FileStorage( calendar ); | 1203 | FileStorage* storage = new FileStorage( calendar ); |
1208 | bool syncOK = false; | 1204 | bool syncOK = false; |
1209 | storage->setFileName( filename ); | 1205 | storage->setFileName( filename ); |
1210 | // qDebug("loading ... "); | 1206 | // qDebug("loading ... "); |
1211 | if ( storage->load() ) { | 1207 | if ( storage->load() ) { |
@@ -1222,20 +1218,17 @@ bool CalendarView::syncCalendar(QString filename, int mode) | |||
1222 | setModified( true ); | 1218 | setModified( true ); |
1223 | } | 1219 | } |
1224 | delete storage; | 1220 | delete storage; |
1225 | delete calendar; | 1221 | delete calendar; |
1226 | if ( syncOK ) | 1222 | if ( syncOK ) |
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; |
1237 | 1230 | ||
1238 | qApp->processEvents(); | 1231 | qApp->processEvents(); |
1239 | CalendarLocal* calendar = new CalendarLocal(); | 1232 | CalendarLocal* calendar = new CalendarLocal(); |
1240 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1233 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
1241 | bool syncOK = false; | 1234 | bool syncOK = false; |
@@ -1308,22 +1301,16 @@ void CalendarView::syncExternal( int mode ) | |||
1308 | question, i18n("Ok")) ; | 1301 | question, i18n("Ok")) ; |
1309 | 1302 | ||
1310 | } | 1303 | } |
1311 | delete calendar; | 1304 | delete calendar; |
1312 | updateView(); | 1305 | updateView(); |
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 | { |
1325 | #ifndef KORG_NOKABC | 1312 | #ifndef KORG_NOKABC |
1326 | 1313 | ||
1327 | #ifdef DESKTOP_VERSION | 1314 | #ifdef DESKTOP_VERSION |
1328 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); | 1315 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); |
1329 | KABC::AddressBook::Iterator it; | 1316 | KABC::AddressBook::Iterator it; |
@@ -1584,20 +1571,23 @@ bool CalendarView::openCalendar(QString filename, bool merge) | |||
1584 | } | 1571 | } |
1585 | globalFlagBlockAgenda = 2; | 1572 | globalFlagBlockAgenda = 2; |
1586 | // if ( getLastSyncEvent() ) | 1573 | // if ( getLastSyncEvent() ) |
1587 | // getLastSyncEvent()->setReadOnly( true ); | 1574 | // getLastSyncEvent()->setReadOnly( true ); |
1588 | mCalendar->reInitAlarmSettings(); | 1575 | mCalendar->reInitAlarmSettings(); |
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 { |
1599 | // while failing to load, the calendar object could | 1589 | // while failing to load, the calendar object could |
1600 | // have become partially populated. Clear it out. | 1590 | // have become partially populated. Clear it out. |
1601 | if ( !merge ) { | 1591 | if ( !merge ) { |
1602 | mCalendar->close(); | 1592 | mCalendar->close(); |
1603 | mViewManager->setDocumentId( filename ); | 1593 | mViewManager->setDocumentId( filename ); |
@@ -1684,26 +1674,29 @@ bool CalendarView::checkFileVersion(QString fn) | |||
1684 | bool CalendarView::saveCalendar( QString filename ) | 1674 | bool CalendarView::saveCalendar( QString filename ) |
1685 | { | 1675 | { |
1686 | 1676 | ||
1687 | // Store back all unsaved data into calendar object | 1677 | // Store back all unsaved data into calendar object |
1688 | // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); | 1678 | // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); |
1689 | if ( mViewManager->currentView() ) | 1679 | if ( mViewManager->currentView() ) |
1690 | mViewManager->currentView()->flushView(); | 1680 | mViewManager->currentView()->flushView(); |
1691 | 1681 | ||
1692 | //mStorage->setFileName( filename ); | ||
1693 | 1682 | ||
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; |
1697 | success = mStorage->save(); | 1687 | success = mStorage->save(); |
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 | ||
1705 | void CalendarView::closeCalendar() | 1698 | void CalendarView::closeCalendar() |
1706 | { | 1699 | { |
1707 | 1700 | ||
1708 | // child windows no longer valid | 1701 | // child windows no longer valid |
1709 | emit closingDown(); | 1702 | emit closingDown(); |
@@ -2177,21 +2170,16 @@ void CalendarView::edit_paste() | |||
2177 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); | 2170 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); |
2178 | } | 2171 | } |
2179 | 2172 | ||
2180 | void CalendarView::edit_options() | 2173 | void CalendarView::edit_options() |
2181 | { | 2174 | { |
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 | { |
2193 | mDateFrame->hide(); | 2181 | mDateFrame->hide(); |
2194 | if ( mDatePickerMode == 1 ) { | 2182 | if ( mDatePickerMode == 1 ) { |
2195 | mNavigator->slotDaySelect( d ); | 2183 | mNavigator->slotDaySelect( d ); |
2196 | } else if ( mDatePickerMode == 2 ) { | 2184 | } else if ( mDatePickerMode == 2 ) { |
2197 | if ( mMoveIncidence->type() == "Todo" ) { | 2185 | if ( mMoveIncidence->type() == "Todo" ) { |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 751b8d9..660cce7 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -315,17 +315,16 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
315 | /** copy the current appointment(s) to the clipboard */ | 315 | /** copy the current appointment(s) to the clipboard */ |
316 | void edit_copy(); | 316 | void edit_copy(); |
317 | 317 | ||
318 | /** paste the current vobject(s) in the clipboard buffer into calendar */ | 318 | /** paste the current vobject(s) in the clipboard buffer into calendar */ |
319 | void edit_paste(); | 319 | void edit_paste(); |
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. |
327 | */ | 326 | */ |
328 | void print(); | 327 | void print(); |
329 | void printSetup(); | 328 | void printSetup(); |
330 | void printPreview(); | 329 | void printPreview(); |
331 | 330 | ||
@@ -431,18 +430,16 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
431 | void purgeCompleted(); | 430 | void purgeCompleted(); |
432 | bool removeCompletedSubTodos( Todo* ); | 431 | bool removeCompletedSubTodos( Todo* ); |
433 | void slotCalendarChanged(); | 432 | void slotCalendarChanged(); |
434 | bool importBday(); | 433 | bool importBday(); |
435 | bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday ); | 434 | bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday ); |
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( ) ; |
444 | void moveIncidence(Incidence *) ; | 441 | void moveIncidence(Incidence *) ; |
445 | void beamIncidence(Incidence *) ; | 442 | void beamIncidence(Incidence *) ; |
446 | void beamCalendar() ; | 443 | void beamCalendar() ; |
447 | void beamFilteredCalendar() ; | 444 | void beamFilteredCalendar() ; |
448 | void beamIncidenceList(QPtrList<Incidence>) ; | 445 | void beamIncidenceList(QPtrList<Incidence>) ; |
@@ -461,17 +458,16 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
461 | 458 | ||
462 | public: | 459 | public: |
463 | // show a standard warning | 460 | // show a standard warning |
464 | // returns KMsgBox::yesNoCancel() | 461 | // returns KMsgBox::yesNoCancel() |
465 | int msgCalModified(); | 462 | int msgCalModified(); |
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); |
473 | bool checkFileChanged(QString fn); | 469 | bool checkFileChanged(QString fn); |
474 | Event* getLastSyncEvent(); | 470 | Event* getLastSyncEvent(); |
475 | /** Adapt navigation units correpsonding to step size of navigation of the | 471 | /** Adapt navigation units correpsonding to step size of navigation of the |
476 | * current view. | 472 | * current view. |
477 | */ | 473 | */ |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index c7ce8cb..2d17986 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1379,21 +1379,19 @@ void MainWindow::save() | |||
1379 | if ( mSyncManager->blockSave() ) | 1379 | if ( mSyncManager->blockSave() ) |
1380 | return; | 1380 | return; |
1381 | mSyncManager->setBlockSave(true); | 1381 | mSyncManager->setBlockSave(true); |
1382 | if ( mView->checkFileVersion( defaultFileName()) ) { | 1382 | if ( mView->checkFileVersion( defaultFileName()) ) { |
1383 | 1383 | ||
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 ); |
1395 | setCaption(savemes); | 1393 | setCaption(savemes); |
1396 | } else | 1394 | } else |
1397 | setCaption(i18n("Saving cancelled!")); | 1395 | setCaption(i18n("Saving cancelled!")); |
1398 | mCalendarModifiedFlag = false; | 1396 | mCalendarModifiedFlag = false; |
1399 | mSyncManager->setBlockSave( false ); | 1397 | mSyncManager->setBlockSave( false ); |
@@ -1816,20 +1814,18 @@ void MainWindow::syncFileRequest() | |||
1816 | save(); | 1814 | save(); |
1817 | } | 1815 | } |
1818 | void MainWindow::getFile( bool success ) | 1816 | void MainWindow::getFile( bool success ) |
1819 | { | 1817 | { |
1820 | if ( ! success ) { | 1818 | if ( ! 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( ) |
1831 | { | 1827 | { |
1832 | mView->viewManager()->agendaView()->agenda()->printSelection(); | 1828 | mView->viewManager()->agendaView()->agenda()->printSelection(); |
1833 | } | 1829 | } |
1834 | 1830 | ||
1835 | void MainWindow::printCal() | 1831 | void MainWindow::printCal() |