Ticket #9265: bluetoothUI.patch

new file headers/private/bluetooth/BluetoothIconView.h

@@ +1 @@
+/* 
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ * 
+ * Authors:
+ *      Tri-Edge AI <triedgeai@gmail.com>
+ */ 
+
+#ifndef _BLUETOOTH_ICON_VIEW_H_
+#define _BLUETOOTH_ICON_VIEW_H_
+
+#include <View.h>
+#include <Bitmap.h>
+#include <MimeType.h>
+#include <IconUtils.h>
+
+namespace Bluetooth
+{
+
+class BluetoothIconView : public BView
+{
+public:
+                        BluetoothIconView();
+    void                Draw(BRect rect);
+    
+private:
+    BBitmap*            bitmap;
+};
+
+}
+
+#endif /* _BLUETOOTH_ICON_VIEW_H_ */ 

headers/private/bluetooth/ConnectionIncoming.h

@@ -1 @@
-/*
+/* 
  * Copyright 2007-2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
- *
+ * 
  * All rights reserved. Distributed under the terms of the MIT License.
- *
- */
+ * 
+ */ 
 
 #ifndef _CONNECTION_INCOMING_H_
 #define _CONNECTION_INCOMING_H_
 
-
-//----------------------- Global includes  ----------------------
 #include <AppKit.h>
 #include <SupportKit.h>
 #include <InterfaceKit.h>
+
+#include <ConnectionView.h>
+#include <bluetooth/RemoteDevice.h>
+
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
 
-namespace Bluetooth {
-
-class RemoteDevice;
-
-class ConnectionView
-        : public BView
+namespace Bluetooth 
 {
-public:
-                        ConnectionView(BRect frame, const char *name);
-                        ~ConnectionView();
-    virtual void        MessageReceived(BMessage *message);
-    void                Draw(BRect update);
-    void                Pulse();
-
-private:
-
-
-};
 
+class RemoteDevice;
+class ConnectionView;
 
 class ConnectionIncoming : public BWindow
 {
 public:
                         ConnectionIncoming(RemoteDevice* rDevice);
                         ~ConnectionIncoming();
-    virtual void        MessageReceived(BMessage *message);
+                        
+    virtual void        MessageReceived(BMessage* message);
     virtual bool        QuitRequested();
 
 private:
-    ConnectionView*             _ConnectionView;
+    ConnectionView*     view;
 };
 
 }
@@ -55 +44 @@
 using Bluetooth::ConnectionIncoming;
 #endif
 
-
-#endif
+#endif /* _CONNECTION_INCOMING_H_ */ 

new file headers/private/bluetooth/ConnectionView.h

@@ +1 @@
+/* 
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ * 
+ * Authors:
+ *      Tri-Edge AI <triedgeai@gmail.com>
+ */ 
+ 
+#ifndef _CONNECTION_VIEW_H_
+#define _CONNECTION_VIEW_H_
+ 
+#include <Window.h>
+#include <View.h>
+#include <StringView.h>
+#include <GroupLayout.h>
+#include <GroupLayoutBuilder.h>
+#include <Font.h>
+#include <String.h>
+ 
+namespace Bluetooth
+{
+
+class ConnectionView : public BView
+{
+public:
+                        ConnectionView::ConnectionView(BRect frame, 
+                            BString device);
+    void                Pulse();
+private:
+    BString             strMessage;
+    BStringView*        vMessage;
+};
+
+}
+
+#endif /* _CONNECTION_VIEW_H_ */ 

new file src/kits/bluetooth/UI/BluetoothIconView.cpp

@@ +1 @@
+/* 
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ * 
+ * Authors:
+ *      Tri-Edge AI <triedgeai@gmail.com>
+ */ 
+
+#include <BluetoothIconView.h>
+
+namespace Bluetooth
+{
+    
+BluetoothIconView::BluetoothIconView()
+    :
+    BView(BRect(0, 0, 80, 80), "", B_FOLLOW_ALL, B_WILL_DRAW)
+{
+    bitmap = new BBitmap(BRect(0, 0, 64, 64), 0, B_RGBA32);
+    
+    uint8* ticon;
+    size_t tsize;
+    
+    BMimeType mime("application/x-vnd.Haiku-bluetooth_server");
+    mime.GetIcon(&ticon, &tsize);
+    
+    BIconUtils::GetVectorIcon(ticon, tsize, bitmap);
+    
+    SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+    SetDrawingMode(B_OP_ALPHA);
+    SetBlendingMode(B_CONSTANT_ALPHA, B_ALPHA_OVERLAY);
+}
+
+
+void
+BluetoothIconView::Draw(BRect rect)
+{
+    this->DrawBitmap(bitmap);
+}
+
+}

src/kits/bluetooth/UI/ConnectionIncoming.cpp

@@ -1 @@
-/*
+/* 
  * Copyright 2007-2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
- *
+ * 
  * All rights reserved. Distributed under the terms of the MIT License.
- *
- */
+ * 
+ */ 
 
 #include <ConnectionIncoming.h>
+#include <ConnectionView.h>
 
-#define B_PULSES_BY_SECOND(x) (2*x)
-
-namespace Bluetooth {
-
-ConnectionView::ConnectionView(BRect frame, const char *name): BView(BRect(0, 0, 400, 400), "MyViewName", 
-                                                                    B_FOLLOW_LEFT | B_FOLLOW_TOP,
-                                                                    B_WILL_DRAW | B_PULSE_NEEDED)
+namespace Bluetooth 
 {
 
-    SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-
-}
-
-ConnectionView::~ConnectionView()
-{
-
-}
-
-
-void ConnectionView::MessageReceived(BMessage *message)
-{
-    switch(message->what)
-    {
-    default:
+ConnectionIncoming::ConnectionIncoming(RemoteDevice* rDevice)
+            :
+            BWindow(BRect(600, 100, 1000, 180), "Incoming connection", 
+                B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
+                B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
+                    // 400x80
+{
+    SetPulseRate(1 * 1000 * 1000); 
+        // 1 second
     
-    break;
-    }
-}
-
-
-void ConnectionView::Draw(BRect update)
-{
-
-}
-
-
-void ConnectionView::Pulse()
-{
-    static int a = 0;
+    if (rDevice != NULL)
+        view = new ConnectionView(BRect(0, 0, 400, 80), rDevice->GetFriendlyName());
+    else
+        view = new ConnectionView(BRect(0, 0, 400, 80), "<unknown_device>");
     
-    if (a++ == B_PULSES_BY_SECOND(5)) {
-        // BUG: for some reason the window is not being removed...
-        Window()->PostMessage(B_QUIT_REQUESTED);
-        Window()->Quit();
-    }
-}
-
-
-
-//---------------------------------------------------------------
-ConnectionIncoming::ConnectionIncoming(RemoteDevice* rDevice)
-             : BWindow(BRect(700, 100, 900, 150), "Connection completed", 
-                                   B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
-                                   B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
-{
-    _ConnectionView = new ConnectionView(BRect(0, 0, 400, 400),"mViewName");
-
-    AddChild(_ConnectionView);
+    AddChild(view);
 }
 
 
 ConnectionIncoming::~ConnectionIncoming()
 {
-
+    
 }
 
 
-void ConnectionIncoming::MessageReceived(BMessage *message)
+void
+ConnectionIncoming::MessageReceived(BMessage* message)
 {
-    switch(message->what)
+    switch (message->what)
     {
     default:
     
@@ -85 +48 @@
 }
 
 
-bool ConnectionIncoming::QuitRequested()
+bool
+ConnectionIncoming::QuitRequested()
 {
     return BWindow::QuitRequested();
 }

new file src/kits/bluetooth/UI/ConnectionView.cpp

@@ +1 @@
+/* 
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ * 
+ * Authors:
+ *      Tri-Edge AI <triedgeai@gmail.com>
+ */ 
+
+#include <ConnectionView.h>
+#include <BluetoothIconView.h>
+
+namespace Bluetooth
+{
+    
+ConnectionView::ConnectionView(BRect frame, BString device)
+    :
+    BView(frame, "ConnectionView", 0, B_PULSE_NEEDED)
+{
+    BFont font;
+    
+    font.SetFace(B_BOLD_FACE);
+    
+    SetLayout(new BGroupLayout(B_HORIZONTAL));
+    SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+    
+    BluetoothIconView* vIcon = new BluetoothIconView();
+    
+    strMessage = "A new connection is incoming..";
+    
+    vMessage = new BStringView(frame, "", 
+                                    strMessage, 
+                                    B_FOLLOW_LEFT);
+                                    
+    vMessage->SetAlignment(B_ALIGN_LEFT);
+                                                        
+    BStringView* vDevice = new BStringView(frame, "", 
+                                    "Remote Device: ", B_FOLLOW_LEFT);
+    
+    vDevice->SetFont(&font, B_FONT_FACE);
+    
+    BStringView* vDeviceText = new BStringView(frame, "", 
+                                    device, B_FOLLOW_RIGHT);
+    
+    AddChild(BGroupLayoutBuilder(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
+            .Add(BGroupLayoutBuilder(B_VERTICAL, 0)
+                .Add(vIcon)
+                .SetInsets(8, 8, 8, 8)
+            )
+            .Add(BGroupLayoutBuilder(B_VERTICAL, B_USE_DEFAULT_SPACING)
+                .AddGlue()
+                .Add(vMessage)
+                .Add(BGroupLayoutBuilder(B_HORIZONTAL, 0)
+                    .Add(vDevice)
+                    .Add(vDeviceText)
+                )
+                .AddGlue(3.0f)
+            )
+            .AddGlue()
+    );
+}
+
+
+void
+ConnectionView::Pulse()
+{
+    static int pulses = 0;
+    
+    pulses++;
+    
+    if (pulses >= 5) {
+        Window()->PostMessage(B_QUIT_REQUESTED);
+    } else {
+        strMessage += ".";
+        vMessage->SetText(strMessage);
+    }
+}
+
+}
+