-rw-r--r-- | korganizer/calendarview.cpp | 20 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
-rw-r--r-- | korganizer/koprefs.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 115 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 2 |
5 files changed, 13 insertions, 126 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index eaea040..fecc7e2 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1212,32 +1212,32 @@ void CalendarView::setSyncName( QString s ) | |||
1212 | { | 1212 | { |
1213 | mCurrentSyncName= s; | 1213 | mCurrentSyncName= s; |
1214 | } | 1214 | } |
1215 | bool CalendarView::syncCalendar(QString filename, int mode) | 1215 | bool CalendarView::syncCalendar(QString filename, int mode) |
1216 | { | 1216 | { |
1217 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 1217 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
1218 | CalendarLocal* calendar = new CalendarLocal(); | 1218 | CalendarLocal* calendar = new CalendarLocal(); |
1219 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1219 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
1220 | FileStorage* storage = new FileStorage( calendar ); | 1220 | FileStorage* storage = new FileStorage( calendar ); |
1221 | bool syncOK = false; | 1221 | bool syncOK = false; |
1222 | storage->setFileName( filename ); | 1222 | storage->setFileName( filename ); |
1223 | // qDebug("loading ... "); | 1223 | // qDebug("loading ... "); |
1224 | if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) { | 1224 | if ( storage->load() ) { |
1225 | getEventViewerDialog()->setSyncMode( true ); | 1225 | getEventViewerDialog()->setSyncMode( true ); |
1226 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); | 1226 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); |
1227 | getEventViewerDialog()->setSyncMode( false ); | 1227 | getEventViewerDialog()->setSyncMode( false ); |
1228 | if ( syncOK ) { | 1228 | if ( syncOK ) { |
1229 | if ( KOPrefs::instance()->mWriteBackFile ) | 1229 | if ( KOPrefs::instance()->mWriteBackFile ) |
1230 | { | 1230 | { |
1231 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); | 1231 | storage->setSaveFormat( new ICalFormat() ); |
1232 | storage->save(); | 1232 | storage->save(); |
1233 | } | 1233 | } |
1234 | } | 1234 | } |
1235 | setModified( true ); | 1235 | setModified( true ); |
1236 | } | 1236 | } |
1237 | delete storage; | 1237 | delete storage; |
1238 | delete calendar; | 1238 | delete calendar; |
1239 | if ( syncOK ) | 1239 | if ( syncOK ) |
1240 | updateView(); | 1240 | updateView(); |
1241 | return syncOK; | 1241 | return syncOK; |
1242 | } | 1242 | } |
1243 | void CalendarView::syncPhone() | 1243 | void CalendarView::syncPhone() |
@@ -1490,42 +1490,44 @@ bool CalendarView::openCalendar(QString filename, bool merge) | |||
1490 | } | 1490 | } |
1491 | 1491 | ||
1492 | if (!QFile::exists(filename)) { | 1492 | if (!QFile::exists(filename)) { |
1493 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); | 1493 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); |
1494 | return false; | 1494 | return false; |
1495 | } | 1495 | } |
1496 | 1496 | ||
1497 | globalFlagBlockAgenda = 1; | 1497 | globalFlagBlockAgenda = 1; |
1498 | if (!merge) mCalendar->close(); | 1498 | if (!merge) mCalendar->close(); |
1499 | 1499 | ||
1500 | mStorage->setFileName( filename ); | 1500 | mStorage->setFileName( filename ); |
1501 | 1501 | ||
1502 | if ( mStorage->load(KOPrefs::instance()->mUseQuicksave) ) { | 1502 | if ( mStorage->load() ) { |
1503 | if ( merge ) ;//setModified( true ); | 1503 | if ( merge ) ;//setModified( true ); |
1504 | else { | 1504 | else { |
1505 | //setModified( true ); | 1505 | //setModified( true ); |
1506 | mViewManager->setDocumentId( filename ); | 1506 | mViewManager->setDocumentId( filename ); |
1507 | mDialogManager->setDocumentId( filename ); | 1507 | mDialogManager->setDocumentId( filename ); |
1508 | mTodoList->setDocumentId( filename ); | 1508 | mTodoList->setDocumentId( filename ); |
1509 | } | 1509 | } |
1510 | globalFlagBlockAgenda = 2; | 1510 | globalFlagBlockAgenda = 2; |
1511 | // if ( getLastSyncEvent() ) | 1511 | // if ( getLastSyncEvent() ) |
1512 | // getLastSyncEvent()->setReadOnly( true ); | 1512 | // getLastSyncEvent()->setReadOnly( true ); |
1513 | mCalendar->reInitAlarmSettings(); | 1513 | mCalendar->reInitAlarmSettings(); |
1514 | setSyncEventsReadOnly(); | 1514 | setSyncEventsReadOnly(); |
1515 | updateUnmanagedViews(); | 1515 | updateUnmanagedViews(); |
1516 | updateView(); | 1516 | updateView(); |
1517 | if ( filename != MainWindow::defaultFileName() ) | ||
1518 | saveCalendar( MainWindow::defaultFileName() ); | ||
1519 | loadedFileVersion = QDateTime::currentDateTime(); | 1517 | loadedFileVersion = QDateTime::currentDateTime(); |
1518 | if ( filename != MainWindow::defaultFileName() ) { | ||
1519 | saveCalendar( MainWindow::defaultFileName() ); | ||
1520 | watchSavedFile(); | ||
1521 | } | ||
1520 | return true; | 1522 | return true; |
1521 | } else { | 1523 | } else { |
1522 | // while failing to load, the calendar object could | 1524 | // while failing to load, the calendar object could |
1523 | // have become partially populated. Clear it out. | 1525 | // have become partially populated. Clear it out. |
1524 | if ( !merge ) mCalendar->close(); | 1526 | if ( !merge ) mCalendar->close(); |
1525 | 1527 | ||
1526 | KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename)); | 1528 | KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename)); |
1527 | 1529 | ||
1528 | globalFlagBlockAgenda = 2; | 1530 | globalFlagBlockAgenda = 2; |
1529 | updateView(); | 1531 | updateView(); |
1530 | } | 1532 | } |
1531 | return false; | 1533 | return false; |
@@ -1591,25 +1593,25 @@ bool CalendarView::checkFileVersion(QString fn) | |||
1591 | } | 1593 | } |
1592 | 1594 | ||
1593 | bool CalendarView::saveCalendar( QString filename ) | 1595 | bool CalendarView::saveCalendar( QString filename ) |
1594 | { | 1596 | { |
1595 | 1597 | ||
1596 | // Store back all unsaved data into calendar object | 1598 | // Store back all unsaved data into calendar object |
1597 | // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); | 1599 | // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); |
1598 | if ( mViewManager->currentView() ) | 1600 | if ( mViewManager->currentView() ) |
1599 | mViewManager->currentView()->flushView(); | 1601 | mViewManager->currentView()->flushView(); |
1600 | 1602 | ||
1601 | //mStorage->setFileName( filename ); | 1603 | //mStorage->setFileName( filename ); |
1602 | 1604 | ||
1603 | mStorage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); | 1605 | mStorage->setSaveFormat( new ICalFormat() ); |
1604 | mStorage->setFileName( filename ); | 1606 | mStorage->setFileName( filename ); |
1605 | bool success; | 1607 | bool success; |
1606 | success = mStorage->save(); | 1608 | success = mStorage->save(); |
1607 | if ( !success ) { | 1609 | if ( !success ) { |
1608 | return false; | 1610 | return false; |
1609 | } | 1611 | } |
1610 | 1612 | ||
1611 | return true; | 1613 | return true; |
1612 | } | 1614 | } |
1613 | 1615 | ||
1614 | void CalendarView::closeCalendar() | 1616 | void CalendarView::closeCalendar() |
1615 | { | 1617 | { |
@@ -2292,25 +2294,25 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel ) | |||
2292 | Incidence *in = incidence->clone(); | 2294 | Incidence *in = incidence->clone(); |
2293 | if ( addText ) | 2295 | if ( addText ) |
2294 | description += in->summary() + "\n"; | 2296 | description += in->summary() + "\n"; |
2295 | cal->addIncidence( in ); | 2297 | cal->addIncidence( in ); |
2296 | incidence = delSel.next(); | 2298 | incidence = delSel.next(); |
2297 | } | 2299 | } |
2298 | if ( beamDialog->beamVcal() ) { | 2300 | if ( beamDialog->beamVcal() ) { |
2299 | fn += ".vcs"; | 2301 | fn += ".vcs"; |
2300 | FileStorage storage( cal, fn, new VCalFormat ); | 2302 | FileStorage storage( cal, fn, new VCalFormat ); |
2301 | storage.save(); | 2303 | storage.save(); |
2302 | } else { | 2304 | } else { |
2303 | fn += ".ics"; | 2305 | fn += ".ics"; |
2304 | FileStorage storage( cal, fn, new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); | 2306 | FileStorage storage( cal, fn, new ICalFormat( ) ); |
2305 | storage.save(); | 2307 | storage.save(); |
2306 | } | 2308 | } |
2307 | delete cal; | 2309 | delete cal; |
2308 | mes = i18n("KO/Pi: Ready for beaming"); | 2310 | mes = i18n("KO/Pi: Ready for beaming"); |
2309 | setCaption(mes); | 2311 | setCaption(mes); |
2310 | 2312 | ||
2311 | #ifndef DESKTOP_VERSION | 2313 | #ifndef DESKTOP_VERSION |
2312 | Ir *ir = new Ir( this ); | 2314 | Ir *ir = new Ir( this ); |
2313 | connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) ); | 2315 | connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) ); |
2314 | ir->send( fn, description, "text/x-vCalendar" ); | 2316 | ir->send( fn, description, "text/x-vCalendar" ); |
2315 | #endif | 2317 | #endif |
2316 | } | 2318 | } |
@@ -2847,25 +2849,25 @@ void CalendarView::action_mail() | |||
2847 | i18n("Can't generate mail:\nNo attendees defined.\n")); | 2849 | i18n("Can't generate mail:\nNo attendees defined.\n")); |
2848 | return; | 2850 | return; |
2849 | } | 2851 | } |
2850 | 2852 | ||
2851 | CalendarLocal cal_tmp; | 2853 | CalendarLocal cal_tmp; |
2852 | Event *event = 0; | 2854 | Event *event = 0; |
2853 | Event *ev = 0; | 2855 | Event *ev = 0; |
2854 | if ( incidence && incidence->type() == "Event" ) { | 2856 | if ( incidence && incidence->type() == "Event" ) { |
2855 | event = static_cast<Event *>(incidence); | 2857 | event = static_cast<Event *>(incidence); |
2856 | ev = new Event(*event); | 2858 | ev = new Event(*event); |
2857 | cal_tmp.addEvent(ev); | 2859 | cal_tmp.addEvent(ev); |
2858 | } | 2860 | } |
2859 | ICalFormat mForm( KOPrefs::instance()->mUseQuicksave); | 2861 | ICalFormat mForm(); |
2860 | QString attachment = mForm.toString( &cal_tmp ); | 2862 | QString attachment = mForm.toString( &cal_tmp ); |
2861 | if (ev) delete(ev); | 2863 | if (ev) delete(ev); |
2862 | 2864 | ||
2863 | mailClient.mailAttendees(currentSelection(), attachment); | 2865 | mailClient.mailAttendees(currentSelection(), attachment); |
2864 | 2866 | ||
2865 | #endif | 2867 | #endif |
2866 | 2868 | ||
2867 | #if 0 | 2869 | #if 0 |
2868 | Event *anEvent = 0; | 2870 | Event *anEvent = 0; |
2869 | if (mViewManager->currentView()->isEventView()) { | 2871 | if (mViewManager->currentView()->isEventView()) { |
2870 | anEvent = dynamic_cast<Event *>((mViewManager->currentView()->selectedIncidences()).first()); | 2872 | anEvent = dynamic_cast<Event *>((mViewManager->currentView()->selectedIncidences()).first()); |
2871 | } | 2873 | } |
@@ -3132,25 +3134,25 @@ void CalendarView::printPreview() | |||
3132 | mViewManager->currentView()->printPreview(mCalPrinter,tmpDateList.first(), | 3134 | mViewManager->currentView()->printPreview(mCalPrinter,tmpDateList.first(), |
3133 | tmpDateList.last()); | 3135 | tmpDateList.last()); |
3134 | #endif | 3136 | #endif |
3135 | } | 3137 | } |
3136 | 3138 | ||
3137 | void CalendarView::exportICalendar() | 3139 | void CalendarView::exportICalendar() |
3138 | { | 3140 | { |
3139 | QString filename = KFileDialog::getSaveFileName("icalout.ics",i18n("*.ics|ICalendars"),this); | 3141 | QString filename = KFileDialog::getSaveFileName("icalout.ics",i18n("*.ics|ICalendars"),this); |
3140 | 3142 | ||
3141 | // Force correct extension | 3143 | // Force correct extension |
3142 | if (filename.right(4) != ".ics") filename += ".ics"; | 3144 | if (filename.right(4) != ".ics") filename += ".ics"; |
3143 | 3145 | ||
3144 | FileStorage storage( mCalendar, filename, new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); | 3146 | FileStorage storage( mCalendar, filename, new ICalFormat() ); |
3145 | storage.save(); | 3147 | storage.save(); |
3146 | } | 3148 | } |
3147 | 3149 | ||
3148 | bool CalendarView::exportVCalendar( QString filename ) | 3150 | bool CalendarView::exportVCalendar( QString filename ) |
3149 | { | 3151 | { |
3150 | if (mCalendar->journals().count() > 0) { | 3152 | if (mCalendar->journals().count() > 0) { |
3151 | int result = KMessageBox::warningContinueCancel(this, | 3153 | int result = KMessageBox::warningContinueCancel(this, |
3152 | i18n("The journal entries can not be\nexported to a vCalendar file."), | 3154 | i18n("The journal entries can not be\nexported to a vCalendar file."), |
3153 | i18n("Data Loss Warning"),i18n("Proceed"),i18n("Cancel"), | 3155 | i18n("Data Loss Warning"),i18n("Proceed"),i18n("Cancel"), |
3154 | true); | 3156 | true); |
3155 | if (result != KMessageBox::Continue) return false; | 3157 | if (result != KMessageBox::Continue) return false; |
3156 | } | 3158 | } |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 0034715..e0623d5 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -215,25 +215,24 @@ KOPrefs::KOPrefs() : | |||
215 | addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" ); | 215 | addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" ); |
216 | addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" ); | 216 | addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" ); |
217 | addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" ); | 217 | addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" ); |
218 | addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" ); | 218 | addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" ); |
219 | addItemString("LastSyncedLocalFile", &mLastSyncedLocalFile ,hdp +"lastsync.ics" ); | 219 | addItemString("LastSyncedLocalFile", &mLastSyncedLocalFile ,hdp +"lastsync.ics" ); |
220 | 220 | ||
221 | 221 | ||
222 | KPrefs::setCurrentGroup("Locale"); | 222 | KPrefs::setCurrentGroup("Locale"); |
223 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); | 223 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); |
224 | addItemInt("PreferredTime",&mPreferredTime,0); | 224 | addItemInt("PreferredTime",&mPreferredTime,0); |
225 | addItemInt("PreferredDate",&mPreferredDate,0); | 225 | addItemInt("PreferredDate",&mPreferredDate,0); |
226 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); | 226 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); |
227 | addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); | ||
228 | addItemBool("ShortDateInViewer",&mShortDateInViewer,false); | 227 | addItemBool("ShortDateInViewer",&mShortDateInViewer,false); |
229 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); | 228 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); |
230 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); | 229 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); |
231 | 230 | ||
232 | 231 | ||
233 | KPrefs::setCurrentGroup("Colors"); | 232 | KPrefs::setCurrentGroup("Colors"); |
234 | addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor); | 233 | addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor); |
235 | addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor); | 234 | addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor); |
236 | addItemColor("Event Color",&mEventColor,mDefaultCategoryColor); | 235 | addItemColor("Event Color",&mEventColor,mDefaultCategoryColor); |
237 | addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor); | 236 | addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor); |
238 | addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor); | 237 | addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor); |
239 | addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor); | 238 | addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor); |
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 696433e..7abd741 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -257,25 +257,24 @@ class KOPrefs : public KPimPrefs | |||
257 | bool mHighlightCurrentDay; | 257 | bool mHighlightCurrentDay; |
258 | bool mUseHighlightLightColor; | 258 | bool mUseHighlightLightColor; |
259 | bool mListViewMonthTimespan; | 259 | bool mListViewMonthTimespan; |
260 | bool mWNViewShowsParents; | 260 | bool mWNViewShowsParents; |
261 | bool mWNViewShowLocation; | 261 | bool mWNViewShowLocation; |
262 | bool mTodoViewShowsPercentage; | 262 | bool mTodoViewShowsPercentage; |
263 | bool mTodoViewUsesCatColors; | 263 | bool mTodoViewUsesCatColors; |
264 | bool mTodoViewUsesSmallFont; | 264 | bool mTodoViewUsesSmallFont; |
265 | bool mTodoViewUsesForegroundColor; | 265 | bool mTodoViewUsesForegroundColor; |
266 | bool mMonthViewUsesForegroundColor; | 266 | bool mMonthViewUsesForegroundColor; |
267 | 267 | ||
268 | bool mHightlightDateTimeEdit; | 268 | bool mHightlightDateTimeEdit; |
269 | bool mUseQuicksave; | ||
270 | bool mShortDateInViewer; | 269 | bool mShortDateInViewer; |
271 | 270 | ||
272 | QStringList mLocationDefaults; | 271 | QStringList mLocationDefaults; |
273 | QStringList mEventSummaryUser; | 272 | QStringList mEventSummaryUser; |
274 | QStringList mTodoSummaryUser; | 273 | QStringList mTodoSummaryUser; |
275 | 274 | ||
276 | bool mUseInternalAlarmNotification; | 275 | bool mUseInternalAlarmNotification; |
277 | int mAlarmPlayBeeps; | 276 | int mAlarmPlayBeeps; |
278 | int mAlarmSuspendTime; | 277 | int mAlarmSuspendTime; |
279 | int mAlarmSuspendCount; | 278 | int mAlarmSuspendCount; |
280 | int mAlarmBeepInterval; | 279 | int mAlarmBeepInterval; |
281 | 280 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5aa75f5..43ee2d7 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1943,51 +1943,46 @@ void MainWindow::enableQuick() | |||
1943 | return; | 1943 | return; |
1944 | } | 1944 | } |
1945 | connect( mServerSocket, SIGNAL ( saveFile() ), this, SLOT ( save() ) ); | 1945 | connect( mServerSocket, SIGNAL ( saveFile() ), this, SLOT ( save() ) ); |
1946 | connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SLOT ( getFile( bool ) ) ); | 1946 | connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SLOT ( getFile( bool ) ) ); |
1947 | } | 1947 | } |
1948 | 1948 | ||
1949 | void MainWindow::getFile( bool success ) | 1949 | void MainWindow::getFile( bool success ) |
1950 | { | 1950 | { |
1951 | if ( ! success ) { | 1951 | if ( ! success ) { |
1952 | setCaption( i18n("Error receiving file. Nothing changed!") ); | 1952 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
1953 | return; | 1953 | return; |
1954 | } | 1954 | } |
1955 | // pending adjust time for watchSavedFile() | 1955 | mView->watchSavedFile(); |
1956 | //mView->watchSavedFile(); | ||
1957 | mView->openCalendar( defaultFileName() ); | 1956 | mView->openCalendar( defaultFileName() ); |
1958 | setCaption( i18n("Pi-Sync successful!") ); | 1957 | setCaption( i18n("Pi-Sync successful!") ); |
1959 | 1958 | ||
1960 | } | 1959 | } |
1961 | 1960 | ||
1962 | 1961 | ||
1963 | void MainWindow::syncPi() | 1962 | void MainWindow::syncPi() |
1964 | { | 1963 | { |
1965 | qApp->processEvents(); | 1964 | qApp->processEvents(); |
1966 | performQuickQuick(); | ||
1967 | } | ||
1968 | |||
1969 | void MainWindow::performQuickQuick() | ||
1970 | { | ||
1971 | bool ok; | 1965 | bool ok; |
1972 | Q_UINT16 port = KOPrefs::instance()->mActiveSyncPort.toUInt(&ok); | 1966 | Q_UINT16 port = KOPrefs::instance()->mActiveSyncPort.toUInt(&ok); |
1973 | if ( ! ok ) { | 1967 | if ( ! ok ) { |
1974 | setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 1968 | setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
1975 | return; | 1969 | return; |
1976 | } | 1970 | } |
1977 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, KOPrefs::instance()->mActiveSyncIP, this ); | 1971 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, KOPrefs::instance()->mActiveSyncIP, this ); |
1978 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1972 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1979 | setCaption( i18n("Sending request for remote file ...") ); | 1973 | setCaption( i18n("Sending request for remote file ...") ); |
1980 | commandSocket->readFile( syncFileName() ); | 1974 | commandSocket->readFile( syncFileName() ); |
1981 | } | 1975 | } |
1976 | |||
1982 | void MainWindow::deleteCommandSocket(KCommandSocket*s, int state) | 1977 | void MainWindow::deleteCommandSocket(KCommandSocket*s, int state) |
1983 | { | 1978 | { |
1984 | qDebug("MainWindow::deleteCommandSocket %d", state); | 1979 | qDebug("MainWindow::deleteCommandSocket %d", state); |
1985 | 1980 | ||
1986 | //enum { success, errorW, errorR, quiet }; | 1981 | //enum { success, errorW, errorR, quiet }; |
1987 | if ( state == KCommandSocket::errorR ) { | 1982 | if ( state == KCommandSocket::errorR ) { |
1988 | setCaption( i18n("ERROR: Receiving remote file failed.") ); | 1983 | setCaption( i18n("ERROR: Receiving remote file failed.") ); |
1989 | delete s; | 1984 | delete s; |
1990 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, KOPrefs::instance()->mActiveSyncPort.toUInt(), KOPrefs::instance()->mActiveSyncIP, this ); | 1985 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, KOPrefs::instance()->mActiveSyncPort.toUInt(), KOPrefs::instance()->mActiveSyncIP, this ); |
1991 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1986 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1992 | commandSocket->sendStop(); | 1987 | commandSocket->sendStop(); |
1993 | return; | 1988 | return; |
@@ -2157,130 +2152,24 @@ void MainWindow::syncRemote( KSyncProfile* prof, bool ask) | |||
2157 | result = system ( command ); | 2152 | result = system ( command ); |
2158 | qDebug("KO: Writing back file result: %d ", result); | 2153 | qDebug("KO: Writing back file result: %d ", result); |
2159 | if ( result != 0 ) { | 2154 | if ( result != 0 ) { |
2160 | setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); | 2155 | setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); |
2161 | return; | 2156 | return; |
2162 | } else { | 2157 | } else { |
2163 | setCaption ( i18n( "Syncronization sucessfully completed" ) ); | 2158 | setCaption ( i18n( "Syncronization sucessfully completed" ) ); |
2164 | } | 2159 | } |
2165 | } | 2160 | } |
2166 | } | 2161 | } |
2167 | return; | 2162 | return; |
2168 | } | 2163 | } |
2169 | void MainWindow::syncSSH() | ||
2170 | { | ||
2171 | // not used anymore | ||
2172 | QTime timer; | ||
2173 | timer.start(); | ||
2174 | //qDebug("MainWindow::syncssh() "); | ||
2175 | KOPrefs *p = KOPrefs::instance(); | ||
2176 | QString localFile = p->mLocalTempFile; | ||
2177 | QString remoteIP = p->mRemoteIP; | ||
2178 | QString remoteUser = p->mRemoteUser; | ||
2179 | QString remoteFile = p->mRemoteFile; | ||
2180 | if ( p->mUsePassWd && p->mRemotePassWd.length() > 0 ) | ||
2181 | remoteUser += ":" + p->mRemotePassWd; | ||
2182 | |||
2183 | QString question = i18n("Do you really want\nto remote sync?\n \n") + | ||
2184 | i18n("IP: " ) +remoteIP +"\n" + | ||
2185 | i18n("User: " ) + remoteUser +"\n" ; | ||
2186 | int maxlen = 30; | ||
2187 | if ( QApplication::desktop()->width() > 320 ) | ||
2188 | maxlen += 25; | ||
2189 | if ( remoteFile.length() > maxlen ) | ||
2190 | question += i18n("Remote file:\n..." ) + remoteFile.right(maxlen) +"\n"; | ||
2191 | else | ||
2192 | question += i18n("Remote file:\n " ) + remoteFile +"\n"; | ||
2193 | if ( localFile.length() > maxlen ) | ||
2194 | question += i18n("Local temp file:\n..." ) + localFile.right(maxlen) +"\n"; | ||
2195 | else | ||
2196 | question += i18n("Local temp file:\n " ) + localFile +"\n"; | ||
2197 | |||
2198 | if ( QMessageBox::information( this, i18n("KO/Pi Sync"), | ||
2199 | question, | ||
2200 | i18n("Yes"), i18n("No"), | ||
2201 | 0, 0 ) != 0 ) | ||
2202 | return; | ||
2203 | // if ( !p->mUsePassWd ) { | ||
2204 | // QString pass = getPassword(); | ||
2205 | // if ( pass.length() > 0 ) | ||
2206 | // remoteUser += ":" + pass; | ||
2207 | // } | ||
2208 | QString command = "scp " + remoteUser + "@" + remoteIP +":" + remoteFile +" " +localFile; | ||
2209 | setCaption ( i18n( "Copy remote file to local machine..." ) ); | ||
2210 | int fileSize = 0; | ||
2211 | int result = system ( command ); | ||
2212 | // 0 : okay | ||
2213 | // 256: no such file or dir | ||
2214 | // | ||
2215 | qDebug("KO: Remote copy result(0 = okay): %d ",result ); | ||
2216 | if ( result != 0 ) { | ||
2217 | int len = maxlen; | ||
2218 | while ( len < command.length() ) { | ||
2219 | command.insert( len , "\n" ); | ||
2220 | len += maxlen +2; | ||
2221 | } | ||
2222 | question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ; | ||
2223 | QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"), | ||
2224 | question, | ||
2225 | i18n("Okay!")) ; | ||
2226 | setCaption ("KO/Pi"); | ||
2227 | return; | ||
2228 | } | ||
2229 | |||
2230 | |||
2231 | setCaption ( i18n( "Copying succeed." ) ); | ||
2232 | //mView->setSyncDevice("ssh-scp" ); | ||
2233 | if ( syncWithFile(localFile , true ) ) { | ||
2234 | // Event* e = mView->getLastSyncEvent(); | ||
2235 | // e->setReadOnly( false ); | ||
2236 | // e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); | ||
2237 | // e->setReadOnly( true ); | ||
2238 | if ( KOPrefs::instance()->mWriteBackFile ) { | ||
2239 | command = "scp " + localFile +" " +remoteUser + "@" + remoteIP +":" + remoteFile ; | ||
2240 | setCaption ( i18n( "Writing back file ..." ) ); | ||
2241 | result = system ( command ); | ||
2242 | if ( result != 0 ) { | ||
2243 | int len = maxlen; | ||
2244 | while ( len < command.length() ) { | ||
2245 | command.insert( len , "\n" ); | ||
2246 | len += maxlen +2; | ||
2247 | } | ||
2248 | question = i18n("Sorry, the copy back command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ; | ||
2249 | QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"), | ||
2250 | question, | ||
2251 | i18n("Okay!")) ; | ||
2252 | setCaption ("KO/Pi"); | ||
2253 | return; | ||
2254 | } else { | ||
2255 | setCaption ( i18n( "Syncronization sucessfully completed" ) ); | ||
2256 | } | ||
2257 | } | ||
2258 | } | ||
2259 | return; | ||
2260 | #if 0 | ||
2261 | system ("scp zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics /home/polo/Applications/korganizer/z_sync.ics"); | ||
2262 | while ( timer.elapsed() < 5000 ) | ||
2263 | qApp->processEvents(); | ||
2264 | |||
2265 | qDebug("MainWindow::merging) "); | ||
2266 | mView->syncCalendar( "/home/polo/Applications/korganizer/z_sync.ics", 0 ); | ||
2267 | while ( mBlockSaveFlag ) | ||
2268 | qApp->processEvents(); | ||
2269 | save(); | ||
2270 | system ("scp /home/polo/Applications/korganizer/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics"); | ||
2271 | #endif | ||
2272 | |||
2273 | } | ||
2274 | |||
2275 | 2164 | ||
2276 | void MainWindow::syncSharp() | 2165 | void MainWindow::syncSharp() |
2277 | { | 2166 | { |
2278 | if ( mCalendarModifiedFlag ) | 2167 | if ( mCalendarModifiedFlag ) |
2279 | save(); | 2168 | save(); |
2280 | mView->syncSharp(); | 2169 | mView->syncSharp(); |
2281 | slotModifiedChanged( true ); | 2170 | slotModifiedChanged( true ); |
2282 | 2171 | ||
2283 | } | 2172 | } |
2284 | void MainWindow::syncPhone() | 2173 | void MainWindow::syncPhone() |
2285 | { | 2174 | { |
2286 | if ( mCalendarModifiedFlag ) | 2175 | if ( mCalendarModifiedFlag ) |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 4da371e..ba627b9 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -136,25 +136,24 @@ class MainWindow : public QMainWindow | |||
136 | 136 | ||
137 | void save(); | 137 | void save(); |
138 | void configureToolBar( int ); | 138 | void configureToolBar( int ); |
139 | void printSel(); | 139 | void printSel(); |
140 | void printCal(); | 140 | void printCal(); |
141 | void saveCalendar(); | 141 | void saveCalendar(); |
142 | void loadCalendar(); | 142 | void loadCalendar(); |
143 | void exportVCalendar(); | 143 | void exportVCalendar(); |
144 | void fillFilterMenu(); | 144 | void fillFilterMenu(); |
145 | void selectFilter( int ); | 145 | void selectFilter( int ); |
146 | 146 | ||
147 | void slotSyncMenu( int ); | 147 | void slotSyncMenu( int ); |
148 | void syncSSH(); | ||
149 | void confSync(); | 148 | void confSync(); |
150 | void syncSharp(); | 149 | void syncSharp(); |
151 | void syncPhone(); | 150 | void syncPhone(); |
152 | void syncPi(); | 151 | void syncPi(); |
153 | void syncLocalFile(); | 152 | void syncLocalFile(); |
154 | bool syncWithFile( QString, bool ); | 153 | bool syncWithFile( QString, bool ); |
155 | void quickSyncLocalFile(); | 154 | void quickSyncLocalFile(); |
156 | 155 | ||
157 | 156 | ||
158 | protected: | 157 | protected: |
159 | void displayText( QString, QString); | 158 | void displayText( QString, QString); |
160 | void displayFile( QString, QString); | 159 | void displayFile( QString, QString); |
@@ -168,25 +167,24 @@ class MainWindow : public QMainWindow | |||
168 | void deleteCommandSocket(KCommandSocket* s, int state ); | 167 | void deleteCommandSocket(KCommandSocket* s, int state ); |
169 | void fillSyncMenu(); | 168 | void fillSyncMenu(); |
170 | void getFile( bool ); | 169 | void getFile( bool ); |
171 | void readFileFromSocket(); | 170 | void readFileFromSocket(); |
172 | private: | 171 | private: |
173 | //QTimer* mTimerCommandSocket; | 172 | //QTimer* mTimerCommandSocket; |
174 | QString mPassWordPiSync; | 173 | QString mPassWordPiSync; |
175 | KServerSocket * mServerSocket; | 174 | KServerSocket * mServerSocket; |
176 | bool mClosed; | 175 | bool mClosed; |
177 | void saveOnClose(); | 176 | void saveOnClose(); |
178 | int mCurrentSyncProfile; | 177 | int mCurrentSyncProfile; |
179 | void enableQuick(); | 178 | void enableQuick(); |
180 | void performQuickQuick(); | ||
181 | void syncRemote( KSyncProfile* , bool ask = true); | 179 | void syncRemote( KSyncProfile* , bool ask = true); |
182 | bool mFlagKeyPressed; | 180 | bool mFlagKeyPressed; |
183 | bool mBlockAtStartup; | 181 | bool mBlockAtStartup; |
184 | QPEToolBar *iconToolBar; | 182 | QPEToolBar *iconToolBar; |
185 | void initActions(); | 183 | void initActions(); |
186 | void setDefaultPreferences(); | 184 | void setDefaultPreferences(); |
187 | void keyPressEvent ( QKeyEvent * ) ; | 185 | void keyPressEvent ( QKeyEvent * ) ; |
188 | void keyReleaseEvent ( QKeyEvent * ) ; | 186 | void keyReleaseEvent ( QKeyEvent * ) ; |
189 | QPopupMenu *configureToolBarMenu; | 187 | QPopupMenu *configureToolBarMenu; |
190 | QPopupMenu *selectFilterMenu; | 188 | QPopupMenu *selectFilterMenu; |
191 | QPopupMenu *configureAgendaMenu, *syncMenu; | 189 | QPopupMenu *configureAgendaMenu, *syncMenu; |
192 | CalendarLocal *mCalendar; | 190 | CalendarLocal *mCalendar; |