From 3ca00ffdbc314d156c08af0eda1a6b231a7be3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 13 Dec 2010 19:57:19 +0000 Subject: [PATCH] * Moved WirelessNetworkMenuItem into its own file. * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39833 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/networkstatus/Jamfile | 2 + src/apps/networkstatus/NetworkStatus.cpp | 7 +- src/apps/networkstatus/NetworkStatusView.cpp | 86 +------------------ .../networkstatus/WirelessNetworkMenuItem.cpp | 66 ++++++++++++++ .../networkstatus/WirelessNetworkMenuItem.h | 37 ++++++++ 5 files changed, 110 insertions(+), 88 deletions(-) create mode 100644 src/apps/networkstatus/WirelessNetworkMenuItem.cpp create mode 100644 src/apps/networkstatus/WirelessNetworkMenuItem.h diff --git a/src/apps/networkstatus/Jamfile b/src/apps/networkstatus/Jamfile index 4e7cf7aafa..ef83316adc 100644 --- a/src/apps/networkstatus/Jamfile +++ b/src/apps/networkstatus/Jamfile @@ -15,6 +15,8 @@ Application NetworkStatus : NetworkStatusView.cpp NetworkStatus.cpp RadioView.cpp + WirelessNetworkMenuItem.cpp + : be $(HAIKU_LOCALE_LIBS) $(icon_libs) $(TARGET_NETWORK_LIBS) libbnetapi.so $(TARGET_LIBSTDC++) : NetworkStatus.rdef NetworkStatusIcons.rdef diff --git a/src/apps/networkstatus/NetworkStatus.cpp b/src/apps/networkstatus/NetworkStatus.cpp index d6fc8ba472..8dcace6965 100644 --- a/src/apps/networkstatus/NetworkStatus.cpp +++ b/src/apps/networkstatus/NetworkStatus.cpp @@ -66,9 +66,10 @@ our_image(image_info& image) NetworkStatus::NetworkStatus() - : BApplication(kSignature), - fAutoInstallInDeskbar(false), - fQuitImmediately(false) + : + BApplication(kSignature), + fAutoInstallInDeskbar(false), + fQuitImmediately(false) { } diff --git a/src/apps/networkstatus/NetworkStatusView.cpp b/src/apps/networkstatus/NetworkStatusView.cpp index e88abc1110..2f04490310 100644 --- a/src/apps/networkstatus/NetworkStatusView.cpp +++ b/src/apps/networkstatus/NetworkStatusView.cpp @@ -45,6 +45,7 @@ #include "NetworkStatus.h" #include "NetworkStatusIcons.h" #include "RadioView.h" +#include "WirelessNetworkMenuItem.h" #undef B_TRANSLATE_CONTEXT @@ -70,31 +71,6 @@ const uint32 kMinIconWidth = 16; const uint32 kMinIconHeight = 16; -class WirelessNetworkMenuItem : public BMenuItem { -public: - WirelessNetworkMenuItem(const char* name, - int32 signalQuality, bool encrypted, - BMessage* message); - virtual ~WirelessNetworkMenuItem(); - - void SetSignalQuality(int32 quality); - int32 SignalQuality() const - { return fQuality; } - bool IsEncrypted() const - { return fIsEncrypted; } - -protected: - virtual void DrawContent(); - virtual void Highlight(bool isHighlighted); - virtual void GetContentSize(float* width, float* height); - void DrawRadioIcon(); - -private: - int32 fQuality; - bool fIsEncrypted; -}; - - class SocketOpener { public: SocketOpener() @@ -122,66 +98,6 @@ private: }; -// #pragma mark - WirelessNetworkMenuItem - - -WirelessNetworkMenuItem::WirelessNetworkMenuItem(const char* name, - int32 signalQuality, bool encrypted, BMessage* message) - : - BMenuItem(name, message), - fQuality(signalQuality), - fIsEncrypted(encrypted) -{ -} - - -WirelessNetworkMenuItem::~WirelessNetworkMenuItem() -{ -} - - -void -WirelessNetworkMenuItem::SetSignalQuality(int32 quality) -{ - fQuality = quality; -} - - -void -WirelessNetworkMenuItem::DrawContent() -{ - DrawRadioIcon(); - BMenuItem::DrawContent(); -} - - -void -WirelessNetworkMenuItem::Highlight(bool isHighlighted) -{ - BMenuItem::Highlight(isHighlighted); -} - - -void -WirelessNetworkMenuItem::GetContentSize(float* width, float* height) -{ - BMenuItem::GetContentSize(width, height); - *width += *height + 4; -} - - -void -WirelessNetworkMenuItem::DrawRadioIcon() -{ - BRect bounds = Frame(); - bounds.left = bounds.right - 4 - bounds.Height(); - bounds.right -= 4; - bounds.bottom -= 2; - - RadioView::Draw(Menu(), bounds, fQuality, RadioView::DefaultMax()); -} - - // #pragma mark - diff --git a/src/apps/networkstatus/WirelessNetworkMenuItem.cpp b/src/apps/networkstatus/WirelessNetworkMenuItem.cpp new file mode 100644 index 0000000000..043f293171 --- /dev/null +++ b/src/apps/networkstatus/WirelessNetworkMenuItem.cpp @@ -0,0 +1,66 @@ +/* + * Copyright 2010, Axel Dörfler, axeld@pinc-software.de. + * Distributed under the terms of the MIT License. + */ + + +#include "WirelessNetworkMenuItem.h" + +#include "RadioView.h" + + +WirelessNetworkMenuItem::WirelessNetworkMenuItem(const char* name, + int32 signalQuality, bool encrypted, BMessage* message) + : + BMenuItem(name, message), + fQuality(signalQuality), + fIsEncrypted(encrypted) +{ +} + + +WirelessNetworkMenuItem::~WirelessNetworkMenuItem() +{ +} + + +void +WirelessNetworkMenuItem::SetSignalQuality(int32 quality) +{ + fQuality = quality; +} + + +void +WirelessNetworkMenuItem::DrawContent() +{ + DrawRadioIcon(); + BMenuItem::DrawContent(); +} + + +void +WirelessNetworkMenuItem::Highlight(bool isHighlighted) +{ + BMenuItem::Highlight(isHighlighted); +} + + +void +WirelessNetworkMenuItem::GetContentSize(float* width, float* height) +{ + BMenuItem::GetContentSize(width, height); + *width += *height + 4; +} + + +void +WirelessNetworkMenuItem::DrawRadioIcon() +{ + BRect bounds = Frame(); + bounds.left = bounds.right - 4 - bounds.Height(); + bounds.right -= 4; + bounds.bottom -= 2; + + RadioView::Draw(Menu(), bounds, fQuality, RadioView::DefaultMax()); +} diff --git a/src/apps/networkstatus/WirelessNetworkMenuItem.h b/src/apps/networkstatus/WirelessNetworkMenuItem.h new file mode 100644 index 0000000000..83e18f98d5 --- /dev/null +++ b/src/apps/networkstatus/WirelessNetworkMenuItem.h @@ -0,0 +1,37 @@ +/* + * Copyright 2010, Axel Dörfler, axeld@pinc-software.de. + * Distributed under the terms of the MIT License. + */ +#ifndef WIRELESS_NETWORK_MENU_ITEM_H +#define WIRELESS_NETWORK_MENU_ITEM_H + + +#include + + +class WirelessNetworkMenuItem : public BMenuItem { +public: + WirelessNetworkMenuItem(const char* name, + int32 signalQuality, bool encrypted, + BMessage* message); + virtual ~WirelessNetworkMenuItem(); + + void SetSignalQuality(int32 quality); + int32 SignalQuality() const + { return fQuality; } + bool IsEncrypted() const + { return fIsEncrypted; } + +protected: + virtual void DrawContent(); + virtual void Highlight(bool isHighlighted); + virtual void GetContentSize(float* width, float* height); + void DrawRadioIcon(); + +private: + int32 fQuality; + bool fIsEncrypted; +}; + + +#endif // WIRELESS_NETWORK_MENU_ITEM_H