author | zecke <zecke> | 2003-02-18 20:42:05 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-18 20:42:05 (UTC) |
commit | d3f15e100af8a91504ac9e5fb95dce0cadfe4837 (patch) (side-by-side diff) | |
tree | 04ddeda0f690aa1d51ba486b114251250eef2ef9 | |
parent | 9f5098a6da637e81f6525482456394a68524dc61 (diff) | |
download | opie-d3f15e100af8a91504ac9e5fb95dce0cadfe4837.zip opie-d3f15e100af8a91504ac9e5fb95dce0cadfe4837.tar.gz opie-d3f15e100af8a91504ac9e5fb95dce0cadfe4837.tar.bz2 |
Convert the way of storing the devices in the QTextBrowser
we assign ids by now
it looks soo nice... but it counts up tries and then say there was a failure
but it is working though
-rw-r--r-- | core/obex/obex.cc | 22 | ||||
-rw-r--r-- | core/obex/obexsend.cpp | 141 | ||||
-rw-r--r-- | core/obex/obexsend.h | 47 |
3 files changed, 143 insertions, 67 deletions
diff --git a/core/obex/obex.cc b/core/obex/obex.cc index b8ed6e0..595fed9 100644 --- a/core/obex/obex.cc +++ b/core/obex/obex.cc @@ -1,9 +1,12 @@ #include <qapplication.h> #include <qfile.h> -#include <qmessagebox.h> +#include <qfileinfo.h> +#include <qtextcodec.h> + #include <qpe/qcopenvelope_qws.h> + #include <opie/oprocess.h> #include "obex.h" using namespace OpieObex; @@ -105,18 +108,31 @@ void Obex::slotExited(OProcess* proc ){ } } void Obex::slotStdOut(OProcess* proc, char* buf, int len){ if ( proc == m_rec ) { // only receive - QString str = QString::fromUtf8( buf, len ); - m_outp.append( str ); + for (int i = 0; i < len; i++ ) { + printf("%c", buf[i] ); + } + printf("\n"); + QByteArray ar( len ); + memcpy( ar.data(), buf, len ); + qWarning("parsed: %s", ar.data() ); + m_outp.append( ar ); } } void Obex::received() { if (m_rec->normalExit() ) { if ( m_rec->exitStatus() == 0 ) { // we got one QString filename = parseOut(); qWarning("ACHTUNG %s", filename.latin1() ); + if (filename.contains( 'ö' ) || filename.contains( 'ä' ) || filename.contains('ü' ) ) { + qWarning("renaming!!!!"); + QFileInfo inf( filename ); + QString newName = "/tmp/opie-obex." + inf.extension(); + ::rename( QFile::encodeName( filename ).data(), newName ); + qWarning("name is %s", QFile::encodeName( filename ).data() ); + } emit receivedFile( filename ); } }else{ emit done(false); diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp index d5ebd81..0da57ca 100644 --- a/core/obex/obexsend.cpp +++ b/core/obex/obexsend.cpp @@ -2,8 +2,9 @@ #include <qlabel.h> #include <qhbox.h> #include <qlayout.h> #include <qtimer.h> +#include <qtl.h> #include <qcopchannel_qws.h> #include <qpe/resource.h> @@ -58,10 +59,10 @@ void SendWidget::initUI() { lay->addWidget( devices,10 ); m_devBox = new DeviceBox(this); lay->addWidget( m_devBox, 50 ); - connect(m_devBox, SIGNAL(selectedDevice(const QString&, int ) ), - this, SLOT(slotSelectedDevice(const QString&, int) ) ); + connect(m_devBox, SIGNAL(selectedDevice(int, int ) ), + this, SLOT(slotSelectedDevice(int, int) ) ); QPushButton *but = new QPushButton(this); but->setText(tr("Done") ); connect(but, SIGNAL(clicked() ), @@ -85,18 +86,18 @@ void SendWidget::send( const QString& file, const QString& desc ) { m_start = 0; m_lblFile->setText(desc.isEmpty() ? file : desc ); if ( !QCopChannel::isRegistered("QPE/IrDaApplet") ) { - m_devBox->addDevice( tr("IrDa is not enabled!"), DeviceBox::Error ); + m_irDeSearch = m_devBox->addDevice( tr("IrDa is not enabled!"), DeviceBox::Error ); m_start++; }else - m_devBox->addDevice( tr("Searching for IrDa Devices."), DeviceBox::Search ); + m_irDeSearch = m_devBox->addDevice( tr("Searching for IrDa Devices."), DeviceBox::Search ); if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) { - m_devBox->addDevice( tr("Bluetooth is not available"), DeviceBox::Error ); + m_btDeSearch = m_devBox->addDevice( tr("Bluetooth is not available"), DeviceBox::Error ); m_start++; }else - m_devBox->addDevice( tr("Searching for bluetooth Devices."), DeviceBox::Search ); + m_btDeSearch = m_devBox->addDevice( tr("Searching for bluetooth Devices."), DeviceBox::Search ); if (m_start != 2 ) { QCopEnvelope e0("QPE/IrDaApplet", "enableIrda()"); QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()"); @@ -105,29 +106,30 @@ void SendWidget::send( const QString& file, const QString& desc ) { } } void SendWidget::slotIrDaDevices( const QStringList& list) { qWarning("slot it irda devices "); - m_irDa = list; - m_start = 0; - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) - m_devBox->addDevice( (*it), DeviceBox::IrDa, tr("Scheduling for beam.") ); - - m_devBox->removeDevice( tr("Searching for IrDa Devices.") ); + for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { + int id = m_devBox->addDevice( (*it), DeviceBox::IrDa, tr("Scheduling for beam.") ); + m_irDa.insert( id, (*it) ); + } + m_devBox->removeDevice( m_irDeSearch ); + m_irDaIt = m_irDa.begin(); slotStartIrda(); } + void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { - m_bt = str; for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) { - m_devBox->addDevice( it.key(), DeviceBox::BT, tr("Click to beam") ); + int id = m_devBox->addDevice( it.key(), DeviceBox::BT, tr("Click to beam") ); + m_bt.insert( id, Pair( it.key(), it.data() ) ); } - m_devBox->removeDevice( tr("Searching for bluetooth Devices.") ); + m_devBox->removeDevice( m_btDeSearch ); } -void SendWidget::slotSelectedDevice( const QString& name, int dev ) { - qWarning("Start beam? %s %d", name.latin1(), dev ); - if ( name == tr("Search again for IrDa.") ) { - for (QStringList::Iterator it= m_irDa.begin(); it != m_irDa.end(); ++it ) - m_devBox->removeDevice( (*it) ); +void SendWidget::slotSelectedDevice( int name, int dev ) { + qWarning("Start beam? %d %d", name, dev ); + 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()"); } } @@ -139,30 +141,30 @@ void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) { stream >> list; slotIrDaDevices( list ); } } -void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) { +void SendWidget::dispatchBt( const QCString&, const QByteArray& ) { } void SendWidget::slotIrError( int ) { } void SendWidget::slotIrSent( bool b) { qWarning("irda sent!!"); QString text = b ? tr("Sent") : tr("Failure"); -// m_devBox->setStatus( m_irDa[m_start], text ); - m_start++; + m_devBox->setStatus( m_irDaIt.key(), text ); + ++m_irDaIt; slotStartIrda(); } void SendWidget::slotIrTry(unsigned int trI) { -// m_devBox->setStatus( m_irDa[m_start], tr("Try %1").arg( QString::number( trI ) ) ); + m_devBox->setStatus( m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) ) ); } void SendWidget::slotStartIrda() { - if (m_start >= m_irDa.count() ) { - m_devBox->addDevice(tr("Search again for IrDa."), DeviceBox::Search ); + if (m_irDaIt == m_irDa.end() ) { + m_irDeSearch = m_devBox->addDevice(tr("Search again for IrDa."), DeviceBox::Search ); return; } -// m_devBox->setStatus( m_irDa[m_start], tr("Start sending") ); + m_devBox->setStatus( m_irDaIt.key(), tr("Start sending") ); m_obex->send( m_file ); } void SendWidget::slotDone() { QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()"); @@ -178,45 +180,80 @@ DeviceBox::DeviceBox( QWidget* parent ) } DeviceBox::~DeviceBox() { } -void DeviceBox::addDevice( const QString& name, int dev, const QString& status ) { - QString tex; - DeviceItem item( name, status, dev ); - m_dev.insert( name, item ); - tex = item.toString(); - m_devices.prepend(tex); - setText( text()+ "<br>"+tex ); -} -void DeviceBox::removeDevice( const QString& name ) { - if (!m_dev.contains(name) ) return; - m_devices.remove( m_dev[name].toString() ); +int DeviceBox::addDevice( const QString& name, int dev, const QString& status ) { + /* return a id for a range of devices */ + int id = idFor ( dev ); + DeviceItem item( name, status, dev,id ); + m_dev.insert( id, item ); + setText( allText() ); - m_dev.remove(name); - setText( m_devices.join("<br>") ); + return id; +} +void DeviceBox::removeDevice( int id ) { + if (!m_dev.contains(id) ) return; + m_dev.remove( id ); + setText( allText() ); } -void DeviceBox::setStatus( const QString& name, const QString& status ) { - if ( !m_dev.contains(name) ) return; - DeviceItem dev = m_dev[name]; - QString ole = dev.toString(); - dev.setStatus( status ); - int index = m_devices.findIndex( ole ); - m_devices[index] = dev.toString(); - setText( m_devices.join("<br>") ); +void DeviceBox::setStatus( int id, const QString& status ) { + if ( !m_dev.contains(id) ) return; + m_dev[id].setStatus(status ); + setText( allText() ); } void DeviceBox::setSource( const QString& str ) { - qWarning("SetSource:%s", str.latin1() ); - emit selectedDevice( str, m_dev[str].device() ); + qWarning("SetSource:%d", str.toInt() ); + int id = str.toInt(); + emit selectedDevice( id, m_dev[id].device() ); +} +int DeviceBox::idFor ( int id ) { + static int irId = 1501; + static int irBT = 1001; + static int irSr = 501; + static int irEr = 0; + + int ret = -1; + switch(id ) { + case IrDa: + ret = irId; + irId++; + break; + case BT: + ret = irBT; + irBT++; + break; + case Search: + ret = irSr; + irSr++; + break; + case Error: + ret = irEr; + irEr++; + break; + } + return ret; } +QString DeviceBox::allText() { + QString str; + typedef QMap<int, DeviceItem> DeviceMap; + for (QMap<int, DeviceItem>::Iterator it = m_dev.begin(); it != m_dev.end(); ++it ) { + str += it.data().toString() + "<br>"; + } + return str; +} DeviceItem::DeviceItem( const QString& name, - const QString& status, int dev) + const QString& status, int dev, int id) { m_name = name; m_status = status; m_dev = dev; + m_id = id; +} +int DeviceItem::id()const { + return m_id; } QString DeviceItem::name()const { return m_name; } @@ -249,6 +286,6 @@ DeviceItem::~DeviceItem() { void DeviceItem::setStatus(const QString& status ) { m_status = status; } QString DeviceItem::toString()const { - return "<p><a href=\""+m_name +"\" ><img src=\""+pixmap()+"\" >"+m_name+" "+m_status+" </a></p>" ; + return "<p><a href=\""+QString::number(m_id) +"\" ><img src=\""+pixmap()+"\" >"+m_name+" "+m_status+" </a></p>" ; } diff --git a/core/obex/obexsend.h b/core/obex/obexsend.h index fd819bc..02100f7 100644 --- a/core/obex/obexsend.h +++ b/core/obex/obexsend.h @@ -18,8 +18,20 @@ class QVBoxLayout; */ namespace OpieObex { class DeviceBox; class Obex; + + 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 QWidget{ Q_OBJECT public: SendWidget( QWidget* parent = 0, const char* name = 0); @@ -37,9 +49,9 @@ namespace OpieObex { /* IrDa Names*/ void slotIrDaDevices( const QStringList& ); /* Bt Names + BD-Addr */ void slotBTDevices( const QMap<QString, QString>& ); - void slotSelectedDevice( const QString& name, int dev ); + void slotSelectedDevice( int id, int dev ); void dispatchIrda( const QCString& str, const QByteArray& ar ); void dispatchBt( const QCString& str, const QByteArray& ar ); void slotIrError( int ); @@ -52,48 +64,59 @@ namespace OpieObex { QLabel* m_lblFile; DeviceBox* m_devBox; QVBoxLayout* m_lay; int m_start; - QStringList m_irDa; - QMap<QString, QString> m_bt; + QMap<int, QString> m_irDa; + QMap<int, QString>::Iterator m_irDaIt; + QMap<int, Pair > m_bt; QString m_file; Obex* m_obex; + int m_irDeSearch; // search of irda and bt devices + int m_btDeSearch; }; class DeviceItem { public: DeviceItem( const QString& name = QString::null, - const QString& status = QString::null, int dev = 3); + const QString& status = QString::null, int dev = 3, int id = -1); ~DeviceItem(); void setStatus( const QString& text ); QString name()const; QString status()const; QString pixmap()const; int device()const; + int id()const; QString toString()const; private: QString m_name; QString m_status; int m_dev; + int m_id; }; + + /* + * The text field which contains the information about sending... + * + */ class DeviceBox : public QTextBrowser { Q_OBJECT public: enum Device { IrDa, BT, Search, Error }; DeviceBox( QWidget* parent ); ~DeviceBox(); void setSource( const QString& str ); - void addDevice( const QString& name, int dev, - const QString& status = QString::null ); - void removeDevice( const QString& name ); - void setStatus( const QString& name, const QString& ); + int addDevice( const QString& name, int dev, + const QString& status = QString::null ); + void removeDevice( int ); + void setStatus( int, const QString& ); signals: - void selectedDevice( const QString& name, int dev ); + void selectedDevice( int id, int dev ); private: - QMap<QString, DeviceItem> m_dev; - QStringList m_devices; - + /* returns a id for a device from a device range */ + int idFor (int deviceType ); + QString allText(); + QMap<int, DeviceItem> m_dev; }; } #endif |