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
@@ -1,27 +1,30 @@
// 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 */
@@ -64,31 +67,31 @@ void SendWidget::initUI() {
}
/*
* 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);
}
@@ -185,24 +188,68 @@ void SendWidget::slotStartBt() {
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
{
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
@@ -35,24 +35,25 @@ namespace OpieObex {
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);
@@ -70,25 +71,25 @@ namespace OpieObex {
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;