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
@@ -1,130 +1,133 @@
 //  7-Jul-2005 mbh@sdgsystems.com: replace hand coded form with one
 //             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>
 
 #include <unistd.h>
 /* TRANSLATOR OpieObex::SendWidget */
 
 /* Just for backward compatibility */
 #if OPIE_VERSION < 102010
     #define OResource Resource
 #endif
 
 SendWidget::SendWidget( QWidget* parent, const char* name )
     : obexSendBase( parent, name ) {
     initUI();
 }
 SendWidget::~SendWidget() {
 }
 void SendWidget::initUI() {
     m_obex = new Obex(this, "obex");
     connect(m_obex, SIGNAL(error(int) ),
             this, SLOT(slotIrError(int) ) );
     connect(m_obex, SIGNAL(sent(bool) ),
             this, SLOT(slotIrSent(bool) ) );
     connect(m_obex, SIGNAL(currentTry(unsigned int) ),
             this, SLOT(slotIrTry(unsigned int) ) );
 
     QCopChannel* chan = new QCopChannel("QPE/IrDaAppletBack", this );
     connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
             this, SLOT(dispatchIrda(const QCString&,const QByteArray&) ) );
 
     m_btobex = new BtObex(this, "btobex");
     connect(m_btobex, SIGNAL(error(int) ),
             this, SLOT(slotBtError(int) ) );
     connect(m_btobex, SIGNAL(sent(bool) ),
             this, SLOT(slotBtSent(bool) ) );
     connect(m_btobex, SIGNAL(currentTry(unsigned int) ),
             this, SLOT(slotBtTry(unsigned int) ) );
 
     chan = new QCopChannel("QPE/BluetoothBack", this );
     connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
             this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) );
 
 }
 
 /*
  * in send we'll first set everything up
  * 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)
 {
     return (bool)(receivers[id]->pixmap(2) != NULL);
 }
 
 void SendWidget::setReceiverStatus( int id, const QString& status ) {
     if ( !receivers.contains(id) ) return;
     receivers[id]->setText(3, status );
 }
 
 void SendWidget::slotIrDaDevices( const QStringList& list) {
     for (QStringList::ConstIterator it = list.begin(); 
         it != list.end(); ++it ) {
         int id = addReceiver(*it, "obex/irda.png");
         m_irDa.insert( id, (*it) );
     }
     irdaStatus->setText( tr("ready."));
     m_irDaIt = m_irDa.begin();
 
 }
 
 void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
     for(QMap<QString, QString>::ConstIterator it = str.begin(); 
         it != str.end(); ++it ) {
         int id = addReceiver(it.key(), "obex/bt.png");
         m_bt.insert( id, Pair( it.key(), it.data() ) );
     }
     btStatus->setText(tr("ready."));
     m_btIt = m_bt.begin();
 
 }
 void SendWidget::slotSelectedDevice( int, int ) {
 /*    if ( name ==  m_irDeSearch ) {
         for (QMap<int, QString>::Iterator it= m_irDa.begin(); it != m_irDa.end(); ++it )
             m_devBox->removeDevice( it.key() );
 
         QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
 	}*/
 }
 void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) {
     if ( str == "devices(QStringList)" ) {
@@ -149,96 +152,140 @@ void SendWidget::slotIrTry(unsigned int trI) {
 void SendWidget::slotStartIrda() {
     if ( !m_irDa.count() ) 
         return;
     if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) {
         irdaStatus->setText(tr("complete."));
         return;
     }
     setReceiverStatus( m_irDaIt.key(), tr("Start sending") );
     m_obex->send( m_file, tr("noaddress") );
 }
 
 void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) {
     if ( str == "devices(QStringMap)" ) {
         QDataStream stream( ar, IO_ReadOnly );
         QMap<QString, QString> btmap;
         stream >> btmap;
         slotBTDevices( btmap );
     }
 }
 void SendWidget::slotBtError( int ) {
     btStatus->setText(tr("error :("));    
 }
 void SendWidget::slotBtSent( bool b) {
     QString text = b ? tr("Sent") : tr("Failure");
     setReceiverStatus( m_btIt.key(), text );
     ++m_btIt;
     slotStartBt();
 }
 void SendWidget::slotBtTry(unsigned int trI) {
     setReceiverStatus( m_btIt.key(), tr("Try %1").arg( QString::number( trI ) ) );
 }
 void SendWidget::slotStartBt() {
     // skip past unselected receivers
     while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key()))
         ++m_btIt;
     if (m_btIt == m_bt.end() ) {
         btStatus->setText(tr("complete."));
         return;
     }
     setReceiverStatus( m_btIt.key(), tr("Start sending") );
     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") )
     {
         irdaStatus->setText(tr("not enabled."));
     }
     else
     {
         QCopEnvelope e1("QPE/IrDaApplet", "enableIrda()");
         irdaStatus->setText(tr("searching..."));
         sendButton->setEnabled( true );
         QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
     }
 
     if ( !QCopChannel::isRegistered("QPE/Bluetooth") )
     {
         btStatus->setText(tr("not enabled."));
     }
     else
     {
         QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()");
         btStatus->setText(tr("searching..."));
         sendButton->setEnabled( true );
         QCopEnvelope e3("QPE/Bluetooth", "listDevices()");
     }
 }
 
 void SendWidget::toggle_receiver(QListViewItem* item)
 {
     // toggle the state of an individual receiver.
     if (item->pixmap(2))
         item->setPixmap(2, QPixmap());
     else
         item->setPixmap(2, OResource::loadPixmap("obex/check.png"));
 }
 
 
 void SendWidget::closeEvent( QCloseEvent* evt) {
     delete m_obex;
     m_obex = NULL;
     delete m_btobex;
     m_btobex = NULL;
     obexSendBase::closeEvent(evt);
     {
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
@@ -1,98 +1,99 @@
 #ifndef OPIE_OBEX_SEND_WIDGET_H
 #define OPIE_OBEX_SEND_WIDGET_H
 
 //  7-Jul-2005 mbh@sdgsystems.com: replace hand coded form with one
 //             generated via QT2 Designer.  The new form supports
 //             selection of target devices, as opposed to sending to 
 //             all.
 
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qmap.h>
 #include "obexsendbase.h"
 
 class QLabel;
 class QVBoxLayout;
 /**
  * This is the new sending widget for Obex
  * It will attemp to smart and be able to send
  * it to multiple (selected) devices.
  * It'll support BT + IrDa
  */
 namespace OpieObex {
     class Obex;
     class BtObex;
 
     struct Pair {
         Pair(const QString& first = QString::null,
              const QString& second = QString::null)
             : m_first(first), m_second(second ) {
         }
         QString first()const{ return m_first; }
         QString second()const { return m_second; }
     private:
         QString m_first;
         QString m_second;
     };
     class SendWidget : public obexSendBase {
         Q_OBJECT
     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:
         virtual void userDone();
         virtual void send_to_receivers();
         virtual void scan_for_receivers();
 	virtual void toggle_receiver(QListViewItem* item);
 
     private slots: // QCOP slots
         /* IrDa Names*/
         void slotIrDaDevices( const QStringList& );
         /* Bt Names + BD-Addr */
         void slotBTDevices( const QMap<QString, QString>& );
         void slotSelectedDevice( int id, int dev );
 
         void dispatchIrda( const QCString& str, const QByteArray& ar );
 
         void slotIrError( int );
         void slotIrSent(bool);
         void slotIrTry(unsigned int );
         void slotStartIrda();
 
         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;
 	QMap<int, QListViewItem *> receivers;
         QString m_file;
         Obex* m_obex;
         BtObex* m_btobex;
     };
 }
 
 #endif