| -rw-r--r-- | core/obex/obexsend.cpp | 41 | ||||
| -rw-r--r-- | core/obex/obexsendbase.ui | 8 |
2 files changed, 27 insertions, 22 deletions
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp index a80a48b..9cd9972 100644 --- a/core/obex/obexsend.cpp +++ b/core/obex/obexsend.cpp @@ -17,6 +17,7 @@ using namespace Opie::Core; /* QT */ #include <qlabel.h> +#include <qpushbutton.h> #include <qpixmap.h> #include <qlistview.h> #include <qtimer.h> @@ -138,6 +139,7 @@ void SendWidget::slotIrTry(unsigned int trI) { setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); } void SendWidget::slotStartIrda() { + if ( !m_irDa.count() ) return; if (m_irDaIt == m_irDa.end() ) { irdaStatus->setText(tr("complete.")); return; @@ -183,31 +185,34 @@ void SendWidget::send_to_receivers() { slotStartBt(); } -void SendWidget::scan_for_receivers() { - - bool enable_irda=false; - bool enable_bt=false; +void SendWidget::scan_for_receivers() +{ + //FIXME: Clean ListBox prior to (re)scan + sendButton->setDisabled( true ); - if ( !QCopChannel::isRegistered("QPE/IrDaApplet") ) { + if ( !QCopChannel::isRegistered("QPE/IrDaApplet") ) + { irdaStatus->setText(tr("not enabled.")); - enable_irda=true; - } else + } + else + { + QCopEnvelope e1("QPE/IrDaApplet", "enableIrda()"); irdaStatus->setText(tr("searching...")); + sendButton->setEnabled( true ); + QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); + } - if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) { + if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) + { btStatus->setText(tr("not enabled.")); - enable_bt=true; - } else - btStatus->setText(tr("searching...")); - - if (enable_irda) - QCopEnvelope e0("QPE/IrDaApplet", "enableIrda()"); - if (enable_bt) + } + else + { QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()"); - - QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); + btStatus->setText(tr("searching...")); + sendButton->setEnabled( true ); QCopEnvelope e3("QPE/Bluetooth", "listDevices()"); - + } } void SendWidget::toggle_receiver(QListViewItem* item) diff --git a/core/obex/obexsendbase.ui b/core/obex/obexsendbase.ui index a192dd3..4619842 100644 --- a/core/obex/obexsendbase.ui +++ b/core/obex/obexsendbase.ui @@ -16,7 +16,7 @@ for selecting destination hosts.</comment> <rect> <x>0</x> <y>0</y> - <width>363</width> + <width>359</width> <height>221</height> </rect> </property> @@ -297,7 +297,7 @@ for selecting destination hosts.</comment> </property> <property stdset="1"> <name>text</name> - <string>Scan</string> + <string>&Rescan</string> </property> </widget> <widget> @@ -308,7 +308,7 @@ for selecting destination hosts.</comment> </property> <property stdset="1"> <name>text</name> - <string>Send</string> + <string>&Send</string> </property> </widget> <widget> @@ -319,7 +319,7 @@ for selecting destination hosts.</comment> </property> <property stdset="1"> <name>text</name> - <string>Done</string> + <string>&Close</string> </property> </widget> </hbox> |