-rw-r--r-- | libkdepim/ksyncmanager.cpp | 12 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 28af135..fad9a76 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -742,102 +742,104 @@ bool KSyncManager::isProgressBarCanceled() | |||
742 | return !bar->isVisible(); | 742 | return !bar->isVisible(); |
743 | } | 743 | } |
744 | 744 | ||
745 | QString KSyncManager::syncFileName() | 745 | QString KSyncManager::syncFileName() |
746 | { | 746 | { |
747 | 747 | ||
748 | QString fn = "tempfile"; | 748 | QString fn = "tempfile"; |
749 | switch(mTargetApp) | 749 | switch(mTargetApp) |
750 | { | 750 | { |
751 | case (KAPI): | 751 | case (KAPI): |
752 | fn = "tempsyncab.vcf"; | 752 | fn = "tempsyncab.vcf"; |
753 | break; | 753 | break; |
754 | case (KOPI): | 754 | case (KOPI): |
755 | fn = "tempsynccal.ics"; | 755 | fn = "tempsynccal.ics"; |
756 | break; | 756 | break; |
757 | case (PWMPI): | 757 | case (PWMPI): |
758 | fn = "tempsyncpw.pwm"; | 758 | fn = "tempsyncpw.pwm"; |
759 | break; | 759 | break; |
760 | default: | 760 | default: |
761 | break; | 761 | break; |
762 | } | 762 | } |
763 | #ifdef _WIN32_ | 763 | #ifdef _WIN32_ |
764 | return locateLocal( "tmp", fn ); | 764 | return locateLocal( "tmp", fn ); |
765 | #else | 765 | #else |
766 | return (QString( "/tmp/" )+ fn ); | 766 | return (QString( "/tmp/" )+ fn ); |
767 | #endif | 767 | #endif |
768 | } | 768 | } |
769 | 769 | ||
770 | void KSyncManager::syncPi() | 770 | void KSyncManager::syncPi() |
771 | { | 771 | { |
772 | qApp->processEvents(); | 772 | qApp->processEvents(); |
773 | bool ok; | 773 | bool ok; |
774 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); | 774 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); |
775 | if ( ! ok ) { | 775 | if ( ! ok ) { |
776 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 776 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
777 | return; | 777 | return; |
778 | } | 778 | } |
779 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this ); | 779 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this ); |
780 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 780 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
781 | mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") ); | 781 | mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") ); |
782 | commandSocket->readFile( syncFileName() ); | 782 | commandSocket->readFile( syncFileName() ); |
783 | } | 783 | } |
784 | 784 | ||
785 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | 785 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) |
786 | { | 786 | { |
787 | qDebug("MainWindow::deleteCommandSocket %d", state); | 787 | qDebug("MainWindow::deleteCommandSocket %d", state); |
788 | 788 | ||
789 | //enum { success, errorW, errorR, quiet }; | 789 | //enum { success, errorW, errorR, quiet }; |
790 | if ( state == KCommandSocket::errorR ) { | 790 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { |
791 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 791 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); |
792 | delete s; | 792 | delete s; |
793 | if ( state == KCommandSocket::errorR ) { | ||
793 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); | 794 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); |
794 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 795 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
795 | commandSocket->sendStop(); | 796 | commandSocket->sendStop(); |
797 | } | ||
796 | return; | 798 | return; |
797 | 799 | ||
798 | } else if ( state == KCommandSocket::errorW ) { | 800 | } else if ( state == KCommandSocket::errorW ) { |
799 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 801 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
800 | 802 | ||
801 | } else if ( state == KCommandSocket::successR ) { | 803 | } else if ( state == KCommandSocket::successR ) { |
802 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | 804 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); |
803 | 805 | ||
804 | } else if ( state == KCommandSocket::successW ) { | 806 | } else if ( state == KCommandSocket::successW ) { |
805 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 807 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
806 | } | 808 | } |
807 | 809 | ||
808 | delete s; | 810 | delete s; |
809 | } | 811 | } |
810 | 812 | ||
811 | void KSyncManager::readFileFromSocket() | 813 | void KSyncManager::readFileFromSocket() |
812 | { | 814 | { |
813 | QString fileName = syncFileName(); | 815 | QString fileName = syncFileName(); |
814 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 816 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |
815 | if ( ! syncWithFile( fileName , true ) ) { | 817 | if ( ! syncWithFile( fileName , true ) ) { |
816 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); | 818 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); |
817 | qDebug("Syncing failed "); | 819 | qDebug("Syncing failed "); |
818 | return; | 820 | return; |
819 | } | 821 | } |
820 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); | 822 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); |
821 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 823 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
822 | if ( mWriteBackFile ) | 824 | if ( mWriteBackFile ) |
823 | commandSocket->writeFile( fileName ); | 825 | commandSocket->writeFile( fileName ); |
824 | else { | 826 | else { |
825 | commandSocket->sendStop(); | 827 | commandSocket->sendStop(); |
826 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 828 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
827 | } | 829 | } |
828 | } | 830 | } |
829 | 831 | ||
830 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | 832 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) |
831 | { | 833 | { |
832 | mPassWord = pw; | 834 | mPassWord = pw; |
833 | mSocket = 0; | 835 | mSocket = 0; |
834 | mSyncActionDialog = 0; | 836 | mSyncActionDialog = 0; |
835 | blockRC = false; | 837 | blockRC = false; |
836 | }; | 838 | }; |
837 | 839 | ||
838 | void KServerSocket::newConnection ( int socket ) | 840 | void KServerSocket::newConnection ( int socket ) |
839 | { | 841 | { |
840 | // qDebug("KServerSocket:New connection %d ", socket); | 842 | // qDebug("KServerSocket:New connection %d ", socket); |
841 | if ( mSocket ) { | 843 | if ( mSocket ) { |
842 | qDebug("KServerSocket::newConnection Socket deleted! "); | 844 | qDebug("KServerSocket::newConnection Socket deleted! "); |
843 | delete mSocket; | 845 | delete mSocket; |
@@ -1092,57 +1094,63 @@ void KCommandSocket::startReadFileFromSocket() | |||
1092 | mTime.start(); | 1094 | mTime.start(); |
1093 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); | 1095 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); |
1094 | 1096 | ||
1095 | } | 1097 | } |
1096 | void KCommandSocket::readFileFromSocket() | 1098 | void KCommandSocket::readFileFromSocket() |
1097 | { | 1099 | { |
1098 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); | 1100 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); |
1099 | while ( mSocket->canReadLine () ) { | 1101 | while ( mSocket->canReadLine () ) { |
1100 | mTime.restart(); | 1102 | mTime.restart(); |
1101 | QString line = mSocket->readLine (); | 1103 | QString line = mSocket->readLine (); |
1102 | mFileString += line; | 1104 | mFileString += line; |
1103 | //qDebug("readline: %s ", line.latin1()); | 1105 | //qDebug("readline: %s ", line.latin1()); |
1104 | } | 1106 | } |
1105 | if ( mTime.elapsed () < 3000 ) { | 1107 | if ( mTime.elapsed () < 3000 ) { |
1106 | // wait for more | 1108 | // wait for more |
1107 | //qDebug("waitformore "); | 1109 | //qDebug("waitformore "); |
1108 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); | 1110 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); |
1109 | return; | 1111 | return; |
1110 | } | 1112 | } |
1111 | QString fileName = mFileName; | 1113 | QString fileName = mFileName; |
1112 | QFile file ( fileName ); | 1114 | QFile file ( fileName ); |
1113 | if (!file.open( IO_WriteOnly ) ) { | 1115 | if (!file.open( IO_WriteOnly ) ) { |
1114 | mFileString = ""; | 1116 | mFileString = ""; |
1115 | mRetVal = errorR; | 1117 | mRetVal = errorR; |
1116 | qDebug("Error open temp calender file for writing: %s",fileName.latin1() ); | 1118 | qDebug("Error open temp calender file for writing: %s",fileName.latin1() ); |
1117 | deleteSocket(); | 1119 | deleteSocket(); |
1118 | return ; | 1120 | return ; |
1119 | 1121 | ||
1120 | } | 1122 | } |
1121 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1123 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1122 | QTextStream ts ( &file ); | 1124 | QTextStream ts ( &file ); |
1123 | ts.setEncoding( QTextStream::Latin1 ); | 1125 | ts.setEncoding( QTextStream::Latin1 ); |
1124 | ts << mFileString; | 1126 | ts << mFileString; |
1125 | file.close(); | 1127 | file.close(); |
1126 | mFileString = ""; | 1128 | mFileString = ""; |
1127 | mRetVal = successR; | 1129 | mRetVal = successR; |
1128 | mSocket->close(); | 1130 | mSocket->close(); |
1129 | // if state is not idle, deleteSocket(); is called via | 1131 | // if state is not idle, deleteSocket(); is called via |
1130 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1132 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1131 | if ( mSocket->state() == QSocket::Idle ) | 1133 | if ( mSocket->state() == QSocket::Idle ) |
1132 | deleteSocket(); | 1134 | deleteSocket(); |
1133 | } | 1135 | } |
1134 | 1136 | ||
1135 | void KCommandSocket::deleteSocket() | 1137 | void KCommandSocket::deleteSocket() |
1136 | { | 1138 | { |
1137 | if ( mTimerSocket->isActive () ) { | 1139 | if ( mTimerSocket->isActive () ) { |
1138 | mTimerSocket->stop(); | 1140 | mTimerSocket->stop(); |
1139 | KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out!\nDid you forgot to enable\nsyncing on remote host? ")); | 1141 | KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out!\nDid you forgot to enable\nsyncing on remote host? ")); |
1140 | mRetVal = errorR; | 1142 | mRetVal = errorTO; |
1143 | if ( mSocket ) { | ||
1144 | mSocket->close(); | ||
1145 | if ( mSocket->state() == QSocket::Idle ) | ||
1146 | deleteSocket(); | ||
1147 | return; | ||
1148 | } | ||
1141 | } | 1149 | } |
1142 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); | 1150 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); |
1143 | if ( mSocket) | 1151 | if ( mSocket) |
1144 | delete mSocket; | 1152 | delete mSocket; |
1145 | mSocket = 0; | 1153 | mSocket = 0; |
1146 | emit commandFinished( this, mRetVal ); | 1154 | emit commandFinished( this, mRetVal ); |
1147 | } | 1155 | } |
1148 | 1156 | ||
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 32400af..25892d8 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -30,179 +30,179 @@ $Id$ | |||
30 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
31 | #include <qregexp.h> | 31 | #include <qregexp.h> |
32 | 32 | ||
33 | class QPopupMenu; | 33 | class QPopupMenu; |
34 | class KSyncProfile; | 34 | class KSyncProfile; |
35 | class KPimPrefs; | 35 | class KPimPrefs; |
36 | class QWidget; | 36 | class QWidget; |
37 | class KSyncManager; | 37 | class KSyncManager; |
38 | class KSyncInterface; | 38 | class KSyncInterface; |
39 | class QProgressBar; | 39 | class QProgressBar; |
40 | 40 | ||
41 | 41 | ||
42 | class KServerSocket : public QServerSocket | 42 | class KServerSocket : public QServerSocket |
43 | { | 43 | { |
44 | Q_OBJECT | 44 | Q_OBJECT |
45 | 45 | ||
46 | public: | 46 | public: |
47 | KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); | 47 | KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); |
48 | 48 | ||
49 | void newConnection ( int socket ) ; | 49 | void newConnection ( int socket ) ; |
50 | void setFileName( QString fn ) {mFileName = fn;}; | 50 | void setFileName( QString fn ) {mFileName = fn;}; |
51 | 51 | ||
52 | signals: | 52 | signals: |
53 | void file_received( bool ); | 53 | void file_received( bool ); |
54 | void request_file(); | 54 | void request_file(); |
55 | void saveFile(); | 55 | void saveFile(); |
56 | void endConnect(); | 56 | void endConnect(); |
57 | private slots: | 57 | private slots: |
58 | void discardClient(); | 58 | void discardClient(); |
59 | void readClient(); | 59 | void readClient(); |
60 | void readBackFileFromSocket(); | 60 | void readBackFileFromSocket(); |
61 | private : | 61 | private : |
62 | bool blockRC; | 62 | bool blockRC; |
63 | void send_file(); | 63 | void send_file(); |
64 | void get_file(); | 64 | void get_file(); |
65 | void end_connect(); | 65 | void end_connect(); |
66 | QDialog* mSyncActionDialog; | 66 | QDialog* mSyncActionDialog; |
67 | QSocket* mSocket; | 67 | QSocket* mSocket; |
68 | QString mPassWord; | 68 | QString mPassWord; |
69 | QString mFileName; | 69 | QString mFileName; |
70 | QTime piTime; | 70 | QTime piTime; |
71 | QString piFileString; | 71 | QString piFileString; |
72 | }; | 72 | }; |
73 | 73 | ||
74 | class KCommandSocket : public QObject | 74 | class KCommandSocket : public QObject |
75 | { | 75 | { |
76 | Q_OBJECT | 76 | Q_OBJECT |
77 | public: | 77 | public: |
78 | enum state { successR, errorR, successW, errorW, quiet }; | 78 | enum state { successR, errorR, successW, errorW, errorTO, quiet }; |
79 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 ); | 79 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 ); |
80 | void readFile( QString ); | 80 | void readFile( QString ); |
81 | void writeFile( QString ); | 81 | void writeFile( QString ); |
82 | void sendStop(); | 82 | void sendStop(); |
83 | 83 | ||
84 | 84 | ||
85 | signals: | 85 | signals: |
86 | void commandFinished( KCommandSocket*, int ); | 86 | void commandFinished( KCommandSocket*, int ); |
87 | private slots: | 87 | private slots: |
88 | void startReadFileFromSocket(); | 88 | void startReadFileFromSocket(); |
89 | void readFileFromSocket(); | 89 | void readFileFromSocket(); |
90 | void deleteSocket(); | 90 | void deleteSocket(); |
91 | void writeFileToSocket(); | 91 | void writeFileToSocket(); |
92 | private : | 92 | private : |
93 | QSocket* mSocket; | 93 | QSocket* mSocket; |
94 | QString mPassWord; | 94 | QString mPassWord; |
95 | Q_UINT16 mPort; | 95 | Q_UINT16 mPort; |
96 | QString mHost; | 96 | QString mHost; |
97 | QString mFileName; | 97 | QString mFileName; |
98 | QTimer* mTimerSocket; | 98 | QTimer* mTimerSocket; |
99 | int mRetVal; | 99 | int mRetVal; |
100 | QTime mTime; | 100 | QTime mTime; |
101 | QString mFileString; | 101 | QString mFileString; |
102 | bool mFirst; | 102 | bool mFirst; |
103 | }; | 103 | }; |
104 | 104 | ||
105 | 105 | ||
106 | class KSyncManager : public QObject | 106 | class KSyncManager : public QObject |
107 | { | 107 | { |
108 | Q_OBJECT | 108 | Q_OBJECT |
109 | 109 | ||
110 | public: | 110 | public: |
111 | enum TargetApp { | 111 | enum TargetApp { |
112 | KOPI = 0, | 112 | KOPI = 0, |
113 | KAPI = 1, | 113 | KAPI = 1, |
114 | PWMPI = 2 }; | 114 | PWMPI = 2 }; |
115 | 115 | ||
116 | 116 | ||
117 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); | 117 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); |
118 | ~KSyncManager() ; | 118 | ~KSyncManager() ; |
119 | 119 | ||
120 | bool blockSave() { return mBlockSaveFlag; } | 120 | bool blockSave() { return mBlockSaveFlag; } |
121 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } | 121 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } |
122 | void setDefaultFileName( QString s) { mDefFileName = s ;} | 122 | void setDefaultFileName( QString s) { mDefFileName = s ;} |
123 | QString defaultFileName() { return mDefFileName ;} | 123 | QString defaultFileName() { return mDefFileName ;} |
124 | QString syncFileName(); | 124 | QString syncFileName(); |
125 | void fillSyncMenu(); | ||
125 | 126 | ||
126 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } | 127 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } |
127 | QString getCurrentSyncName() { return mCurrentSyncName; } | 128 | QString getCurrentSyncName() { return mCurrentSyncName; } |
128 | 129 | ||
129 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); | 130 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); |
130 | void hideProgressBar(); | 131 | void hideProgressBar(); |
131 | bool isProgressBarCanceled(); | 132 | bool isProgressBarCanceled(); |
132 | 133 | ||
133 | // sync stuff | 134 | // sync stuff |
134 | QString mLocalMachineName; | 135 | QString mLocalMachineName; |
135 | QStringList mExternSyncProfiles; | 136 | QStringList mExternSyncProfiles; |
136 | QStringList mSyncProfileNames; | 137 | QStringList mSyncProfileNames; |
137 | bool mAskForPreferences; | 138 | bool mAskForPreferences; |
138 | bool mShowSyncSummary; | 139 | bool mShowSyncSummary; |
139 | bool mShowSyncEvents; | 140 | bool mShowSyncEvents; |
140 | bool mShowTodoInAgenda; | 141 | bool mShowTodoInAgenda; |
141 | bool mWriteBackExistingOnly; | 142 | bool mWriteBackExistingOnly; |
142 | int mSyncAlgoPrefs; | 143 | int mSyncAlgoPrefs; |
143 | int mRingSyncAlgoPrefs; | 144 | int mRingSyncAlgoPrefs; |
144 | bool mWriteBackFile; | 145 | bool mWriteBackFile; |
145 | int mWriteBackInFuture; | 146 | int mWriteBackInFuture; |
146 | QString mPhoneDevice; | 147 | QString mPhoneDevice; |
147 | QString mPhoneConnection; | 148 | QString mPhoneConnection; |
148 | QString mPhoneModel; | 149 | QString mPhoneModel; |
149 | QString mLastSyncedLocalFile; // save! | 150 | QString mLastSyncedLocalFile; // save! |
150 | QString mPassWordPiSync; | 151 | QString mPassWordPiSync; |
151 | QString mActiveSyncPort; | 152 | QString mActiveSyncPort; |
152 | QString mActiveSyncIP ; | 153 | QString mActiveSyncIP ; |
153 | 154 | ||
154 | signals: | 155 | signals: |
155 | void save(); | 156 | void save(); |
156 | void request_file(); | 157 | void request_file(); |
157 | void getFile( bool ); | 158 | void getFile( bool ); |
158 | 159 | ||
159 | public slots: | 160 | public slots: |
160 | void fillSyncMenu(); | ||
161 | void slotSyncMenu( int ); | 161 | void slotSyncMenu( int ); |
162 | void deleteCommandSocket(KCommandSocket*s, int state); | 162 | void deleteCommandSocket(KCommandSocket*s, int state); |
163 | void readFileFromSocket(); | 163 | void readFileFromSocket(); |
164 | 164 | ||
165 | private: | 165 | private: |
166 | // LR ******************************* | 166 | // LR ******************************* |
167 | // sync stuff! | 167 | // sync stuff! |
168 | void syncPi(); | 168 | void syncPi(); |
169 | KServerSocket * mServerSocket; | 169 | KServerSocket * mServerSocket; |
170 | void enableQuick(); | 170 | void enableQuick(); |
171 | KPimPrefs* mPrefs; | 171 | KPimPrefs* mPrefs; |
172 | QString mDefFileName; | 172 | QString mDefFileName; |
173 | QString mCurrentSyncDevice; | 173 | QString mCurrentSyncDevice; |
174 | QString mCurrentSyncName; | 174 | QString mCurrentSyncName; |
175 | void quickSyncLocalFile(); | 175 | void quickSyncLocalFile(); |
176 | bool syncWithFile( QString fn , bool quick ); | 176 | bool syncWithFile( QString fn , bool quick ); |
177 | void syncLocalFile(); | 177 | void syncLocalFile(); |
178 | void syncPhone(); | 178 | void syncPhone(); |
179 | void syncSharp(); | 179 | void syncSharp(); |
180 | bool syncExternalApplication(QString); | 180 | bool syncExternalApplication(QString); |
181 | void multiSync( bool askforPrefs ); | 181 | void multiSync( bool askforPrefs ); |
182 | int mCurrentSyncProfile ; | 182 | int mCurrentSyncProfile ; |
183 | void syncRemote( KSyncProfile* prof, bool ask = true); | 183 | void syncRemote( KSyncProfile* prof, bool ask = true); |
184 | void edit_sync_options(); | 184 | void edit_sync_options(); |
185 | int ringSync(); | 185 | int ringSync(); |
186 | QString getPassword( ); | 186 | QString getPassword( ); |
187 | 187 | ||
188 | private slots: | 188 | private slots: |
189 | void confSync(); | 189 | void confSync(); |
190 | // ********************* | 190 | // ********************* |
191 | 191 | ||
192 | private: | 192 | private: |
193 | bool mBlockSaveFlag; | 193 | bool mBlockSaveFlag; |
194 | 194 | ||
195 | 195 | ||
196 | QWidget* mParent; | 196 | QWidget* mParent; |
197 | KSyncInterface* mImplementation; | 197 | KSyncInterface* mImplementation; |
198 | TargetApp mTargetApp; | 198 | TargetApp mTargetApp; |
199 | QPopupMenu* mSyncMenu; | 199 | QPopupMenu* mSyncMenu; |
200 | 200 | ||
201 | QProgressBar* bar; | 201 | QProgressBar* bar; |
202 | 202 | ||
203 | 203 | ||
204 | 204 | ||
205 | 205 | ||
206 | 206 | ||
207 | }; | 207 | }; |
208 | 208 | ||