From edbcbaa6317a2fa5905f71b6b9f40dab7e9c5dda Mon Sep 17 00:00:00 2001 From: Ryan Leavengood Date: Thu, 1 Oct 2009 21:49:15 +0000 Subject: [PATCH] Updated the screensavers Haiku, Icons and Message to use the new default settings view function. Also some clean-up. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33405 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/screen_savers/haiku/Jamfile | 7 +++---- .../screen_savers/haiku/ScreenSaver.cpp | 6 +++++- .../screen_savers/icons/IconsSaver.cpp | 20 ++++--------------- src/add-ons/screen_savers/icons/Jamfile | 2 ++ src/add-ons/screen_savers/message/Jamfile | 2 ++ src/add-ons/screen_savers/message/Message.cpp | 14 +++++++------ 6 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/add-ons/screen_savers/haiku/Jamfile b/src/add-ons/screen_savers/haiku/Jamfile index b5a62c42a4..297c780fee 100644 --- a/src/add-ons/screen_savers/haiku/Jamfile +++ b/src/add-ons/screen_savers/haiku/Jamfile @@ -2,12 +2,11 @@ SubDir HAIKU_TOP src add-ons screen_savers haiku ; SetSubDirSupportedPlatformsBeOSCompatible ; +UsePrivateHeaders screen_saver ; + # For BuildScreenSaverDefaultSettingsView + Addon Haiku : ScreenSaver.cpp : be screensaver $(TARGET_LIBSUPC++) ; -Package haiku-screensaverkit-cvs : - Haiku : - boot home config add-ons Screen\ Savers -; diff --git a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp b/src/add-ons/screen_savers/haiku/ScreenSaver.cpp index d4feaeb0c8..f725aa1278 100644 --- a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp +++ b/src/add-ons/screen_savers/haiku/ScreenSaver.cpp @@ -14,6 +14,9 @@ #include #include +#include + + class ScreenSaver : public BScreenSaver { public: @@ -52,7 +55,8 @@ ScreenSaver::ScreenSaver(BMessage *archive, image_id id) void ScreenSaver::StartConfig(BView *view) { - view->AddChild(new BStringView(BRect(20, 10, 200, 35), "", "Haiku, by Marcus Overhagen")); + BPrivate::BuildScreenSaverDefaultSettingsView(view, "Haiku", + "by Marcus Overhagen"); } diff --git a/src/add-ons/screen_savers/icons/IconsSaver.cpp b/src/add-ons/screen_savers/icons/IconsSaver.cpp index 0df95a2561..900163a1cc 100644 --- a/src/add-ons/screen_savers/icons/IconsSaver.cpp +++ b/src/add-ons/screen_savers/icons/IconsSaver.cpp @@ -13,6 +13,8 @@ #include #include +#include + #include "IconDisplay.h" @@ -183,21 +185,7 @@ IconsSaver::Draw(BView *view, int32 frame) void IconsSaver::StartConfig(BView* view) { - const uint8 spacer = 5; - BRect frame = view->Frame(); - BRect position(spacer, spacer, frame.Width() - 2 * spacer, 0); - - view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - - BStringView* stringView = new BStringView(position, "", "Icons"); - stringView->SetFont(be_bold_font); - stringView->ResizeToPreferred(); - position.top += stringView->Frame().Height(); - view->AddChild(stringView); - - stringView = new BStringView(position, "", "By Vincent Duvert"); - stringView->ResizeToPreferred(); - position.top += stringView->Frame().Height(); - view->AddChild(stringView); + BPrivate::BuildScreenSaverDefaultSettingsView(view, "Icons", + "by Vincent Duvert"); } diff --git a/src/add-ons/screen_savers/icons/Jamfile b/src/add-ons/screen_savers/icons/Jamfile index 5a15d881ea..1c22062586 100644 --- a/src/add-ons/screen_savers/icons/Jamfile +++ b/src/add-ons/screen_savers/icons/Jamfile @@ -1,6 +1,8 @@ SubDir HAIKU_TOP src add-ons screen_savers icons ; UseLibraryHeaders icon ; +UsePrivateHeaders screen_saver ; + # For BuildScreenSaverDefaultSettingsView ScreenSaver Icons : IconDisplay.cpp IconsSaver.cpp : diff --git a/src/add-ons/screen_savers/message/Jamfile b/src/add-ons/screen_savers/message/Jamfile index 90431a04a3..b91707aca4 100644 --- a/src/add-ons/screen_savers/message/Jamfile +++ b/src/add-ons/screen_savers/message/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src add-ons screen_savers message ; +UsePrivateHeaders screen_saver ; + # For BuildScreenSaverDefaultSettingsView UsePrivateHeaders shared ; # For ObjectList diff --git a/src/add-ons/screen_savers/message/Message.cpp b/src/add-ons/screen_savers/message/Message.cpp index a4e03070f7..9d78d1f745 100644 --- a/src/add-ons/screen_savers/message/Message.cpp +++ b/src/add-ons/screen_savers/message/Message.cpp @@ -7,6 +7,10 @@ */ +#include +#include +#include + #include #include #include @@ -14,12 +18,10 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include // Double brackets to satisfy a compiler warning const pattern kCheckered = { { 0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc, 0x33, 0x33 } }; @@ -123,8 +125,8 @@ Message::~Message() void Message::StartConfig(BView *view) { - view->AddChild(new BStringView(BRect(20, 10, 200, 35), "", "Message, by Ryan Leavengood")); - view->AddChild(new BStringView(BRect(20, 40, 200, 65), "", "Inspired by Jon Watte's Original")); + BPrivate::BuildScreenSaverDefaultSettingsView(view, "Message", + "by Ryan Leavengood"); }