Added OBEX receive functionality.

2 files changed, 34 insertions, 8 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 {
         bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
         bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
         bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" );
+        bluezReceiveOnPixmap = Resource::loadPixmap( "bluetoothapplet/receive.png" );
 #else
         bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon );
         bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon );
         bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon );
+        bluezReceiveOnPixmap = )Resource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon );
 #endif
         startTimer(2000);
         btDevice = 0;
         btManager = 0;
         bluezactive = false;
         bluezDiscoveryActive = false;
+        bluezReceiveActive = false;
+        bluezReceiveChanged = false;
         doListDevice = false;
         isScanning = false;
         m_wasOn = false;
@@ -134,7 +138,6 @@ namespace OpieTooth {
                 btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" );
                 break;
 #endif
-
 	    case Model_iPAQ_H22xx:
 		btDevice = new Device( "/dev/tts/3", "any", "921600" );
 		break;
@@ -148,6 +151,7 @@ namespace OpieTooth {
                 this, SLOT(slotDevice(const QString&, bool)));
             
         } else {
+            setObexRecieveStatus(0);
             ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null");
             if ( btManager ) {
                 delete btManager;
@@ -169,6 +173,16 @@ namespace OpieTooth {
       return bluezDiscoveryActive = d;
     }
 
+    int BluezApplet::setObexRecieveStatus(int d) {
+        {
+    	    QCopEnvelope e ( "QPE/Obex", "btreceive(int)" );
+	        e << ( d ? 1 : 0 );
+        }
+		bluezReceiveActive = (bool)(d != 0);
+		bluezReceiveChanged = true;
+		return d;
+    }
+    
     // FIXME mbhaynie
     // receiver for QCopChannel("QPE/Bluetooth") messages.
     void BluezApplet::slotMessage( const QCString& str, const QByteArray& )
@@ -244,12 +258,13 @@ namespace OpieTooth {
         //menu->insertItem( tr("Signal strength"), signal,  5);
         //menu->insertSeparator(8);
 
-        if (bluezDiscoveryActive) {
-            menu->insertItem( tr("Disable discovery"), 3 );
+        if (bluezactive) {
+	        if (bluezReceiveActive) {
+                menu->insertItem( tr("Disable receive"), 3 );
         } else {
-            menu->insertItem( tr("Enable discovery"), 4 );
+                menu->insertItem( tr("Enable receive"), 4 );
+        	}
         }
-
 
         QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) );
         ret = menu->exec(p, 0);
@@ -270,11 +285,11 @@ namespace OpieTooth {
             timerEvent( 0 );
             break;
         case 3:
-            setBluezDiscoveryStatus(0);
+            setObexRecieveStatus(0);
             timerEvent( 0 );
             break;
         case 4:
-            setBluezDiscoveryStatus(1);
+            setObexRecieveStatus(1);
             timerEvent(0 );
             break;
             //case 7:
@@ -306,12 +321,15 @@ namespace OpieTooth {
         bluezDiscoveryActive = checkBluezDiscoveryStatus();
 
         if ((bluezactive != oldactive) || 
-            (bluezDiscoveryActive != olddiscovery))
+            (bluezDiscoveryActive != olddiscovery) ||
+			bluezReceiveChanged)
             update();
         if (bluezactive && doListDevice) {
             const QByteArray arr;
             slotMessage("listDevices()", arr);
         }
+		if (bluezReceiveChanged)
+			bluezReceiveChanged = false;
     }
 
 /**
@@ -339,7 +357,11 @@ namespace OpieTooth {
         if (bluezDiscoveryActive) {
             p.drawPixmap( 0, 0,  bluezDiscoveryOnPixmap );
         }
+        if (bluezReceiveActive) {
+            p.drawPixmap( 0, 0,  bluezReceiveOnPixmap );
     }
+    }
+
     /**
     * Reacts on device up
     * @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:
         int setBluezStatus(int, bool sync = false);
         int checkBluezDiscoveryStatus();
         int setBluezDiscoveryStatus(int);
+        int setObexRecieveStatus(int);
 
     private:
         Device* btDevice;
@@ -65,8 +66,11 @@ public slots:
         QPixmap bluezOnPixmap;
         QPixmap bluezOffPixmap;
         QPixmap bluezDiscoveryOnPixmap;
+        QPixmap bluezReceiveOnPixmap;
         bool bluezactive;
         bool bluezDiscoveryActive;
+        bool bluezReceiveActive;
+        bool bluezReceiveChanged;
         bool doListDevice; //If I have to list devices after bringing BT up?
         bool isScanning; //If I'm scanning devices
         bool m_wasOn; //If BT was started by menu?