Made list of receivers loaded form files saved by bt-manager.

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
@@ -2,22 +2,25 @@
 //             generated via QT2 Designer.  The new form supports
 //             selection of target devices, as opposed to sending to 
 //             all.
 
 #include "obex.h"
 #include "btobex.h"
 #include "obexsend.h"
 using namespace OpieObex;
+using namespace OpieTooth;
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <opie2/oresource.h>
 #include <qpe/version.h>
+#include <devicehandler.h>
+#include "remotedevice.h"
 
 using namespace Opie::Core;
 
 /* QT */
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qpixmap.h>
 #include <qlistview.h>
@@ -68,23 +71,23 @@ void SendWidget::initUI() {
  * and then wait for a list of devices.
  */
 void SendWidget::send( const QString& file, const QString& desc ) {
     m_file = file;
     m_irDa.clear();
     m_start = 0;
 
     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 ) );
 
     int id=receivers.count();
     receivers[id]=item;
     return id;
 }
 
 bool SendWidget::receiverSelected(int id)
@@ -189,16 +192,60 @@ void SendWidget::slotStartBt() {
     m_btobex->send( m_file, m_btIt.data().second() );
 }
 
 void SendWidget::send_to_receivers() {
     slotStartIrda();
     slotStartBt();
 }
 
+/**
+ * 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()
 {
     receiverList->clear();
     receivers.clear();
     sendButton->setDisabled( true );
 
     if ( !QCopChannel::isRegistered("QPE/IrDaApplet") )
     {
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
@@ -39,16 +39,17 @@ namespace OpieObex {
     public:
         SendWidget( QWidget* parent = 0, const char* name = 0);
         ~SendWidget();
 
         QString file()const;
 
     protected:
         void closeEvent( QCloseEvent* );
+	void read_receivers();
 
     public slots:
         void send( const QString& file, const QString& desc );
 
     signals:
         void done();
 
     protected slots:
@@ -74,17 +75,17 @@ namespace OpieObex {
         void dispatchBt( const QCString& str, const QByteArray& ar );
         void slotBtError( int );
         void slotBtSent(bool);
         void slotBtTry(unsigned int );
         void slotStartBt();
 
     private:
         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 );
 	bool receiverSelected(int id);
 
         int m_start;
         QMap<int, QString> m_irDa;
         QMap<int, QString>::Iterator m_irDaIt;
         QMap<int, Pair > m_bt;
         QMap<int, Pair>::Iterator m_btIt;