ScreenSaver: Rename BuildScreenSaverDefaultSettingsView

...to just DefaultSettingsView

It is just as obvious what it does in context, but shorter.

Rename the function it contains from
BuildDefaultScreenSaverSettingsView to
BuildDefaultSettingsView
This commit is contained in:
John Scipione
2016-04-13 15:50:30 -07:00
parent 3801c37b90
commit e9208b6876
16 changed files with 44 additions and 50 deletions
@@ -1,24 +0,0 @@
/*
* Copyright 2009 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Ryan Leavengood, [email protected]
*/
#ifndef _BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW_H
#define _BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW_H
class BView;
namespace BPrivate {
void
BuildScreenSaverDefaultSettingsView(BView* view, const char* moduleName,
const char* info);
} // namespace BPrivate
#endif // _BUILD_SCREEN_SAVER_DEFAULT_SETTINGS_VIEW_H
@@ -0,0 +1,23 @@
/*
* Copyright 2009 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Ryan Leavengood, [email protected]
*/
#ifndef _DEFAULT_SETTINGS_VIEW_H
#define _DEFAULT_SETTINGS_VIEW_H
class BView;
namespace BPrivate {
void
BuildDefaultSettingsView(BView* view, const char* moduleName, const char* info);
} // namespace BPrivate
#endif // _DEFAULT_SETTINGS_VIEW_H
@@ -14,11 +14,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <Catalog.h> #include <Catalog.h>
#include <DefaultSettingsView.h>
#include <OS.h> #include <OS.h>
#include <View.h> #include <View.h>
#include <BuildScreenSaverDefaultSettingsView.h>
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "Screensaver Butterfly" #define B_TRANSLATION_CONTEXT "Screensaver Butterfly"
@@ -43,7 +42,7 @@ Butterfly::Butterfly(BMessage* archive, image_id imageId)
void void
Butterfly::StartConfig(BView* view) Butterfly::StartConfig(BView* view)
{ {
BPrivate::BuildScreenSaverDefaultSettingsView(view, "Butterfly", BPrivate::BuildDefaultSettingsView(view, "Butterfly",
B_TRANSLATE("by Geoffry Song")); B_TRANSLATE("by Geoffry Song"));
} }
+1 -1
View File
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons screen_savers butterfly ; SubDir HAIKU_TOP src add-ons screen_savers butterfly ;
UsePrivateHeaders screen_saver ; UsePrivateHeaders screen_saver ;
# For BuildScreenSaverDefaultSettingsView # For BuildDefaultSettingsView
AddResources Butterfly : Butterfly.rdef ; AddResources Butterfly : Butterfly.rdef ;
@@ -10,12 +10,11 @@
#include "DebugNow.h" #include "DebugNow.h"
#include <Catalog.h> #include <Catalog.h>
#include <DefaultSettingsView.h>
#include <Font.h> #include <Font.h>
#include <StringView.h> #include <StringView.h>
#include <View.h> #include <View.h>
#include <BuildScreenSaverDefaultSettingsView.h>
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "Screensaver DebugNow" #define B_TRANSLATION_CONTEXT "Screensaver DebugNow"
@@ -51,7 +50,7 @@ DebugNow::DebugNow(BMessage* archive, image_id id)
void void
DebugNow::StartConfig(BView* view) DebugNow::StartConfig(BView* view)
{ {
BPrivate::BuildScreenSaverDefaultSettingsView(view, "DEBUG NOW", BPrivate::BuildDefaultSettingsView(view, "DEBUG NOW",
B_TRANSLATE("by Ryan Leavengood")); B_TRANSLATE("by Ryan Leavengood"));
} }
+1 -1
View File
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons screen_savers debugnow ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders screen_saver ; UsePrivateHeaders screen_saver ;
# For BuildScreenSaverDefaultSettingsView # For BuildDefaultSettingsView
AddResources DebugNow : DebugNow.rdef ; AddResources DebugNow : DebugNow.rdef ;
+1 -1
View File
@@ -5,7 +5,7 @@ UseBuildFeatureHeaders mesa ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders screen_saver ; UsePrivateHeaders screen_saver ;
# For BuildScreenSaverDefaultSettingsView # For BuildDefaultSettingsView
local sources = local sources =
GLifeSaver.cpp GLifeSaver.cpp
+1 -1
View File
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons screen_savers haiku ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders screen_saver ; UsePrivateHeaders screen_saver ;
# For BuildScreenSaverDefaultSettingsView # For BuildDefaultSettingsView
AddResources Haiku : ScreenSaver.rdef ; AddResources Haiku : ScreenSaver.rdef ;
@@ -12,12 +12,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <Catalog.h> #include <Catalog.h>
#include <DefaultSettingsView.h>
#include <Font.h> #include <Font.h>
#include <ScreenSaver.h> #include <ScreenSaver.h>
#include <StringView.h> #include <StringView.h>
#include <View.h> #include <View.h>
#include <BuildScreenSaverDefaultSettingsView.h>
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "Screensaver Haiku" #define B_TRANSLATION_CONTEXT "Screensaver Haiku"
@@ -61,7 +61,7 @@ ScreenSaver::ScreenSaver(BMessage *archive, image_id id)
void void
ScreenSaver::StartConfig(BView *view) ScreenSaver::StartConfig(BView *view)
{ {
BPrivate::BuildScreenSaverDefaultSettingsView(view, "Haiku", BPrivate::BuildDefaultSettingsView(view, "Haiku",
B_TRANSLATE("by Marcus Overhagen")); B_TRANSLATE("by Marcus Overhagen"));
} }
@@ -16,10 +16,9 @@
#include <Bitmap.h> #include <Bitmap.h>
#include <Catalog.h> #include <Catalog.h>
#include <DefaultSettingsView.h>
#include <MimeType.h> #include <MimeType.h>
#include <BuildScreenSaverDefaultSettingsView.h>
#include "IconDisplay.h" #include "IconDisplay.h"
#include "VectorIcon.h" #include "VectorIcon.h"
@@ -176,7 +175,7 @@ IconsSaver::Draw(BView* view, int32 frame)
void void
IconsSaver::StartConfig(BView* view) IconsSaver::StartConfig(BView* view)
{ {
BPrivate::BuildScreenSaverDefaultSettingsView(view, "Icons", BPrivate::BuildDefaultSettingsView(view, "Icons",
B_TRANSLATE("by Vincent Duvert")); B_TRANSLATE("by Vincent Duvert"));
} }
+1 -1
View File
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons screen_savers icons ; SubDir HAIKU_TOP src add-ons screen_savers icons ;
UsePrivateHeaders screen_saver ; UsePrivateHeaders screen_saver ;
# For BuildScreenSaverDefaultSettingsView # For BuildDefaultSettingsView
AddResources Icons : Icons.rdef ; AddResources Icons : Icons.rdef ;
+1 -1
View File
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons screen_savers message ; SubDir HAIKU_TOP src add-ons screen_savers message ;
UsePrivateHeaders screen_saver ; UsePrivateHeaders screen_saver ;
# For BuildScreenSaverDefaultSettingsView # For BuildDefaultSettingsView
UsePrivateHeaders shared ; UsePrivateHeaders shared ;
# For ObjectList # For ObjectList
@@ -13,6 +13,7 @@
#include <Bitmap.h> #include <Bitmap.h>
#include <Catalog.h> #include <Catalog.h>
#include <DefaultSettingsView.h>
#include <Font.h> #include <Font.h>
#include <ObjectList.h> #include <ObjectList.h>
#include <Picture.h> #include <Picture.h>
@@ -23,7 +24,6 @@
#include <TextView.h> #include <TextView.h>
#include <View.h> #include <View.h>
#include <BuildScreenSaverDefaultSettingsView.h>
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "Screensaver Message" #define B_TRANSLATION_CONTEXT "Screensaver Message"
@@ -120,7 +120,7 @@ Message::~Message()
void void
Message::StartConfig(BView *view) Message::StartConfig(BView *view)
{ {
BPrivate::BuildScreenSaverDefaultSettingsView(view, "Message", BPrivate::BuildDefaultSettingsView(view, "Message",
B_TRANSLATE("by Ryan Leavengood")); B_TRANSLATE("by Ryan Leavengood"));
} }
@@ -8,7 +8,7 @@
*/ */
#include <BuildScreenSaverDefaultSettingsView.h> #include <DefaultSettingsView.h>
#include <LayoutBuilder.h> #include <LayoutBuilder.h>
#include <StringView.h> #include <StringView.h>
@@ -19,8 +19,7 @@ namespace BPrivate {
// Provides a consistent look for the settings view for screen savers // Provides a consistent look for the settings view for screen savers
// that don't provide any configuration settings. // that don't provide any configuration settings.
void void
BuildScreenSaverDefaultSettingsView(BView* view, const char* moduleName, BuildDefaultSettingsView(BView* view, const char* moduleName, const char* info)
const char* info)
{ {
view->SetViewUIColor(B_PANEL_BACKGROUND_COLOR); view->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
+1 -1
View File
@@ -11,7 +11,7 @@ local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
SharedLibrary [ MultiArchDefaultGristFiles libscreensaver.so ] : SharedLibrary [ MultiArchDefaultGristFiles libscreensaver.so ] :
BuildScreenSaverDefaultSettingsView.cpp DefaultSettingsView.cpp
ScreenSaver.cpp ScreenSaver.cpp
ScreenSaverSettings.cpp ScreenSaverSettings.cpp
ScreenSaverRunner.cpp ScreenSaverRunner.cpp
@@ -23,6 +23,7 @@
#include <Catalog.h> #include <Catalog.h>
#include <CheckBox.h> #include <CheckBox.h>
#include <ControlLook.h> #include <ControlLook.h>
#include <DefaultSettingsView.h>
#include <Directory.h> #include <Directory.h>
#include <DurationFormat.h> #include <DurationFormat.h>
#include <Entry.h> #include <Entry.h>
@@ -49,8 +50,6 @@
#include <algorithm> #include <algorithm>
// for std::max and std::min // for std::max and std::min
#include <BuildScreenSaverDefaultSettingsView.h>
#include "PreviewView.h" #include "PreviewView.h"
#include "ScreenCornerSelector.h" #include "ScreenCornerSelector.h"
#include "ScreenSaverItem.h" #include "ScreenSaverItem.h"
@@ -865,7 +864,7 @@ ModulesView::_OpenSaver()
if (fSettingsView->ChildAt(0) == NULL) { if (fSettingsView->ChildAt(0) == NULL) {
// There are no settings at all, we add the module name here to // There are no settings at all, we add the module name here to
// let it look a bit better at least. // let it look a bit better at least.
BPrivate::BuildScreenSaverDefaultSettingsView(fSettingsView, BPrivate::BuildDefaultSettingsView(fSettingsView,
fSettings.ModuleName()[0] ? fSettings.ModuleName() fSettings.ModuleName()[0] ? fSettings.ModuleName()
: B_TRANSLATE("Blackness"), : B_TRANSLATE("Blackness"),
saver != NULL || !fSettings.ModuleName()[0] saver != NULL || !fSettings.ModuleName()[0]