Diffstat (limited to 'noncore/net/opietooth/applet/bluezapplet.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 15 |
1 files changed, 10 insertions, 5 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 { | |||
53 | setFixedWidth( 14 ); | 53 | setFixedWidth( 14 ); |
54 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); | 54 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); |
55 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); | 55 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); |
56 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); | 56 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); |
57 | startTimer(5000); | 57 | startTimer(5000); |
58 | btDevice = 0; | 58 | btDevice = 0; |
59 | 59 | ||
60 | } | 60 | } |
61 | 61 | ||
62 | BluezApplet::~BluezApplet() { | 62 | BluezApplet::~BluezApplet() { |
63 | } | 63 | } |
64 | 64 | ||
65 | int BluezApplet::checkBluezStatus() { | 65 | bool BluezApplet::checkBluezStatus() { |
66 | if (btDevice) { | 66 | if (btDevice) { |
67 | if (btDevice->isLoaded() ) { | 67 | if (btDevice->isLoaded() ) { |
68 | return 1; | 68 | return true; |
69 | } else { | 69 | } else { |
70 | return 0; | 70 | return false; |
71 | } | 71 | } |
72 | } else { | 72 | } else { |
73 | return 0; | 73 | return false; |
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | int BluezApplet::setBluezStatus(int c) { | 77 | int BluezApplet::setBluezStatus(int c) { |
78 | 78 | ||
79 | if (c == 1) { | 79 | if (c == 1) { |
80 | btDevice = new Device("/dev/ttySB0", "csr" ); | 80 | btDevice = new Device("/dev/ttySB0", "csr" ); |
81 | } else { | 81 | } else { |
82 | if (btDevice) { | 82 | if (btDevice) { |
83 | delete btDevice; | 83 | delete btDevice; |
84 | btDevice = 0; | 84 | btDevice = 0; |
85 | } | 85 | } |
@@ -119,62 +119,67 @@ namespace OpieTooth { | |||
119 | menu->insertItem( tr("Disable discovery"), 3 ); | 119 | menu->insertItem( tr("Disable discovery"), 3 ); |
120 | } else { | 120 | } else { |
121 | menu->insertItem( tr("Enable discovery"), 4 ); | 121 | menu->insertItem( tr("Enable discovery"), 4 ); |
122 | } | 122 | } |
123 | 123 | ||
124 | 124 | ||
125 | QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); | 125 | QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); |
126 | ret = menu->exec(p, 0); | 126 | ret = menu->exec(p, 0); |
127 | 127 | ||
128 | switch(ret) { | 128 | switch(ret) { |
129 | case 0: | 129 | case 0: |
130 | setBluezStatus(0); | 130 | setBluezStatus(0); |
131 | timerEvent(NULL); | ||
131 | break; | 132 | break; |
132 | case 1: | 133 | case 1: |
133 | setBluezStatus(1); | 134 | setBluezStatus(1); |
135 | timerEvent(NULL); | ||
134 | break; | 136 | break; |
135 | case 2: | 137 | case 2: |
136 | // start bluetoothmanager | 138 | // start bluetoothmanager |
137 | launchManager(); | 139 | launchManager(); |
140 | timerEvent(NULL); | ||
138 | break; | 141 | break; |
139 | case 3: | 142 | case 3: |
140 | setBluezDiscoveryStatus(0); | 143 | setBluezDiscoveryStatus(0); |
144 | timerEvent(NULL); | ||
141 | break; | 145 | break; |
142 | case 4: | 146 | case 4: |
143 | setBluezDiscoveryStatus(1); | 147 | setBluezDiscoveryStatus(1); |
148 | timerEvent(NULL); | ||
144 | break; | 149 | break; |
145 | //case 7: | 150 | //case 7: |
146 | // With table of currently-detected devices. | 151 | // With table of currently-detected devices. |
147 | } | 152 | } |
148 | 153 | ||
149 | timerEvent(NULL); | 154 | timerEvent(NULL); |
150 | delete signal; | 155 | delete signal; |
151 | delete menu; | 156 | delete menu; |
152 | } | 157 | } |
153 | 158 | ||
154 | 159 | ||
155 | /** | 160 | /** |
156 | * Launches the bluetooth manager | 161 | * Launches the bluetooth manager |
157 | */ | 162 | */ |
158 | void BluezApplet::launchManager() { | 163 | void BluezApplet::launchManager() { |
159 | QCopEnvelope e("QPE/System", "execute(QString)"); | 164 | QCopEnvelope e("QPE/System", "execute(QString)"); |
160 | e << QString("bluetooth-manager"); | 165 | e << QString("bluetooth-manager"); |
161 | } | 166 | } |
162 | 167 | ||
163 | /** | 168 | /** |
164 | * Refresh timer | 169 | * Refresh timer |
165 | * @param the timer event | 170 | * @param the timer event |
166 | */ | 171 | */ |
167 | void BluezApplet::timerEvent( QTimerEvent * ) { | 172 | void BluezApplet::timerEvent( QTimerEvent * ) { |
168 | int oldactive = bluezactive; | 173 | bool oldactive = bluezactive; |
169 | int olddiscovery = bluezDiscoveryActive; | 174 | int olddiscovery = bluezDiscoveryActive; |
170 | 175 | ||
171 | bluezactive = checkBluezStatus(); | 176 | bluezactive = checkBluezStatus(); |
172 | bluezDiscoveryActive = checkBluezDiscoveryStatus(); | 177 | bluezDiscoveryActive = checkBluezDiscoveryStatus(); |
173 | 178 | ||
174 | if ((bluezactive != oldactive) || (bluezDiscoveryActive != olddiscovery)) { | 179 | if ((bluezactive != oldactive) || (bluezDiscoveryActive != olddiscovery)) { |
175 | paintEvent(NULL); | 180 | paintEvent(NULL); |
176 | } | 181 | } |
177 | } | 182 | } |
178 | 183 | ||
179 | /** | 184 | /** |
180 | * Implementation of the paint event | 185 | * Implementation of the paint event |