summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-07 19:42:44 (UTC)
committer zautrix <zautrix>2004-10-07 19:42:44 (UTC)
commit0a661f5800b86df385cc23f4c9a8324bd0b50a5c (patch) (side-by-side diff)
treefcc17cfad0ffd022a4b92974bc53d39ba3f650de
parent1f1538e5707b59bfcff2014901f29a65589229e3 (diff)
downloadkdepimpi-0a661f5800b86df385cc23f4c9a8324bd0b50a5c.zip
kdepimpi-0a661f5800b86df385cc23f4c9a8324bd0b50a5c.tar.gz
kdepimpi-0a661f5800b86df385cc23f4c9a8324bd0b50a5c.tar.bz2
sync fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp126
-rw-r--r--libkdepim/ksyncmanager.h93
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,19 +1,19 @@
/*
- 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.
*/
@@ -75,3 +75,3 @@ KSyncManager::~KSyncManager()
{
- delete bar;
+ delete bar;
}
@@ -167,3 +167,3 @@ void KSyncManager::slotSyncMenu( int action )
if (blockSave())
- return;
+ return;
@@ -302,18 +302,18 @@ void KSyncManager::syncLocalFile()
- 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;
- }
+ }
@@ -392,3 +392,3 @@ void KSyncManager::multiSync( bool askforPrefs )
edit_sync_options();
- mRingSyncAlgoPrefs = mSyncAlgoPrefs;
+ mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs;
}
@@ -522,8 +522,8 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask)
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;
}
@@ -741,11 +741,11 @@ 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 );
}
@@ -754,3 +754,3 @@ void KSyncManager::hideProgressBar()
{
- bar->hide();
+ bar->hide();
}
@@ -759,3 +759,3 @@ bool KSyncManager::isProgressBarCanceled()
{
- return !bar->isVisible();
+ return !bar->isVisible();
}
@@ -809,9 +809,9 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
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;
@@ -819,3 +819,3 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
} else if ( state == KCommandSocket::errorW ) {
- mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") );
+ mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") );
@@ -825,3 +825,3 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
} else if ( state == KCommandSocket::successW ) {
- mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
+ mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
}
@@ -1158,11 +1158,11 @@ 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;
+ }
}
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 7027894..1f7c7e7 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -1,21 +1,21 @@
/*
- 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$
*/
@@ -45,3 +45,3 @@ class KServerSocket : public QServerSocket
-public:
+ public:
KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 );
@@ -50,4 +50,3 @@ public:
void setFileName( QString fn ) {mFileName = fn;};
-
-signals:
+ signals:
void file_received( bool );
@@ -56,3 +55,3 @@ signals:
void endConnect();
-private slots:
+ private slots:
void discardClient();
@@ -76,3 +75,3 @@ class KCommandSocket : public QObject
Q_OBJECT
-public:
+ public:
enum state { successR, errorR, successW, errorW, errorTO, quiet };
@@ -82,7 +81,6 @@ public:
void sendStop();
-
-
-signals:
+
+ signals:
void commandFinished( KCommandSocket*, int );
-private slots:
+ private slots:
void startReadFileFromSocket();
@@ -107,10 +105,9 @@ class KSyncManager : public QObject
{
- Q_OBJECT
+ Q_OBJECT
- public:
+ public:
enum TargetApp {
- KOPI = 0,
- KAPI = 1,
- PWMPI = 2 };
-
+ KOPI = 0,
+ KAPI = 1,
+ PWMPI = 2 };
@@ -125,3 +122,2 @@ class KSyncManager : public QObject
QString syncFileName();
- void fillSyncMenu();
@@ -134,3 +130,3 @@ class KSyncManager : public QObject
- // sync stuff
+ // sync stuff
QString mLocalMachineName;
@@ -140,7 +136,4 @@ class KSyncManager : public QObject
bool mShowSyncSummary;
- bool mShowSyncEvents;
- bool mShowTodoInAgenda;
bool mWriteBackExistingOnly;
int mSyncAlgoPrefs;
- int mRingSyncAlgoPrefs;
bool mWriteBackFile;
@@ -159,3 +152,3 @@ class KSyncManager : public QObject
- public slots:
+ public slots:
void slotSyncMenu( int );
@@ -163,6 +156,5 @@ class KSyncManager : public QObject
void readFileFromSocket();
+ void fillSyncMenu();
private:
- // LR *******************************
- // sync stuff!
void syncPi();
@@ -175,3 +167,3 @@ class KSyncManager : public QObject
void quickSyncLocalFile();
- bool syncWithFile( QString fn , bool quick );
+ bool syncWithFile( QString fn , bool quick );
void syncLocalFile();
@@ -186,10 +178,6 @@ class KSyncManager : public QObject
- private slots:
+ private slots:
void confSync();
- // *********************
-
private:
bool mBlockSaveFlag;
-
-
QWidget* mParent;
@@ -198,9 +186,4 @@ class KSyncManager : public QObject
QPopupMenu* mSyncMenu;
-
QProgressBar* bar;
-
-
-
-
};
@@ -210,12 +193,10 @@ 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;
+ }