author | zautrix <zautrix> | 2004-10-07 07:28:54 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-07 07:28:54 (UTC) |
commit | 77280f6a176a15b60004f312e6cacdfbbd3909c1 (patch) (unidiff) | |
tree | e074d4abedc2f4cc575e5655575e038b9d460106 | |
parent | f1eb5b74c962909851607c4b4cb05ee18a347d37 (diff) | |
download | kdepimpi-77280f6a176a15b60004f312e6cacdfbbd3909c1.zip kdepimpi-77280f6a176a15b60004f312e6cacdfbbd3909c1.tar.gz kdepimpi-77280f6a176a15b60004f312e6cacdfbbd3909c1.tar.bz2 |
sync changes
-rw-r--r-- | kaddressbook/kabcore.cpp | 29 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 7 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 2 | ||||
-rw-r--r-- | korganizer/koprefs.h | 3 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 321 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 70 | ||||
-rw-r--r-- | libkdepim/kpimprefs.cpp | 3 | ||||
-rw-r--r-- | libkdepim/kpimprefs.h | 3 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 523 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 99 |
10 files changed, 619 insertions, 441 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index d9eb391..83fede4 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1662,48 +1662,52 @@ void KABCore::initGUI() | |||
1662 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1662 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1663 | #else //KAB_NOSPLITTER | 1663 | #else //KAB_NOSPLITTER |
1664 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1664 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1665 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); | 1665 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); |
1666 | topLayout->setSpacing( 10 ); | 1666 | topLayout->setSpacing( 10 ); |
1667 | 1667 | ||
1668 | // mDetailsSplitter = new QSplitter( this ); | 1668 | // mDetailsSplitter = new QSplitter( this ); |
1669 | 1669 | ||
1670 | QVBox *viewSpace = new QVBox( this ); | 1670 | QVBox *viewSpace = new QVBox( this ); |
1671 | 1671 | ||
1672 | mViewManager = new ViewManager( this, viewSpace ); | 1672 | mViewManager = new ViewManager( this, viewSpace ); |
1673 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1673 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1674 | 1674 | ||
1675 | mDetails = new ViewContainer( this ); | 1675 | mDetails = new ViewContainer( this ); |
1676 | 1676 | ||
1677 | topLayout->addWidget( viewSpace ); | 1677 | topLayout->addWidget( viewSpace ); |
1678 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1678 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1679 | topLayout->addWidget( mDetails ); | 1679 | topLayout->addWidget( mDetails ); |
1680 | #endif //KAB_NOSPLITTER | 1680 | #endif //KAB_NOSPLITTER |
1681 | */ | 1681 | */ |
1682 | 1682 | ||
1683 | syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); | 1683 | syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); |
1684 | syncManager->setBlockSave(false); | 1684 | syncManager->setBlockSave(false); |
1685 | 1685 | ||
1686 | connect(syncManager , SIGNAL( save() ), this, SLOT( save() ) ); | ||
1687 | connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | ||
1688 | syncManager->setDefaultFileName(locateLocal( "apps","kabc/std.vcf") ); | ||
1689 | //connect(syncManager , SIGNAL( ), this, SLOT( ) ); | ||
1686 | 1690 | ||
1687 | #endif //KAB_EMBEDDED | 1691 | #endif //KAB_EMBEDDED |
1688 | initActions(); | 1692 | initActions(); |
1689 | 1693 | ||
1690 | #ifdef KAB_EMBEDDED | 1694 | #ifdef KAB_EMBEDDED |
1691 | addActionsManually(); | 1695 | addActionsManually(); |
1692 | //US make sure the export and import menues are initialized before creating the xxPortManager. | 1696 | //US make sure the export and import menues are initialized before creating the xxPortManager. |
1693 | mXXPortManager = new XXPortManager( this, this ); | 1697 | mXXPortManager = new XXPortManager( this, this ); |
1694 | 1698 | ||
1695 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); | 1699 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); |
1696 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); | 1700 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); |
1697 | // mActionQuit->plug ( mMainWindow->toolBar()); | 1701 | // mActionQuit->plug ( mMainWindow->toolBar()); |
1698 | //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() ); | 1702 | //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() ); |
1699 | //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget); | 1703 | //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget); |
1700 | // mIncSearchWidget->hide(); | 1704 | // mIncSearchWidget->hide(); |
1701 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 1705 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
1702 | SLOT( incrementalSearch( const QString& ) ) ); | 1706 | SLOT( incrementalSearch( const QString& ) ) ); |
1703 | 1707 | ||
1704 | 1708 | ||
1705 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1709 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1706 | 1710 | ||
1707 | topLayout->addWidget( mJumpButtonBar ); | 1711 | topLayout->addWidget( mJumpButtonBar ); |
1708 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); | 1712 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); |
1709 | 1713 | ||
@@ -2816,61 +2820,52 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
2816 | if ( KOPrefs::instance()->mWriteBackFile ) | 2820 | if ( KOPrefs::instance()->mWriteBackFile ) |
2817 | { | 2821 | { |
2818 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); | 2822 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); |
2819 | storage->save(); | 2823 | storage->save(); |
2820 | } | 2824 | } |
2821 | } | 2825 | } |
2822 | setModified(); | 2826 | setModified(); |
2823 | } | 2827 | } |
2824 | 2828 | ||
2825 | #endif | 2829 | #endif |
2826 | } | 2830 | } |
2827 | 2831 | ||
2828 | 2832 | ||
2829 | //this is a overwritten callbackmethods from the syncinterface | 2833 | //this is a overwritten callbackmethods from the syncinterface |
2830 | bool KABCore::syncExternal(KSyncManager* manager, QString resource) | 2834 | bool KABCore::syncExternal(KSyncManager* manager, QString resource) |
2831 | { | 2835 | { |
2832 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 2836 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
2833 | 2837 | ||
2834 | AddressBook abLocal( resource,"syncContact"); | 2838 | AddressBook abLocal( resource,"syncContact"); |
2835 | bool syncOK = false; | 2839 | bool syncOK = false; |
2836 | if ( abLocal.load() ) { | 2840 | if ( abLocal.load() ) { |
2837 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 2841 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
2838 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2842 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
2839 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | 2843 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); |
2840 | qDebug("KABCore::syncExternal: why do we acces here KABPrefs and not somehow KSyncProfile? "); | ||
2841 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | 2844 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); |
2842 | if ( syncOK ) { | 2845 | if ( syncOK ) { |
2843 | if ( syncManager->mWriteBackFile ) { | 2846 | if ( syncManager->mWriteBackFile ) { |
2844 | abLocal.saveAB(); | 2847 | abLocal.saveAB(); |
2845 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); | 2848 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); |
2846 | } | 2849 | } |
2847 | } | 2850 | } |
2848 | setModified(); | 2851 | setModified(); |
2849 | } | 2852 | } |
2850 | if ( syncOK ) | 2853 | if ( syncOK ) |
2851 | mViewManager->refreshView(); | 2854 | mViewManager->refreshView(); |
2852 | return syncOK; | 2855 | return syncOK; |
2853 | 2856 | ||
2854 | } | 2857 | } |
2855 | 2858 | ||
2856 | //called by the syncmanager to indicate that the work has to marked as dirty. | 2859 | void KABCore::getFile( bool success ) |
2857 | void KABCore::sync_setModified() | ||
2858 | { | 2860 | { |
2859 | setModified(); | 2861 | if ( ! success ) { |
2860 | } | 2862 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
2861 | 2863 | return; | |
2862 | //called by the syncmanager to ask if the dirty flag is set. | ||
2863 | bool KABCore::sync_isModified() | ||
2864 | { | ||
2865 | return mModified; | ||
2866 | } | 2864 | } |
2867 | 2865 | //mView->watchSavedFile(); | |
2868 | 2866 | //mView->openCalendar( defaultFileName() ); | |
2869 | //called by the syncmanager to indicate that the work has to be saved. | 2867 | // pending: reload received file! |
2870 | void KABCore::sync_save() | 2868 | setCaption( i18n("Pi-Sync successful!") ); |
2871 | { | ||
2872 | save(); | ||
2873 | } | 2869 | } |
2874 | 2870 | ||
2875 | 2871 | ||
2876 | |||
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index c9c0d38..355e828 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -321,48 +321,49 @@ class KABCore : public QWidget, public KSyncInterface | |||
321 | Launches the ldap search dialog. | 321 | Launches the ldap search dialog. |
322 | */ | 322 | */ |
323 | void openLDAPDialog(); | 323 | void openLDAPDialog(); |
324 | 324 | ||
325 | /** | 325 | /** |
326 | Creates a KAddressBookPrinter, which will display the print | 326 | Creates a KAddressBookPrinter, which will display the print |
327 | dialog and do the printing. | 327 | dialog and do the printing. |
328 | */ | 328 | */ |
329 | void print(); | 329 | void print(); |
330 | 330 | ||
331 | /** | 331 | /** |
332 | Registers a new GUI client, so plugins can register its actions. | 332 | Registers a new GUI client, so plugins can register its actions. |
333 | */ | 333 | */ |
334 | void addGUIClient( KXMLGUIClient *client ); | 334 | void addGUIClient( KXMLGUIClient *client ); |
335 | 335 | ||
336 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); | 336 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); |
337 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); | 337 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); |
338 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); | 338 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); |
339 | 339 | ||
340 | 340 | ||
341 | signals: | 341 | signals: |
342 | void contactSelected( const QString &name ); | 342 | void contactSelected( const QString &name ); |
343 | void contactSelected( const QPixmap &pixmap ); | 343 | void contactSelected( const QPixmap &pixmap ); |
344 | public slots: | 344 | public slots: |
345 | void getFile( bool success ); | ||
345 | void setDetailsVisible( bool visible ); | 346 | void setDetailsVisible( bool visible ); |
346 | void setDetailsToState(); | 347 | void setDetailsToState(); |
347 | // void slotSyncMenu( int ); | 348 | // void slotSyncMenu( int ); |
348 | private slots: | 349 | private slots: |
349 | void setJumpButtonBarVisible( bool visible ); | 350 | void setJumpButtonBarVisible( bool visible ); |
350 | void importFromOL(); | 351 | void importFromOL(); |
351 | void extensionModified( const KABC::Addressee::List &list ); | 352 | void extensionModified( const KABC::Addressee::List &list ); |
352 | void extensionChanged( int id ); | 353 | void extensionChanged( int id ); |
353 | void clipboardDataChanged(); | 354 | void clipboardDataChanged(); |
354 | void updateActionMenu(); | 355 | void updateActionMenu(); |
355 | void configureKeyBindings(); | 356 | void configureKeyBindings(); |
356 | void removeVoice(); | 357 | void removeVoice(); |
357 | #ifdef KAB_EMBEDDED | 358 | #ifdef KAB_EMBEDDED |
358 | void configureResources(); | 359 | void configureResources(); |
359 | #endif //KAB_EMBEDDED | 360 | #endif //KAB_EMBEDDED |
360 | 361 | ||
361 | void slotEditorDestroyed( const QString &uid ); | 362 | void slotEditorDestroyed( const QString &uid ); |
362 | void configurationChanged(); | 363 | void configurationChanged(); |
363 | void addressBookChanged(); | 364 | void addressBookChanged(); |
364 | 365 | ||
365 | private: | 366 | private: |
366 | void initGUI(); | 367 | void initGUI(); |
367 | void initActions(); | 368 | void initActions(); |
368 | 369 | ||
@@ -440,45 +441,39 @@ class KABCore : public QWidget, public KSyncInterface | |||
440 | QPopupMenu *changeMenu; | 441 | QPopupMenu *changeMenu; |
441 | //US QAction *mActionSave; | 442 | //US QAction *mActionSave; |
442 | QPopupMenu *ImportMenu; | 443 | QPopupMenu *ImportMenu; |
443 | QPopupMenu *ExportMenu; | 444 | QPopupMenu *ExportMenu; |
444 | //LR additional methods | 445 | //LR additional methods |
445 | KAction *mActionRemoveVoice; | 446 | KAction *mActionRemoveVoice; |
446 | KAction * mActionImportOL; | 447 | KAction * mActionImportOL; |
447 | 448 | ||
448 | #ifndef KAB_EMBEDDED | 449 | #ifndef KAB_EMBEDDED |
449 | KAddressBookService *mAddressBookService; | 450 | KAddressBookService *mAddressBookService; |
450 | #endif //KAB_EMBEDDED | 451 | #endif //KAB_EMBEDDED |
451 | 452 | ||
452 | class KABCorePrivate; | 453 | class KABCorePrivate; |
453 | KABCorePrivate *d; | 454 | KABCorePrivate *d; |
454 | //US bool mBlockSaveFlag; | 455 | //US bool mBlockSaveFlag; |
455 | 456 | ||
456 | #ifdef KAB_EMBEDDED | 457 | #ifdef KAB_EMBEDDED |
457 | KAddressBookMain *mMainWindow; // should be the same like mGUIClient | 458 | KAddressBookMain *mMainWindow; // should be the same like mGUIClient |
458 | #endif //KAB_EMBEDDED | 459 | #endif //KAB_EMBEDDED |
459 | 460 | ||
460 | //this are the overwritten callbackmethods from the syncinterface | 461 | //this are the overwritten callbackmethods from the syncinterface |
461 | virtual bool sync(KSyncManager* manager, QString filename, int mode); | 462 | virtual bool sync(KSyncManager* manager, QString filename, int mode); |
462 | virtual bool syncExternal(KSyncManager* manager, QString resource); | 463 | virtual bool syncExternal(KSyncManager* manager, QString resource); |
463 | 464 | ||
464 | //called by the syncmanager to indicate that the work has to marked as dirty. | ||
465 | virtual void sync_setModified(); | ||
466 | //called by the syncmanager to ask if the dirty flag is set. | ||
467 | virtual bool sync_isModified(); | ||
468 | //called by the syncmanager to indicate that the work has to be saved. | ||
469 | virtual void sync_save(); | ||
470 | 465 | ||
471 | // LR ******************************* | 466 | // LR ******************************* |
472 | // sync stuff! | 467 | // sync stuff! |
473 | QPopupMenu *syncMenu; | 468 | QPopupMenu *syncMenu; |
474 | KSyncManager* syncManager; | 469 | KSyncManager* syncManager; |
475 | int mGlobalSyncMode; | 470 | int mGlobalSyncMode; |
476 | bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode); | 471 | bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode); |
477 | KABC::Addressee getLastSyncAddressee(); | 472 | KABC::Addressee getLastSyncAddressee(); |
478 | QDateTime mLastAddressbookSync; | 473 | QDateTime mLastAddressbookSync; |
479 | int takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ); | 474 | int takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ); |
480 | // ********************* | 475 | // ********************* |
481 | 476 | ||
482 | }; | 477 | }; |
483 | 478 | ||
484 | #endif | 479 | #endif |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 84e3d00..1210094 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -171,50 +171,48 @@ KOPrefs::KOPrefs() : | |||
171 | addItemFont("TimeBar Font",&mTimeBarFont); | 171 | addItemFont("TimeBar Font",&mTimeBarFont); |
172 | addItemFont("MonthView Font",&mMonthViewFont); | 172 | addItemFont("MonthView Font",&mMonthViewFont); |
173 | addItemFont("AgendaView Font",&mAgendaViewFont); | 173 | addItemFont("AgendaView Font",&mAgendaViewFont); |
174 | addItemFont("MarcusBains Font",&mMarcusBainsFont); | 174 | addItemFont("MarcusBains Font",&mMarcusBainsFont); |
175 | addItemFont("TimeLabels Font",&mTimeLabelsFont); | 175 | addItemFont("TimeLabels Font",&mTimeLabelsFont); |
176 | addItemFont("TodoView Font",&mTodoViewFont); | 176 | addItemFont("TodoView Font",&mTodoViewFont); |
177 | addItemFont("ListView Font",&mListViewFont); | 177 | addItemFont("ListView Font",&mListViewFont); |
178 | addItemFont("DateNavigator Font",&mDateNavigatorFont); | 178 | addItemFont("DateNavigator Font",&mDateNavigatorFont); |
179 | addItemFont("EditBox Font",&mEditBoxFont); | 179 | addItemFont("EditBox Font",&mEditBoxFont); |
180 | addItemFont("JournalView Font",&mJornalViewFont); | 180 | addItemFont("JournalView Font",&mJornalViewFont); |
181 | addItemFont("WhatsNextView Font",&mWhatsNextFont); | 181 | addItemFont("WhatsNextView Font",&mWhatsNextFont); |
182 | addItemFont("EventView Font",&mEventViewFont); | 182 | addItemFont("EventView Font",&mEventViewFont); |
183 | 183 | ||
184 | // KPrefs::setCurrentGroup("SyncProfiles"); | 184 | // KPrefs::setCurrentGroup("SyncProfiles"); |
185 | // addItemString("LocalMachineName",&mLocalMachineName, "undefined"); | 185 | // addItemString("LocalMachineName",&mLocalMachineName, "undefined"); |
186 | // addItemStringList("SyncProfileNames",&mSyncProfileNames); | 186 | // addItemStringList("SyncProfileNames",&mSyncProfileNames); |
187 | // addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames); | 187 | // addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames); |
188 | 188 | ||
189 | KPrefs::setCurrentGroup("RemoteSyncing"); | 189 | KPrefs::setCurrentGroup("RemoteSyncing"); |
190 | // addItemBool("UsePasswd",&mUsePassWd,false); | 190 | // addItemBool("UsePasswd",&mUsePassWd,false); |
191 | // addItemBool("WriteBackFile",&mWriteBackFile,true); | 191 | // addItemBool("WriteBackFile",&mWriteBackFile,true); |
192 | // addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false); | 192 | // addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false); |
193 | // addItemBool("AskForPreferences",&mAskForPreferences,true); | 193 | // addItemBool("AskForPreferences",&mAskForPreferences,true); |
194 | // addItemBool("ShowSyncSummary",&mShowSyncSummary,true); | 194 | // addItemBool("ShowSyncSummary",&mShowSyncSummary,true); |
195 | addItemString("PassiveSyncPort",&mPassiveSyncPort,"9197" ); | ||
196 | addItemString("PassiveSyncPw",&mPassiveSyncPw,"abc" ); | ||
197 | addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" ); | 195 | addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" ); |
198 | addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); | 196 | addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); |
199 | addItemBool("ShowSyncEvents",&mShowSyncEvents,false); | 197 | addItemBool("ShowSyncEvents",&mShowSyncEvents,false); |
200 | addItemInt("LastSyncTime",&mLastSyncTime,0); | 198 | addItemInt("LastSyncTime",&mLastSyncTime,0); |
201 | addItemInt("SyncAlgoPrefs",&mSyncAlgoPrefs,3); | 199 | addItemInt("SyncAlgoPrefs",&mSyncAlgoPrefs,3); |
202 | addItemInt("RingSyncAlgoPrefs",&mRingSyncAlgoPrefs,3); | 200 | addItemInt("RingSyncAlgoPrefs",&mRingSyncAlgoPrefs,3); |
203 | 201 | ||
204 | #ifdef _WIN32_ | 202 | #ifdef _WIN32_ |
205 | QString hdp= locateLocal("data","korganizer")+"\\\\"; | 203 | QString hdp= locateLocal("data","korganizer")+"\\\\"; |
206 | #else | 204 | #else |
207 | QString hdp= locateLocal("data","korganizer")+"/"; | 205 | QString hdp= locateLocal("data","korganizer")+"/"; |
208 | #endif | 206 | #endif |
209 | // addItemString("RemoteIP",&mRemoteIP, "192.168.0.65"); | 207 | // addItemString("RemoteIP",&mRemoteIP, "192.168.0.65"); |
210 | // addItemString("RemoteUser",&mRemoteUser, "zaurus"); | 208 | // addItemString("RemoteUser",&mRemoteUser, "zaurus"); |
211 | // addItemString("RemotePassWd",&mRemotePassWd, ""); | 209 | // addItemString("RemotePassWd",&mRemotePassWd, ""); |
212 | // addItemString("RemoteFile", &mRemoteFile, hdp+"mycalendar.ics"); | 210 | // addItemString("RemoteFile", &mRemoteFile, hdp+"mycalendar.ics"); |
213 | // addItemString("LocalTempFile",&mLocalTempFile, "/tmp/tempsyncfile.ics" ); | 211 | // addItemString("LocalTempFile",&mLocalTempFile, "/tmp/tempsyncfile.ics" ); |
214 | 212 | ||
215 | 213 | ||
216 | KPrefs::setCurrentGroup("LoadSaveFileNames"); | 214 | KPrefs::setCurrentGroup("LoadSaveFileNames"); |
217 | 215 | ||
218 | addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" ); | 216 | addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" ); |
219 | addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" ); | 217 | addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" ); |
220 | addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" ); | 218 | addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" ); |
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index d9ac851..ff09e19 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -257,50 +257,49 @@ 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 mShortDateInViewer; | 269 | bool mShortDateInViewer; |
270 | 270 | ||
271 | QStringList mLocationDefaults; | 271 | QStringList mLocationDefaults; |
272 | QStringList mEventSummaryUser; | 272 | QStringList mEventSummaryUser; |
273 | QStringList mTodoSummaryUser; | 273 | QStringList mTodoSummaryUser; |
274 | 274 | ||
275 | bool mUseInternalAlarmNotification; | 275 | bool mUseInternalAlarmNotification; |
276 | int mAlarmPlayBeeps; | 276 | int mAlarmPlayBeeps; |
277 | int mAlarmSuspendTime; | 277 | int mAlarmSuspendTime; |
278 | int mAlarmSuspendCount; | 278 | int mAlarmSuspendCount; |
279 | int mAlarmBeepInterval; | 279 | int mAlarmBeepInterval; |
280 | 280 | ||
281 | QString mPassiveSyncPort; | 281 | |
282 | QString mPassiveSyncPw; | ||
283 | QString mActiveSyncPort; | 282 | QString mActiveSyncPort; |
284 | QString mActiveSyncIP; | 283 | QString mActiveSyncIP; |
285 | 284 | ||
286 | 285 | ||
287 | //US I copied the following settings into KPimGlobalPrefs | 286 | //US I copied the following settings into KPimGlobalPrefs |
288 | // that allows us later to easily remove the settings from here. | 287 | // that allows us later to easily remove the settings from here. |
289 | int mPreferredDate; | 288 | int mPreferredDate; |
290 | QString mUserDateFormatLong; | 289 | QString mUserDateFormatLong; |
291 | QString mUserDateFormatShort; | 290 | QString mUserDateFormatShort; |
292 | int mPreferredLanguage; | 291 | int mPreferredLanguage; |
293 | int mPreferredTime; | 292 | int mPreferredTime; |
294 | bool mWeekStartsOnSunday; | 293 | bool mWeekStartsOnSunday; |
295 | QString mTimeZoneId; | 294 | QString mTimeZoneId; |
296 | bool mUseDaylightsaving; | 295 | bool mUseDaylightsaving; |
297 | int mDaylightsavingStart; | 296 | int mDaylightsavingStart; |
298 | int mDaylightsavingEnd; | 297 | int mDaylightsavingEnd; |
299 | 298 | ||
300 | 299 | ||
301 | private: | 300 | private: |
302 | QDict<QColor> mCategoryColors; | 301 | QDict<QColor> mCategoryColors; |
303 | QColor mDefaultCategoryColor; | 302 | QColor mDefaultCategoryColor; |
304 | 303 | ||
305 | QFont mDefaultTimeBarFont; | 304 | QFont mDefaultTimeBarFont; |
306 | QFont mDefaultViewFont; | 305 | QFont mDefaultViewFont; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 9104347..e3324ee 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -109,49 +109,48 @@ class KOex2phonePrefs : public QDialog | |||
109 | QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); | 109 | QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); |
110 | lay->addWidget( ok ); | 110 | lay->addWidget( ok ); |
111 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 111 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
112 | lay->addWidget( cancel ); | 112 | lay->addWidget( cancel ); |
113 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | 113 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); |
114 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 114 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
115 | resize( 220, 240 ); | 115 | resize( 220, 240 ); |
116 | 116 | ||
117 | } | 117 | } |
118 | 118 | ||
119 | public: | 119 | public: |
120 | QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; | 120 | QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; |
121 | QCheckBox* mWriteBackFuture; | 121 | QCheckBox* mWriteBackFuture; |
122 | QSpinBox* mWriteBackFutureWeeks; | 122 | QSpinBox* mWriteBackFutureWeeks; |
123 | }; | 123 | }; |
124 | 124 | ||
125 | int globalFlagBlockStartup; | 125 | int globalFlagBlockStartup; |
126 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | 126 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : |
127 | QMainWindow( parent, name ) | 127 | QMainWindow( parent, name ) |
128 | { | 128 | { |
129 | mPassWordPiSync = "abc"; | 129 | mPassWordPiSync = "abc"; |
130 | #ifdef DESKTOP_VERSION | 130 | #ifdef DESKTOP_VERSION |
131 | setFont( QFont("Arial"), 14 ); | 131 | setFont( QFont("Arial"), 14 ); |
132 | #endif | 132 | #endif |
133 | mSyncActionDialog = 0; | ||
134 | mServerSocket = 0; | 133 | mServerSocket = 0; |
135 | mClosed = false; | 134 | mClosed = false; |
136 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; | 135 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; |
137 | QString confFile = locateLocal("config","korganizerrc"); | 136 | QString confFile = locateLocal("config","korganizerrc"); |
138 | QFileInfo finf ( confFile ); | 137 | QFileInfo finf ( confFile ); |
139 | bool showWarning = !finf.exists(); | 138 | bool showWarning = !finf.exists(); |
140 | setIcon(SmallIcon( "ko24" ) ); | 139 | setIcon(SmallIcon( "ko24" ) ); |
141 | mBlockAtStartup = true; | 140 | mBlockAtStartup = true; |
142 | mFlagKeyPressed = false; | 141 | mFlagKeyPressed = false; |
143 | setCaption("KOrganizer/Pi"); | 142 | setCaption("KOrganizer/Pi"); |
144 | KOPrefs *p = KOPrefs::instance(); | 143 | KOPrefs *p = KOPrefs::instance(); |
145 | KPimGlobalPrefs::instance()->setGlobalConfig(); | 144 | KPimGlobalPrefs::instance()->setGlobalConfig(); |
146 | // if ( QApplication::desktop()->height() > 480 ) { | 145 | // if ( QApplication::desktop()->height() > 480 ) { |
147 | // if ( p->mHourSize == 4 ) | 146 | // if ( p->mHourSize == 4 ) |
148 | // p->mHourSize = 6; | 147 | // p->mHourSize = 6; |
149 | // } | 148 | // } |
150 | if ( p->mHourSize > 18 ) | 149 | if ( p->mHourSize > 18 ) |
151 | p->mHourSize = 18; | 150 | p->mHourSize = 18; |
152 | QMainWindow::ToolBarDock tbd; | 151 | QMainWindow::ToolBarDock tbd; |
153 | if ( p->mToolBarHor ) { | 152 | if ( p->mToolBarHor ) { |
154 | if ( p->mToolBarUp ) | 153 | if ( p->mToolBarUp ) |
155 | tbd = Bottom; | 154 | tbd = Bottom; |
156 | else | 155 | else |
157 | tbd = Top; | 156 | tbd = Top; |
@@ -2326,344 +2325,24 @@ void MainWindow::syncSharp() | |||
2326 | save(); | 2325 | save(); |
2327 | mView->syncSharp(); | 2326 | mView->syncSharp(); |
2328 | slotModifiedChanged( true ); | 2327 | slotModifiedChanged( true ); |
2329 | 2328 | ||
2330 | } | 2329 | } |
2331 | void MainWindow::syncPhone() | 2330 | void MainWindow::syncPhone() |
2332 | { | 2331 | { |
2333 | if ( mCalendarModifiedFlag ) | 2332 | if ( mCalendarModifiedFlag ) |
2334 | save(); | 2333 | save(); |
2335 | mView->syncPhone(); | 2334 | mView->syncPhone(); |
2336 | slotModifiedChanged( true ); | 2335 | slotModifiedChanged( true ); |
2337 | 2336 | ||
2338 | } | 2337 | } |
2339 | 2338 | ||
2340 | void MainWindow::printSel( ) | 2339 | void MainWindow::printSel( ) |
2341 | { | 2340 | { |
2342 | mView->viewManager()->agendaView()->agenda()->printSelection(); | 2341 | mView->viewManager()->agendaView()->agenda()->printSelection(); |
2343 | } | 2342 | } |
2344 | 2343 | ||
2345 | void MainWindow::printCal() | 2344 | void MainWindow::printCal() |
2346 | { | 2345 | { |
2347 | mView->print();//mCp->showDialog(); | 2346 | mView->print();//mCp->showDialog(); |
2348 | } | 2347 | } |
2349 | 2348 | ||
2350 | |||
2351 | |||
2352 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | ||
2353 | { | ||
2354 | mPassWord = pw; | ||
2355 | mSocket = 0; | ||
2356 | mSyncActionDialog = 0; | ||
2357 | blockRC = false; | ||
2358 | }; | ||
2359 | |||
2360 | void KServerSocket::newConnection ( int socket ) | ||
2361 | { | ||
2362 | // qDebug("KServerSocket:New connection %d ", socket); | ||
2363 | if ( mSocket ) { | ||
2364 | qDebug("KServerSocket::newConnection Socket deleted! "); | ||
2365 | delete mSocket; | ||
2366 | mSocket = 0; | ||
2367 | } | ||
2368 | mSocket = new QSocket( this ); | ||
2369 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); | ||
2370 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); | ||
2371 | mSocket->setSocket( socket ); | ||
2372 | } | ||
2373 | |||
2374 | void KServerSocket::discardClient() | ||
2375 | { | ||
2376 | //qDebug(" KServerSocket::discardClient()"); | ||
2377 | if ( mSocket ) { | ||
2378 | delete mSocket; | ||
2379 | mSocket = 0; | ||
2380 | } | ||
2381 | //emit endConnect(); | ||
2382 | } | ||
2383 | void KServerSocket::readClient() | ||
2384 | { | ||
2385 | if ( blockRC ) | ||
2386 | return; | ||
2387 | if ( mSocket == 0 ) { | ||
2388 | qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 "); | ||
2389 | return; | ||
2390 | } | ||
2391 | qDebug("KServerSocket readClient()"); | ||
2392 | if ( mSocket->canReadLine() ) { | ||
2393 | QString line = mSocket->readLine(); | ||
2394 | qDebug("KServerSocket readline: %s ", line.latin1()); | ||
2395 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); | ||
2396 | if ( tokens[0] == "GET" ) { | ||
2397 | if ( tokens[1] == mPassWord ) | ||
2398 | //emit sendFile( mSocket ); | ||
2399 | send_file(); | ||
2400 | else { | ||
2401 | KMessageBox::information( 0, i18n("ERROR:\nGot send file request\nwith invalid password")); | ||
2402 | qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | ||
2403 | } | ||
2404 | } | ||
2405 | if ( tokens[0] == "PUT" ) { | ||
2406 | if ( tokens[1] == mPassWord ) { | ||
2407 | //emit getFile( mSocket ); | ||
2408 | blockRC = true; | ||
2409 | get_file(); | ||
2410 | } | ||
2411 | else { | ||
2412 | KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password")); | ||
2413 | qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | ||
2414 | } | ||
2415 | } | ||
2416 | if ( tokens[0] == "STOP" ) { | ||
2417 | //emit endConnect(); | ||
2418 | end_connect(); | ||
2419 | } | ||
2420 | } | ||
2421 | } | ||
2422 | void KServerSocket::end_connect() | ||
2423 | { | ||
2424 | delete mSyncActionDialog; | ||
2425 | mSyncActionDialog = 0; | ||
2426 | } | ||
2427 | void KServerSocket::send_file() | ||
2428 | { | ||
2429 | //qDebug("MainWindow::sendFile(QSocket* s) "); | ||
2430 | if ( mSyncActionDialog ) | ||
2431 | delete mSyncActionDialog; | ||
2432 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); | ||
2433 | mSyncActionDialog->setCaption(i18n("Received sync request")); | ||
2434 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); | ||
2435 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); | ||
2436 | lay->addWidget( label); | ||
2437 | lay->setMargin(7); | ||
2438 | lay->setSpacing(7); | ||
2439 | mSyncActionDialog->setFixedSize( 230, 120); | ||
2440 | mSyncActionDialog->show(); | ||
2441 | qDebug("KSS::saving ... "); | ||
2442 | emit saveFile(); | ||
2443 | qApp->processEvents(); | ||
2444 | QString fileName = mFileName; | ||
2445 | QFile file( fileName ); | ||
2446 | if (!file.open( IO_ReadOnly ) ) { | ||
2447 | delete mSyncActionDialog; | ||
2448 | mSyncActionDialog = 0; | ||
2449 | qDebug("KSS::error open file "); | ||
2450 | mSocket->close(); | ||
2451 | if ( mSocket->state() == QSocket::Idle ) | ||
2452 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | ||
2453 | return ; | ||
2454 | |||
2455 | } | ||
2456 | mSyncActionDialog->setCaption( i18n("Sending file...") ); | ||
2457 | QTextStream ts( &file ); | ||
2458 | ts.setCodec( QTextCodec::codecForName("utf8") ); | ||
2459 | QTextStream os( mSocket ); | ||
2460 | os.setCodec( QTextCodec::codecForName("utf8") ); | ||
2461 | //os.setEncoding( QTextStream::UnicodeUTF8 ); | ||
2462 | while ( ! ts.atEnd() ) { | ||
2463 | os << ts.readLine() << "\n"; | ||
2464 | } | ||
2465 | //os << ts.read(); | ||
2466 | file.close(); | ||
2467 | mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); | ||
2468 | mSocket->close(); | ||
2469 | if ( mSocket->state() == QSocket::Idle ) | ||
2470 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | ||
2471 | } | ||
2472 | void KServerSocket::get_file() | ||
2473 | { | ||
2474 | mSyncActionDialog->setCaption( i18n("Receiving synced file...") ); | ||
2475 | |||
2476 | piTime.start(); | ||
2477 | piFileString = ""; | ||
2478 | QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) )); | ||
2479 | } | ||
2480 | |||
2481 | |||
2482 | void KServerSocket::readBackFileFromSocket() | ||
2483 | { | ||
2484 | //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ()); | ||
2485 | while ( mSocket->canReadLine () ) { | ||
2486 | piTime.restart(); | ||
2487 | QString line = mSocket->readLine (); | ||
2488 | piFileString += line; | ||
2489 | //qDebug("readline: %s ", line.latin1()); | ||
2490 | mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) ); | ||
2491 | |||
2492 | } | ||
2493 | if ( piTime.elapsed () < 3000 ) { | ||
2494 | // wait for more | ||
2495 | //qDebug("waitformore "); | ||
2496 | QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); | ||
2497 | return; | ||
2498 | } | ||
2499 | QString fileName = mFileName; | ||
2500 | QFile file ( fileName ); | ||
2501 | if (!file.open( IO_WriteOnly ) ) { | ||
2502 | delete mSyncActionDialog; | ||
2503 | mSyncActionDialog = 0; | ||
2504 | qDebug("error open cal file "); | ||
2505 | piFileString = ""; | ||
2506 | emit file_received( false ); | ||
2507 | blockRC = false; | ||
2508 | return ; | ||
2509 | |||
2510 | } | ||
2511 | |||
2512 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | ||
2513 | QTextStream ts ( &file ); | ||
2514 | ts.setCodec( QTextCodec::codecForName("utf8") ); | ||
2515 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); | ||
2516 | ts << piFileString; | ||
2517 | mSocket->close(); | ||
2518 | if ( mSocket->state() == QSocket::Idle ) | ||
2519 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | ||
2520 | file.close(); | ||
2521 | delete mSyncActionDialog; | ||
2522 | mSyncActionDialog = 0; | ||
2523 | piFileString = ""; | ||
2524 | blockRC = false; | ||
2525 | emit file_received( true ); | ||
2526 | |||
2527 | } | ||
2528 | |||
2529 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name ) | ||
2530 | { | ||
2531 | mPassWord = password; | ||
2532 | mSocket = 0; | ||
2533 | mPort = port; | ||
2534 | mHost = host; | ||
2535 | |||
2536 | mRetVal = quiet; | ||
2537 | mTimerSocket = new QTimer ( this ); | ||
2538 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); | ||
2539 | } | ||
2540 | void KCommandSocket::readFile( QString fn ) | ||
2541 | { | ||
2542 | if ( !mSocket ) { | ||
2543 | mSocket = new QSocket( this ); | ||
2544 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); | ||
2545 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | ||
2546 | } | ||
2547 | mFileString = ""; | ||
2548 | mFileName = fn; | ||
2549 | mFirst = true; | ||
2550 | mSocket->connectToHost( mHost, mPort ); | ||
2551 | QTextStream os( mSocket ); | ||
2552 | os.setEncoding( QTextStream::UnicodeUTF8 ); | ||
2553 | os << "GET " << mPassWord << "\r\n"; | ||
2554 | mTimerSocket->start( 10000 ); | ||
2555 | } | ||
2556 | |||
2557 | void KCommandSocket::writeFile( QString fileName ) | ||
2558 | { | ||
2559 | if ( !mSocket ) { | ||
2560 | mSocket = new QSocket( this ); | ||
2561 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | ||
2562 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); | ||
2563 | } | ||
2564 | mFileName = fileName ; | ||
2565 | mSocket->connectToHost( mHost, mPort ); | ||
2566 | } | ||
2567 | void KCommandSocket::writeFileToSocket() | ||
2568 | { | ||
2569 | QFile file2( mFileName ); | ||
2570 | if (!file2.open( IO_ReadOnly ) ) { | ||
2571 | mRetVal= errorW; | ||
2572 | mSocket->close(); | ||
2573 | if ( mSocket->state() == QSocket::Idle ) | ||
2574 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | ||
2575 | return ; | ||
2576 | } | ||
2577 | QTextStream ts2( &file2 ); | ||
2578 | ts2.setCodec( QTextCodec::codecForName("utf8") ); | ||
2579 | QTextStream os2( mSocket ); | ||
2580 | os2.setCodec( QTextCodec::codecForName("utf8") ); | ||
2581 | os2 << "PUT " << mPassWord << "\r\n";; | ||
2582 | while ( ! ts2.atEnd() ) { | ||
2583 | os2 << ts2.readLine() << "\n"; | ||
2584 | } | ||
2585 | mRetVal= successW; | ||
2586 | file2.close(); | ||
2587 | mSocket->close(); | ||
2588 | if ( mSocket->state() == QSocket::Idle ) | ||
2589 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | ||
2590 | } | ||
2591 | void KCommandSocket::sendStop() | ||
2592 | { | ||
2593 | if ( !mSocket ) { | ||
2594 | mSocket = new QSocket( this ); | ||
2595 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | ||
2596 | } | ||
2597 | mSocket->connectToHost( mHost, mPort ); | ||
2598 | QTextStream os2( mSocket ); | ||
2599 | os2.setCodec( QTextCodec::codecForName("utf8") ); | ||
2600 | os2 << "STOP\r\n"; | ||
2601 | mSocket->close(); | ||
2602 | if ( mSocket->state() == QSocket::Idle ) | ||
2603 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | ||
2604 | } | ||
2605 | |||
2606 | void KCommandSocket::startReadFileFromSocket() | ||
2607 | { | ||
2608 | if ( ! mFirst ) | ||
2609 | return; | ||
2610 | mFirst = false; | ||
2611 | mTimerSocket->stop(); | ||
2612 | mFileString = ""; | ||
2613 | mTime.start(); | ||
2614 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); | ||
2615 | |||
2616 | } | ||
2617 | void KCommandSocket::readFileFromSocket() | ||
2618 | { | ||
2619 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); | ||
2620 | while ( mSocket->canReadLine () ) { | ||
2621 | mTime.restart(); | ||
2622 | QString line = mSocket->readLine (); | ||
2623 | mFileString += line; | ||
2624 | //qDebug("readline: %s ", line.latin1()); | ||
2625 | } | ||
2626 | if ( mTime.elapsed () < 3000 ) { | ||
2627 | // wait for more | ||
2628 | //qDebug("waitformore "); | ||
2629 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); | ||
2630 | return; | ||
2631 | } | ||
2632 | QString fileName = mFileName; | ||
2633 | QFile file ( fileName ); | ||
2634 | if (!file.open( IO_WriteOnly ) ) { | ||
2635 | mFileString = ""; | ||
2636 | mRetVal = errorR; | ||
2637 | qDebug("Error open temp calender file for writing: %s",fileName.latin1() ); | ||
2638 | deleteSocket(); | ||
2639 | return ; | ||
2640 | |||
2641 | } | ||
2642 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | ||
2643 | QTextStream ts ( &file ); | ||
2644 | ts.setCodec( QTextCodec::codecForName("utf8") ); | ||
2645 | ts << mFileString; | ||
2646 | file.close(); | ||
2647 | mFileString = ""; | ||
2648 | mRetVal = successR; | ||
2649 | mSocket->close(); | ||
2650 | // if state is not idle, deleteSocket(); is called via | ||
2651 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | ||
2652 | if ( mSocket->state() == QSocket::Idle ) | ||
2653 | deleteSocket(); | ||
2654 | } | ||
2655 | |||
2656 | void KCommandSocket::deleteSocket() | ||
2657 | { | ||
2658 | if ( mTimerSocket->isActive () ) { | ||
2659 | mTimerSocket->stop(); | ||
2660 | KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out!\nDid you forgot to enable\nsyncing on remote host? ")); | ||
2661 | mRetVal = errorR; | ||
2662 | } | ||
2663 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); | ||
2664 | if ( mSocket) | ||
2665 | delete mSocket; | ||
2666 | mSocket = 0; | ||
2667 | emit commandFinished( this, mRetVal ); | ||
2668 | } | ||
2669 | |||
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 4f89e03..0da0be0 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -1,115 +1,48 @@ | |||
1 | #ifndef KORGE_MAINWINDOW_H | 1 | #ifndef KORGE_MAINWINDOW_H |
2 | #define KORGE_MAINWINDOW_H | 2 | #define KORGE_MAINWINDOW_H |
3 | 3 | ||
4 | #include <qmainwindow.h> | 4 | #include <qmainwindow.h> |
5 | #include <qtimer.h> | 5 | #include <qtimer.h> |
6 | #include <qdict.h> | 6 | #include <qdict.h> |
7 | #include <qfile.h> | 7 | #include <qfile.h> |
8 | #include <qsocket.h> | ||
9 | #include <qtextstream.h> | 8 | #include <qtextstream.h> |
10 | #include <qregexp.h> | 9 | #include <qregexp.h> |
11 | 10 | ||
12 | #include <libkcal/incidence.h> | 11 | #include <libkcal/incidence.h> |
13 | #include "simplealarmclient.h" | 12 | #include "simplealarmclient.h" |
13 | #include <ksyncmanager.h> | ||
14 | 14 | ||
15 | class QAction; | 15 | class QAction; |
16 | class CalendarView; | 16 | class CalendarView; |
17 | class KSyncProfile; | 17 | class KSyncProfile; |
18 | #ifdef DESKTOP_VERSION | 18 | #ifdef DESKTOP_VERSION |
19 | 19 | ||
20 | #define QPEToolBar QToolBar | 20 | #define QPEToolBar QToolBar |
21 | #define QPEMenuBar QMenuBar | 21 | #define QPEMenuBar QMenuBar |
22 | #endif | 22 | #endif |
23 | class QPEToolBar; | 23 | class QPEToolBar; |
24 | #include <qserversocket.h> | ||
25 | #include <qsocket.h> | ||
26 | #include <qnetworkprotocol.h> | ||
27 | 24 | ||
28 | class KServerSocket : public QServerSocket | ||
29 | { | ||
30 | Q_OBJECT | ||
31 | |||
32 | public: | ||
33 | KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); | ||
34 | |||
35 | void newConnection ( int socket ) ; | ||
36 | void setFileName( QString fn ) {mFileName = fn;}; | ||
37 | |||
38 | signals: | ||
39 | //void sendFile(QSocket*); | ||
40 | //void getFile(QSocket*); | ||
41 | void file_received( bool ); | ||
42 | //void file_sent(); | ||
43 | void saveFile(); | ||
44 | void endConnect(); | ||
45 | private slots: | ||
46 | void discardClient(); | ||
47 | void readClient(); | ||
48 | void readBackFileFromSocket(); | ||
49 | private : | ||
50 | bool blockRC; | ||
51 | void send_file(); | ||
52 | void get_file(); | ||
53 | void end_connect(); | ||
54 | QDialog* mSyncActionDialog; | ||
55 | QSocket* mSocket; | ||
56 | QString mPassWord; | ||
57 | QString mFileName; | ||
58 | QTime piTime; | ||
59 | QString piFileString; | ||
60 | }; | ||
61 | |||
62 | class KCommandSocket : public QObject | ||
63 | { | ||
64 | Q_OBJECT | ||
65 | public: | ||
66 | enum state { successR, errorR, successW, errorW, quiet }; | ||
67 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 ); | ||
68 | void readFile( QString ); | ||
69 | void writeFile( QString ); | ||
70 | void sendStop(); | ||
71 | |||
72 | |||
73 | signals: | ||
74 | void commandFinished( KCommandSocket*, int ); | ||
75 | private slots: | ||
76 | void startReadFileFromSocket(); | ||
77 | void readFileFromSocket(); | ||
78 | void deleteSocket(); | ||
79 | void writeFileToSocket(); | ||
80 | private : | ||
81 | QSocket* mSocket; | ||
82 | QString mPassWord; | ||
83 | Q_UINT16 mPort; | ||
84 | QString mHost; | ||
85 | QString mFileName; | ||
86 | QTimer* mTimerSocket; | ||
87 | int mRetVal; | ||
88 | QTime mTime; | ||
89 | QString mFileString; | ||
90 | bool mFirst; | ||
91 | }; | ||
92 | 25 | ||
93 | namespace KCal { | 26 | namespace KCal { |
94 | class CalendarLocal; | 27 | class CalendarLocal; |
95 | } | 28 | } |
96 | 29 | ||
97 | using namespace KCal; | 30 | using namespace KCal; |
98 | 31 | ||
99 | class MainWindow : public QMainWindow | 32 | class MainWindow : public QMainWindow |
100 | { | 33 | { |
101 | Q_OBJECT | 34 | Q_OBJECT |
102 | public: | 35 | public: |
103 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); | 36 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); |
104 | ~MainWindow(); | 37 | ~MainWindow(); |
105 | public slots: | 38 | public slots: |
106 | virtual void showMaximized (); | 39 | virtual void showMaximized (); |
107 | void configureAgenda( int ); | 40 | void configureAgenda( int ); |
108 | void recieve( const QCString& msg, const QByteArray& data ); | 41 | void recieve( const QCString& msg, const QByteArray& data ); |
109 | static QString defaultFileName(); | 42 | static QString defaultFileName(); |
110 | static QString syncFileName(); | 43 | static QString syncFileName(); |
111 | static QString resourcePath(); | 44 | static QString resourcePath(); |
112 | protected slots: | 45 | protected slots: |
113 | void setCaptionToDates(); | 46 | void setCaptionToDates(); |
114 | int ringSync(); | 47 | int ringSync(); |
115 | void multiSync( bool askforPrefs = false ); | 48 | void multiSync( bool askforPrefs = false ); |
@@ -188,29 +121,28 @@ class MainWindow : public QMainWindow | |||
188 | void keyReleaseEvent ( QKeyEvent * ) ; | 121 | void keyReleaseEvent ( QKeyEvent * ) ; |
189 | QPopupMenu *configureToolBarMenu; | 122 | QPopupMenu *configureToolBarMenu; |
190 | QPopupMenu *selectFilterMenu; | 123 | QPopupMenu *selectFilterMenu; |
191 | QPopupMenu *configureAgendaMenu, *syncMenu; | 124 | QPopupMenu *configureAgendaMenu, *syncMenu; |
192 | CalendarLocal *mCalendar; | 125 | CalendarLocal *mCalendar; |
193 | CalendarView *mView; | 126 | CalendarView *mView; |
194 | QString getPassword(); | 127 | QString getPassword(); |
195 | QAction *mNewSubTodoAction; | 128 | QAction *mNewSubTodoAction; |
196 | 129 | ||
197 | QAction *mShowAction; | 130 | QAction *mShowAction; |
198 | QAction *mEditAction; | 131 | QAction *mEditAction; |
199 | QAction *mDeleteAction; | 132 | QAction *mDeleteAction; |
200 | QAction *mCloneAction; | 133 | QAction *mCloneAction; |
201 | QAction *mMoveAction; | 134 | QAction *mMoveAction; |
202 | QAction *mBeamAction; | 135 | QAction *mBeamAction; |
203 | QAction *mCancelAction; | 136 | QAction *mCancelAction; |
204 | 137 | ||
205 | 138 | ||
206 | void closeEvent( QCloseEvent* ce ); | 139 | void closeEvent( QCloseEvent* ce ); |
207 | SimpleAlarmClient mAlarmClient; | 140 | SimpleAlarmClient mAlarmClient; |
208 | QTimer mSaveTimer; | 141 | QTimer mSaveTimer; |
209 | bool mBlockSaveFlag; | 142 | bool mBlockSaveFlag; |
210 | bool mCalendarModifiedFlag; | 143 | bool mCalendarModifiedFlag; |
211 | QPixmap loadPixmap( QString ); | 144 | QPixmap loadPixmap( QString ); |
212 | QDialog * mSyncActionDialog; | ||
213 | }; | 145 | }; |
214 | 146 | ||
215 | 147 | ||
216 | #endif | 148 | #endif |
diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp index a9ea330..0a2f5f1 100644 --- a/libkdepim/kpimprefs.cpp +++ b/libkdepim/kpimprefs.cpp | |||
@@ -17,48 +17,51 @@ | |||
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kconfig.h> | 32 | #include <kconfig.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | 35 | ||
36 | #include "kpimprefs.h" | 36 | #include "kpimprefs.h" |
37 | 37 | ||
38 | KPimPrefs::KPimPrefs( const QString &name ) : | 38 | KPimPrefs::KPimPrefs( const QString &name ) : |
39 | KPrefs( name ) | 39 | KPrefs( name ) |
40 | { | 40 | { |
41 | config()->setGroup("General"); | ||
42 | addItemString("PassiveSyncPort",&mPassiveSyncPort,"9197" ); | ||
43 | addItemString("PassiveSyncPw",&mPassiveSyncPw,"abc" ); | ||
41 | } | 44 | } |
42 | 45 | ||
43 | KPimPrefs::~KPimPrefs() | 46 | KPimPrefs::~KPimPrefs() |
44 | { | 47 | { |
45 | } | 48 | } |
46 | 49 | ||
47 | void KPimPrefs::usrSetDefaults() | 50 | void KPimPrefs::usrSetDefaults() |
48 | { | 51 | { |
49 | setCategoryDefaults(); | 52 | setCategoryDefaults(); |
50 | } | 53 | } |
51 | 54 | ||
52 | void KPimPrefs::usrReadConfig() | 55 | void KPimPrefs::usrReadConfig() |
53 | { | 56 | { |
54 | kdDebug(5300) << "KPimPrefs::usrReadConfig()" << endl; | 57 | kdDebug(5300) << "KPimPrefs::usrReadConfig()" << endl; |
55 | 58 | ||
56 | config()->setGroup("General"); | 59 | config()->setGroup("General"); |
57 | mCustomCategories = config()->readListEntry("Custom Categories"); | 60 | mCustomCategories = config()->readListEntry("Custom Categories"); |
58 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); | 61 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); |
59 | } | 62 | } |
60 | 63 | ||
61 | 64 | ||
62 | void KPimPrefs::usrWriteConfig() | 65 | void KPimPrefs::usrWriteConfig() |
63 | { | 66 | { |
64 | config()->setGroup("General"); | 67 | config()->setGroup("General"); |
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h index 6f92919..fde8093 100644 --- a/libkdepim/kpimprefs.h +++ b/libkdepim/kpimprefs.h | |||
@@ -34,36 +34,37 @@ $Id$ | |||
34 | #include <qstringlist.h> | 34 | #include <qstringlist.h> |
35 | 35 | ||
36 | #include "kprefs.h" | 36 | #include "kprefs.h" |
37 | 37 | ||
38 | class KPimPrefs : public KPrefs | 38 | class KPimPrefs : public KPrefs |
39 | { | 39 | { |
40 | public: | 40 | public: |
41 | 41 | ||
42 | KPimPrefs( const QString &name = QString::null ); | 42 | KPimPrefs( const QString &name = QString::null ); |
43 | 43 | ||
44 | virtual ~KPimPrefs(); | 44 | virtual ~KPimPrefs(); |
45 | 45 | ||
46 | /** Set preferences to default values */ | 46 | /** Set preferences to default values */ |
47 | void usrSetDefaults(); | 47 | void usrSetDefaults(); |
48 | 48 | ||
49 | /** Read preferences from config file */ | 49 | /** Read preferences from config file */ |
50 | void usrReadConfig(); | 50 | void usrReadConfig(); |
51 | 51 | ||
52 | /** Write preferences to config file */ | 52 | /** Write preferences to config file */ |
53 | void usrWriteConfig(); | 53 | void usrWriteConfig(); |
54 | 54 | ||
55 | 55 | ||
56 | public: | 56 | public: |
57 | QStringList mCustomCategories; | 57 | QStringList mCustomCategories; |
58 | 58 | QString mPassiveSyncPort; | |
59 | QString mPassiveSyncPw; | ||
59 | 60 | ||
60 | 61 | ||
61 | 62 | ||
62 | protected: | 63 | protected: |
63 | virtual void setCategoryDefaults(); | 64 | virtual void setCategoryDefaults(); |
64 | 65 | ||
65 | 66 | ||
66 | 67 | ||
67 | }; | 68 | }; |
68 | 69 | ||
69 | #endif | 70 | #endif |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index c0cc840..5d48884 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -11,157 +11,175 @@ | |||
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | // $Id$ | 21 | // $Id$ |
22 | 22 | ||
23 | #include "ksyncmanager.h" | 23 | #include "ksyncmanager.h" |
24 | 24 | ||
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | 26 | ||
27 | #ifndef _WIN32_ | 27 | #ifndef _WIN32_ |
28 | #include <unistd.h> | 28 | #include <unistd.h> |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | 31 | ||
32 | #include "ksyncprofile.h" | 32 | #include "ksyncprofile.h" |
33 | #include "ksyncprefsdialog.h" | 33 | #include "ksyncprefsdialog.h" |
34 | #include "kpimprefs.h" | 34 | #include "kpimprefs.h" |
35 | #include <kmessagebox.h> | ||
35 | 36 | ||
36 | #include <qdir.h> | 37 | #include <qdir.h> |
37 | #include <qprogressbar.h> | 38 | #include <qprogressbar.h> |
38 | #include <qpopupmenu.h> | 39 | #include <qpopupmenu.h> |
39 | #include <qpushbutton.h> | 40 | #include <qpushbutton.h> |
40 | #include <qradiobutton.h> | 41 | #include <qradiobutton.h> |
41 | #include <qbuttongroup.h> | 42 | #include <qbuttongroup.h> |
42 | #include <qtimer.h> | 43 | #include <qtimer.h> |
43 | #include <qmessagebox.h> | 44 | #include <qmessagebox.h> |
44 | #include <qapplication.h> | 45 | #include <qapplication.h> |
45 | #include <qlineedit.h> | 46 | #include <qlineedit.h> |
46 | #include <qdialog.h> | 47 | #include <qdialog.h> |
47 | #include <qlayout.h> | 48 | #include <qlayout.h> |
49 | #include <qtextcodec.h> | ||
50 | #include <qlabel.h> | ||
48 | 51 | ||
49 | #include <klocale.h> | 52 | #include <klocale.h> |
50 | #include <kglobal.h> | 53 | #include <kglobal.h> |
51 | #include <kconfig.h> | 54 | #include <kconfig.h> |
52 | #include <kfiledialog.h> | 55 | #include <kfiledialog.h> |
53 | 56 | ||
54 | KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) | 57 | KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) |
55 | : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu) | 58 | : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu) |
56 | { | 59 | { |
60 | mServerSocket = 0; | ||
57 | bar = new QProgressBar ( 1, 0 ); | 61 | bar = new QProgressBar ( 1, 0 ); |
58 | bar->setCaption (""); | 62 | bar->setCaption (""); |
59 | 63 | ||
60 | int w = 300; | 64 | int w = 300; |
61 | if ( QApplication::desktop()->width() < 320 ) | 65 | if ( QApplication::desktop()->width() < 320 ) |
62 | w = 220; | 66 | w = 220; |
63 | int h = bar->sizeHint().height() ; | 67 | int h = bar->sizeHint().height() ; |
64 | int dw = QApplication::desktop()->width(); | 68 | int dw = QApplication::desktop()->width(); |
65 | int dh = QApplication::desktop()->height(); | 69 | int dh = QApplication::desktop()->height(); |
66 | bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 70 | bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
67 | 71 | ||
68 | } | 72 | } |
69 | 73 | ||
70 | KSyncManager::~KSyncManager() | 74 | KSyncManager::~KSyncManager() |
71 | { | 75 | { |
72 | delete bar; | 76 | delete bar; |
73 | } | 77 | } |
74 | 78 | ||
75 | 79 | //LR ok | |
76 | void KSyncManager::fillSyncMenu() | 80 | void KSyncManager::fillSyncMenu() |
77 | { | 81 | { |
78 | if ( mSyncMenu->count() ) | 82 | if ( mSyncMenu->count() ) |
79 | mSyncMenu->clear(); | 83 | mSyncMenu->clear(); |
80 | 84 | ||
81 | mSyncMenu->insertItem( i18n("Configure..."), 0 ); | 85 | mSyncMenu->insertItem( i18n("Configure..."), 0 ); |
82 | mSyncMenu->insertSeparator(); | 86 | mSyncMenu->insertSeparator(); |
87 | if ( mServerSocket == 0 ) { | ||
88 | mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 ); | ||
89 | } else { | ||
90 | mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 ); | ||
91 | } | ||
92 | mSyncMenu->insertSeparator(); | ||
83 | mSyncMenu->insertItem( i18n("Multiple sync"), 1 ); | 93 | mSyncMenu->insertItem( i18n("Multiple sync"), 1 ); |
84 | mSyncMenu->insertSeparator(); | 94 | mSyncMenu->insertSeparator(); |
85 | 95 | ||
86 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 96 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
87 | config.setGroup("General"); | 97 | config.setGroup("General"); |
88 | QStringList prof = config.readListEntry("SyncProfileNames"); | 98 | QStringList prof = config.readListEntry("SyncProfileNames"); |
89 | mLocalMachineName = config.readEntry("LocalMachineName","undefined"); | 99 | mLocalMachineName = config.readEntry("LocalMachineName","undefined"); |
90 | if ( prof.count() < 3 ) { | 100 | if ( prof.count() < 2 ) { |
91 | prof.clear(); | 101 | prof.clear(); |
92 | prof << i18n("Sharp_DTM"); | 102 | prof << i18n("Sharp_DTM"); |
93 | prof << i18n("Local_file"); | 103 | prof << i18n("Local_file"); |
94 | prof << i18n("Last_file"); | ||
95 | KSyncProfile* temp = new KSyncProfile (); | 104 | KSyncProfile* temp = new KSyncProfile (); |
96 | temp->setName( prof[0] ); | 105 | temp->setName( prof[0] ); |
97 | temp->writeConfig(&config); | 106 | temp->writeConfig(&config); |
98 | temp->setName( prof[1] ); | 107 | temp->setName( prof[1] ); |
99 | temp->writeConfig(&config); | 108 | temp->writeConfig(&config); |
100 | temp->setName( prof[2] ); | ||
101 | temp->writeConfig(&config); | ||
102 | config.setGroup("General"); | 109 | config.setGroup("General"); |
103 | config.writeEntry("SyncProfileNames",prof); | 110 | config.writeEntry("SyncProfileNames",prof); |
104 | config.writeEntry("ExternSyncProfiles","Sharp_DTM"); | 111 | config.writeEntry("ExternSyncProfiles","Sharp_DTM"); |
105 | config.sync(); | 112 | config.sync(); |
106 | delete temp; | 113 | delete temp; |
107 | } | 114 | } |
108 | mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); | 115 | mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); |
109 | mSyncProfileNames = prof; | 116 | mSyncProfileNames = prof; |
110 | unsigned int i; | 117 | unsigned int i; |
111 | for ( i = 0; i < prof.count(); ++i ) { | 118 | for ( i = 0; i < prof.count(); ++i ) { |
112 | mSyncMenu->insertItem( prof[i], 1000+i ); | 119 | mSyncMenu->insertItem( prof[i], 1000+i ); |
113 | if ( i == 2 ) | 120 | if ( i == 2 ) |
114 | mSyncMenu->insertSeparator(); | 121 | mSyncMenu->insertSeparator(); |
115 | } | 122 | } |
116 | QDir app_dir; | 123 | QDir app_dir; |
117 | //US do not display SharpDTM if app is pwmpi, or no sharpfiles available | 124 | //US do not display SharpDTM if app is pwmpi, or no sharpfiles available |
118 | if ( mTargetApp == PWMPI) { | 125 | if ( mTargetApp == PWMPI) { |
119 | mSyncMenu->removeItem( 1000 ); | 126 | mSyncMenu->removeItem( 1000 ); |
120 | } | 127 | } |
121 | else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { | 128 | else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { |
122 | mSyncMenu->setItemEnabled( 1000, false ); | 129 | mSyncMenu->setItemEnabled( 1000, false ); |
123 | } | 130 | } |
124 | } | 131 | } |
125 | 132 | ||
126 | void KSyncManager::slotSyncMenu( int action ) | 133 | void KSyncManager::slotSyncMenu( int action ) |
127 | { | 134 | { |
128 | //qDebug("syncaction %d ", action); | 135 | //qDebug("syncaction %d ", action); |
129 | if ( action == 0 ) { | 136 | if ( action == 0 ) { |
130 | 137 | ||
131 | // seems to be a Qt2 event handling bug | 138 | // seems to be a Qt2 event handling bug |
132 | // syncmenu.clear causes a segfault at first time | 139 | // syncmenu.clear causes a segfault at first time |
133 | // when we call it after the main event loop, it is ok | 140 | // when we call it after the main event loop, it is ok |
134 | // same behaviour when calling OM/Pi via QCOP for the first time | 141 | // same behaviour when calling OM/Pi via QCOP for the first time |
135 | QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); | 142 | QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); |
136 | //confSync(); | 143 | //confSync(); |
137 | 144 | ||
138 | return; | 145 | return; |
139 | } | 146 | } |
140 | if ( action == 1 ) { | 147 | if ( action == 1 ) { |
141 | multiSync( true ); | 148 | multiSync( true ); |
142 | return; | 149 | return; |
143 | } | 150 | } |
151 | if ( action == 2 ) { | ||
152 | enableQuick(); | ||
153 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); | ||
154 | return; | ||
155 | } | ||
156 | if ( action == 3 ) { | ||
157 | delete mServerSocket; | ||
158 | mServerSocket = 0; | ||
159 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); | ||
160 | return; | ||
161 | } | ||
144 | 162 | ||
145 | if (blockSave()) | 163 | if (blockSave()) |
146 | return; | 164 | return; |
147 | 165 | ||
148 | setBlockSave(true); | 166 | setBlockSave(true); |
149 | 167 | ||
150 | mCurrentSyncProfile = action - 1000 ; | 168 | mCurrentSyncProfile = action - 1000 ; |
151 | mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ; | 169 | mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ; |
152 | mCurrentSyncName = mLocalMachineName ; | 170 | mCurrentSyncName = mLocalMachineName ; |
153 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 171 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
154 | KSyncProfile* temp = new KSyncProfile (); | 172 | KSyncProfile* temp = new KSyncProfile (); |
155 | temp->setName(mSyncProfileNames[mCurrentSyncProfile]); | 173 | temp->setName(mSyncProfileNames[mCurrentSyncProfile]); |
156 | temp->readConfig(&config); | 174 | temp->readConfig(&config); |
157 | mAskForPreferences = temp->getAskForPreferences(); | 175 | mAskForPreferences = temp->getAskForPreferences(); |
158 | mSyncAlgoPrefs = temp->getSyncPrefs(); | 176 | mSyncAlgoPrefs = temp->getSyncPrefs(); |
159 | mWriteBackFile = temp->getWriteBackFile(); | 177 | mWriteBackFile = temp->getWriteBackFile(); |
160 | mWriteBackExistingOnly = temp->getWriteBackExisting(); | 178 | mWriteBackExistingOnly = temp->getWriteBackExisting(); |
161 | mWriteBackInFuture = 0; | 179 | mWriteBackInFuture = 0; |
162 | if ( temp->getWriteBackFuture() ) | 180 | if ( temp->getWriteBackFuture() ) |
163 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); | 181 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); |
164 | mShowSyncSummary = temp->getShowSummaryAfterSync(); | 182 | mShowSyncSummary = temp->getShowSummaryAfterSync(); |
165 | if ( action == 1000 ) { | 183 | if ( action == 1000 ) { |
166 | syncSharp(); | 184 | syncSharp(); |
167 | 185 | ||
@@ -177,56 +195,110 @@ void KSyncManager::slotSyncMenu( int action ) | |||
177 | { | 195 | { |
178 | case (KAPI): | 196 | case (KAPI): |
179 | if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) ) | 197 | if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) ) |
180 | mLastSyncedLocalFile = temp->getRemoteFileNameAB(); | 198 | mLastSyncedLocalFile = temp->getRemoteFileNameAB(); |
181 | break; | 199 | break; |
182 | case (KOPI): | 200 | case (KOPI): |
183 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) | 201 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) |
184 | mLastSyncedLocalFile = temp->getRemoteFileName(); | 202 | mLastSyncedLocalFile = temp->getRemoteFileName(); |
185 | break; | 203 | break; |
186 | case (PWMPI): | 204 | case (PWMPI): |
187 | if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) ) | 205 | if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) ) |
188 | mLastSyncedLocalFile = temp->getRemoteFileNamePWM(); | 206 | mLastSyncedLocalFile = temp->getRemoteFileNamePWM(); |
189 | break; | 207 | break; |
190 | default: | 208 | default: |
191 | qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); | 209 | qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); |
192 | break; | 210 | break; |
193 | 211 | ||
194 | } | 212 | } |
195 | } else { | 213 | } else { |
196 | if ( temp->getIsPhoneSync() ) { | 214 | if ( temp->getIsPhoneSync() ) { |
197 | mPhoneDevice = temp->getPhoneDevice( ) ; | 215 | mPhoneDevice = temp->getPhoneDevice( ) ; |
198 | mPhoneConnection = temp->getPhoneConnection( ); | 216 | mPhoneConnection = temp->getPhoneConnection( ); |
199 | mPhoneModel = temp->getPhoneModel( ); | 217 | mPhoneModel = temp->getPhoneModel( ); |
200 | syncPhone(); | 218 | syncPhone(); |
201 | } else | 219 | } else if ( temp->getIsPiSync() ) { |
220 | mPassWordPiSync = temp->getRemotePw(); | ||
221 | mActiveSyncPort = temp->getRemotePort(); | ||
222 | mActiveSyncIP = temp->getRemoteIP(); | ||
223 | syncPi(); | ||
224 | } | ||
202 | syncRemote( temp ); | 225 | syncRemote( temp ); |
203 | 226 | ||
204 | } | 227 | } |
205 | } | 228 | } |
206 | delete temp; | 229 | delete temp; |
207 | setBlockSave(false); | 230 | setBlockSave(false); |
208 | } | 231 | } |
232 | void KSyncManager::enableQuick() | ||
233 | { | ||
234 | QDialog dia ( 0, "input-dialog", true ); | ||
235 | QLineEdit lab ( &dia ); | ||
236 | QVBoxLayout lay( &dia ); | ||
237 | lab.setText( mPrefs->mPassiveSyncPort ); | ||
238 | lay.setMargin(7); | ||
239 | lay.setSpacing(7); | ||
240 | int po = 9197+mTargetApp; | ||
241 | QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia ); | ||
242 | lay.addWidget( &label); | ||
243 | lay.addWidget( &lab); | ||
244 | |||
245 | QLineEdit lepw ( &dia ); | ||
246 | lepw.setText( mPrefs->mPassiveSyncPw ); | ||
247 | QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia ); | ||
248 | lay.addWidget( &label2); | ||
249 | lay.addWidget( &lepw); | ||
250 | dia.setFixedSize( 230,80 ); | ||
251 | dia.setCaption( i18n("Enter port for Pi-Sync") ); | ||
252 | QPushButton pb ( "OK", &dia); | ||
253 | lay.addWidget( &pb ); | ||
254 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | ||
255 | dia.show(); | ||
256 | if ( ! dia.exec() ) | ||
257 | return; | ||
258 | dia.hide(); | ||
259 | qApp->processEvents(); | ||
260 | mPrefs->mPassiveSyncPw = lepw.text(); | ||
261 | mPrefs->mPassiveSyncPort = lab.text(); | ||
262 | bool ok; | ||
263 | Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok); | ||
264 | if ( ! ok ) { | ||
265 | KMessageBox::information( 0, i18n("No valid port")); | ||
266 | return; | ||
267 | } | ||
268 | //qDebug("port %d ", port); | ||
269 | mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); | ||
270 | mServerSocket->setFileName( defaultFileName() ); | ||
271 | //qDebug("connected "); | ||
272 | if ( !mServerSocket->ok() ) { | ||
273 | KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!")); | ||
274 | delete mServerSocket; | ||
275 | mServerSocket = 0; | ||
276 | return; | ||
277 | } | ||
278 | connect( mServerSocket, SIGNAL ( saveFile() ),this, SIGNAL ( save() ) ); | ||
279 | connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) ); | ||
280 | } | ||
209 | 281 | ||
210 | void KSyncManager::syncLocalFile() | 282 | void KSyncManager::syncLocalFile() |
211 | { | 283 | { |
212 | 284 | ||
213 | QString fn =mLastSyncedLocalFile; | 285 | QString fn =mLastSyncedLocalFile; |
214 | QString ext; | 286 | QString ext; |
215 | 287 | ||
216 | switch(mTargetApp) | 288 | switch(mTargetApp) |
217 | { | 289 | { |
218 | case (KAPI): | 290 | case (KAPI): |
219 | ext = "(*.vcf)"; | 291 | ext = "(*.vcf)"; |
220 | break; | 292 | break; |
221 | case (KOPI): | 293 | case (KOPI): |
222 | ext = "(*.ics/*.vcs)"; | 294 | ext = "(*.ics/*.vcs)"; |
223 | break; | 295 | break; |
224 | case (PWMPI): | 296 | case (PWMPI): |
225 | ext = "(*.pwm)"; | 297 | ext = "(*.pwm)"; |
226 | break; | 298 | break; |
227 | default: | 299 | default: |
228 | qDebug("KSyncManager::syncLocalFile: invalid apptype selected"); | 300 | qDebug("KSyncManager::syncLocalFile: invalid apptype selected"); |
229 | break; | 301 | break; |
230 | 302 | ||
231 | } | 303 | } |
232 | 304 | ||
@@ -250,88 +322,87 @@ bool KSyncManager::syncWithFile( QString fn , bool quick ) | |||
250 | int result = QMessageBox::warning( mParent, i18n("Warning!"), | 322 | int result = QMessageBox::warning( mParent, i18n("Warning!"), |
251 | mess ); | 323 | mess ); |
252 | return ret; | 324 | return ret; |
253 | } | 325 | } |
254 | int result = 0; | 326 | int result = 0; |
255 | if ( !quick ) { | 327 | if ( !quick ) { |
256 | mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); | 328 | mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); |
257 | result = QMessageBox::warning( mParent, i18n("Warning!"), | 329 | result = QMessageBox::warning( mParent, i18n("Warning!"), |
258 | mess, | 330 | mess, |
259 | i18n("Sync"), i18n("Cancel"), 0, | 331 | i18n("Sync"), i18n("Cancel"), 0, |
260 | 0, 1 ); | 332 | 0, 1 ); |
261 | if ( result ) | 333 | if ( result ) |
262 | return false; | 334 | return false; |
263 | } | 335 | } |
264 | if ( mAskForPreferences ) | 336 | if ( mAskForPreferences ) |
265 | edit_sync_options(); | 337 | edit_sync_options(); |
266 | if ( result == 0 ) { | 338 | if ( result == 0 ) { |
267 | //qDebug("Now sycing ... "); | 339 | //qDebug("Now sycing ... "); |
268 | if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) | 340 | if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) |
269 | mParent->setCaption( i18n("Synchronization successful") ); | 341 | mParent->setCaption( i18n("Synchronization successful") ); |
270 | else | 342 | else |
271 | mParent->setCaption( i18n("Sync cancelled or failed. Nothing synced.") ); | 343 | mParent->setCaption( i18n("Sync cancelled or failed. Nothing synced.") ); |
272 | if ( ! quick ) | 344 | if ( ! quick ) |
273 | mLastSyncedLocalFile = fn; | 345 | mLastSyncedLocalFile = fn; |
274 | mImplementation->sync_setModified(); | ||
275 | } | 346 | } |
276 | return ret; | 347 | return ret; |
277 | } | 348 | } |
278 | void KSyncManager::quickSyncLocalFile() | 349 | void KSyncManager::quickSyncLocalFile() |
279 | { | 350 | { |
280 | 351 | ||
281 | if ( syncWithFile( mLastSyncedLocalFile, false ) ) { | 352 | if ( syncWithFile( mLastSyncedLocalFile, false ) ) { |
282 | qDebug("quick syncLocalFile() successful "); | 353 | qDebug("quick syncLocalFile() successful "); |
283 | 354 | ||
284 | } | 355 | } |
285 | } | 356 | } |
286 | void KSyncManager::multiSync( bool askforPrefs ) | 357 | void KSyncManager::multiSync( bool askforPrefs ) |
287 | { | 358 | { |
288 | if (blockSave()) | 359 | if (blockSave()) |
289 | return; | 360 | return; |
290 | setBlockSave(true); | 361 | setBlockSave(true); |
291 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); | 362 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); |
292 | if ( QMessageBox::information( mParent, i18n("Sync"), | 363 | if ( QMessageBox::information( mParent, i18n("Sync"), |
293 | question, | 364 | question, |
294 | i18n("Yes"), i18n("No"), | 365 | i18n("Yes"), i18n("No"), |
295 | 0, 0 ) != 0 ) { | 366 | 0, 0 ) != 0 ) { |
296 | setBlockSave(false); | 367 | setBlockSave(false); |
297 | mParent->setCaption(i18n("Aborted! Nothing synced!")); | 368 | mParent->setCaption(i18n("Aborted! Nothing synced!")); |
298 | return; | 369 | return; |
299 | } | 370 | } |
300 | mCurrentSyncDevice = i18n("Multiple profiles") ; | 371 | mCurrentSyncDevice = i18n("Multiple profiles") ; |
301 | mSyncAlgoPrefs = mRingSyncAlgoPrefs; | 372 | mSyncAlgoPrefs = mRingSyncAlgoPrefs; |
302 | if ( askforPrefs ) { | 373 | if ( askforPrefs ) { |
303 | edit_sync_options(); | 374 | edit_sync_options(); |
304 | mRingSyncAlgoPrefs = mSyncAlgoPrefs; | 375 | mRingSyncAlgoPrefs = mSyncAlgoPrefs; |
305 | } | 376 | } |
306 | mParent->setCaption(i18n("Multiple sync started.") ); | 377 | mParent->setCaption(i18n("Multiple sync started.") ); |
307 | qApp->processEvents(); | 378 | qApp->processEvents(); |
308 | int num = ringSync() ; | 379 | int num = ringSync() ; |
309 | if ( num > 1 ) | 380 | if ( num > 1 ) |
310 | ringSync(); | 381 | ringSync(); |
311 | setBlockSave(false); | 382 | setBlockSave(false); |
312 | if ( num ) | 383 | if ( num ) |
313 | mImplementation->sync_save(); | 384 | emit save(); |
314 | if ( num ) | 385 | if ( num ) |
315 | mParent->setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) ); | 386 | mParent->setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) ); |
316 | else | 387 | else |
317 | mParent->setCaption(i18n("Nothing synced! No profiles defined for multisync!")); | 388 | mParent->setCaption(i18n("Nothing synced! No profiles defined for multisync!")); |
318 | return; | 389 | return; |
319 | } | 390 | } |
320 | int KSyncManager::ringSync() | 391 | int KSyncManager::ringSync() |
321 | { | 392 | { |
322 | int syncedProfiles = 0; | 393 | int syncedProfiles = 0; |
323 | unsigned int i; | 394 | unsigned int i; |
324 | QTime timer; | 395 | QTime timer; |
325 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 396 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
326 | QStringList syncProfileNames = mSyncProfileNames; | 397 | QStringList syncProfileNames = mSyncProfileNames; |
327 | KSyncProfile* temp = new KSyncProfile (); | 398 | KSyncProfile* temp = new KSyncProfile (); |
328 | mAskForPreferences = false; | 399 | mAskForPreferences = false; |
329 | for ( i = 0; i < syncProfileNames.count(); ++i ) { | 400 | for ( i = 0; i < syncProfileNames.count(); ++i ) { |
330 | mCurrentSyncProfile = i; | 401 | mCurrentSyncProfile = i; |
331 | temp->setName(syncProfileNames[mCurrentSyncProfile]); | 402 | temp->setName(syncProfileNames[mCurrentSyncProfile]); |
332 | temp->readConfig(&config); | 403 | temp->readConfig(&config); |
333 | 404 | ||
334 | QString includeInRingSync; | 405 | QString includeInRingSync; |
335 | switch(mTargetApp) | 406 | switch(mTargetApp) |
336 | { | 407 | { |
337 | case (KAPI): | 408 | case (KAPI): |
@@ -593,71 +664,495 @@ void KSyncManager::confSync() | |||
593 | static KSyncPrefsDialog* sp = 0; | 664 | static KSyncPrefsDialog* sp = 0; |
594 | if ( ! sp ) { | 665 | if ( ! sp ) { |
595 | sp = new KSyncPrefsDialog( mParent, "syncprefs", true ); | 666 | sp = new KSyncPrefsDialog( mParent, "syncprefs", true ); |
596 | } | 667 | } |
597 | sp->usrReadConfig(); | 668 | sp->usrReadConfig(); |
598 | #ifndef DESKTOP_VERSION | 669 | #ifndef DESKTOP_VERSION |
599 | sp->showMaximized(); | 670 | sp->showMaximized(); |
600 | #else | 671 | #else |
601 | sp->show(); | 672 | sp->show(); |
602 | #endif | 673 | #endif |
603 | sp->exec(); | 674 | sp->exec(); |
604 | mSyncProfileNames = sp->getSyncProfileNames(); | 675 | mSyncProfileNames = sp->getSyncProfileNames(); |
605 | mLocalMachineName = sp->getLocalMachineName (); | 676 | mLocalMachineName = sp->getLocalMachineName (); |
606 | fillSyncMenu(); | 677 | fillSyncMenu(); |
607 | } | 678 | } |
608 | 679 | ||
609 | void KSyncManager::syncSharp() | 680 | void KSyncManager::syncSharp() |
610 | { | 681 | { |
611 | if ( ! syncExternalApplication("sharp") ) | 682 | if ( ! syncExternalApplication("sharp") ) |
612 | qDebug("ERROR sync sharp ");; | 683 | qDebug("ERROR sync sharp ");; |
613 | } | 684 | } |
614 | 685 | ||
615 | bool KSyncManager::syncExternalApplication(QString resource) | 686 | bool KSyncManager::syncExternalApplication(QString resource) |
616 | { | 687 | { |
617 | if ( mImplementation->sync_isModified() ) | 688 | |
618 | mImplementation->sync_save(); | 689 | emit save(); |
619 | 690 | ||
620 | if ( mAskForPreferences ) | 691 | if ( mAskForPreferences ) |
621 | edit_sync_options(); | 692 | edit_sync_options(); |
622 | 693 | ||
623 | qDebug("sync %s", resource.latin1()); | 694 | qDebug("sync %s", resource.latin1()); |
624 | 695 | ||
625 | bool syncOK = mImplementation->syncExternal(this, resource); | 696 | bool syncOK = mImplementation->syncExternal(this, resource); |
626 | 697 | ||
627 | return syncOK; | 698 | return syncOK; |
628 | 699 | ||
629 | } | 700 | } |
630 | 701 | ||
631 | void KSyncManager::syncPhone() | 702 | void KSyncManager::syncPhone() |
632 | { | 703 | { |
633 | if ( mImplementation->sync_isModified() ) | 704 | emit save(); |
634 | mImplementation->sync_save(); | ||
635 | 705 | ||
636 | qDebug("pending syncPhone(); "); | 706 | qDebug("pending syncPhone(); "); |
637 | //mView->syncPhone(); | 707 | //mView->syncPhone(); |
638 | mImplementation->sync_setModified(); | ||
639 | 708 | ||
640 | } | 709 | } |
641 | 710 | ||
642 | void KSyncManager::showProgressBar(int percentage, QString caption, int total) | 711 | void KSyncManager::showProgressBar(int percentage, QString caption, int total) |
643 | { | 712 | { |
644 | if (!bar->isVisible()) | 713 | if (!bar->isVisible()) |
645 | { | 714 | { |
646 | bar->setCaption (caption); | 715 | bar->setCaption (caption); |
647 | bar->setTotalSteps ( total ) ; | 716 | bar->setTotalSteps ( total ) ; |
648 | 717 | ||
649 | bar->show(); | 718 | bar->show(); |
650 | } | 719 | } |
651 | 720 | ||
652 | bar->setProgress( percentage ); | 721 | bar->setProgress( percentage ); |
653 | } | 722 | } |
654 | 723 | ||
655 | void KSyncManager::hideProgressBar() | 724 | void KSyncManager::hideProgressBar() |
656 | { | 725 | { |
657 | bar->hide(); | 726 | bar->hide(); |
658 | } | 727 | } |
659 | 728 | ||
660 | bool KSyncManager::isProgressBarCanceled() | 729 | bool KSyncManager::isProgressBarCanceled() |
661 | { | 730 | { |
662 | return !bar->isVisible(); | 731 | return !bar->isVisible(); |
663 | } | 732 | } |
733 | |||
734 | QString KSyncManager::syncFileName() | ||
735 | { | ||
736 | |||
737 | QString fn = "tempfile"; | ||
738 | switch(mTargetApp) | ||
739 | { | ||
740 | case (KAPI): | ||
741 | fn = "addressbook.vcf"; | ||
742 | break; | ||
743 | case (KOPI): | ||
744 | fn = "synccalendar.ics"; | ||
745 | break; | ||
746 | case (PWMPI): | ||
747 | fn = "manager.pwm"; | ||
748 | break; | ||
749 | default: | ||
750 | break; | ||
751 | } | ||
752 | #ifdef _WIN32_ | ||
753 | return locateLocal( "tmp", fn ); | ||
754 | #else | ||
755 | return (QString( "/tmp/" )+ fn ); | ||
756 | #endif | ||
757 | } | ||
758 | |||
759 | void KSyncManager::syncPi() | ||
760 | { | ||
761 | qApp->processEvents(); | ||
762 | bool ok; | ||
763 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); | ||
764 | if ( ! ok ) { | ||
765 | mParent->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | ||
766 | return; | ||
767 | } | ||
768 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this ); | ||
769 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | ||
770 | mParent->setCaption( i18n("Sending request for remote file ...") ); | ||
771 | commandSocket->readFile( syncFileName() ); | ||
772 | } | ||
773 | |||
774 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | ||
775 | { | ||
776 | qDebug("MainWindow::deleteCommandSocket %d", state); | ||
777 | |||
778 | //enum { success, errorW, errorR, quiet }; | ||
779 | if ( state == KCommandSocket::errorR ) { | ||
780 | mParent->setCaption( i18n("ERROR: Receiving remote file failed.") ); | ||
781 | delete s; | ||
782 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); | ||
783 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | ||
784 | commandSocket->sendStop(); | ||
785 | return; | ||
786 | |||
787 | } else if ( state == KCommandSocket::errorW ) { | ||
788 | mParent->setCaption( i18n("ERROR:Writing back file failed.") ); | ||
789 | |||
790 | } else if ( state == KCommandSocket::successR ) { | ||
791 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | ||
792 | |||
793 | } else if ( state == KCommandSocket::successW ) { | ||
794 | mParent->setCaption( i18n("Pi-Sync succesful!") ); | ||
795 | } | ||
796 | |||
797 | delete s; | ||
798 | } | ||
799 | |||
800 | void KSyncManager::readFileFromSocket() | ||
801 | { | ||
802 | QString fileName = syncFileName(); | ||
803 | mParent->setCaption( i18n("Remote file saved to temp file.") ); | ||
804 | if ( ! syncWithFile( fileName , true ) ) { | ||
805 | mParent->setCaption( i18n("Syncing failed.") ); | ||
806 | qDebug("Syncing failed "); | ||
807 | return; | ||
808 | } | ||
809 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); | ||
810 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | ||
811 | if ( mWriteBackFile ) | ||
812 | commandSocket->writeFile( fileName ); | ||
813 | else { | ||
814 | commandSocket->sendStop(); | ||
815 | mParent->setCaption( i18n("Pi-Sync succesful!") ); | ||
816 | } | ||
817 | } | ||
818 | |||
819 | |||
820 | |||
821 | |||
822 | |||
823 | |||
824 | |||
825 | |||
826 | |||
827 | |||
828 | |||
829 | |||
830 | |||
831 | |||
832 | |||
833 | |||
834 | |||
835 | |||
836 | |||
837 | |||
838 | |||
839 | |||
840 | |||
841 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | ||
842 | { | ||
843 | mPassWord = pw; | ||
844 | mSocket = 0; | ||
845 | mSyncActionDialog = 0; | ||
846 | blockRC = false; | ||
847 | }; | ||
848 | |||
849 | void KServerSocket::newConnection ( int socket ) | ||
850 | { | ||
851 | // qDebug("KServerSocket:New connection %d ", socket); | ||
852 | if ( mSocket ) { | ||
853 | qDebug("KServerSocket::newConnection Socket deleted! "); | ||
854 | delete mSocket; | ||
855 | mSocket = 0; | ||
856 | } | ||
857 | mSocket = new QSocket( this ); | ||
858 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); | ||
859 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); | ||
860 | mSocket->setSocket( socket ); | ||
861 | } | ||
862 | |||
863 | void KServerSocket::discardClient() | ||
864 | { | ||
865 | //qDebug(" KServerSocket::discardClient()"); | ||
866 | if ( mSocket ) { | ||
867 | delete mSocket; | ||
868 | mSocket = 0; | ||
869 | } | ||
870 | //emit endConnect(); | ||
871 | } | ||
872 | void KServerSocket::readClient() | ||
873 | { | ||
874 | if ( blockRC ) | ||
875 | return; | ||
876 | if ( mSocket == 0 ) { | ||
877 | qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 "); | ||
878 | return; | ||
879 | } | ||
880 | qDebug("KServerSocket readClient()"); | ||
881 | if ( mSocket->canReadLine() ) { | ||
882 | QString line = mSocket->readLine(); | ||
883 | qDebug("KServerSocket readline: %s ", line.latin1()); | ||
884 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); | ||
885 | if ( tokens[0] == "GET" ) { | ||
886 | if ( tokens[1] == mPassWord ) | ||
887 | //emit sendFile( mSocket ); | ||
888 | send_file(); | ||
889 | else { | ||
890 | KMessageBox::information( 0, i18n("ERROR:\nGot send file request\nwith invalid password")); | ||
891 | qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | ||
892 | } | ||
893 | } | ||
894 | if ( tokens[0] == "PUT" ) { | ||
895 | if ( tokens[1] == mPassWord ) { | ||
896 | //emit getFile( mSocket ); | ||
897 | blockRC = true; | ||
898 | get_file(); | ||
899 | } | ||
900 | else { | ||
901 | KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password")); | ||
902 | qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | ||
903 | } | ||
904 | } | ||
905 | if ( tokens[0] == "STOP" ) { | ||
906 | //emit endConnect(); | ||
907 | end_connect(); | ||
908 | } | ||
909 | } | ||
910 | } | ||
911 | void KServerSocket::end_connect() | ||
912 | { | ||
913 | delete mSyncActionDialog; | ||
914 | mSyncActionDialog = 0; | ||
915 | } | ||
916 | void KServerSocket::send_file() | ||
917 | { | ||
918 | //qDebug("MainWindow::sendFile(QSocket* s) "); | ||
919 | if ( mSyncActionDialog ) | ||
920 | delete mSyncActionDialog; | ||
921 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); | ||
922 | mSyncActionDialog->setCaption(i18n("Received sync request")); | ||
923 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); | ||
924 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); | ||
925 | lay->addWidget( label); | ||
926 | lay->setMargin(7); | ||
927 | lay->setSpacing(7); | ||
928 | mSyncActionDialog->setFixedSize( 230, 120); | ||
929 | mSyncActionDialog->show(); | ||
930 | qDebug("KSS::saving ... "); | ||
931 | emit saveFile(); | ||
932 | qApp->processEvents(); | ||
933 | QString fileName = mFileName; | ||
934 | QFile file( fileName ); | ||
935 | if (!file.open( IO_ReadOnly ) ) { | ||
936 | delete mSyncActionDialog; | ||
937 | mSyncActionDialog = 0; | ||
938 | qDebug("KSS::error open file "); | ||
939 | mSocket->close(); | ||
940 | if ( mSocket->state() == QSocket::Idle ) | ||
941 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | ||
942 | return ; | ||
943 | |||
944 | } | ||
945 | mSyncActionDialog->setCaption( i18n("Sending file...") ); | ||
946 | QTextStream ts( &file ); | ||
947 | ts.setCodec( QTextCodec::codecForName("utf8") ); | ||
948 | QTextStream os( mSocket ); | ||
949 | os.setCodec( QTextCodec::codecForName("utf8") ); | ||
950 | //os.setEncoding( QTextStream::UnicodeUTF8 ); | ||
951 | while ( ! ts.atEnd() ) { | ||
952 | os << ts.readLine() << "\n"; | ||
953 | } | ||
954 | //os << ts.read(); | ||
955 | file.close(); | ||
956 | mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); | ||
957 | mSocket->close(); | ||
958 | if ( mSocket->state() == QSocket::Idle ) | ||
959 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | ||
960 | } | ||
961 | void KServerSocket::get_file() | ||
962 | { | ||
963 | mSyncActionDialog->setCaption( i18n("Receiving synced file...") ); | ||
964 | |||
965 | piTime.start(); | ||
966 | piFileString = ""; | ||
967 | QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) )); | ||
968 | } | ||
969 | |||
970 | |||
971 | void KServerSocket::readBackFileFromSocket() | ||
972 | { | ||
973 | //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ()); | ||
974 | while ( mSocket->canReadLine () ) { | ||
975 | piTime.restart(); | ||
976 | QString line = mSocket->readLine (); | ||
977 | piFileString += line; | ||
978 | //qDebug("readline: %s ", line.latin1()); | ||
979 | mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) ); | ||
980 | |||
981 | } | ||
982 | if ( piTime.elapsed () < 3000 ) { | ||
983 | // wait for more | ||
984 | //qDebug("waitformore "); | ||
985 | QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); | ||
986 | return; | ||
987 | } | ||
988 | QString fileName = mFileName; | ||
989 | QFile file ( fileName ); | ||
990 | if (!file.open( IO_WriteOnly ) ) { | ||
991 | delete mSyncActionDialog; | ||
992 | mSyncActionDialog = 0; | ||
993 | qDebug("error open cal file "); | ||
994 | piFileString = ""; | ||
995 | emit file_received( false ); | ||
996 | blockRC = false; | ||
997 | return ; | ||
998 | |||
999 | } | ||
1000 | |||
1001 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | ||
1002 | QTextStream ts ( &file ); | ||
1003 | ts.setCodec( QTextCodec::codecForName("utf8") ); | ||
1004 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); | ||
1005 | ts << piFileString; | ||
1006 | mSocket->close(); | ||
1007 | if ( mSocket->state() == QSocket::Idle ) | ||
1008 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | ||
1009 | file.close(); | ||
1010 | delete mSyncActionDialog; | ||
1011 | mSyncActionDialog = 0; | ||
1012 | piFileString = ""; | ||
1013 | blockRC = false; | ||
1014 | emit file_received( true ); | ||
1015 | |||
1016 | } | ||
1017 | |||
1018 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name ) | ||
1019 | { | ||
1020 | mPassWord = password; | ||
1021 | mSocket = 0; | ||
1022 | mPort = port; | ||
1023 | mHost = host; | ||
1024 | |||
1025 | mRetVal = quiet; | ||
1026 | mTimerSocket = new QTimer ( this ); | ||
1027 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); | ||
1028 | } | ||
1029 | void KCommandSocket::readFile( QString fn ) | ||
1030 | { | ||
1031 | if ( !mSocket ) { | ||
1032 | mSocket = new QSocket( this ); | ||
1033 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); | ||
1034 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | ||
1035 | } | ||
1036 | mFileString = ""; | ||
1037 | mFileName = fn; | ||
1038 | mFirst = true; | ||
1039 | mSocket->connectToHost( mHost, mPort ); | ||
1040 | QTextStream os( mSocket ); | ||
1041 | os.setEncoding( QTextStream::UnicodeUTF8 ); | ||
1042 | os << "GET " << mPassWord << "\r\n"; | ||
1043 | mTimerSocket->start( 10000 ); | ||
1044 | } | ||
1045 | |||
1046 | void KCommandSocket::writeFile( QString fileName ) | ||
1047 | { | ||
1048 | if ( !mSocket ) { | ||
1049 | mSocket = new QSocket( this ); | ||
1050 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | ||
1051 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); | ||
1052 | } | ||
1053 | mFileName = fileName ; | ||
1054 | mSocket->connectToHost( mHost, mPort ); | ||
1055 | } | ||
1056 | void KCommandSocket::writeFileToSocket() | ||
1057 | { | ||
1058 | QFile file2( mFileName ); | ||
1059 | if (!file2.open( IO_ReadOnly ) ) { | ||
1060 | mRetVal= errorW; | ||
1061 | mSocket->close(); | ||
1062 | if ( mSocket->state() == QSocket::Idle ) | ||
1063 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | ||
1064 | return ; | ||
1065 | } | ||
1066 | QTextStream ts2( &file2 ); | ||
1067 | ts2.setCodec( QTextCodec::codecForName("utf8") ); | ||
1068 | QTextStream os2( mSocket ); | ||
1069 | os2.setCodec( QTextCodec::codecForName("utf8") ); | ||
1070 | os2 << "PUT " << mPassWord << "\r\n";; | ||
1071 | while ( ! ts2.atEnd() ) { | ||
1072 | os2 << ts2.readLine() << "\n"; | ||
1073 | } | ||
1074 | mRetVal= successW; | ||
1075 | file2.close(); | ||
1076 | mSocket->close(); | ||
1077 | if ( mSocket->state() == QSocket::Idle ) | ||
1078 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | ||
1079 | } | ||
1080 | void KCommandSocket::sendStop() | ||
1081 | { | ||
1082 | if ( !mSocket ) { | ||
1083 | mSocket = new QSocket( this ); | ||
1084 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | ||
1085 | } | ||
1086 | mSocket->connectToHost( mHost, mPort ); | ||
1087 | QTextStream os2( mSocket ); | ||
1088 | os2.setCodec( QTextCodec::codecForName("utf8") ); | ||
1089 | os2 << "STOP\r\n"; | ||
1090 | mSocket->close(); | ||
1091 | if ( mSocket->state() == QSocket::Idle ) | ||
1092 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | ||
1093 | } | ||
1094 | |||
1095 | void KCommandSocket::startReadFileFromSocket() | ||
1096 | { | ||
1097 | if ( ! mFirst ) | ||
1098 | return; | ||
1099 | mFirst = false; | ||
1100 | mTimerSocket->stop(); | ||
1101 | mFileString = ""; | ||
1102 | mTime.start(); | ||
1103 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); | ||
1104 | |||
1105 | } | ||
1106 | void KCommandSocket::readFileFromSocket() | ||
1107 | { | ||
1108 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); | ||
1109 | while ( mSocket->canReadLine () ) { | ||
1110 | mTime.restart(); | ||
1111 | QString line = mSocket->readLine (); | ||
1112 | mFileString += line; | ||
1113 | //qDebug("readline: %s ", line.latin1()); | ||
1114 | } | ||
1115 | if ( mTime.elapsed () < 3000 ) { | ||
1116 | // wait for more | ||
1117 | //qDebug("waitformore "); | ||
1118 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); | ||
1119 | return; | ||
1120 | } | ||
1121 | QString fileName = mFileName; | ||
1122 | QFile file ( fileName ); | ||
1123 | if (!file.open( IO_WriteOnly ) ) { | ||
1124 | mFileString = ""; | ||
1125 | mRetVal = errorR; | ||
1126 | qDebug("Error open temp calender file for writing: %s",fileName.latin1() ); | ||
1127 | deleteSocket(); | ||
1128 | return ; | ||
1129 | |||
1130 | } | ||
1131 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | ||
1132 | QTextStream ts ( &file ); | ||
1133 | ts.setCodec( QTextCodec::codecForName("utf8") ); | ||
1134 | ts << mFileString; | ||
1135 | file.close(); | ||
1136 | mFileString = ""; | ||
1137 | mRetVal = successR; | ||
1138 | mSocket->close(); | ||
1139 | // if state is not idle, deleteSocket(); is called via | ||
1140 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | ||
1141 | if ( mSocket->state() == QSocket::Idle ) | ||
1142 | deleteSocket(); | ||
1143 | } | ||
1144 | |||
1145 | void KCommandSocket::deleteSocket() | ||
1146 | { | ||
1147 | if ( mTimerSocket->isActive () ) { | ||
1148 | mTimerSocket->stop(); | ||
1149 | KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out!\nDid you forgot to enable\nsyncing on remote host? ")); | ||
1150 | mRetVal = errorR; | ||
1151 | } | ||
1152 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); | ||
1153 | if ( mSocket) | ||
1154 | delete mSocket; | ||
1155 | mSocket = 0; | ||
1156 | emit commandFinished( this, mRetVal ); | ||
1157 | } | ||
1158 | |||
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 6b10016..52e2772 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -3,145 +3,226 @@ | |||
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | $Id$ | 20 | $Id$ |
21 | */ | 21 | */ |
22 | #ifndef _KSYNCMANAGER_H | 22 | #ifndef _KSYNCMANAGER_H |
23 | #define _KSYNCMANAGER_H | 23 | #define _KSYNCMANAGER_H |
24 | 24 | ||
25 | #include <qobject.h> | 25 | #include <qobject.h> |
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | #include <qsocket.h> | ||
28 | #include <qdatetime.h> | ||
29 | #include <qserversocket.h> | ||
30 | #include <qtextstream.h> | ||
31 | #include <qregexp.h> | ||
27 | 32 | ||
28 | class QPopupMenu; | 33 | class QPopupMenu; |
29 | class KSyncProfile; | 34 | class KSyncProfile; |
30 | class KPimPrefs; | 35 | class KPimPrefs; |
31 | class QWidget; | 36 | class QWidget; |
32 | class KSyncManager; | 37 | class KSyncManager; |
33 | class KSyncInterface; | 38 | class KSyncInterface; |
34 | class QProgressBar; | 39 | class QProgressBar; |
35 | 40 | ||
41 | |||
42 | class KServerSocket : public QServerSocket | ||
43 | { | ||
44 | Q_OBJECT | ||
45 | |||
46 | public: | ||
47 | KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); | ||
48 | |||
49 | void newConnection ( int socket ) ; | ||
50 | void setFileName( QString fn ) {mFileName = fn;}; | ||
51 | |||
52 | signals: | ||
53 | //void sendFile(QSocket*); | ||
54 | //void getFile(QSocket*); | ||
55 | void file_received( bool ); | ||
56 | //void file_sent(); | ||
57 | void saveFile(); | ||
58 | void endConnect(); | ||
59 | private slots: | ||
60 | void discardClient(); | ||
61 | void readClient(); | ||
62 | void readBackFileFromSocket(); | ||
63 | private : | ||
64 | bool blockRC; | ||
65 | void send_file(); | ||
66 | void get_file(); | ||
67 | void end_connect(); | ||
68 | QDialog* mSyncActionDialog; | ||
69 | QSocket* mSocket; | ||
70 | QString mPassWord; | ||
71 | QString mFileName; | ||
72 | QTime piTime; | ||
73 | QString piFileString; | ||
74 | }; | ||
75 | |||
76 | class KCommandSocket : public QObject | ||
77 | { | ||
78 | Q_OBJECT | ||
79 | public: | ||
80 | enum state { successR, errorR, successW, errorW, quiet }; | ||
81 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 ); | ||
82 | void readFile( QString ); | ||
83 | void writeFile( QString ); | ||
84 | void sendStop(); | ||
85 | |||
86 | |||
87 | signals: | ||
88 | void commandFinished( KCommandSocket*, int ); | ||
89 | private slots: | ||
90 | void startReadFileFromSocket(); | ||
91 | void readFileFromSocket(); | ||
92 | void deleteSocket(); | ||
93 | void writeFileToSocket(); | ||
94 | private : | ||
95 | QSocket* mSocket; | ||
96 | QString mPassWord; | ||
97 | Q_UINT16 mPort; | ||
98 | QString mHost; | ||
99 | QString mFileName; | ||
100 | QTimer* mTimerSocket; | ||
101 | int mRetVal; | ||
102 | QTime mTime; | ||
103 | QString mFileString; | ||
104 | bool mFirst; | ||
105 | }; | ||
106 | |||
107 | |||
36 | class KSyncManager : public QObject | 108 | class KSyncManager : public QObject |
37 | { | 109 | { |
38 | Q_OBJECT | 110 | Q_OBJECT |
39 | 111 | ||
40 | public: | 112 | public: |
41 | enum TargetApp { | 113 | enum TargetApp { |
42 | KOPI = 0, | 114 | KOPI = 0, |
43 | KAPI = 1, | 115 | KAPI = 1, |
44 | PWMPI = 2 }; | 116 | PWMPI = 2 }; |
45 | 117 | ||
46 | 118 | ||
47 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); | 119 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); |
48 | ~KSyncManager() ; | 120 | ~KSyncManager() ; |
49 | 121 | ||
50 | bool blockSave() { return mBlockSaveFlag; } | 122 | bool blockSave() { return mBlockSaveFlag; } |
51 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } | 123 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } |
52 | 124 | void setDefaultFileName( QString s) { mDefFileName = s ;} | |
125 | QString defaultFileName() { return mDefFileName ;} | ||
126 | QString syncFileName(); | ||
53 | void fillSyncMenu(); | 127 | void fillSyncMenu(); |
54 | 128 | ||
55 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } | 129 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } |
56 | QString getCurrentSyncName() { return mCurrentSyncName; } | 130 | QString getCurrentSyncName() { return mCurrentSyncName; } |
57 | 131 | ||
58 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); | 132 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); |
59 | void hideProgressBar(); | 133 | void hideProgressBar(); |
60 | bool isProgressBarCanceled(); | 134 | bool isProgressBarCanceled(); |
61 | 135 | ||
62 | // sync stuff | 136 | // sync stuff |
63 | QString mLocalMachineName; | 137 | QString mLocalMachineName; |
64 | QStringList mExternSyncProfiles; | 138 | QStringList mExternSyncProfiles; |
65 | QStringList mSyncProfileNames; | 139 | QStringList mSyncProfileNames; |
66 | bool mAskForPreferences; | 140 | bool mAskForPreferences; |
67 | bool mShowSyncSummary; | 141 | bool mShowSyncSummary; |
68 | bool mShowSyncEvents; | 142 | bool mShowSyncEvents; |
69 | bool mShowTodoInAgenda; | 143 | bool mShowTodoInAgenda; |
70 | bool mWriteBackExistingOnly; | 144 | bool mWriteBackExistingOnly; |
71 | int mSyncAlgoPrefs; | 145 | int mSyncAlgoPrefs; |
72 | int mRingSyncAlgoPrefs; | 146 | int mRingSyncAlgoPrefs; |
73 | bool mWriteBackFile; | 147 | bool mWriteBackFile; |
74 | int mWriteBackInFuture; | 148 | int mWriteBackInFuture; |
75 | QString mPhoneDevice; | 149 | QString mPhoneDevice; |
76 | QString mPhoneConnection; | 150 | QString mPhoneConnection; |
77 | QString mPhoneModel; | 151 | QString mPhoneModel; |
78 | QString mLastSyncedLocalFile; // save! | 152 | QString mLastSyncedLocalFile; // save! |
153 | QString mPassWordPiSync; | ||
154 | QString mActiveSyncPort; | ||
155 | QString mActiveSyncIP ; | ||
79 | 156 | ||
80 | 157 | signals: | |
158 | void save(); | ||
159 | void getFile( bool ); | ||
81 | 160 | ||
82 | public slots: | 161 | public slots: |
83 | void slotSyncMenu( int ); | 162 | void slotSyncMenu( int ); |
84 | 163 | ||
85 | private: | 164 | private: |
86 | // LR ******************************* | 165 | // LR ******************************* |
87 | // sync stuff! | 166 | // sync stuff! |
167 | void syncPi(); | ||
168 | void deleteCommandSocket(KCommandSocket*s, int state); | ||
169 | void readFileFromSocket(); | ||
170 | KServerSocket * mServerSocket; | ||
171 | void enableQuick(); | ||
172 | KPimPrefs* mPrefs; | ||
173 | QString mDefFileName; | ||
88 | QString mCurrentSyncDevice; | 174 | QString mCurrentSyncDevice; |
89 | QString mCurrentSyncName; | 175 | QString mCurrentSyncName; |
90 | void quickSyncLocalFile(); | 176 | void quickSyncLocalFile(); |
91 | bool syncWithFile( QString fn , bool quick ); | 177 | bool syncWithFile( QString fn , bool quick ); |
92 | void syncLocalFile(); | 178 | void syncLocalFile(); |
93 | void syncPhone(); | 179 | void syncPhone(); |
94 | void syncSharp(); | 180 | void syncSharp(); |
95 | bool syncExternalApplication(QString); | 181 | bool syncExternalApplication(QString); |
96 | void multiSync( bool askforPrefs ); | 182 | void multiSync( bool askforPrefs ); |
97 | int mCurrentSyncProfile ; | 183 | int mCurrentSyncProfile ; |
98 | void syncRemote( KSyncProfile* prof, bool ask = true); | 184 | void syncRemote( KSyncProfile* prof, bool ask = true); |
99 | void edit_sync_options(); | 185 | void edit_sync_options(); |
100 | int ringSync(); | 186 | int ringSync(); |
101 | QString getPassword( ); | 187 | QString getPassword( ); |
102 | 188 | ||
103 | private slots: | 189 | private slots: |
104 | void confSync(); | 190 | void confSync(); |
105 | // ********************* | 191 | // ********************* |
106 | 192 | ||
107 | private: | 193 | private: |
108 | bool mBlockSaveFlag; | 194 | bool mBlockSaveFlag; |
109 | 195 | ||
110 | 196 | ||
111 | QWidget* mParent; | 197 | QWidget* mParent; |
112 | KSyncInterface* mImplementation; | 198 | KSyncInterface* mImplementation; |
113 | TargetApp mTargetApp; | 199 | TargetApp mTargetApp; |
114 | QPopupMenu* mSyncMenu; | 200 | QPopupMenu* mSyncMenu; |
115 | 201 | ||
116 | QProgressBar* bar; | 202 | QProgressBar* bar; |
117 | 203 | ||
118 | 204 | ||
119 | 205 | ||
120 | 206 | ||
121 | 207 | ||
122 | }; | 208 | }; |
123 | 209 | ||
124 | 210 | ||
125 | class KSyncInterface | 211 | class KSyncInterface |
126 | { | 212 | { |
213 | |||
214 | |||
127 | public: | 215 | public: |
128 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; | 216 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; |
129 | 217 | ||
130 | virtual bool syncExternal(KSyncManager* manager, QString resource) | 218 | virtual bool syncExternal(KSyncManager* manager, QString resource) |
131 | { | 219 | { |
132 | // empty implementation, because some syncable applications do not have an external(sharpdtm) syncmode, like pwmanager. | 220 | // empty implementation, because some syncable applications do not have an external(sharpdtm) syncmode, like pwmanager. |
133 | return false; | 221 | return false; |
134 | } | 222 | } |
135 | 223 | ||
136 | //called by the syncmanager to indicate that the work has to be marked as dirty. | ||
137 | virtual void sync_setModified() = 0; | ||
138 | |||
139 | //called by the syncmanager to ask if the dirty flag is set. | ||
140 | virtual bool sync_isModified() = 0; | ||
141 | 224 | ||
142 | //called by the syncmanager to indicate that the work has to be saved. | ||
143 | virtual void sync_save() = 0; | ||
144 | }; | 225 | }; |
145 | 226 | ||
146 | 227 | ||
147 | #endif | 228 | #endif |