summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/obexsend.cpp4
-rw-r--r--core/obex/obexsend.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 0da57ca..1b19c6b 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -153,32 +153,36 @@ void SendWidget::slotIrSent( bool b) {
153 QString text = b ? tr("Sent") : tr("Failure"); 153 QString text = b ? tr("Sent") : tr("Failure");
154 m_devBox->setStatus( m_irDaIt.key(), text ); 154 m_devBox->setStatus( m_irDaIt.key(), text );
155 ++m_irDaIt; 155 ++m_irDaIt;
156 slotStartIrda(); 156 slotStartIrda();
157} 157}
158void SendWidget::slotIrTry(unsigned int trI) { 158void SendWidget::slotIrTry(unsigned int trI) {
159 m_devBox->setStatus( m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) ) ); 159 m_devBox->setStatus( m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) ) );
160} 160}
161void SendWidget::slotStartIrda() { 161void SendWidget::slotStartIrda() {
162 if (m_irDaIt == m_irDa.end() ) { 162 if (m_irDaIt == m_irDa.end() ) {
163 m_irDeSearch = m_devBox->addDevice(tr("Search again for IrDa."), DeviceBox::Search ); 163 m_irDeSearch = m_devBox->addDevice(tr("Search again for IrDa."), DeviceBox::Search );
164 return; 164 return;
165 } 165 }
166 m_devBox->setStatus( m_irDaIt.key(), tr("Start sending") ); 166 m_devBox->setStatus( m_irDaIt.key(), tr("Start sending") );
167 m_obex->send( m_file ); 167 m_obex->send( m_file );
168} 168}
169void SendWidget::closeEvent( QCloseEvent* e) {
170 e->accept(); // make sure
171 QTimer::singleShot(0, this, SLOT(slotDone() ) );
172}
169void SendWidget::slotDone() { 173void SendWidget::slotDone() {
170 QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()"); 174 QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()");
171 QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()"); 175 QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()");
172 emit done(); 176 emit done();
173} 177}
174QString SendWidget::file()const { 178QString SendWidget::file()const {
175 return m_file; 179 return m_file;
176} 180}
177DeviceBox::DeviceBox( QWidget* parent ) 181DeviceBox::DeviceBox( QWidget* parent )
178 : QTextBrowser( parent ) { 182 : QTextBrowser( parent ) {
179 183
180} 184}
181DeviceBox::~DeviceBox() { 185DeviceBox::~DeviceBox() {
182 186
183} 187}
184int DeviceBox::addDevice( const QString& name, int dev, const QString& status ) { 188int DeviceBox::addDevice( const QString& name, int dev, const QString& status ) {
diff --git a/core/obex/obexsend.h b/core/obex/obexsend.h
index 02100f7..bf901cb 100644
--- a/core/obex/obexsend.h
+++ b/core/obex/obexsend.h
@@ -26,32 +26,35 @@ namespace OpieObex {
26 : m_first(first), m_second(second ) { 26 : m_first(first), m_second(second ) {
27 } 27 }
28 QString first()const{ return m_first; } 28 QString first()const{ return m_first; }
29 QString second()const { return m_second; } 29 QString second()const { return m_second; }
30 private: 30 private:
31 QString m_first; 31 QString m_first;
32 QString m_second; 32 QString m_second;
33 }; 33 };
34 class SendWidget : public QWidget{ 34 class SendWidget : public QWidget{
35 Q_OBJECT 35 Q_OBJECT
36 public: 36 public:
37 SendWidget( QWidget* parent = 0, const char* name = 0); 37 SendWidget( QWidget* parent = 0, const char* name = 0);
38 ~SendWidget(); 38 ~SendWidget();
39 39
40 QString file()const; 40 QString file()const;
41 41
42 protected:
43 void closeEvent( QCloseEvent* );
44
42 public slots: 45 public slots:
43 void send( const QString& file, const QString& desc ); 46 void send( const QString& file, const QString& desc );
44 47
45 signals: 48 signals:
46 void done(); 49 void done();
47 50
48 private slots: // QCOP slots 51 private slots: // QCOP slots
49 /* IrDa Names*/ 52 /* IrDa Names*/
50 void slotIrDaDevices( const QStringList& ); 53 void slotIrDaDevices( const QStringList& );
51 /* Bt Names + BD-Addr */ 54 /* Bt Names + BD-Addr */
52 void slotBTDevices( const QMap<QString, QString>& ); 55 void slotBTDevices( const QMap<QString, QString>& );
53 void slotSelectedDevice( int id, int dev ); 56 void slotSelectedDevice( int id, int dev );
54 void dispatchIrda( const QCString& str, const QByteArray& ar ); 57 void dispatchIrda( const QCString& str, const QByteArray& ar );
55 void dispatchBt( const QCString& str, const QByteArray& ar ); 58 void dispatchBt( const QCString& str, const QByteArray& ar );
56 59
57 void slotIrError( int ); 60 void slotIrError( int );