summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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.h6
3 files changed, 23 insertions, 6 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 @@
+Files: plugins/obex/libopieobex.so*
+Priority: optional
+Section: opie/system
+Maintainer: Holger Freyther <zecke@handhelds.org>
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION.1
+Depends: opie-base ($QPE_VERSION), openobex
+Description: Irda obex lib
+ \ 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
@@ -47,19 +47,18 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
stream >> desc;
QString filename;
stream >> filename;
m_sendgui->showMaximized();
m_sendgui->lblPath->setText(filename);
connect( (QObject*)m_sendgui->PushButton2, SIGNAL(clicked()),
this, SLOT(slotCancelSend()));
m_obex->send(filename );
- // QCopEnvelope e ("QPE/Obex", "done(QString)" ); //but this into a slot
- //e << filename;
-
+ connect( (QObject*)m_obex, SIGNAL( sent() ), this,
+ SLOT( slotSent() ) );
}else if(msg == "receive(bool)" ) { // open a GUI
m_recvgui->showMaximized();
m_obex->receive();
} else if (msg =="done(QString)") {
QString filename;
stream >> filename;
m_sendgui->lblPath->setText(tr("Done transfering " + filename));
@@ -67,13 +66,22 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
}
}
void ObexImpl::slotCancelSend() {
// cancel sync process too
m_sendgui->hide();
}
+void ObexImpl::slotDone(bool) {
+ QCopEnvelope e ("QPE/Obex", "done(QString)" ); //but this into a slot
+ e << "Done!";
+}
+
+void ObexImpl::slotSent() {
+ m_sendgui->lblPath->setText("Done!");
+ m_sendgui->hide();
+}
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( ObexImpl )
}
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
@@ -22,15 +22,15 @@ namespace OpieObex {
Obex* m_obex; // obex lib
QCopChannel *m_chan;
ObexDlg *m_sendgui;
ObexInc *m_recvgui;
private slots:
void slotCancelSend();
void slotMessage( const QCString&, const QByteArray& );
/* void slotError(int );
- void slotCurrentTry( unsigned int );
+ void slotCurrentTry( unsigned int ); */
void slotDone(bool);
- void slotReceivedFile(const QString & );
- void slotSent();*/
+ //void slotReceivedFile(const QString & );
+ void slotSent();
};
};
#endif