author | korovkin <korovkin> | 2006-07-02 12:08:22 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-07-02 12:08:22 (UTC) |
commit | adcfc6f4afe184a9eb6fbf458616494dfe0dadda (patch) (unidiff) | |
tree | 5111ace883270f8e2f6da6e6578ad07ea7c650c1 | |
parent | b06b849f271079b0dd5d3419ad1162232ff4a9f5 (diff) | |
download | opie-adcfc6f4afe184a9eb6fbf458616494dfe0dadda.zip opie-adcfc6f4afe184a9eb6fbf458616494dfe0dadda.tar.gz opie-adcfc6f4afe184a9eb6fbf458616494dfe0dadda.tar.bz2 |
Added OBEX receive functionality.
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 54 | ||||
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.h | 4 |
2 files changed, 42 insertions, 16 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index a1d64a4..32560a1 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp | |||
@@ -66,2 +66,3 @@ namespace OpieTooth { | |||
66 | bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" ); | 66 | bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" ); |
67 | bluezReceiveOnPixmap = Resource::loadPixmap( "bluetoothapplet/receive.png" ); | ||
67 | #else | 68 | #else |
@@ -70,2 +71,3 @@ namespace OpieTooth { | |||
70 | bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon ); | 71 | bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon ); |
72 | bluezReceiveOnPixmap = )Resource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon ); | ||
71 | #endif | 73 | #endif |
@@ -76,2 +78,4 @@ namespace OpieTooth { | |||
76 | bluezDiscoveryActive = false; | 78 | bluezDiscoveryActive = false; |
79 | bluezReceiveActive = false; | ||
80 | bluezReceiveChanged = false; | ||
77 | doListDevice = false; | 81 | doListDevice = false; |
@@ -136,6 +140,5 @@ namespace OpieTooth { | |||
136 | #endif | 140 | #endif |
137 | 141 | case Model_iPAQ_H22xx: | |
138 | case Model_iPAQ_H22xx: | 142 | btDevice = new Device( "/dev/tts/3", "any", "921600" ); |
139 | btDevice = new Device( "/dev/tts/3", "any", "921600" ); | 143 | break; |
140 | break; | ||
141 | 144 | ||
@@ -150,2 +153,3 @@ namespace OpieTooth { | |||
150 | } else { | 153 | } else { |
154 | setObexRecieveStatus(0); | ||
151 | ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); | 155 | ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); |
@@ -170,4 +174,14 @@ namespace OpieTooth { | |||
170 | } | 174 | } |
171 | 175 | ||
172 | // FIXME mbhaynie | 176 | int BluezApplet::setObexRecieveStatus(int d) { |
177 | { | ||
178 | QCopEnvelope e ( "QPE/Obex", "btreceive(int)" ); | ||
179 | e << ( d ? 1 : 0 ); | ||
180 | } | ||
181 | bluezReceiveActive = (bool)(d != 0); | ||
182 | bluezReceiveChanged = true; | ||
183 | return d; | ||
184 | } | ||
185 | |||
186 | // FIXME mbhaynie | ||
173 | // receiver for QCopChannel("QPE/Bluetooth") messages. | 187 | // receiver for QCopChannel("QPE/Bluetooth") messages. |
@@ -246,8 +260,9 @@ namespace OpieTooth { | |||
246 | 260 | ||
247 | if (bluezDiscoveryActive) { | 261 | if (bluezactive) { |
248 | menu->insertItem( tr("Disable discovery"), 3 ); | 262 | if (bluezReceiveActive) { |
249 | } else { | 263 | menu->insertItem( tr("Disable receive"), 3 ); |
250 | menu->insertItem( tr("Enable discovery"), 4 ); | 264 | } else { |
251 | } | 265 | menu->insertItem( tr("Enable receive"), 4 ); |
252 | 266 | } | |
267 | } | ||
253 | 268 | ||
@@ -272,3 +287,3 @@ namespace OpieTooth { | |||
272 | case 3: | 287 | case 3: |
273 | setBluezDiscoveryStatus(0); | 288 | setObexRecieveStatus(0); |
274 | timerEvent( 0 ); | 289 | timerEvent( 0 ); |
@@ -276,4 +291,4 @@ namespace OpieTooth { | |||
276 | case 4: | 291 | case 4: |
277 | setBluezDiscoveryStatus(1); | 292 | setObexRecieveStatus(1); |
278 | timerEvent(0 ); | 293 | timerEvent( 0 ); |
279 | break; | 294 | break; |
@@ -308,3 +323,4 @@ namespace OpieTooth { | |||
308 | if ((bluezactive != oldactive) || | 323 | if ((bluezactive != oldactive) || |
309 | (bluezDiscoveryActive != olddiscovery)) | 324 | (bluezDiscoveryActive != olddiscovery) || |
325 | bluezReceiveChanged) | ||
310 | update(); | 326 | update(); |
@@ -314,2 +330,4 @@ namespace OpieTooth { | |||
314 | } | 330 | } |
331 | if (bluezReceiveChanged) | ||
332 | bluezReceiveChanged = false; | ||
315 | } | 333 | } |
@@ -341,3 +359,7 @@ namespace OpieTooth { | |||
341 | } | 359 | } |
360 | if (bluezReceiveActive) { | ||
361 | p.drawPixmap( 0, 0, bluezReceiveOnPixmap ); | ||
362 | } | ||
342 | } | 363 | } |
364 | |||
343 | /** | 365 | /** |
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h index b79ed5b..9809d20 100644 --- a/noncore/net/opietooth/applet/bluezapplet.h +++ b/noncore/net/opietooth/applet/bluezapplet.h | |||
@@ -60,2 +60,3 @@ public slots: | |||
60 | int setBluezDiscoveryStatus(int); | 60 | int setBluezDiscoveryStatus(int); |
61 | int setObexRecieveStatus(int); | ||
61 | 62 | ||
@@ -67,4 +68,7 @@ public slots: | |||
67 | QPixmap bluezDiscoveryOnPixmap; | 68 | QPixmap bluezDiscoveryOnPixmap; |
69 | QPixmap bluezReceiveOnPixmap; | ||
68 | bool bluezactive; | 70 | bool bluezactive; |
69 | bool bluezDiscoveryActive; | 71 | bool bluezDiscoveryActive; |
72 | bool bluezReceiveActive; | ||
73 | bool bluezReceiveChanged; | ||
70 | bool doListDevice; //If I have to list devices after bringing BT up? | 74 | bool doListDevice; //If I have to list devices after bringing BT up? |