author | harlekin <harlekin> | 2002-06-16 19:26:43 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-16 19:26:43 (UTC) |
commit | 8dde6abcd14717bd362248c365fe140efe0f0386 (patch) (side-by-side diff) | |
tree | f9e97c987e5197d4cbb3d0a0d5afe99fe12b1eba /noncore/net/opietooth | |
parent | 1eca76c99326afc111efeb2bf55a306a4f37eb1e (diff) | |
download | opie-8dde6abcd14717bd362248c365fe140efe0f0386.zip opie-8dde6abcd14717bd362248c365fe140efe0f0386.tar.gz opie-8dde6abcd14717bd362248c365fe140efe0f0386.tar.bz2 |
update
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 14 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 5 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 46 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.h | 10 |
4 files changed, 64 insertions, 11 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index e3b9e53..71da82e 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -42,4 +42,5 @@ namespace OpieTooth { + class RemoteDevices; BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) @@ -50,4 +51,7 @@ namespace OpieTooth { QObject::connect((QObject*)configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges())); + + + QPalette pal = this->palette(); QColor col = pal.color(QPalette::Active, QColorGroup::Background); @@ -150,4 +154,11 @@ namespace OpieTooth { + void BlueBase::addSearchedDevices( QList<RemoteDevices> &newDevices ) { + + + + } + + /** * Open the "scan for devices" dialog @@ -155,4 +166,7 @@ namespace OpieTooth { void BlueBase::startScan() { ScanDialog *scan = new ScanDialog( this, "", true); + QObject::connect((QObject*)scan, SIGNAL( selectedDevices(QList<RemoteDevices>&) ), + this, SLOT( addSearchedDevices(QList<RemoteDevices>& ) )); + scan->showMaximized(); } diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h index 023af7a..ae5ce67 100644 --- a/noncore/net/opietooth/manager/bluebase.h +++ b/noncore/net/opietooth/manager/bluebase.h @@ -7,4 +7,5 @@ #include <qscrollview.h> #include <qsplitter.h> +#include <qlist.h> #include "bluetoothbase.h" @@ -21,4 +22,6 @@ class QCheckBox; namespace OpieTooth { + + class BlueBase : public BluetoothBase { Q_OBJECT @@ -49,5 +52,5 @@ namespace OpieTooth { private slots: - + void addSearchedDevices( QList<RemoteDevices> &newDevices ); void applyConfigChanges(); diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index 63c5472..70ea77a 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp @@ -29,12 +29,15 @@ #include <qwhatsthis.h> #include <qprogressbar.h> +#include <qlist.h> #include <manager.h> #include <device.h> -#include <remotedevice.h> + namespace OpieTooth { +#include <remotedevice.h> + /* */ @@ -64,10 +67,11 @@ namespace OpieTooth { StartButton = new QPushButton( buttonFrame, "StartButton" ); - StartButton->setText( tr( "Start" ) ); + StartButton->setText( tr( "Start scan" ) ); StopButton = new QPushButton( buttonFrame, "StopButton" ); - StopButton->setText( tr( "Cancel" ) ); + StopButton->setText( tr( "Cancel scan" ) ); QHBoxLayout *buttonLayout = new QHBoxLayout(buttonFrame); + buttonLayout->addWidget(StartButton); buttonLayout->addWidget(StopButton); @@ -75,6 +79,6 @@ namespace OpieTooth { ListView1 = new QListView( privateLayoutWidget, "ListView1" ); - ListView1->addColumn( tr( "Add" ) ); - ListView1->addColumn( tr( "Device Name" ) ); + //ListView1->addColumn( tr( "Add" ) ); + ListView1->addColumn( tr( "Add Device" ) ); //ListView1->addColumn( tr( "Type" ) ); @@ -107,4 +111,7 @@ namespace OpieTooth { progressStat = 0; + QCheckListItem *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox ); + deviceItem2->setText(1, "BLAH" ); + progressTimer(); // when finished, it emmite foundDevices() @@ -120,11 +127,35 @@ namespace OpieTooth { void ScanDialog::fillList(const QString& device, RemoteDevices::ValueList deviceList) { - QListViewItem * deviceItem; + QCheckListItem * deviceItem; RemoteDevices::ValueList::Iterator it; for( it = deviceList.begin(); it != deviceList.end(); ++it ) { - deviceItem = new QListViewItem( ListView1, (*it).name() ); + deviceItem = new QCheckListItem( ListView1, (*it).name() ); + deviceItem->setText(1, (*it).mac() ); + } + + } + +/* + * Iterates trough the items, and collects the checked items. + * Then it emits it, so the manager can connect to the signal to fill the listing. + */ + void ScanDialog::emitToManager() { + + if (!ListView1) { + return; + } + + QList<RemoteDevices> *deviceList = new QList<RemoteDevices>; + + QListViewItemIterator it( ListView1 ); + for ( ; it.current(); ++it ) { + if ( it.current()->isSelected() ) { + RemoteDevices* device = new RemoteDevices( it.current()->text(1), it.current()->text(0)); + deviceList->append( device ); + } } + emit selectedDevices( *deviceList ); } @@ -133,4 +164,5 @@ namespace OpieTooth { */ ScanDialog::~ScanDialog() { + emitToManager(); delete localDevice; } diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h index fcaee6e..4785a62 100644 --- a/noncore/net/opietooth/manager/scandialog.h +++ b/noncore/net/opietooth/manager/scandialog.h @@ -20,8 +20,7 @@ #include <qvariant.h> #include <qdialog.h> +#include <qlist.h> -#include <remotedevice.h> - class QVBoxLayout; class QHBoxLayout; @@ -37,5 +36,5 @@ class QProgressBar; namespace OpieTooth { - +#include <remotedevices.h> class Manager; class Device; @@ -65,8 +64,13 @@ class Device; private: + void emitToManager(); Manager *localDevice; int progressStat; + + signals: + void selectedDevices(QList<RemoteDevices>&); }; + } |