diff --git a/src/tests/kits/net/preflet/NetworkSetupAddOn.cpp b/src/tests/kits/net/preflet/NetworkSetupAddOn.cpp index 659a5bc42d..b310171ff3 100644 --- a/src/tests/kits/net/preflet/NetworkSetupAddOn.cpp +++ b/src/tests/kits/net/preflet/NetworkSetupAddOn.cpp @@ -1,15 +1,19 @@ #include +#include +#include + #include "NetworkSetupAddOn.h" NetworkSetupAddOn::NetworkSetupAddOn(image_id image) - : is_dirty(false), profile(NULL), addon_image(image) + : m_is_dirty(false), m_profile(NULL), m_addon_image(image), m_addon_resources(NULL) { } NetworkSetupAddOn::~NetworkSetupAddOn() { + delete m_addon_resources; } BView * NetworkSetupAddOn::CreateView(BRect *bounds) @@ -34,7 +38,7 @@ status_t NetworkSetupAddOn::Revert() status_t NetworkSetupAddOn::ProfileChanged(NetworkSetupProfile *new_profile) { - profile = new_profile; + m_profile = new_profile; return B_OK; } @@ -43,3 +47,24 @@ const char * NetworkSetupAddOn::Name() return "Dummy NetworkSetupAddon"; } +BResources * NetworkSetupAddOn::Resources() +{ + if (!m_addon_resources) { + image_info info; + if (get_image_info(m_addon_image, &info) != B_OK) + return NULL; + + BResources *resources = new BResources(); + BFile addon_file(info.name, O_RDONLY); + if (resources->SetTo(&addon_file) == B_OK) + m_addon_resources = resources; + else + delete resources; + }; + return m_addon_resources; +} + + + + + diff --git a/src/tests/kits/net/preflet/NetworkSetupAddOn.h b/src/tests/kits/net/preflet/NetworkSetupAddOn.h index d83edac3ee..6c515b1223 100644 --- a/src/tests/kits/net/preflet/NetworkSetupAddOn.h +++ b/src/tests/kits/net/preflet/NetworkSetupAddOn.h @@ -1,8 +1,9 @@ #ifndef NETWORKSETUPADDON_H #define NETWORKSETUPADDON_H -#include +#include #include // for image_id +#include class NetworkSetupProfile; @@ -23,18 +24,20 @@ class NetworkSetupAddOn { NetworkSetupProfile * Profile(); bool IsDirty(); void SetDirty(bool dirty = true); - image_id AddonImageId(); + image_id ImageId(); + BResources * Resources(); private: - bool is_dirty; - NetworkSetupProfile * profile; - image_id addon_image; + bool m_is_dirty; + NetworkSetupProfile * m_profile; + image_id m_addon_image; + BResources * m_addon_resources; }; -inline bool NetworkSetupAddOn::IsDirty() { return is_dirty; }; -inline void NetworkSetupAddOn::SetDirty(bool dirty) { is_dirty = dirty; }; -inline NetworkSetupProfile * NetworkSetupAddOn::Profile() { return profile; }; -inline image_id NetworkSetupAddOn::AddonImageId() { return addon_image; }; +inline bool NetworkSetupAddOn::IsDirty() { return m_is_dirty; }; +inline void NetworkSetupAddOn::SetDirty(bool dirty) { m_is_dirty = dirty; }; +inline NetworkSetupProfile * NetworkSetupAddOn::Profile() { return m_profile; }; +inline image_id NetworkSetupAddOn::ImageId() { return m_addon_image; }; extern "C" { diff --git a/src/tests/kits/net/preflet/NetworkSetupWindow.cpp b/src/tests/kits/net/preflet/NetworkSetupWindow.cpp index 7c0bdd544d..148dd05c69 100644 --- a/src/tests/kits/net/preflet/NetworkSetupWindow.cpp +++ b/src/tests/kits/net/preflet/NetworkSetupWindow.cpp @@ -143,7 +143,7 @@ NetworkSetupWindow::NetworkSetupWindow(const char *title) fHelpButton = button; #endif - r.top += h + SMALL_MARGIN; + r.top += h + V_MARGIN; r.left = H_MARGIN; fPanel = new BBox(r, "showview_box", B_FOLLOW_ALL, @@ -228,7 +228,7 @@ void NetworkSetupWindow::MessageReceived fPanel->AddChild(fAddonView); fAddonView->ResizeTo(fPanel->Bounds().Width(), fPanel->Bounds().Height()); - fAddonView->SetViewColor((rand() % 256), (rand() % 256), (rand() % 256)); + // fAddonView->SetViewColor((rand() % 256), (rand() % 256), (rand() % 256)); break; }