summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp162
-rw-r--r--noncore/net/opietooth/manager/bluebase.h12
-rw-r--r--noncore/net/opietooth/manager/bluetoothbase.ui16
3 files changed, 146 insertions, 44 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index c993c7c..d45fbe0 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -41,7 +41,7 @@
+#include <remotedevice.h>
-namespace OpieTooth {
+namespace OpieTooth {
- #include <remotedevice.h>
@@ -51,7 +51,17 @@ namespace OpieTooth {
- QObject::connect( (QObject*) PushButton2, SIGNAL( clicked() ), this, SLOT(startScan()));
- QObject::connect((QObject*)configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges()));
+ QObject::connect( (QObject*)PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
+ QObject::connect( (QObject*)configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
+ QObject::connect( (QObject*)ListView2, SIGNAL( expanded( QListViewItem * item ) ),
+ this, SLOT( addServicesToDevice( QListViewItem * item ) ) );
+ QObject::connect( (QObject*)ListView2, SIGNAL( clicked( QListViewItem * )),
+ this, SLOT( startServiceActionClicked( QListViewItem * item ) ) );
+
+ //
+ // QObject::connect( (QObject*) Manager, SIGNAL (foundServices( const QString& device, Services::ValueList ), this () ) );
+ //Load all icons needed
+ QPixmap offPix = Resource::loadPixmap( "editdelete" );
+ QPixmap onPix = Resource::loadPixmap( "installed" );
@@ -69,7 +79,24 @@ namespace OpieTooth {
initGui();
+
+
+ //TESTING
+
+ ListView2->setRootIsDecorated(true);
+
+ QListViewItem *topLV = new QListViewItem( ListView2, "Harlekins Dongle" , "yes");
+ topLV->setPixmap(0, offPix);
+ (void) new QListViewItem( topLV, "on" );
+ (void) new QListViewItem( topLV, "off" );
+
+ QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" );
+ topLV2->setPixmap(0, onPix);
+ (void) new QListViewItem( topLV2, "on" );
+ (void) new QListViewItem( topLV2, "off" );
+
}
-/**
- * Reads all options from the config file
- */
+
+ /**
+ * Reads all options from the config file
+ */
void BlueBase::readConfig() {
@@ -89,5 +116,5 @@ namespace OpieTooth {
-/**
- * Writes all options to the config file
- */
+ /**
+ * Writes all options to the config file
+ */
void BlueBase::writeConfig() {
@@ -98,3 +125,2 @@ namespace OpieTooth {
-
cfg.writeEntry("name", deviceName);
@@ -108,5 +134,23 @@ namespace OpieTooth {
-/**
- * Set up the gui
- */
+ /*
+ * Read the list of allready known devices
+ *
+ */
+ void BlueBase::readSavedDevices() {
+
+ }
+
+ /*
+ * Read the list of allready known devices
+ *
+ */
+ void BlueBase::writeSavedDevices() {
+
+
+ }
+
+
+ /**
+ * Set up the gui
+ */
void BlueBase::initGui() {
@@ -121,2 +165,4 @@ namespace OpieTooth {
passkeyLine->setText(defaultPasskey);
+ // set info tab
+ setInfo();
}
@@ -124,9 +170,13 @@ namespace OpieTooth {
-/**
- * Get the status informations and returns it
- * @return QString the status informations gathered
- */
+ /**
+ * Get the status informations and returns it
+ * @return QString the status informations gathered
+ */
QString BlueBase::getStatus(){
- return ("manger.h need also a status method");
+ QString infoString = tr("<b>Device name : </b> Ipaq" );
+ infoString += QString("<br><b>" + tr("MAC adress: ") +"</b> No idea");
+ infoString += QString("<br><b>" + tr("Class") + "</b> PDA");
+
+ return (infoString);
@@ -135,5 +185,5 @@ namespace OpieTooth {
-/**
- * Read the current values from the gui and invoke writeConfig()
- */
+ /**
+ * Read the current values from the gui and invoke writeConfig()
+ */
void BlueBase::applyConfigChanges() {
@@ -157,2 +207,6 @@ namespace OpieTooth {
+ /*
+ * Add fresh found devices from scan dialog to the listing
+ *
+ */
void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) {
@@ -167,3 +221,10 @@ namespace OpieTooth {
RemoteDevice *dev = it.current();
- deviceItem = new QListViewItem( ListView4, dev->name() );
+ deviceItem = new QListViewItem( ListView2, dev->name() );
+
+ if (deviceActive( dev ) ) {
+ deviceItem->setPixmap(0, onPix);
+ } else {
+ deviceItem->setPixmap(0, offPix);
+ }
+
deviceItem->setText(1, dev->mac() );
@@ -173,6 +234,44 @@ namespace OpieTooth {
-/**
- * Open the "scan for devices" dialog
- */
+ /*
+ * Action that is toggled on entrys on click
+ */
+ void BlueBase::startServiceActionClicked( QListViewItem * item ) {
+
+
+ }
+
+ /*
+ * Action that are toggled on hold (mostly QPopups i guess)
+ */
+ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column) {
+
+
+ }
+
+ /*
+ * Search and display avail. services for a device (on expand from device listing)
+ *
+ */
+ void BlueBase::addServicesToDevice( QListViewItem * item ) {
+ // row of mac adress
+ RemoteDevice *device = new RemoteDevice(item->text(1), item->text(0));
+ //dann nen manager und darauf dann searchServises, das liefert nen signal, das wieder connected
+ // werden muss.
+
+ // delete
+ }
+
+ /*
+ * Find out if a device can currently be reached
+ */
+ bool BlueBase::deviceActive( RemoteDevice *device ) {
+
+ return true;
+ }
+
+ /**
+ * Open the "scan for devices" dialog
+ */
void BlueBase::startScan() {
+
ScanDialog *scan = new ScanDialog( this, "", true);
@@ -184,5 +283,10 @@ namespace OpieTooth {
-/**
- * Decontructor
- */
+
+ void BlueBase::setInfo() {
+ StatusLabel->setText(getStatus());
+ }
+
+ /**
+ * Decontructor
+ */
BlueBase::~BlueBase(){
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index c8ceed2..7b03f82 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -9,2 +9,3 @@
#include <qlist.h>
+#include <qpixmap.h>
@@ -23,2 +24,3 @@ class QCheckBox;
+
namespace OpieTooth {
@@ -43,5 +45,9 @@ namespace OpieTooth {
void writeConfig();
+ void readSavedDevices();
+ void writeSavedDevices();
QString getStatus();
void initGui();
+ void setInfo();
+ bool deviceActive( RemoteDevice *device );
@@ -54,4 +60,10 @@ namespace OpieTooth {
+ QPixmap offPix;
+ QPixmap onPix;
+
private slots:
void addSearchedDevices( QList<RemoteDevice> &newDevices );
+ void addServicesToDevice( QListViewItem * item );
+ void startServiceActionClicked( QListViewItem * item );
+ void startServiceActionHold( QListViewItem * item, const QPoint & point, int column);
void applyConfigChanges();
diff --git a/noncore/net/opietooth/manager/bluetoothbase.ui b/noncore/net/opietooth/manager/bluetoothbase.ui
index 61e2bcf..869a9cb 100644
--- a/noncore/net/opietooth/manager/bluetoothbase.ui
+++ b/noncore/net/opietooth/manager/bluetoothbase.ui
@@ -93,16 +93,2 @@
<name>text</name>
- <string>Active</string>
- </property>
- <property>
- <name>clickable</name>
- <bool>true</bool>
- </property>
- <property>
- <name>resizeable</name>
- <bool>true</bool>
- </property>
- </column>
- <column>
- <property>
- <name>text</name>
<string>Device Name</string>
@@ -121,3 +107,3 @@
<name>text</name>
- <string>Type</string>
+ <string>Online</string>
</property>