summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/obex/libopieobex.control9
-rw-r--r--core/applets/obex/obeximpl.cc14
-rw-r--r--core/applets/obex/obeximpl.h8
3 files changed, 24 insertions, 7 deletions
diff --git a/core/applets/obex/libopieobex.control b/core/applets/obex/libopieobex.control
new file mode 100644
index 0000000..d74b51c
--- a/dev/null
+++ b/core/applets/obex/libopieobex.control
@@ -0,0 +1,9 @@
1Files: plugins/obex/libopieobex.so*
2Priority: optional
3Section: opie/system
4Maintainer: Holger Freyther <zecke@handhelds.org>
5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION.1
7Depends: opie-base ($QPE_VERSION), openobex
8Description: Irda obex lib
9 \ No newline at end of file
diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc
index 616f3b1..1244836 100644
--- a/core/applets/obex/obeximpl.cc
+++ b/core/applets/obex/obeximpl.cc
@@ -7,73 +7,81 @@
7#include "obeximpl.h" 7#include "obeximpl.h"
8 8
9 9
10 10
11using namespace OpieObex; 11using namespace OpieObex;
12 12
13ObexImpl::ObexImpl( ) 13ObexImpl::ObexImpl( )
14 : QObject() { 14 : QObject() {
15 // register to a channel 15 // register to a channel
16 qWarning( "c'tor" ); 16 qWarning( "c'tor" );
17 m_obex = new Obex(this, "obex"); 17 m_obex = new Obex(this, "obex");
18 m_sendgui = new ObexDlg(); 18 m_sendgui = new ObexDlg();
19 m_recvgui = new ObexInc(); 19 m_recvgui = new ObexInc();
20 m_chan = new QCopChannel("QPE/Obex" ); 20 m_chan = new QCopChannel("QPE/Obex" );
21 connect(m_chan, SIGNAL(received(const QCString&, const QByteArray& ) ), 21 connect(m_chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
22 this, SLOT(slotMessage(const QCString&, const QByteArray&) ) ); 22 this, SLOT(slotMessage(const QCString&, const QByteArray&) ) );
23} 23}
24ObexImpl::~ObexImpl() { 24ObexImpl::~ObexImpl() {
25 delete m_obex; 25 delete m_obex;
26 delete m_chan; 26 delete m_chan;
27 delete m_sendgui; 27 delete m_sendgui;
28} 28}
29QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { 29QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
30 *iface = 0; 30 *iface = 0;
31 if( uuid == IID_QUnknown ) 31 if( uuid == IID_QUnknown )
32 *iface = this; 32 *iface = this;
33 else if( uuid == IID_ObexInterface ) 33 else if( uuid == IID_ObexInterface )
34 *iface = this; 34 *iface = this;
35 35
36 qWarning("query" ); 36 qWarning("query" );
37 if(*iface ) 37 if(*iface )
38 (*iface)->addRef(); 38 (*iface)->addRef();
39 return QS_OK; 39 return QS_OK;
40 40
41} 41}
42void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) { 42void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
43 QDataStream stream( data, IO_ReadOnly ); 43 QDataStream stream( data, IO_ReadOnly );
44 qWarning("Message %s", msg.data() ); 44 qWarning("Message %s", msg.data() );
45 if(msg == "send(QString,QString,QString)" ) { 45 if(msg == "send(QString,QString,QString)" ) {
46 QString desc; 46 QString desc;
47 stream >> desc; 47 stream >> desc;
48 QString filename; 48 QString filename;
49 stream >> filename; 49 stream >> filename;
50 m_sendgui->showMaximized(); 50 m_sendgui->showMaximized();
51 m_sendgui->lblPath->setText(filename); 51 m_sendgui->lblPath->setText(filename);
52 connect( (QObject*)m_sendgui->PushButton2, SIGNAL(clicked()), 52 connect( (QObject*)m_sendgui->PushButton2, SIGNAL(clicked()),
53 this, SLOT(slotCancelSend())); 53 this, SLOT(slotCancelSend()));
54 m_obex->send(filename ); 54 m_obex->send(filename );
55 // QCopEnvelope e ("QPE/Obex", "done(QString)" ); //but this into a slot 55 connect( (QObject*)m_obex, SIGNAL( sent() ), this,
56 //e << filename; 56 SLOT( slotSent() ) );
57
58 }else if(msg == "receive(bool)" ) { // open a GUI 57 }else if(msg == "receive(bool)" ) { // open a GUI
59 m_recvgui->showMaximized(); 58 m_recvgui->showMaximized();
60 m_obex->receive(); 59 m_obex->receive();
61 60
62 } else if (msg =="done(QString)") { 61 } else if (msg =="done(QString)") {
63 QString filename; 62 QString filename;
64 stream >> filename; 63 stream >> filename;
65 m_sendgui->lblPath->setText(tr("Done transfering " + filename)); 64 m_sendgui->lblPath->setText(tr("Done transfering " + filename));
66 65
67 } 66 }
68} 67}
69 68
70void ObexImpl::slotCancelSend() { 69void ObexImpl::slotCancelSend() {
71 // cancel sync process too 70 // cancel sync process too
72 m_sendgui->hide(); 71 m_sendgui->hide();
73} 72}
74 73
74void ObexImpl::slotDone(bool) {
75 QCopEnvelope e ("QPE/Obex", "done(QString)" ); //but this into a slot
76 e << "Done!";
77}
78
79void ObexImpl::slotSent() {
80 m_sendgui->lblPath->setText("Done!");
81 m_sendgui->hide();
82}
75 83
76Q_EXPORT_INTERFACE() 84Q_EXPORT_INTERFACE()
77{ 85{
78 Q_CREATE_INSTANCE( ObexImpl ) 86 Q_CREATE_INSTANCE( ObexImpl )
79} 87}
diff --git a/core/applets/obex/obeximpl.h b/core/applets/obex/obeximpl.h
index aad0883..1a8fe99 100644
--- a/core/applets/obex/obeximpl.h
+++ b/core/applets/obex/obeximpl.h
@@ -1,36 +1,36 @@
1 1
2#ifndef OpieObexImpl_H 2#ifndef OpieObexImpl_H
3#define OpieObexImpl_H 3#define OpieObexImpl_H
4 4
5#include <qobject.h> 5#include <qobject.h>
6#include "../obexinterface.h" 6#include "../obexinterface.h"
7#include "obexdlg.h" 7#include "obexdlg.h"
8#include "obexinc.h" 8#include "obexinc.h"
9#include <qpe/qcopenvelope_qws.h> 9#include <qpe/qcopenvelope_qws.h>
10 10
11namespace OpieObex { 11namespace OpieObex {
12 class Obex; 12 class Obex;
13 class ObexImpl : public QObject, public ObexInterface { 13 class ObexImpl : public QObject, public ObexInterface {
14 Q_OBJECT 14 Q_OBJECT
15 public: 15 public:
16 ObexImpl(); 16 ObexImpl();
17 virtual ~ObexImpl(); 17 virtual ~ObexImpl();
18 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 18 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
19 Q_REFCOUNT // for reference counting (macro ) 19 Q_REFCOUNT // for reference counting (macro )
20 private: 20 private:
21 ulong ref; 21 ulong ref;
22 Obex* m_obex; // obex lib 22 Obex* m_obex; // obex lib
23 QCopChannel *m_chan; 23 QCopChannel *m_chan;
24 ObexDlg *m_sendgui; 24 ObexDlg *m_sendgui;
25 ObexInc *m_recvgui; 25 ObexInc *m_recvgui;
26 private slots: 26 private slots:
27 void slotCancelSend(); 27 void slotCancelSend();
28 void slotMessage( const QCString&, const QByteArray& ); 28 void slotMessage( const QCString&, const QByteArray& );
29 /* void slotError(int ); 29 /* void slotError(int );
30 void slotCurrentTry( unsigned int ); 30 void slotCurrentTry( unsigned int ); */
31 void slotDone(bool); 31 void slotDone(bool);
32 void slotReceivedFile(const QString & ); 32 //void slotReceivedFile(const QString & );
33 void slotSent();*/ 33 void slotSent();
34 }; 34 };
35}; 35};
36#endif 36#endif