Diffstat (limited to 'noncore/net/opietooth/applet/bluezapplet.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 8bb7a93..c0ad246 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp @@ -53,12 +53,14 @@ namespace OpieTooth { setFixedWidth( 14 ); bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); startTimer(5000); btDevice = 0; + bluezactive = false; + bluezDiscoveryActive = false; } BluezApplet::~BluezApplet() { } @@ -97,13 +99,13 @@ namespace OpieTooth { QPopupMenu *menu = new QPopupMenu(); QPopupMenu *signal = new QPopupMenu(); int ret=0; /* Refresh active state */ - timerEvent(NULL); + timerEvent( 0 ); if (bluezactive) { menu->insertItem( tr("Disable Bluetooth"), 0 ); } else { menu->insertItem( tr("Enable Bluetooth"), 1 ); @@ -125,36 +127,35 @@ namespace OpieTooth { QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); ret = menu->exec(p, 0); switch(ret) { case 0: setBluezStatus(0); - timerEvent(NULL); + timerEvent( 0 ); break; case 1: setBluezStatus(1); - timerEvent(NULL); + timerEvent( 0 ); break; case 2: // start bluetoothmanager launchManager(); - timerEvent(NULL); + timerEvent( 0 ); break; case 3: setBluezDiscoveryStatus(0); - timerEvent(NULL); + timerEvent( 0 ); break; case 4: setBluezDiscoveryStatus(1); - timerEvent(NULL); + timerEvent(0 ); break; //case 7: // With table of currently-detected devices. } - timerEvent(NULL); delete signal; delete menu; } /** @@ -174,26 +175,24 @@ namespace OpieTooth { int olddiscovery = bluezDiscoveryActive; bluezactive = checkBluezStatus(); bluezDiscoveryActive = checkBluezDiscoveryStatus(); if ((bluezactive != oldactive) || (bluezDiscoveryActive != olddiscovery)) { - paintEvent(NULL); + update(); } } /** * Implementation of the paint event * @param the QPaintEvent */ void BluezApplet::paintEvent( QPaintEvent* ) { QPainter p(this); qDebug("paint bluetooth pixmap"); - p.eraseRect ( 0, 0, this->width(), this->height() ); - if (bluezactive > 0) { p.drawPixmap( 0, 1, bluezOnPixmap ); } else { p.drawPixmap( 0, 1, bluezOffPixmap ); } |