| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 126 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.h | 93 |
2 files changed, 100 insertions, 119 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 568c2a9..01309d5 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1,21 +1,21 @@ /* - This file is part of KDE-Pim/Pi. - Copyright (c) 2004 Ulf Schenk - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + This file is part of KDE-Pim/Pi. + Copyright (c) 2004 Ulf Schenk + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ // $Id$ @@ -73,7 +73,7 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ KSyncManager::~KSyncManager() { - delete bar; + delete bar; } @@ -165,7 +165,7 @@ void KSyncManager::slotSyncMenu( int action ) } if (blockSave()) - return; + return; setBlockSave(true); @@ -300,22 +300,22 @@ void KSyncManager::syncLocalFile() QString fn =mPrefs->mLastSyncedLocalFile; QString ext; - switch(mTargetApp) - { + switch(mTargetApp) + { case (KAPI): - ext = "(*.vcf)"; - break; + ext = "(*.vcf)"; + break; case (KOPI): - ext = "(*.ics/*.vcs)"; - break; + ext = "(*.ics/*.vcs)"; + break; case (PWMPI): - ext = "(*.pwm)"; - break; + ext = "(*.pwm)"; + break; default: - qDebug("KSyncManager::syncLocalFile: invalid apptype selected"); - break; + qDebug("KSyncManager::syncLocalFile: invalid apptype selected"); + break; - } + } fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent ); if ( fn == "" ) @@ -390,7 +390,7 @@ void KSyncManager::multiSync( bool askforPrefs ) mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; if ( askforPrefs ) { edit_sync_options(); - mRingSyncAlgoPrefs = mSyncAlgoPrefs; + mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; } mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); qApp->processEvents(); @@ -520,12 +520,12 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask) { QString question; if ( ask ) { - question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n"; - if ( QMessageBox::information( mParent, i18n("Sync"), - question, - i18n("Yes"), i18n("No"), - 0, 0 ) != 0 ) - return; + question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n"; + if ( QMessageBox::information( mParent, i18n("Sync"), + question, + i18n("Yes"), i18n("No"), + 0, 0 ) != 0 ) + return; } QString preCommand; @@ -739,25 +739,25 @@ void KSyncManager::syncPhone() void KSyncManager::showProgressBar(int percentage, QString caption, int total) { - if (!bar->isVisible()) - { - bar->setCaption (caption); - bar->setTotalSteps ( total ) ; + if (!bar->isVisible()) + { + bar->setCaption (caption); + bar->setTotalSteps ( total ) ; - bar->show(); - } + bar->show(); + } - bar->setProgress( percentage ); + bar->setProgress( percentage ); } void KSyncManager::hideProgressBar() { - bar->hide(); + bar->hide(); } bool KSyncManager::isProgressBarCanceled() { - return !bar->isVisible(); + return !bar->isVisible(); } QString KSyncManager::syncFileName() @@ -807,23 +807,23 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) //enum { success, errorW, errorR, quiet }; if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { - mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); + mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); delete s; - if ( state == KCommandSocket::errorR ) { - KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); - connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); - commandSocket->sendStop(); - } + if ( state == KCommandSocket::errorR ) { + KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); + connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); + commandSocket->sendStop(); + } return; } else if ( state == KCommandSocket::errorW ) { - mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); + mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); } else if ( state == KCommandSocket::successR ) { QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); } else if ( state == KCommandSocket::successW ) { - mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); + mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); } delete s; @@ -1156,15 +1156,15 @@ void KCommandSocket::readFileFromSocket() void KCommandSocket::deleteSocket() { if ( mTimerSocket->isActive () ) { - mTimerSocket->stop(); - KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out!\nDid you forgot to enable\nsyncing on remote host? ")); - mRetVal = errorTO; - if ( mSocket ) { - mSocket->close(); - if ( mSocket->state() == QSocket::Idle ) - deleteSocket(); - return; - } + mTimerSocket->stop(); + KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out!\nDid you forgot to enable\nsyncing on remote host? ")); + mRetVal = errorTO; + if ( mSocket ) { + mSocket->close(); + if ( mSocket->state() == QSocket::Idle ) + deleteSocket(); + return; + } } //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); if ( mSocket) diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 7027894..1f7c7e7 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h @@ -1,23 +1,23 @@ /* - This file is part of KDE-Pim/Pi. - Copyright (c) 2004 Ulf Schenk + This file is part of KDE-Pim/Pi. + Copyright (c) 2004 Ulf Schenk - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. -$Id$ + $Id$ */ #ifndef _KSYNCMANAGER_H #define _KSYNCMANAGER_H @@ -43,18 +43,17 @@ class KServerSocket : public QServerSocket { Q_OBJECT -public: + public: KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); void newConnection ( int socket ) ; void setFileName( QString fn ) {mFileName = fn;}; - -signals: + signals: void file_received( bool ); void request_file(); void saveFile(); void endConnect(); -private slots: + private slots: void discardClient(); void readClient(); void readBackFileFromSocket(); @@ -74,17 +73,16 @@ private slots: class KCommandSocket : public QObject { Q_OBJECT -public: + public: enum state { successR, errorR, successW, errorW, errorTO, quiet }; KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 ); void readFile( QString ); void writeFile( QString ); void sendStop(); - - -signals: + + signals: void commandFinished( KCommandSocket*, int ); -private slots: + private slots: void startReadFileFromSocket(); void readFileFromSocket(); void deleteSocket(); @@ -105,14 +103,13 @@ private slots: class KSyncManager : public QObject { - Q_OBJECT + Q_OBJECT - public: + public: enum TargetApp { - KOPI = 0, - KAPI = 1, - PWMPI = 2 }; - + KOPI = 0, + KAPI = 1, + PWMPI = 2 }; KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); ~KSyncManager() ; @@ -123,7 +120,6 @@ class KSyncManager : public QObject void setDefaultFileName( QString s) { mDefFileName = s ;} QString defaultFileName() { return mDefFileName ;} QString syncFileName(); - void fillSyncMenu(); QString getCurrentSyncDevice() { return mCurrentSyncDevice; } QString getCurrentSyncName() { return mCurrentSyncName; } @@ -132,17 +128,14 @@ class KSyncManager : public QObject void hideProgressBar(); bool isProgressBarCanceled(); - // sync stuff + // sync stuff QString mLocalMachineName; QStringList mExternSyncProfiles; QStringList mSyncProfileNames; bool mAskForPreferences; bool mShowSyncSummary; - bool mShowSyncEvents; - bool mShowTodoInAgenda; bool mWriteBackExistingOnly; int mSyncAlgoPrefs; - int mRingSyncAlgoPrefs; bool mWriteBackFile; int mWriteBackInFuture; QString mPhoneDevice; @@ -157,14 +150,13 @@ class KSyncManager : public QObject void request_file(); void getFile( bool ); - public slots: + public slots: void slotSyncMenu( int ); void deleteCommandSocket(KCommandSocket*s, int state); void readFileFromSocket(); + void fillSyncMenu(); private: - // LR ******************************* - // sync stuff! void syncPi(); KServerSocket * mServerSocket; void enableQuick(); @@ -173,7 +165,7 @@ class KSyncManager : public QObject QString mCurrentSyncDevice; QString mCurrentSyncName; void quickSyncLocalFile(); - bool syncWithFile( QString fn , bool quick ); + bool syncWithFile( QString fn , bool quick ); void syncLocalFile(); void syncPhone(); void syncSharp(); @@ -184,40 +176,29 @@ class KSyncManager : public QObject int ringSync(); QString getPassword( ); - private slots: + private slots: void confSync(); - // ********************* - private: bool mBlockSaveFlag; - - QWidget* mParent; KSyncInterface* mImplementation; TargetApp mTargetApp; QPopupMenu* mSyncMenu; - QProgressBar* bar; - - - - }; class KSyncInterface { - - public : virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; - virtual bool syncExternal(KSyncManager* manager, QString resource) - { - // empty implementation, because some syncable applications do not have an external(sharpdtm) syncmode, like pwmanager. - return false; - } + { + // empty implementation, because some syncable applications do not + // have an external(sharpdtm) syncmode, like pwmanager. + return false; + } }; |