Separate stolen ListItem subclass to work on a new one for bluetooth devices

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29325 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/preferences/bluetooth/DeviceListItem.cpp

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2009, Oliver Ruiz Dorantes, <oliver.ruiz.dorantes_at_gmail.com>
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+#include "DeviceListItem.h"
+#include <bluetooth/bdaddrUtils.h>
+
+
+#include <Bitmap.h>
+#include <View.h>
+
+namespace bluetooth {
+
+RangeItem::RangeItem(uint32 lowAddress, uint32 highAddress, const char* name)
+	: BListItem(),
+	fLowAddress(lowAddress), 
+	fHighAddress(highAddress)
+{
+	fName = strdup(name);
+}
+
+RangeItem::~RangeItem()
+{
+	delete fName;
+}
+
+/***********************************************************
+ * DrawItem
+ ***********************************************************/
+void
+RangeItem::DrawItem(BView *owner, BRect itemRect, bool complete)
+{
+	rgb_color kBlack = { 0,0,0,0 };
+	rgb_color kHighlight = { 156,154,156,0 };
+	
+	if (IsSelected() || complete) {
+		rgb_color color;
+		if (IsSelected())
+			color = kHighlight;
+		else
+			color = owner->ViewColor();
+		
+		owner->SetHighColor(color);
+		owner->SetLowColor(color);
+		owner->FillRect(itemRect);
+		owner->SetHighColor(kBlack);
+		
+	} else {
+		owner->SetLowColor(owner->ViewColor());
+	}
+	
+	BFont font = be_plain_font;
+	font_height	finfo;
+	font.GetHeight(&finfo);
+	
+	BPoint point = BPoint(itemRect.left + 17, itemRect.bottom - finfo.descent + 1);
+	owner->SetFont(be_fixed_font);
+	owner->SetHighColor(kBlack);
+	owner->MovePenTo(point);
+	
+/*	if (fLowAddress >= 0) {
+		char string[255];
+		sprintf(string, "0x%04lx - 0x%04lx", fLowAddress, fHighAddress);
+		owner->DrawString(string);
+	}
+	point += BPoint(174, 0);*/
+	owner->SetFont(be_plain_font);
+	owner->MovePenTo(point);
+	owner->DrawString(fName);
+}
+
+int 
+RangeItem::Compare(const void *firstArg, const void *secondArg)
+{
+	const RangeItem *item1 = *static_cast<const RangeItem * const *>(firstArg);
+	const RangeItem *item2 = *static_cast<const RangeItem * const *>(secondArg);
+	
+	if (item1->fLowAddress < item2->fLowAddress) {
+		return -1;
+	} else if (item1->fLowAddress > item2->fLowAddress) {
+		return 1;
+	} else 
+		return 0;
+
+}
+
+}

src/preferences/bluetooth/DeviceListItem.h

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2009, Oliver Ruiz Dorantes, <oliver.ruiz.dorantes_at_gmail.com>
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+#ifndef DEVICELISTITEM_H_
+#define DEVICELISTITEM_H_
+
+#include <ListItem.h>
+
+namespace bluetooth {
+
+// TODO: Implement a BluetoothDeviceListItem class, this one is stolen from somewhere .....
+class RangeItem : public BListItem
+{
+	public:
+		RangeItem(uint32 lowAddress, uint32 highAddress, const char* name);
+		~RangeItem();
+		virtual void DrawItem(BView *, BRect, bool = false);
+		static int Compare(const void *firstArg, const void *secondArg);
+	private:
+		char* fName;
+		uint32 fLowAddress, fHighAddress;
+};
+
+}
+
+
+#endif

src/preferences/bluetooth/InquiryPanel.cpp

@@ -20,6 +20,9 @@
 #include <bluetooth/bdaddrUtils.h>
 
 #include "InquiryPanel.h"
+#include "DeviceListItem.h"
+
+using namespace bluetooth;
 
 // private funcionaility provided by kit
 extern uint8 GetInquiryTime();
@@ -34,93 +37,6 @@ static const uint32 kMsgAddListDevice = 'aDdv';
 static const uint32 kMsgAddToRemoteList = 'aDdL';
 static const uint32 kMsgSecond = 'sCMs';
 
-// TODO: Implement a BluetoothDeviceListItem class, this one is stolen from somewhere .....
-class RangeItem : public BListItem
-{
-	public:
-		RangeItem(uint32 lowAddress, uint32 highAddress, const char* name);
-		~RangeItem();
-		virtual void DrawItem(BView *, BRect, bool = false);
-		static int Compare(const void *firstArg, const void *secondArg);
-	private:
-		char* fName;
-		uint32 fLowAddress, fHighAddress;
-};
-
-RangeItem::RangeItem(uint32 lowAddress, uint32 highAddress, const char* name)
-	: BListItem(),
-	fLowAddress(lowAddress), 
-	fHighAddress(highAddress)
-{
-	fName = strdup(name);
-}
-
-RangeItem::~RangeItem()
-{
-	delete fName;
-}
-
-/***********************************************************
- * DrawItem
- ***********************************************************/
-void
-RangeItem::DrawItem(BView *owner, BRect itemRect, bool complete)
-{
-	rgb_color kBlack = { 0,0,0,0 };
-	rgb_color kHighlight = { 156,154,156,0 };
-	
-	if (IsSelected() || complete) {
-		rgb_color color;
-		if (IsSelected())
-			color = kHighlight;
-		else
-			color = owner->ViewColor();
-		
-		owner->SetHighColor(color);
-		owner->SetLowColor(color);
-		owner->FillRect(itemRect);
-		owner->SetHighColor(kBlack);
-		
-	} else {
-		owner->SetLowColor(owner->ViewColor());
-	}
-	
-	BFont font = be_plain_font;
-	font_height	finfo;
-	font.GetHeight(&finfo);
-	
-	BPoint point = BPoint(itemRect.left + 17, itemRect.bottom - finfo.descent + 1);
-	owner->SetFont(be_fixed_font);
-	owner->SetHighColor(kBlack);
-	owner->MovePenTo(point);
-	
-/*	if (fLowAddress >= 0) {
-		char string[255];
-		sprintf(string, "0x%04lx - 0x%04lx", fLowAddress, fHighAddress);
-		owner->DrawString(string);
-	}
-	point += BPoint(174, 0);*/
-	owner->SetFont(be_plain_font);
-	owner->MovePenTo(point);
-	owner->DrawString(fName);
-}
-
-int 
-RangeItem::Compare(const void *firstArg, const void *secondArg)
-{
-	const RangeItem *item1 = *static_cast<const RangeItem * const *>(firstArg);
-	const RangeItem *item2 = *static_cast<const RangeItem * const *>(secondArg);
-	
-	if (item1->fLowAddress < item2->fLowAddress) {
-		return -1;
-	} else if (item1->fLowAddress > item2->fLowAddress) {
-		return 1;
-	} else 
-		return 0;
-
-}
-
-
 
 class PanelDiscoveryListener : public DiscoveryListener {