summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp29
-rw-r--r--kaddressbook/kabcore.h7
-rw-r--r--korganizer/koprefs.cpp2
-rw-r--r--korganizer/koprefs.h3
-rw-r--r--korganizer/mainwindow.cpp321
-rw-r--r--korganizer/mainwindow.h70
-rw-r--r--libkdepim/kpimprefs.cpp3
-rw-r--r--libkdepim/kpimprefs.h3
-rw-r--r--libkdepim/ksyncmanager.cpp523
-rw-r--r--libkdepim/ksyncmanager.h99
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
@@ -1680,12 +1680,16 @@ void KABCore::initGUI()
#endif //KAB_NOSPLITTER
*/
syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
syncManager->setBlockSave(false);
+ connect(syncManager , SIGNAL( save() ), this, SLOT( save() ) );
+ connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
+ syncManager->setDefaultFileName(locateLocal( "apps","kabc/std.vcf") );
+ //connect(syncManager , SIGNAL( ), this, SLOT( ) );
#endif //KAB_EMBEDDED
initActions();
#ifdef KAB_EMBEDDED
addActionsManually();
@@ -2834,13 +2838,12 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource)
AddressBook abLocal( resource,"syncContact");
bool syncOK = false;
if ( abLocal.load() ) {
qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
mGlobalSyncMode = SYNC_MODE_EXTERNAL;
abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice );
- qDebug("KABCore::syncExternal: why do we acces here KABPrefs and not somehow KSyncProfile? ");
syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
if ( syncOK ) {
if ( syncManager->mWriteBackFile ) {
abLocal.saveAB();
abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
}
@@ -2850,27 +2853,19 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource)
if ( syncOK )
mViewManager->refreshView();
return syncOK;
}
-//called by the syncmanager to indicate that the work has to marked as dirty.
-void KABCore::sync_setModified()
+void KABCore::getFile( bool success )
{
- setModified();
-}
-
-//called by the syncmanager to ask if the dirty flag is set.
-bool KABCore::sync_isModified()
-{
- return mModified;
+ if ( ! success ) {
+ setCaption( i18n("Error receiving file. Nothing changed!") );
+ return;
}
-
-
-//called by the syncmanager to indicate that the work has to be saved.
-void KABCore::sync_save()
-{
- save();
+ //mView->watchSavedFile();
+ //mView->openCalendar( defaultFileName() );
+ // pending: reload received file!
+ setCaption( i18n("Pi-Sync successful!") );
}
-
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index c9c0d38..355e828 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -339,12 +339,13 @@ class KABCore : public QWidget, public KSyncInterface
signals:
void contactSelected( const QString &name );
void contactSelected( const QPixmap &pixmap );
public slots:
+ void getFile( bool success );
void setDetailsVisible( bool visible );
void setDetailsToState();
// void slotSyncMenu( int );
private slots:
void setJumpButtonBarVisible( bool visible );
void importFromOL();
@@ -458,18 +459,12 @@ class KABCore : public QWidget, public KSyncInterface
#endif //KAB_EMBEDDED
//this are the overwritten callbackmethods from the syncinterface
virtual bool sync(KSyncManager* manager, QString filename, int mode);
virtual bool syncExternal(KSyncManager* manager, QString resource);
- //called by the syncmanager to indicate that the work has to marked as dirty.
- virtual void sync_setModified();
- //called by the syncmanager to ask if the dirty flag is set.
- virtual bool sync_isModified();
- //called by the syncmanager to indicate that the work has to be saved.
- virtual void sync_save();
// LR *******************************
// sync stuff!
QPopupMenu *syncMenu;
KSyncManager* syncManager;
int mGlobalSyncMode;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 84e3d00..1210094 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -189,14 +189,12 @@ KOPrefs::KOPrefs() :
KPrefs::setCurrentGroup("RemoteSyncing");
// addItemBool("UsePasswd",&mUsePassWd,false);
// addItemBool("WriteBackFile",&mWriteBackFile,true);
// addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false);
// addItemBool("AskForPreferences",&mAskForPreferences,true);
// addItemBool("ShowSyncSummary",&mShowSyncSummary,true);
- addItemString("PassiveSyncPort",&mPassiveSyncPort,"9197" );
- addItemString("PassiveSyncPw",&mPassiveSyncPw,"abc" );
addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );
addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" );
addItemBool("ShowSyncEvents",&mShowSyncEvents,false);
addItemInt("LastSyncTime",&mLastSyncTime,0);
addItemInt("SyncAlgoPrefs",&mSyncAlgoPrefs,3);
addItemInt("RingSyncAlgoPrefs",&mRingSyncAlgoPrefs,3);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index d9ac851..ff09e19 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -275,14 +275,13 @@ class KOPrefs : public KPimPrefs
bool mUseInternalAlarmNotification;
int mAlarmPlayBeeps;
int mAlarmSuspendTime;
int mAlarmSuspendCount;
int mAlarmBeepInterval;
- QString mPassiveSyncPort;
- QString mPassiveSyncPw;
+
QString mActiveSyncPort;
QString mActiveSyncIP;
//US I copied the following settings into KPimGlobalPrefs
// that allows us later to easily remove the settings from here.
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9104347..e3324ee 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -127,13 +127,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
QMainWindow( parent, name )
{
mPassWordPiSync = "abc";
#ifdef DESKTOP_VERSION
setFont( QFont("Arial"), 14 );
#endif
- mSyncActionDialog = 0;
mServerSocket = 0;
mClosed = false;
//QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
QString confFile = locateLocal("config","korganizerrc");
QFileInfo finf ( confFile );
bool showWarning = !finf.exists();
@@ -2344,326 +2343,6 @@ void MainWindow::printSel( )
void MainWindow::printCal()
{
mView->print();//mCp->showDialog();
}
-
-
-KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
-{
- mPassWord = pw;
- mSocket = 0;
- mSyncActionDialog = 0;
- blockRC = false;
-};
-
-void KServerSocket::newConnection ( int socket )
-{
- // qDebug("KServerSocket:New connection %d ", socket);
- if ( mSocket ) {
- qDebug("KServerSocket::newConnection Socket deleted! ");
- delete mSocket;
- mSocket = 0;
- }
- mSocket = new QSocket( this );
- connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
- connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
- mSocket->setSocket( socket );
-}
-
-void KServerSocket::discardClient()
-{
- //qDebug(" KServerSocket::discardClient()");
- if ( mSocket ) {
- delete mSocket;
- mSocket = 0;
- }
- //emit endConnect();
-}
-void KServerSocket::readClient()
-{
- if ( blockRC )
- return;
- if ( mSocket == 0 ) {
- qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 ");
- return;
- }
- qDebug("KServerSocket readClient()");
- if ( mSocket->canReadLine() ) {
- QString line = mSocket->readLine();
- qDebug("KServerSocket readline: %s ", line.latin1());
- QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
- if ( tokens[0] == "GET" ) {
- if ( tokens[1] == mPassWord )
- //emit sendFile( mSocket );
- send_file();
- else {
- KMessageBox::information( 0, i18n("ERROR:\nGot send file request\nwith invalid password"));
- qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
- }
- }
- if ( tokens[0] == "PUT" ) {
- if ( tokens[1] == mPassWord ) {
- //emit getFile( mSocket );
- blockRC = true;
- get_file();
- }
- else {
- KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password"));
- qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
- }
- }
- if ( tokens[0] == "STOP" ) {
- //emit endConnect();
- end_connect();
- }
- }
-}
-void KServerSocket::end_connect()
-{
- delete mSyncActionDialog;
- mSyncActionDialog = 0;
-}
-void KServerSocket::send_file()
-{
- //qDebug("MainWindow::sendFile(QSocket* s) ");
- if ( mSyncActionDialog )
- delete mSyncActionDialog;
- mSyncActionDialog = new QDialog ( 0, "input-dialog", true );
- mSyncActionDialog->setCaption(i18n("Received sync request"));
- QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog );
- QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
- lay->addWidget( label);
- lay->setMargin(7);
- lay->setSpacing(7);
- mSyncActionDialog->setFixedSize( 230, 120);
- mSyncActionDialog->show();
- qDebug("KSS::saving ... ");
- emit saveFile();
- qApp->processEvents();
- QString fileName = mFileName;
- QFile file( fileName );
- if (!file.open( IO_ReadOnly ) ) {
- delete mSyncActionDialog;
- mSyncActionDialog = 0;
- qDebug("KSS::error open file ");
- mSocket->close();
- if ( mSocket->state() == QSocket::Idle )
- QTimer::singleShot( 10, this , SLOT ( discardClient()));
- return ;
-
- }
- mSyncActionDialog->setCaption( i18n("Sending file...") );
- QTextStream ts( &file );
- ts.setCodec( QTextCodec::codecForName("utf8") );
- QTextStream os( mSocket );
- os.setCodec( QTextCodec::codecForName("utf8") );
- //os.setEncoding( QTextStream::UnicodeUTF8 );
- while ( ! ts.atEnd() ) {
- os << ts.readLine() << "\n";
- }
- //os << ts.read();
- file.close();
- mSyncActionDialog->setCaption( i18n("Waiting for synced file...") );
- mSocket->close();
- if ( mSocket->state() == QSocket::Idle )
- QTimer::singleShot( 10, this , SLOT ( discardClient()));
-}
-void KServerSocket::get_file()
-{
- mSyncActionDialog->setCaption( i18n("Receiving synced file...") );
-
- piTime.start();
- piFileString = "";
- QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) ));
-}
-
-
-void KServerSocket::readBackFileFromSocket()
-{
- //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ());
- while ( mSocket->canReadLine () ) {
- piTime.restart();
- QString line = mSocket->readLine ();
- piFileString += line;
- //qDebug("readline: %s ", line.latin1());
- mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) );
-
- }
- if ( piTime.elapsed () < 3000 ) {
- // wait for more
- //qDebug("waitformore ");
- QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) ));
- return;
- }
- QString fileName = mFileName;
- QFile file ( fileName );
- if (!file.open( IO_WriteOnly ) ) {
- delete mSyncActionDialog;
- mSyncActionDialog = 0;
- qDebug("error open cal file ");
- piFileString = "";
- emit file_received( false );
- blockRC = false;
- return ;
-
- }
-
- // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
- QTextStream ts ( &file );
- ts.setCodec( QTextCodec::codecForName("utf8") );
- mSyncActionDialog->setCaption( i18n("Writing file to disk...") );
- ts << piFileString;
- mSocket->close();
- if ( mSocket->state() == QSocket::Idle )
- QTimer::singleShot( 10, this , SLOT ( discardClient()));
- file.close();
- delete mSyncActionDialog;
- mSyncActionDialog = 0;
- piFileString = "";
- blockRC = false;
- emit file_received( true );
-
-}
-
-KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name )
-{
- mPassWord = password;
- mSocket = 0;
- mPort = port;
- mHost = host;
-
- mRetVal = quiet;
- mTimerSocket = new QTimer ( this );
- connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) );
-}
-void KCommandSocket::readFile( QString fn )
-{
- if ( !mSocket ) {
- mSocket = new QSocket( this );
- connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
- connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
- }
- mFileString = "";
- mFileName = fn;
- mFirst = true;
- mSocket->connectToHost( mHost, mPort );
- QTextStream os( mSocket );
- os.setEncoding( QTextStream::UnicodeUTF8 );
- os << "GET " << mPassWord << "\r\n";
- mTimerSocket->start( 10000 );
-}
-
-void KCommandSocket::writeFile( QString fileName )
-{
- if ( !mSocket ) {
- mSocket = new QSocket( this );
- connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
- connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) );
- }
- mFileName = fileName ;
- mSocket->connectToHost( mHost, mPort );
-}
-void KCommandSocket::writeFileToSocket()
-{
- QFile file2( mFileName );
- if (!file2.open( IO_ReadOnly ) ) {
- mRetVal= errorW;
- mSocket->close();
- if ( mSocket->state() == QSocket::Idle )
- QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
- return ;
- }
- QTextStream ts2( &file2 );
- ts2.setCodec( QTextCodec::codecForName("utf8") );
- QTextStream os2( mSocket );
- os2.setCodec( QTextCodec::codecForName("utf8") );
- os2 << "PUT " << mPassWord << "\r\n";;
- while ( ! ts2.atEnd() ) {
- os2 << ts2.readLine() << "\n";
- }
- mRetVal= successW;
- file2.close();
- mSocket->close();
- if ( mSocket->state() == QSocket::Idle )
- QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
-}
-void KCommandSocket::sendStop()
-{
- if ( !mSocket ) {
- mSocket = new QSocket( this );
- connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
- }
- mSocket->connectToHost( mHost, mPort );
- QTextStream os2( mSocket );
- os2.setCodec( QTextCodec::codecForName("utf8") );
- os2 << "STOP\r\n";
- mSocket->close();
- if ( mSocket->state() == QSocket::Idle )
- QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
-}
-
-void KCommandSocket::startReadFileFromSocket()
-{
- if ( ! mFirst )
- return;
- mFirst = false;
- mTimerSocket->stop();
- mFileString = "";
- mTime.start();
- QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) ));
-
-}
-void KCommandSocket::readFileFromSocket()
-{
- //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ());
- while ( mSocket->canReadLine () ) {
- mTime.restart();
- QString line = mSocket->readLine ();
- mFileString += line;
- //qDebug("readline: %s ", line.latin1());
- }
- if ( mTime.elapsed () < 3000 ) {
- // wait for more
- //qDebug("waitformore ");
- QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) ));
- return;
- }
- QString fileName = mFileName;
- QFile file ( fileName );
- if (!file.open( IO_WriteOnly ) ) {
- mFileString = "";
- mRetVal = errorR;
- qDebug("Error open temp calender file for writing: %s",fileName.latin1() );
- deleteSocket();
- return ;
-
- }
- // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
- QTextStream ts ( &file );
- ts.setCodec( QTextCodec::codecForName("utf8") );
- ts << mFileString;
- file.close();
- mFileString = "";
- mRetVal = successR;
- mSocket->close();
- // if state is not idle, deleteSocket(); is called via
- // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
- if ( mSocket->state() == QSocket::Idle )
- deleteSocket();
-}
-
-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 = errorR;
- }
- //qDebug("KCommandSocket::deleteSocket() %d", mRetVal );
- if ( mSocket)
- delete mSocket;
- mSocket = 0;
- emit commandFinished( this, mRetVal );
-}
-
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 4f89e03..0da0be0 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -2,96 +2,29 @@
#define KORGE_MAINWINDOW_H
#include <qmainwindow.h>
#include <qtimer.h>
#include <qdict.h>
#include <qfile.h>
-#include <qsocket.h>
#include <qtextstream.h>
#include <qregexp.h>
#include <libkcal/incidence.h>
#include "simplealarmclient.h"
+#include <ksyncmanager.h>
class QAction;
class CalendarView;
class KSyncProfile;
#ifdef DESKTOP_VERSION
#define QPEToolBar QToolBar
#define QPEMenuBar QMenuBar
#endif
class QPEToolBar;
-#include <qserversocket.h>
-#include <qsocket.h>
-#include <qnetworkprotocol.h>
-class KServerSocket : public QServerSocket
-{
- Q_OBJECT
-
-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:
- //void sendFile(QSocket*);
- //void getFile(QSocket*);
- void file_received( bool );
- //void file_sent();
- void saveFile();
- void endConnect();
-private slots:
- void discardClient();
- void readClient();
- void readBackFileFromSocket();
- private :
- bool blockRC;
- void send_file();
- void get_file();
- void end_connect();
- QDialog* mSyncActionDialog;
- QSocket* mSocket;
- QString mPassWord;
- QString mFileName;
- QTime piTime;
- QString piFileString;
-};
-
-class KCommandSocket : public QObject
-{
- Q_OBJECT
-public:
- enum state { successR, errorR, successW, errorW, 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:
- void commandFinished( KCommandSocket*, int );
-private slots:
- void startReadFileFromSocket();
- void readFileFromSocket();
- void deleteSocket();
- void writeFileToSocket();
- private :
- QSocket* mSocket;
- QString mPassWord;
- Q_UINT16 mPort;
- QString mHost;
- QString mFileName;
- QTimer* mTimerSocket;
- int mRetVal;
- QTime mTime;
- QString mFileString;
- bool mFirst;
-};
namespace KCal {
class CalendarLocal;
}
using namespace KCal;
@@ -206,11 +139,10 @@ class MainWindow : public QMainWindow
void closeEvent( QCloseEvent* ce );
SimpleAlarmClient mAlarmClient;
QTimer mSaveTimer;
bool mBlockSaveFlag;
bool mCalendarModifiedFlag;
QPixmap loadPixmap( QString );
- QDialog * mSyncActionDialog;
};
#endif
diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp
index a9ea330..0a2f5f1 100644
--- a/libkdepim/kpimprefs.cpp
+++ b/libkdepim/kpimprefs.cpp
@@ -35,12 +35,15 @@ $Id$
#include "kpimprefs.h"
KPimPrefs::KPimPrefs( const QString &name ) :
KPrefs( name )
{
+ config()->setGroup("General");
+ addItemString("PassiveSyncPort",&mPassiveSyncPort,"9197" );
+ addItemString("PassiveSyncPw",&mPassiveSyncPw,"abc" );
}
KPimPrefs::~KPimPrefs()
{
}
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index 6f92919..fde8093 100644
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@@ -52,13 +52,14 @@ class KPimPrefs : public KPrefs
/** Write preferences to config file */
void usrWriteConfig();
public:
QStringList mCustomCategories;
-
+ QString mPassiveSyncPort;
+ QString mPassiveSyncPw;
protected:
virtual void setCategoryDefaults();
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index c0cc840..5d48884 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -29,12 +29,13 @@
#endif
#include "ksyncprofile.h"
#include "ksyncprefsdialog.h"
#include "kpimprefs.h"
+#include <kmessagebox.h>
#include <qdir.h>
#include <qprogressbar.h>
#include <qpopupmenu.h>
#include <qpushbutton.h>
#include <qradiobutton.h>
@@ -42,21 +43,24 @@
#include <qtimer.h>
#include <qmessagebox.h>
#include <qapplication.h>
#include <qlineedit.h>
#include <qdialog.h>
#include <qlayout.h>
+#include <qtextcodec.h>
+#include <qlabel.h>
#include <klocale.h>
#include <kglobal.h>
#include <kconfig.h>
#include <kfiledialog.h>
KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
- : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu)
+ : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu)
{
+ mServerSocket = 0;
bar = new QProgressBar ( 1, 0 );
bar->setCaption ("");
int w = 300;
if ( QApplication::desktop()->width() < 320 )
w = 220;
@@ -69,39 +73,42 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ
KSyncManager::~KSyncManager()
{
delete bar;
}
-
+//LR ok
void KSyncManager::fillSyncMenu()
{
if ( mSyncMenu->count() )
mSyncMenu->clear();
mSyncMenu->insertItem( i18n("Configure..."), 0 );
mSyncMenu->insertSeparator();
+ if ( mServerSocket == 0 ) {
+ mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 );
+ } else {
+ mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 );
+ }
+ mSyncMenu->insertSeparator();
mSyncMenu->insertItem( i18n("Multiple sync"), 1 );
mSyncMenu->insertSeparator();
KConfig config ( locateLocal( "config","ksyncprofilesrc" ) );
config.setGroup("General");
QStringList prof = config.readListEntry("SyncProfileNames");
mLocalMachineName = config.readEntry("LocalMachineName","undefined");
- if ( prof.count() < 3 ) {
+ if ( prof.count() < 2 ) {
prof.clear();
prof << i18n("Sharp_DTM");
prof << i18n("Local_file");
- prof << i18n("Last_file");
KSyncProfile* temp = new KSyncProfile ();
temp->setName( prof[0] );
temp->writeConfig(&config);
temp->setName( prof[1] );
temp->writeConfig(&config);
- temp->setName( prof[2] );
- temp->writeConfig(&config);
config.setGroup("General");
config.writeEntry("SyncProfileNames",prof);
config.writeEntry("ExternSyncProfiles","Sharp_DTM");
config.sync();
delete temp;
}
@@ -138,12 +145,23 @@ void KSyncManager::slotSyncMenu( int action )
return;
}
if ( action == 1 ) {
multiSync( true );
return;
}
+ if ( action == 2 ) {
+ enableQuick();
+ QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) );
+ return;
+ }
+ if ( action == 3 ) {
+ delete mServerSocket;
+ mServerSocket = 0;
+ QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) );
+ return;
+ }
if (blockSave())
return;
setBlockSave(true);
@@ -195,20 +213,74 @@ void KSyncManager::slotSyncMenu( int action )
} else {
if ( temp->getIsPhoneSync() ) {
mPhoneDevice = temp->getPhoneDevice( ) ;
mPhoneConnection = temp->getPhoneConnection( );
mPhoneModel = temp->getPhoneModel( );
syncPhone();
- } else
+ } else if ( temp->getIsPiSync() ) {
+ mPassWordPiSync = temp->getRemotePw();
+ mActiveSyncPort = temp->getRemotePort();
+ mActiveSyncIP = temp->getRemoteIP();
+ syncPi();
+ }
syncRemote( temp );
}
}
delete temp;
setBlockSave(false);
}
+void KSyncManager::enableQuick()
+{
+ QDialog dia ( 0, "input-dialog", true );
+ QLineEdit lab ( &dia );
+ QVBoxLayout lay( &dia );
+ lab.setText( mPrefs->mPassiveSyncPort );
+ lay.setMargin(7);
+ lay.setSpacing(7);
+ int po = 9197+mTargetApp;
+ QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia );
+ lay.addWidget( &label);
+ lay.addWidget( &lab);
+
+ QLineEdit lepw ( &dia );
+ lepw.setText( mPrefs->mPassiveSyncPw );
+ QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
+ lay.addWidget( &label2);
+ lay.addWidget( &lepw);
+ dia.setFixedSize( 230,80 );
+ dia.setCaption( i18n("Enter port for Pi-Sync") );
+ QPushButton pb ( "OK", &dia);
+ lay.addWidget( &pb );
+ connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
+ dia.show();
+ if ( ! dia.exec() )
+ return;
+ dia.hide();
+ qApp->processEvents();
+ mPrefs->mPassiveSyncPw = lepw.text();
+ mPrefs->mPassiveSyncPort = lab.text();
+ bool ok;
+ Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok);
+ if ( ! ok ) {
+ KMessageBox::information( 0, i18n("No valid port"));
+ return;
+ }
+ //qDebug("port %d ", port);
+ mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 );
+ mServerSocket->setFileName( defaultFileName() );
+ //qDebug("connected ");
+ if ( !mServerSocket->ok() ) {
+ KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!"));
+ delete mServerSocket;
+ mServerSocket = 0;
+ return;
+ }
+ connect( mServerSocket, SIGNAL ( saveFile() ),this, SIGNAL ( save() ) );
+ connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) );
+}
void KSyncManager::syncLocalFile()
{
QString fn =mLastSyncedLocalFile;
QString ext;
@@ -268,13 +340,12 @@ bool KSyncManager::syncWithFile( QString fn , bool quick )
if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) )
mParent->setCaption( i18n("Synchronization successful") );
else
mParent->setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
if ( ! quick )
mLastSyncedLocalFile = fn;
- mImplementation->sync_setModified();
}
return ret;
}
void KSyncManager::quickSyncLocalFile()
{
@@ -307,13 +378,13 @@ void KSyncManager::multiSync( bool askforPrefs )
qApp->processEvents();
int num = ringSync() ;
if ( num > 1 )
ringSync();
setBlockSave(false);
if ( num )
- mImplementation->sync_save();
+ emit save();
if ( num )
mParent->setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) );
else
mParent->setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
return;
}
@@ -611,14 +682,14 @@ void KSyncManager::syncSharp()
if ( ! syncExternalApplication("sharp") )
qDebug("ERROR sync sharp ");;
}
bool KSyncManager::syncExternalApplication(QString resource)
{
- if ( mImplementation->sync_isModified() )
- mImplementation->sync_save();
+
+ emit save();
if ( mAskForPreferences )
edit_sync_options();
qDebug("sync %s", resource.latin1());
@@ -627,18 +698,16 @@ bool KSyncManager::syncExternalApplication(QString resource)
return syncOK;
}
void KSyncManager::syncPhone()
{
- if ( mImplementation->sync_isModified() )
- mImplementation->sync_save();
+ emit save();
qDebug("pending syncPhone(); ");
//mView->syncPhone();
- mImplementation->sync_setModified();
}
void KSyncManager::showProgressBar(int percentage, QString caption, int total)
{
if (!bar->isVisible())
@@ -658,6 +727,432 @@ void KSyncManager::hideProgressBar()
}
bool KSyncManager::isProgressBarCanceled()
{
return !bar->isVisible();
}
+
+QString KSyncManager::syncFileName()
+{
+
+ QString fn = "tempfile";
+ switch(mTargetApp)
+ {
+ case (KAPI):
+ fn = "addressbook.vcf";
+ break;
+ case (KOPI):
+ fn = "synccalendar.ics";
+ break;
+ case (PWMPI):
+ fn = "manager.pwm";
+ break;
+ default:
+ break;
+ }
+#ifdef _WIN32_
+ return locateLocal( "tmp", fn );
+#else
+ return (QString( "/tmp/" )+ fn );
+#endif
+}
+
+void KSyncManager::syncPi()
+{
+ qApp->processEvents();
+ bool ok;
+ Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
+ if ( ! ok ) {
+ mParent->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
+ return;
+ }
+ KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this );
+ connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
+ mParent->setCaption( i18n("Sending request for remote file ...") );
+ commandSocket->readFile( syncFileName() );
+}
+
+void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
+{
+ qDebug("MainWindow::deleteCommandSocket %d", state);
+
+ //enum { success, errorW, errorR, quiet };
+ if ( state == KCommandSocket::errorR ) {
+ mParent->setCaption( i18n("ERROR: Receiving remote file failed.") );
+ delete s;
+ 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->setCaption( i18n("ERROR:Writing back file failed.") );
+
+ } else if ( state == KCommandSocket::successR ) {
+ QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
+
+ } else if ( state == KCommandSocket::successW ) {
+ mParent->setCaption( i18n("Pi-Sync succesful!") );
+ }
+
+ delete s;
+}
+
+void KSyncManager::readFileFromSocket()
+{
+ QString fileName = syncFileName();
+ mParent->setCaption( i18n("Remote file saved to temp file.") );
+ if ( ! syncWithFile( fileName , true ) ) {
+ mParent->setCaption( i18n("Syncing failed.") );
+ qDebug("Syncing failed ");
+ return;
+ }
+ KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
+ connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
+ if ( mWriteBackFile )
+ commandSocket->writeFile( fileName );
+ else {
+ commandSocket->sendStop();
+ mParent->setCaption( i18n("Pi-Sync succesful!") );
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
+{
+ mPassWord = pw;
+ mSocket = 0;
+ mSyncActionDialog = 0;
+ blockRC = false;
+};
+
+void KServerSocket::newConnection ( int socket )
+{
+ // qDebug("KServerSocket:New connection %d ", socket);
+ if ( mSocket ) {
+ qDebug("KServerSocket::newConnection Socket deleted! ");
+ delete mSocket;
+ mSocket = 0;
+ }
+ mSocket = new QSocket( this );
+ connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
+ connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
+ mSocket->setSocket( socket );
+}
+
+void KServerSocket::discardClient()
+{
+ //qDebug(" KServerSocket::discardClient()");
+ if ( mSocket ) {
+ delete mSocket;
+ mSocket = 0;
+ }
+ //emit endConnect();
+}
+void KServerSocket::readClient()
+{
+ if ( blockRC )
+ return;
+ if ( mSocket == 0 ) {
+ qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 ");
+ return;
+ }
+ qDebug("KServerSocket readClient()");
+ if ( mSocket->canReadLine() ) {
+ QString line = mSocket->readLine();
+ qDebug("KServerSocket readline: %s ", line.latin1());
+ QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
+ if ( tokens[0] == "GET" ) {
+ if ( tokens[1] == mPassWord )
+ //emit sendFile( mSocket );
+ send_file();
+ else {
+ KMessageBox::information( 0, i18n("ERROR:\nGot send file request\nwith invalid password"));
+ qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
+ }
+ }
+ if ( tokens[0] == "PUT" ) {
+ if ( tokens[1] == mPassWord ) {
+ //emit getFile( mSocket );
+ blockRC = true;
+ get_file();
+ }
+ else {
+ KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password"));
+ qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
+ }
+ }
+ if ( tokens[0] == "STOP" ) {
+ //emit endConnect();
+ end_connect();
+ }
+ }
+}
+void KServerSocket::end_connect()
+{
+ delete mSyncActionDialog;
+ mSyncActionDialog = 0;
+}
+void KServerSocket::send_file()
+{
+ //qDebug("MainWindow::sendFile(QSocket* s) ");
+ if ( mSyncActionDialog )
+ delete mSyncActionDialog;
+ mSyncActionDialog = new QDialog ( 0, "input-dialog", true );
+ mSyncActionDialog->setCaption(i18n("Received sync request"));
+ QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog );
+ QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
+ lay->addWidget( label);
+ lay->setMargin(7);
+ lay->setSpacing(7);
+ mSyncActionDialog->setFixedSize( 230, 120);
+ mSyncActionDialog->show();
+ qDebug("KSS::saving ... ");
+ emit saveFile();
+ qApp->processEvents();
+ QString fileName = mFileName;
+ QFile file( fileName );
+ if (!file.open( IO_ReadOnly ) ) {
+ delete mSyncActionDialog;
+ mSyncActionDialog = 0;
+ qDebug("KSS::error open file ");
+ mSocket->close();
+ if ( mSocket->state() == QSocket::Idle )
+ QTimer::singleShot( 10, this , SLOT ( discardClient()));
+ return ;
+
+ }
+ mSyncActionDialog->setCaption( i18n("Sending file...") );
+ QTextStream ts( &file );
+ ts.setCodec( QTextCodec::codecForName("utf8") );
+ QTextStream os( mSocket );
+ os.setCodec( QTextCodec::codecForName("utf8") );
+ //os.setEncoding( QTextStream::UnicodeUTF8 );
+ while ( ! ts.atEnd() ) {
+ os << ts.readLine() << "\n";
+ }
+ //os << ts.read();
+ file.close();
+ mSyncActionDialog->setCaption( i18n("Waiting for synced file...") );
+ mSocket->close();
+ if ( mSocket->state() == QSocket::Idle )
+ QTimer::singleShot( 10, this , SLOT ( discardClient()));
+}
+void KServerSocket::get_file()
+{
+ mSyncActionDialog->setCaption( i18n("Receiving synced file...") );
+
+ piTime.start();
+ piFileString = "";
+ QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) ));
+}
+
+
+void KServerSocket::readBackFileFromSocket()
+{
+ //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ());
+ while ( mSocket->canReadLine () ) {
+ piTime.restart();
+ QString line = mSocket->readLine ();
+ piFileString += line;
+ //qDebug("readline: %s ", line.latin1());
+ mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) );
+
+ }
+ if ( piTime.elapsed () < 3000 ) {
+ // wait for more
+ //qDebug("waitformore ");
+ QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) ));
+ return;
+ }
+ QString fileName = mFileName;
+ QFile file ( fileName );
+ if (!file.open( IO_WriteOnly ) ) {
+ delete mSyncActionDialog;
+ mSyncActionDialog = 0;
+ qDebug("error open cal file ");
+ piFileString = "";
+ emit file_received( false );
+ blockRC = false;
+ return ;
+
+ }
+
+ // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
+ QTextStream ts ( &file );
+ ts.setCodec( QTextCodec::codecForName("utf8") );
+ mSyncActionDialog->setCaption( i18n("Writing file to disk...") );
+ ts << piFileString;
+ mSocket->close();
+ if ( mSocket->state() == QSocket::Idle )
+ QTimer::singleShot( 10, this , SLOT ( discardClient()));
+ file.close();
+ delete mSyncActionDialog;
+ mSyncActionDialog = 0;
+ piFileString = "";
+ blockRC = false;
+ emit file_received( true );
+
+}
+
+KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name )
+{
+ mPassWord = password;
+ mSocket = 0;
+ mPort = port;
+ mHost = host;
+
+ mRetVal = quiet;
+ mTimerSocket = new QTimer ( this );
+ connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) );
+}
+void KCommandSocket::readFile( QString fn )
+{
+ if ( !mSocket ) {
+ mSocket = new QSocket( this );
+ connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
+ connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
+ }
+ mFileString = "";
+ mFileName = fn;
+ mFirst = true;
+ mSocket->connectToHost( mHost, mPort );
+ QTextStream os( mSocket );
+ os.setEncoding( QTextStream::UnicodeUTF8 );
+ os << "GET " << mPassWord << "\r\n";
+ mTimerSocket->start( 10000 );
+}
+
+void KCommandSocket::writeFile( QString fileName )
+{
+ if ( !mSocket ) {
+ mSocket = new QSocket( this );
+ connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
+ connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) );
+ }
+ mFileName = fileName ;
+ mSocket->connectToHost( mHost, mPort );
+}
+void KCommandSocket::writeFileToSocket()
+{
+ QFile file2( mFileName );
+ if (!file2.open( IO_ReadOnly ) ) {
+ mRetVal= errorW;
+ mSocket->close();
+ if ( mSocket->state() == QSocket::Idle )
+ QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
+ return ;
+ }
+ QTextStream ts2( &file2 );
+ ts2.setCodec( QTextCodec::codecForName("utf8") );
+ QTextStream os2( mSocket );
+ os2.setCodec( QTextCodec::codecForName("utf8") );
+ os2 << "PUT " << mPassWord << "\r\n";;
+ while ( ! ts2.atEnd() ) {
+ os2 << ts2.readLine() << "\n";
+ }
+ mRetVal= successW;
+ file2.close();
+ mSocket->close();
+ if ( mSocket->state() == QSocket::Idle )
+ QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
+}
+void KCommandSocket::sendStop()
+{
+ if ( !mSocket ) {
+ mSocket = new QSocket( this );
+ connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
+ }
+ mSocket->connectToHost( mHost, mPort );
+ QTextStream os2( mSocket );
+ os2.setCodec( QTextCodec::codecForName("utf8") );
+ os2 << "STOP\r\n";
+ mSocket->close();
+ if ( mSocket->state() == QSocket::Idle )
+ QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
+}
+
+void KCommandSocket::startReadFileFromSocket()
+{
+ if ( ! mFirst )
+ return;
+ mFirst = false;
+ mTimerSocket->stop();
+ mFileString = "";
+ mTime.start();
+ QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) ));
+
+}
+void KCommandSocket::readFileFromSocket()
+{
+ //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ());
+ while ( mSocket->canReadLine () ) {
+ mTime.restart();
+ QString line = mSocket->readLine ();
+ mFileString += line;
+ //qDebug("readline: %s ", line.latin1());
+ }
+ if ( mTime.elapsed () < 3000 ) {
+ // wait for more
+ //qDebug("waitformore ");
+ QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) ));
+ return;
+ }
+ QString fileName = mFileName;
+ QFile file ( fileName );
+ if (!file.open( IO_WriteOnly ) ) {
+ mFileString = "";
+ mRetVal = errorR;
+ qDebug("Error open temp calender file for writing: %s",fileName.latin1() );
+ deleteSocket();
+ return ;
+
+ }
+ // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
+ QTextStream ts ( &file );
+ ts.setCodec( QTextCodec::codecForName("utf8") );
+ ts << mFileString;
+ file.close();
+ mFileString = "";
+ mRetVal = successR;
+ mSocket->close();
+ // if state is not idle, deleteSocket(); is called via
+ // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
+ if ( mSocket->state() == QSocket::Idle )
+ deleteSocket();
+}
+
+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 = errorR;
+ }
+ //qDebug("KCommandSocket::deleteSocket() %d", mRetVal );
+ if ( mSocket)
+ delete mSocket;
+ mSocket = 0;
+ emit commandFinished( this, mRetVal );
+}
+
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 6b10016..52e2772 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -21,21 +21,93 @@ $Id$
*/
#ifndef _KSYNCMANAGER_H
#define _KSYNCMANAGER_H
#include <qobject.h>
#include <qstring.h>
+#include <qsocket.h>
+#include <qdatetime.h>
+#include <qserversocket.h>
+#include <qtextstream.h>
+#include <qregexp.h>
class QPopupMenu;
class KSyncProfile;
class KPimPrefs;
class QWidget;
class KSyncManager;
class KSyncInterface;
class QProgressBar;
+
+class KServerSocket : public QServerSocket
+{
+ Q_OBJECT
+
+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:
+ //void sendFile(QSocket*);
+ //void getFile(QSocket*);
+ void file_received( bool );
+ //void file_sent();
+ void saveFile();
+ void endConnect();
+private slots:
+ void discardClient();
+ void readClient();
+ void readBackFileFromSocket();
+ private :
+ bool blockRC;
+ void send_file();
+ void get_file();
+ void end_connect();
+ QDialog* mSyncActionDialog;
+ QSocket* mSocket;
+ QString mPassWord;
+ QString mFileName;
+ QTime piTime;
+ QString piFileString;
+};
+
+class KCommandSocket : public QObject
+{
+ Q_OBJECT
+public:
+ enum state { successR, errorR, successW, errorW, 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:
+ void commandFinished( KCommandSocket*, int );
+private slots:
+ void startReadFileFromSocket();
+ void readFileFromSocket();
+ void deleteSocket();
+ void writeFileToSocket();
+ private :
+ QSocket* mSocket;
+ QString mPassWord;
+ Q_UINT16 mPort;
+ QString mHost;
+ QString mFileName;
+ QTimer* mTimerSocket;
+ int mRetVal;
+ QTime mTime;
+ QString mFileString;
+ bool mFirst;
+};
+
+
class KSyncManager : public QObject
{
Q_OBJECT
public:
enum TargetApp {
@@ -46,13 +118,15 @@ class KSyncManager : public QObject
KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu);
~KSyncManager() ;
bool blockSave() { return mBlockSaveFlag; }
void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
-
+ void setDefaultFileName( QString s) { mDefFileName = s ;}
+ QString defaultFileName() { return mDefFileName ;}
+ QString syncFileName();
void fillSyncMenu();
QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
QString getCurrentSyncName() { return mCurrentSyncName; }
void showProgressBar(int percentage, QString caption = QString::null, int total=100);
@@ -73,21 +147,33 @@ class KSyncManager : public QObject
bool mWriteBackFile;
int mWriteBackInFuture;
QString mPhoneDevice;
QString mPhoneConnection;
QString mPhoneModel;
QString mLastSyncedLocalFile; // save!
+ QString mPassWordPiSync;
+ QString mActiveSyncPort;
+ QString mActiveSyncIP ;
-
+ signals:
+ void save();
+ void getFile( bool );
public slots:
void slotSyncMenu( int );
private:
// LR *******************************
// sync stuff!
+ void syncPi();
+ void deleteCommandSocket(KCommandSocket*s, int state);
+ void readFileFromSocket();
+ KServerSocket * mServerSocket;
+ void enableQuick();
+ KPimPrefs* mPrefs;
+ QString mDefFileName;
QString mCurrentSyncDevice;
QString mCurrentSyncName;
void quickSyncLocalFile();
bool syncWithFile( QString fn , bool quick );
void syncLocalFile();
void syncPhone();
@@ -121,27 +207,22 @@ class KSyncManager : public QObject
};
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;
}
- //called by the syncmanager to indicate that the work has to be marked as dirty.
- virtual void sync_setModified() = 0;
-
- //called by the syncmanager to ask if the dirty flag is set.
- virtual bool sync_isModified() = 0;
- //called by the syncmanager to indicate that the work has to be saved.
- virtual void sync_save() = 0;
};
#endif