[haiku-commits] r39833 - haiku/trunk/src/apps/networkstatus
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 13 Dec 2010 20:57:19 +0100 (CET)
Author: axeld
Date: 2010-12-13 20:57:19 +0100 (Mon, 13 Dec 2010)
New Revision: 39833
Changeset: http://dev.haiku-os.org/changeset/39833
Added:
haiku/trunk/src/apps/networkstatus/WirelessNetworkMenuItem.cpp
haiku/trunk/src/apps/networkstatus/WirelessNetworkMenuItem.h
Modified:
haiku/trunk/src/apps/networkstatus/Jamfile
haiku/trunk/src/apps/networkstatus/NetworkStatus.cpp
haiku/trunk/src/apps/networkstatus/NetworkStatusView.cpp
Log:
* Moved WirelessNetworkMenuItem into its own file.
* Minor cleanup.
Modified: haiku/trunk/src/apps/networkstatus/Jamfile
===================================================================
--- haiku/trunk/src/apps/networkstatus/Jamfile 2010-12-13 19:23:33 UTC (rev
39832)
+++ haiku/trunk/src/apps/networkstatus/Jamfile 2010-12-13 19:57:19 UTC (rev
39833)
@@ -15,6 +15,8 @@
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
Modified: haiku/trunk/src/apps/networkstatus/NetworkStatus.cpp
===================================================================
--- haiku/trunk/src/apps/networkstatus/NetworkStatus.cpp 2010-12-13
19:23:33 UTC (rev 39832)
+++ haiku/trunk/src/apps/networkstatus/NetworkStatus.cpp 2010-12-13
19:57:19 UTC (rev 39833)
@@ -66,9 +66,10 @@
NetworkStatus::NetworkStatus()
- : BApplication(kSignature),
- fAutoInstallInDeskbar(false),
- fQuitImmediately(false)
+ :
+ BApplication(kSignature),
+ fAutoInstallInDeskbar(false),
+ fQuitImmediately(false)
{
}
Modified: haiku/trunk/src/apps/networkstatus/NetworkStatusView.cpp
===================================================================
--- haiku/trunk/src/apps/networkstatus/NetworkStatusView.cpp 2010-12-13
19:23:33 UTC (rev 39832)
+++ haiku/trunk/src/apps/networkstatus/NetworkStatusView.cpp 2010-12-13
19:57:19 UTC (rev 39833)
@@ -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 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 @@
};
-// #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 -
Added: haiku/trunk/src/apps/networkstatus/WirelessNetworkMenuItem.cpp
===================================================================
--- haiku/trunk/src/apps/networkstatus/WirelessNetworkMenuItem.cpp
(rev 0)
+++ haiku/trunk/src/apps/networkstatus/WirelessNetworkMenuItem.cpp
2010-12-13 19:57:19 UTC (rev 39833)
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
+ * 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());
+}
Added: haiku/trunk/src/apps/networkstatus/WirelessNetworkMenuItem.h
===================================================================
--- haiku/trunk/src/apps/networkstatus/WirelessNetworkMenuItem.h
(rev 0)
+++ haiku/trunk/src/apps/networkstatus/WirelessNetworkMenuItem.h
2010-12-13 19:57:19 UTC (rev 39833)
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef WIRELESS_NETWORK_MENU_ITEM_H
+#define WIRELESS_NETWORK_MENU_ITEM_H
+
+
+#include <MenuItem.h>
+
+
+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
Other related posts:
- » [haiku-commits] r39833 - haiku/trunk/src/apps/networkstatus - axeld
