summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp54
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.h4
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
@@ -64,16 +64,20 @@ namespace OpieTooth {
64 bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); 64 bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
65 bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); 65 bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
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
68 bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon ); 69 bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon );
69 bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon ); 70 bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon );
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
72 startTimer(2000); 74 startTimer(2000);
73 btDevice = 0; 75 btDevice = 0;
74 btManager = 0; 76 btManager = 0;
75 bluezactive = false; 77 bluezactive = false;
76 bluezDiscoveryActive = false; 78 bluezDiscoveryActive = false;
79 bluezReceiveActive = false;
80 bluezReceiveChanged = false;
77 doListDevice = false; 81 doListDevice = false;
78 isScanning = false; 82 isScanning = false;
79 m_wasOn = false; 83 m_wasOn = false;
@@ -134,10 +138,9 @@ namespace OpieTooth {
134 btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" ); 138 btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" );
135 break; 139 break;
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
142 default: 145 default:
143 btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" ); 146 btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" );
@@ -148,6 +151,7 @@ namespace OpieTooth {
148 this, SLOT(slotDevice(const QString&, bool))); 151 this, SLOT(slotDevice(const QString&, bool)));
149 152
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");
152 if ( btManager ) { 156 if ( btManager ) {
153 delete btManager; 157 delete btManager;
@@ -168,8 +172,18 @@ namespace OpieTooth {
168 int BluezApplet::setBluezDiscoveryStatus(int d) { 172 int BluezApplet::setBluezDiscoveryStatus(int d) {
169 return bluezDiscoveryActive = d; 173 return bluezDiscoveryActive = d;
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.
174 void BluezApplet::slotMessage( const QCString& str, const QByteArray& ) 188 void BluezApplet::slotMessage( const QCString& str, const QByteArray& )
175 { 189 {
@@ -244,12 +258,13 @@ namespace OpieTooth {
244 //menu->insertItem( tr("Signal strength"), signal, 5); 258 //menu->insertItem( tr("Signal strength"), signal, 5);
245 //menu->insertSeparator(8); 259 //menu->insertSeparator(8);
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
254 QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); 269 QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) );
255 ret = menu->exec(p, 0); 270 ret = menu->exec(p, 0);
@@ -270,12 +285,12 @@ namespace OpieTooth {
270 timerEvent( 0 ); 285 timerEvent( 0 );
271 break; 286 break;
272 case 3: 287 case 3:
273 setBluezDiscoveryStatus(0); 288 setObexRecieveStatus(0);
274 timerEvent( 0 ); 289 timerEvent( 0 );
275 break; 290 break;
276 case 4: 291 case 4:
277 setBluezDiscoveryStatus(1); 292 setObexRecieveStatus(1);
278 timerEvent(0 ); 293 timerEvent( 0 );
279 break; 294 break;
280 //case 7: 295 //case 7:
281 // With table of currently-detected devices. 296 // With table of currently-detected devices.
@@ -306,12 +321,15 @@ namespace OpieTooth {
306 bluezDiscoveryActive = checkBluezDiscoveryStatus(); 321 bluezDiscoveryActive = checkBluezDiscoveryStatus();
307 322
308 if ((bluezactive != oldactive) || 323 if ((bluezactive != oldactive) ||
309 (bluezDiscoveryActive != olddiscovery)) 324 (bluezDiscoveryActive != olddiscovery) ||
325 bluezReceiveChanged)
310 update(); 326 update();
311 if (bluezactive && doListDevice) { 327 if (bluezactive && doListDevice) {
312 const QByteArray arr; 328 const QByteArray arr;
313 slotMessage("listDevices()", arr); 329 slotMessage("listDevices()", arr);
314 } 330 }
331 if (bluezReceiveChanged)
332 bluezReceiveChanged = false;
315 } 333 }
316 334
317/** 335/**
@@ -339,7 +357,11 @@ namespace OpieTooth {
339 if (bluezDiscoveryActive) { 357 if (bluezDiscoveryActive) {
340 p.drawPixmap( 0, 0, bluezDiscoveryOnPixmap ); 358 p.drawPixmap( 0, 0, bluezDiscoveryOnPixmap );
341 } 359 }
360 if (bluezReceiveActive) {
361 p.drawPixmap( 0, 0, bluezReceiveOnPixmap );
362 }
342 } 363 }
364
343 /** 365 /**
344 * Reacts on device up 366 * Reacts on device up
345 * @param name device name 367 * @param name device name
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
@@ -58,6 +58,7 @@ public slots:
58 int setBluezStatus(int, bool sync = false); 58 int setBluezStatus(int, bool sync = false);
59 int checkBluezDiscoveryStatus(); 59 int checkBluezDiscoveryStatus();
60 int setBluezDiscoveryStatus(int); 60 int setBluezDiscoveryStatus(int);
61 int setObexRecieveStatus(int);
61 62
62 private: 63 private:
63 Device* btDevice; 64 Device* btDevice;
@@ -65,8 +66,11 @@ public slots:
65 QPixmap bluezOnPixmap; 66 QPixmap bluezOnPixmap;
66 QPixmap bluezOffPixmap; 67 QPixmap bluezOffPixmap;
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?
71 bool isScanning; //If I'm scanning devices 75 bool isScanning; //If I'm scanning devices
72 bool m_wasOn; //If BT was started by menu? 76 bool m_wasOn; //If BT was started by menu?