author | zecke <zecke> | 2002-06-13 19:04:05 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-13 19:04:05 (UTC) |
commit | ed10b73df98c1b4c41a0b940e4f8729fe28c2b8a (patch) (side-by-side diff) | |
tree | 9fe7679c82a41b21de3378090ce211c00a8bc178 | |
parent | 9939c618389465ef5837bf510186d583891e65e3 (diff) | |
download | opie-ed10b73df98c1b4c41a0b940e4f8729fe28c2b8a.zip opie-ed10b73df98c1b4c41a0b940e4f8729fe28c2b8a.tar.gz opie-ed10b73df98c1b4c41a0b940e4f8729fe28c2b8a.tar.bz2 |
Stop receiving when wanting to send
-rw-r--r-- | core/applets/obex/obex.cc | 62 | ||||
-rw-r--r-- | core/applets/obex/obex.h | 4 | ||||
-rw-r--r-- | core/applets/obex/obeximpl.cc | 10 |
3 files changed, 71 insertions, 5 deletions
diff --git a/core/applets/obex/obex.cc b/core/applets/obex/obex.cc index 683964b..2218dbc 100644 --- a/core/applets/obex/obex.cc +++ b/core/applets/obex/obex.cc @@ -15,2 +15,7 @@ Obex::Obex( QObject *parent, const char* name ) m_count = 0; + m_receive = false; + connect( this, SIGNAL(error(int) ), // for recovering to receive + SLOT(slotError() ) ); + connect( this, SIGNAL(sent() ), + SLOT(slotError() ) ); }; @@ -21,2 +26,3 @@ Obex::~Obex() { void Obex::receive() { + m_receive = true; qWarning("Receive" ); @@ -34,9 +40,26 @@ void Obex::receive() { emit done( false ); + delete m_rec; + m_rec = 0; } - emit currentTry(m_count ); +// emit currentTry(m_count ); } -void Obex::send( const QString& fileName) { +void Obex::send( const QString& fileName) { // if currently receiving stop it send receive m_count = 0; m_file = fileName; + qWarning("send"); + if (m_rec != 0 ) { + qWarning("running"); + if (m_rec->isRunning() ) { + emit error(-1 ); + qWarning("is running"); + delete m_rec; + m_rec = 0; + + }else{ + qWarning("is not running"); + emit error( -1 ); // we did not delete yet but it's not running slotExited is pending + return; + } + } sendNow(); @@ -44,2 +67,3 @@ void Obex::send( const QString& fileName) { void Obex::sendNow(){ + qWarning("sendNow"); if ( m_count >= 25 ) { // could not send @@ -58,2 +82,3 @@ void Obex::sendNow(){ this, SLOT(slotStdOut(OProcess*, char*, int) ) ); + // now start it @@ -63,2 +88,4 @@ void Obex::sendNow(){ emit error(-1 ); + delete m_send; + m_send=0; } @@ -90,5 +117,7 @@ void Obex::recieved() { }else{ - emit error(-1); + emit done(false); }; delete m_rec; + m_rec = 0; + receive(); } @@ -128 +157,28 @@ QString Obex::parseOut( ){ } +/** + * when sent is done slotError is called we will start receive again + */ +void Obex::slotError() { + qWarning("slotError"); + if ( m_receive ) + receive(); +}; +void Obex::setReceiveEnabled( bool receive ) { + if ( !receive ) { // + m_receive = false; + shutDownReceive(); + } +} + +void Obex::shutDownReceive() { + if (m_rec != 0 ) { + qWarning("running"); + if (m_rec->isRunning() ) { + emit error(-1 ); + qWarning("is running"); + delete m_rec; + m_rec = 0; + } + } + +} diff --git a/core/applets/obex/obex.h b/core/applets/obex/obex.h index 4e78015..2ce44f2 100644 --- a/core/applets/obex/obex.h +++ b/core/applets/obex/obex.h @@ -28,2 +28,3 @@ namespace OpieObex { void send( const QString& ); + void setReceiveEnabled( bool = false ); signals: @@ -57,2 +58,4 @@ namespace OpieObex { OProcess *m_rec; + bool m_receive : 1; + void shutDownReceive(); @@ -69,2 +72,3 @@ namespace OpieObex { void slotStdOut(OProcess*, char*, int); + void slotError(); diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc index 856f100..0c137af 100644 --- a/core/applets/obex/obeximpl.cc +++ b/core/applets/obex/obeximpl.cc @@ -51,2 +51,3 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) { stream >> filename; + m_sendgui->raise(); // should be on top m_sendgui->showMaximized(); @@ -58,5 +59,10 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) { SLOT( slotSent() ) ); - }else if(msg == "receive(bool)" ) { // open a GUI + }else if(msg == "receive(int)" ) { // open a GUI m_recvgui->showMaximized(); + int receiveD = 0; + stream >> receiveD; + if ( receiveD == 1) m_obex->receive(); + else + m_obex->setReceiveEnabled( false ); @@ -89,3 +95,3 @@ void ObexImpl::slotError( int errorCode) { QString errorString = ""; - if (errorCode = -1) { + if (errorCode == -1) { errorString = "test"; |