From 235571538b95afde26a555a513f04d4eb20997ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 18 Mar 2015 08:56:17 +0000 Subject: [PATCH] Network: added ability to sort ServiceListItems correctly. * Added ServiceListItem::Label() method. --- src/preferences/network/NetworkWindow.cpp | 5 +++++ src/preferences/network/ServiceListItem.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/preferences/network/NetworkWindow.cpp b/src/preferences/network/NetworkWindow.cpp index b147a5ebe2..bf57f442e5 100644 --- a/src/preferences/network/NetworkWindow.cpp +++ b/src/preferences/network/NetworkWindow.cpp @@ -44,6 +44,7 @@ #include "InterfaceListItem.h" #include "InterfaceView.h" +#include "ServiceListItem.h" const char* kNetworkStatusSignature = "application/x-vnd.Haiku-NetworkStatus"; @@ -574,6 +575,10 @@ NetworkWindow::_ItemName(const BListItem* item) const BNetworkInterfaceListItem*>(item)) return listItem->Label(); + if (const ServiceListItem* listItem = dynamic_cast< + const ServiceListItem*>(item)) + return listItem->Label(); + if (const BStringItem* stringItem = dynamic_cast(item)) return stringItem->Text(); diff --git a/src/preferences/network/ServiceListItem.h b/src/preferences/network/ServiceListItem.h index 4e70d1b2cc..34bde09eba 100644 --- a/src/preferences/network/ServiceListItem.h +++ b/src/preferences/network/ServiceListItem.h @@ -25,6 +25,8 @@ public: const BNetworkSettings& settings); virtual ~ServiceListItem(); + const char* Label() const { return fLabel; } + virtual void DrawItem(BView* owner, BRect bounds, bool complete); virtual void Update(BView* owner, const BFont* font);