summaryrefslogtreecommitdiff
authorkorovkin <korovkin>2006-11-10 20:49:54 (UTC)
committer korovkin <korovkin>2006-11-10 20:49:54 (UTC)
commit961e5561b24452d9cfc2bf7400f6f5952b31431c (patch) (side-by-side diff)
tree44439765333edad675966ce33f88427240cdbb0e
parentb742daec72bbef07039b785dcadca9dca9a0dc1c (diff)
downloadopie-961e5561b24452d9cfc2bf7400f6f5952b31431c.zip
opie-961e5561b24452d9cfc2bf7400f6f5952b31431c.tar.gz
opie-961e5561b24452d9cfc2bf7400f6f5952b31431c.tar.bz2
Made list of receivers loaded form files saved by bt-manager.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/obexsend.cpp53
-rw-r--r--core/obex/obexsend.h3
2 files changed, 52 insertions, 4 deletions
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 5c177e3..bca6784 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -9,2 +9,3 @@
using namespace OpieObex;
+using namespace OpieTooth;
@@ -15,2 +16,4 @@ using namespace OpieObex;
#include <qpe/version.h>
+#include <devicehandler.h>
+#include "remotedevice.h"
@@ -75,9 +78,9 @@ void SendWidget::send( const QString& file, const QString& desc ) {
fileToSend->setText(desc.isEmpty() ? file : desc );
- scan_for_receivers();
+ read_receivers();
}
-int SendWidget::addReceiver(const char *r, const char *icon)
+int SendWidget::addReceiver(const QString& str, const char *icon)
{
QListViewItem * item = new QListViewItem( receiverList, 0 );
- item->setText( 0, r);
+ item->setText( 0, str );
item->setPixmap( 1, OResource::loadPixmap( icon ) );
@@ -196,2 +199,46 @@ void SendWidget::send_to_receivers() {
+/**
+ * Read receivers saved by bluetooth manager
+ */
+void SendWidget::read_receivers()
+{
+ QValueList<RemoteDevice> devices;
+ DeviceHandler handler;
+ QValueList<RemoteDevice>::ConstIterator it;
+
+ receiverList->clear();
+ receivers.clear();
+ sendButton->setDisabled( true );
+
+ if ( !QCopChannel::isRegistered("QPE/IrDaApplet") )
+ {
+ irdaStatus->setText(tr("not enabled."));
+ }
+ else
+ {
+ QCopEnvelope e1("QPE/IrDaApplet", "enableIrda()");
+ irdaStatus->setText(tr("ready"));
+ sendButton->setEnabled( true );
+ }
+ if ( !QCopChannel::isRegistered("QPE/Bluetooth") )
+ {
+ btStatus->setText(tr("not enabled."));
+ }
+ else
+ {
+ QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()");
+
+ devices = handler.load();
+ for( it = devices.begin(); it != devices.end() ; ++it )
+ {
+ int id = addReceiver((*it).name(), "obex/bt.png");
+ m_bt.insert(id, Pair((*it).name(), (*it).mac()));
+ }
+ btStatus->setText(tr("ready."));
+ m_btIt = m_bt.begin();
+ sendButton->setEnabled( true );
+ }
+}
+
+
void SendWidget::scan_for_receivers()
diff --git a/core/obex/obexsend.h b/core/obex/obexsend.h
index 030e180..f9ba340 100644
--- a/core/obex/obexsend.h
+++ b/core/obex/obexsend.h
@@ -46,2 +46,3 @@ namespace OpieObex {
void closeEvent( QCloseEvent* );
+ void read_receivers();
@@ -81,3 +82,3 @@ namespace OpieObex {
void initUI();
- int addReceiver(const char *r, const char *icon);
+ int addReceiver(const QString& str, const char *icon);
void setReceiverStatus( int id, const QString& status );