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
@@ -49,15 +49,14 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
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;
@@ -69,11 +68,20 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
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
@@ -24,13 +24,13 @@ namespace OpieObex {
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