summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp34
1 files changed, 14 insertions, 20 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 6e5ee82..94e29c7 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -46,55 +46,53 @@
#include <device.h>
namespace OpieTooth {
BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
setFixedHeight( 18 );
setFixedWidth( 14 );
bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
// bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" );
startTimer(5000);
- timerEvent(NULL);
+ btDevice = 0;
+
}
BluezApplet::~BluezApplet() {
}
int BluezApplet::checkBluezStatus() {
- if (btDevice) {
- if (btDevice->isLoaded() ) {
- return 1;
+ if (btDevice) {
+ if (btDevice->isLoaded() ) {
+ return 1;
+ } else {
+ return 0;
+ }
} else {
return 0;
}
- } else {
- return 0;
- }
}
int BluezApplet::setBluezStatus(int c) {
if (c == 1) {
btDevice = new Device("/dev/ttySB0", "csr" );
- // system("hciattach /dev/ttySB0 csr");
- //system("hcid");
} else {
if (btDevice) {
delete btDevice;
+ btDevice = 0;
}
- //system("killall hciattach");
- //system("killall hcid");
- }
+ }
return 0;
}
int BluezApplet::checkBluezDiscoveryStatus() {
}
int BluezApplet::setBluezDiscoveryStatus(int d) {
}
void BluezApplet::mousePressEvent( QMouseEvent *) {
QPopupMenu *menu = new QPopupMenu();
@@ -113,56 +111,52 @@ namespace OpieTooth {
menu->insertItem( tr("Launch manager"), 2 );
menu->insertSeparator(6);
menu->insertItem( tr("Signal strength"), signal, 5);
menu->insertSeparator(8);
if (bluezDiscoveryActive) {
menu->insertItem( tr("Disable discovery"), 3 );
} else {
menu->insertItem( tr("Enable discovery"), 4 );
}
- //menu->insertItem( tr("More..."), 7 )
+
QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) );
ret = menu->exec(p, 0);
- // qDebug("ret was %d\n", ret);
-
switch(ret) {
case 0:
setBluezStatus(0);
- timerEvent(NULL);
break;
case 1:
setBluezStatus(1);
- timerEvent(NULL);
break;
case 2:
// start bluetoothmanager
launchManager();
- timerEvent(NULL);
break;
case 3:
setBluezDiscoveryStatus(0);
- timerEvent(NULL);
break;
case 4:
setBluezDiscoveryStatus(1);
- timerEvent(NULL);
break;
//case 7:
// With table of currently-detected devices.
}
+
+ timerEvent(NULL);
+ delete signal;
delete menu;
}
/**
* Launches the bluetooth manager
*/
void BluezApplet::launchManager() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("bluetooth-manager");
}