author | harlekin <harlekin> | 2002-06-16 15:24:00 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-16 15:24:00 (UTC) |
commit | df2185572894877d0b4c524227b204b9f1a2341b (patch) (side-by-side diff) | |
tree | 1da3398299a56d8995be9ca3441abb0d666aeb3e /noncore/net/opietooth | |
parent | 0704b913f5da703218f66ddc18a4c6b280577d97 (diff) | |
download | opie-df2185572894877d0b4c524227b204b9f1a2341b.zip opie-df2185572894877d0b4c524227b204b9f1a2341b.tar.gz opie-df2185572894877d0b4c524227b204b9f1a2341b.tar.bz2 |
update
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 15 | ||||
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.h | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 94e29c7..8bb7a93 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp @@ -53,33 +53,33 @@ namespace OpieTooth { setFixedWidth( 14 ); bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); startTimer(5000); btDevice = 0; } BluezApplet::~BluezApplet() { } - int BluezApplet::checkBluezStatus() { + bool BluezApplet::checkBluezStatus() { if (btDevice) { if (btDevice->isLoaded() ) { - return 1; + return true; } else { - return 0; + return false; } } else { - return 0; + return false; } } int BluezApplet::setBluezStatus(int c) { if (c == 1) { btDevice = new Device("/dev/ttySB0", "csr" ); } else { if (btDevice) { delete btDevice; btDevice = 0; } @@ -119,62 +119,67 @@ namespace OpieTooth { menu->insertItem( tr("Disable discovery"), 3 ); } else { menu->insertItem( tr("Enable discovery"), 4 ); } QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); ret = menu->exec(p, 0); 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"); } /** * Refresh timer * @param the timer event */ void BluezApplet::timerEvent( QTimerEvent * ) { - int oldactive = bluezactive; + bool oldactive = bluezactive; int olddiscovery = bluezDiscoveryActive; bluezactive = checkBluezStatus(); bluezDiscoveryActive = checkBluezDiscoveryStatus(); if ((bluezactive != oldactive) || (bluezDiscoveryActive != olddiscovery)) { paintEvent(NULL); } } /** * Implementation of the paint event diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h index da05a18..6a8a00e 100644 --- a/noncore/net/opietooth/applet/bluezapplet.h +++ b/noncore/net/opietooth/applet/bluezapplet.h @@ -41,35 +41,35 @@ namespace OpieTooth { public: BluezApplet( QWidget *parent = 0, const char *name=0 ); ~BluezApplet(); protected: void timerEvent(QTimerEvent *te ); public slots: private: void mousePressEvent( QMouseEvent * ); void paintEvent( QPaintEvent* ); void launchManager(); - int checkBluezStatus(); + bool checkBluezStatus(); int setBluezStatus(int); int checkBluezDiscoveryStatus(); int setBluezDiscoveryStatus(int); int sockfd; private: Device* btDevice; QPixmap bluezOnPixmap; QPixmap bluezOffPixmap; QPixmap bluezDiscoveryOnPixmap; - int bluezactive; + bool bluezactive; int bluezDiscoveryActive; private slots: }; }; #endif |