* Renamed the ScreenSaverPrefs class to the more Be-like ScreenSaverSettings.

* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17755 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/screen_saver/ScreenSaverRunner.h

@@ -16,13 +16,13 @@
 
 class BScreenSaver;
 class BView;
-class ScreenSaverPrefs;
+class ScreenSaverSettings;
 
 
 class ScreenSaverRunner {
 	public:
 		ScreenSaverRunner(BWindow* window, BView* view,
-			bool preview, ScreenSaverPrefs& prefs);
+			bool preview, ScreenSaverSettings& settings);
 		~ScreenSaverRunner();
 
 		BScreenSaver* ScreenSaver() const;
@@ -44,7 +44,7 @@ class ScreenSaverRunner {
 		BWindow*			fWindow;
 		BDirectWindow*		fDirectWindow;
 		BView*				fView;
-		ScreenSaverPrefs&	fPrefs;
+		ScreenSaverSettings& fSettings;
 		bool				fPreview;
 		bool				fHasStarted;
 

headers/private/screen_saver/ScreenSaverSettings.h

@@ -2,8 +2,8 @@
  * Copyright 2003-2006, Michael Phipps. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef SCREEN_SAVER_PREFS_H
+#ifndef SCREEN_SAVER_SETTINGS_H
-#define SCREEN_SAVER_PREFS_H
+#define SCREEN_SAVER_SETTINGS_H
 
 
 #include <Message.h>
@@ -33,9 +33,9 @@ enum {
 
 #define SCREEN_BLANKER_SIG "application/x-vnd.Haiku.screenblanker"
 
-class ScreenSaverPrefs {
+class ScreenSaverSettings {
 	public:
-		ScreenSaverPrefs();
+		ScreenSaverSettings();
 
 		bool LoadSettings();
 		void Defaults();
@@ -98,4 +98,4 @@ class ScreenSaverPrefs {
 		BPath fSettingsPath, fNetworkPath;
 };
 
-#endif	// SCREEN_SAVER_PREFS_H
+#endif	// SCREEN_SAVER_SETTINGS_H

src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp

@@ -134,7 +134,7 @@ ScreenSaverFilter::~ScreenSaverFilter()
 void
 ScreenSaverFilter::_WatchPreferences()
 {
-	BEntry entry(fPrefs.Path().Path());
+	BEntry entry(fSettings.Path().Path());
 	if (entry.Exists()) {
 		if (fWatchingFile)
 			return;
@@ -166,7 +166,7 @@ ScreenSaverFilter::_Invoke()
 {
 	CALLED();
 	if (fCurrentCorner == fNeverBlankCorner || fEnabled
-		|| fPrefs.TimeFlags() != 1
+		|| fSettings.TimeFlags() != 1
 		|| be_roster->IsRunning(SCREEN_BLANKER_SIG))
 		return;
 
@@ -179,13 +179,13 @@ void
 ScreenSaverFilter::ReloadSettings()
 {
 	CALLED();
-	if (!fPrefs.LoadSettings()) {
+	if (!fSettings.LoadSettings()) {
 		SERIAL_PRINT(("preferences loading failed: going to defaults\n"));
 	}
 
-	fBlankCorner = fPrefs.GetBlankCorner();
+	fBlankCorner = fSettings.GetBlankCorner();
-	fNeverBlankCorner = fPrefs.GetNeverBlankCorner();
+	fNeverBlankCorner = fSettings.GetNeverBlankCorner();
-	fBlankTime = fSnoozeTime = fPrefs.BlankTime();
+	fBlankTime = fSnoozeTime = fSettings.BlankTime();
 	CheckTime();
 
 	delete fRunner;

src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.h

@@ -11,7 +11,7 @@
 #define SCREEN_SAVER_FILTER_H
 
 
-#include "ScreenSaverPrefs.h"
+#include "ScreenSaverSettings.h"
 
 #include <InputServerFilter.h>
 #include <Looper.h>
@@ -56,11 +56,11 @@ class ScreenSaverFilter : public BInputServerFilter {
 		void _Invoke();
 		void _Banish();
 
+		ScreenSaverSettings fSettings;
 		bigtime_t		fLastEventTime, fBlankTime, fSnoozeTime;
 		screen_corner	fBlankCorner, fNeverBlankCorner, fCurrentCorner;
 		BRect			fBlankRect, fNeverBlankRect;
 		bool			fEnabled;
-		ScreenSaverPrefs fPrefs;
 		uint32			fFrameNum;
 
 		ScreenSaverController* fController;

src/bin/screen_blanker/ScreenBlanker.cpp

@@ -57,7 +57,7 @@ ScreenBlanker::~ScreenBlanker()
 void
 ScreenBlanker::ReadyToRun() 
 {
-	if (!fPrefs.LoadSettings()) {
+	if (!fSettings.LoadSettings()) {
 		fprintf(stderr, "could not load settings\n");
 		exit(1);
 	}
@@ -67,7 +67,7 @@ ScreenBlanker::ReadyToRun()
 	BScreen screen(B_MAIN_SCREEN_ID);
 	fWindow = new ScreenSaverWindow(screen.Frame());
 	fPasswordWindow = new PasswordWindow();
-	fRunner = new ScreenSaverRunner(fWindow, fWindow->ChildAt(0), false, fPrefs);
+	fRunner = new ScreenSaverRunner(fWindow, fWindow->ChildAt(0), false, fSettings);
 
 	fSaver = fRunner->ScreenSaver();
 	if (fSaver) {
@@ -138,7 +138,7 @@ ScreenBlanker::_QueueResumeScreenSaver()
 {
 	delete fResumeRunner;
 	fResumeRunner = new BMessageRunner(BMessenger(this), new BMessage(kMsgResumeSaver),
-		fPrefs.BlankTime(), 1);
+		fSettings.BlankTime(), 1);
 	if (fResumeRunner->InitCheck() != B_OK)
 		syslog(LOG_ERR, "resume screen saver runner failed\n");
 }
@@ -157,7 +157,7 @@ ScreenBlanker::_QueueTurnOffScreen()
 
 	// figure out which notifiers we need and which of them are supported
 
-	uint32 flags = fPrefs.TimeFlags();
+	uint32 flags = fSettings.TimeFlags();
 	BScreen screen;
 	uint32 capabilities = screen.DPMSCapabilites();
 	if ((capabilities & B_DPMS_OFF) == 0)
@@ -170,30 +170,30 @@ ScreenBlanker::_QueueTurnOffScreen()
 	if ((flags & ENABLE_DPMS_MASK) == 0)
 		return;
 
-	if (fPrefs.OffTime() == fPrefs.SuspendTime())
+	if (fSettings.OffTime() == fSettings.SuspendTime())
 		flags &= ENABLE_DPMS_SUSPEND;
-	if (fPrefs.SuspendTime() == fPrefs.StandByTime())
+	if (fSettings.SuspendTime() == fSettings.StandByTime())
 		flags &= ENABLE_DPMS_STAND_BY;
 
 	// start them off again
 
 	if (flags & ENABLE_DPMS_STAND_BY) {
 		fStandByScreenRunner = new BMessageRunner(BMessenger(this),
-			new BMessage(kMsgStandByScreen), fPrefs.StandByTime(), 1);
+			new BMessage(kMsgStandByScreen), fSettings.StandByTime(), 1);
 		if (fStandByScreenRunner->InitCheck() != B_OK)
 			syslog(LOG_ERR, "standby screen saver runner failed\n");
 	}
 
 	if (flags & ENABLE_DPMS_SUSPEND) {
 		fSuspendScreenRunner = new BMessageRunner(BMessenger(this),
-			new BMessage(kMsgSuspendScreen), fPrefs.SuspendTime(), 1);
+			new BMessage(kMsgSuspendScreen), fSettings.SuspendTime(), 1);
 		if (fSuspendScreenRunner->InitCheck() != B_OK)
 			syslog(LOG_ERR, "turn off screen saver runner failed\n");
 	}
 
 	if (flags & ENABLE_DPMS_OFF) {
 		fTurnOffScreenRunner = new BMessageRunner(BMessenger(this),
-			new BMessage(kMsgTurnOffScreen), fPrefs.OffTime(), 1);
+			new BMessage(kMsgTurnOffScreen), fSettings.OffTime(), 1);
 		if (fTurnOffScreenRunner->InitCheck() != B_OK)
 			syslog(LOG_ERR, "turn off screen saver runner failed\n");
 	}
@@ -206,8 +206,8 @@ ScreenBlanker::MessageReceived(BMessage* message)
 	switch (message->what) {
 		case kMsgUnlock:
 		{
-			if (strcmp(fPrefs.Password(), crypt(fPasswordWindow->Password(),
+			if (strcmp(fSettings.Password(), crypt(fPasswordWindow->Password(),
-					fPrefs.Password())) != 0) {
+					fSettings.Password())) != 0) {
 				beep();
 				fPasswordWindow->SetPassword("");
 				_QueueResumeScreenSaver();
@@ -253,8 +253,8 @@ ScreenBlanker::MessageReceived(BMessage* message)
 bool
 ScreenBlanker::QuitRequested()
 {
-	if (fPrefs.LockEnable()
+	if (fSettings.LockEnable()
-		&& system_time() - fBlankTime > fPrefs.PasswordTime() - fPrefs.BlankTime()) {
+		&& system_time() - fBlankTime > fSettings.PasswordTime() - fSettings.BlankTime()) {
 		_ShowPasswordWindow();
 		return false;
 	}

src/bin/screen_blanker/ScreenBlanker.h

@@ -11,7 +11,7 @@
 
 
 #include "PasswordWindow.h"
-#include "ScreenSaverPrefs.h"
+#include "ScreenSaverSettings.h"
 #include "ScreenSaverRunner.h"
 #include "ScreenSaverWindow.h"
 
@@ -38,7 +38,7 @@ class ScreenBlanker : public BApplication {
 		void _QueueTurnOffScreen();
 		void _Shutdown();
 
-		ScreenSaverPrefs fPrefs;
+		ScreenSaverSettings fSettings;
 		ScreenSaverWindow *fWindow;
 		BScreenSaver *fSaver;
 		ScreenSaverRunner *fRunner;

src/kits/screensaver/Jamfile

@@ -9,7 +9,7 @@ UsePrivateHeaders screen_saver ;
 
 SharedLibrary libscreensaver.so :
 	ScreenSaver.cpp
-	ScreenSaverPrefs.cpp
+	ScreenSaverSettings.cpp
 	ScreenSaverRunner.cpp
 	:
 	be game

src/kits/screensaver/ScreenSaverRunner.cpp

@@ -10,7 +10,7 @@
 
 
 #include "ScreenSaverRunner.h"
-#include "ScreenSaverPrefs.h"
+#include "ScreenSaverSettings.h"
 
 #include <FindDirectory.h>
 #include <Screen.h>
@@ -21,12 +21,12 @@
 
 
 ScreenSaverRunner::ScreenSaverRunner(BWindow* window, BView* view,
-		bool preview, ScreenSaverPrefs& prefs)
+		bool preview, ScreenSaverSettings& settings)
 	:
 	fSaver(NULL),
 	fWindow(window),
 	fView(view),
-	fPrefs(prefs),
+	fSettings(settings),
 	fPreview(preview),
 	fAddonImage(-1),
 	fThread(-1),
@@ -109,7 +109,7 @@ ScreenSaverRunner::_LoadAddOn()
 	}
 	_CleanUp();
 
-	if (!strcmp("", fPrefs.ModuleName())) {
+	if (!strcmp("", fSettings.ModuleName())) {
 		Resume();
 		return;
 	}
@@ -127,7 +127,7 @@ ScreenSaverRunner::_LoadAddOn()
 			continue;
 
 		path.Append("Screen Savers");
-		path.Append(fPrefs.ModuleName());
+		path.Append(fSettings.ModuleName());
 
 		fAddonImage = load_add_on(path.Path());
 		if (fAddonImage >= B_OK)
@@ -143,7 +143,7 @@ ScreenSaverRunner::_LoadAddOn()
 			printf("Unable to find the instantiator\n");
 		} else {
 			BMessage state;
-			fPrefs.GetState(fPrefs.ModuleName(), &state);
+			fSettings.GetState(fSettings.ModuleName(), &state);
 			fSaver = instantiate(&state, fAddonImage);
 		}
 

src/kits/screensaver/ScreenSaverSettings.cpp

@@ -8,7 +8,7 @@
  */
 
 
-#include "ScreenSaverPrefs.h"
+#include "ScreenSaverSettings.h"
 
 #include <Debug.h>
 #include <File.h>
@@ -20,7 +20,7 @@
 #include <string.h>
 
 
-ScreenSaverPrefs::ScreenSaverPrefs() 
+ScreenSaverSettings::ScreenSaverSettings() 
 {
 	BPath path;
   	find_directory(B_USER_SETTINGS_DIRECTORY, &path);
@@ -36,7 +36,7 @@ ScreenSaverPrefs::ScreenSaverPrefs()
 
 //! Load the flattened settings BMessage from disk and parse it.
 bool
-ScreenSaverPrefs::LoadSettings() 
+ScreenSaverSettings::LoadSettings() 
 {
 	BFile file(fSettingsPath.Path(), B_READ_ONLY);
 	if (file.InitCheck() != B_OK)
@@ -91,7 +91,7 @@ ScreenSaverPrefs::LoadSettings()
 
 
 void
-ScreenSaverPrefs::Defaults()
+ScreenSaverSettings::Defaults()
 {
 	fWindowFrame = BRect(96.5, 77.0, 542.5, 402);
 	fWindowTab = 0;
@@ -111,7 +111,7 @@ ScreenSaverPrefs::Defaults()
 
 
 BMessage &
-ScreenSaverPrefs::GetSettings()
+ScreenSaverSettings::GetSettings()
 {
 	// We can't just empty the message, because the module states are stored
 	// in this message as well.
@@ -153,7 +153,7 @@ ScreenSaverPrefs::GetSettings()
 
 
 status_t
-ScreenSaverPrefs::GetState(const char *name, BMessage *stateMsg) 
+ScreenSaverSettings::GetState(const char *name, BMessage *stateMsg) 
 {
 	BString stateName("modulesettings_");
 	stateName += name;
@@ -162,7 +162,7 @@ ScreenSaverPrefs::GetState(const char *name, BMessage *stateMsg)
 
 
 void
-ScreenSaverPrefs::SetState(const char *name, BMessage *stateMsg) 
+ScreenSaverSettings::SetState(const char *name, BMessage *stateMsg) 
 {
 	BString stateName("modulesettings_");
 	stateName += name;
@@ -172,7 +172,7 @@ ScreenSaverPrefs::SetState(const char *name, BMessage *stateMsg)
 
 
 void 
-ScreenSaverPrefs::SaveSettings() 
+ScreenSaverSettings::SaveSettings() 
 {
   	BMessage &settings = GetSettings();
 	PRINT_OBJECT(settings);

src/preferences/screensaver/PasswordWindow.cpp

@@ -25,10 +25,10 @@ const uint32 kMsgDone = 'done';
 const uint32 kMsgPasswordTypeChanged = 'pwtp';
 
 
-PasswordWindow::PasswordWindow(ScreenSaverPrefs &prefs) 
+PasswordWindow::PasswordWindow(ScreenSaverSettings& settings) 
 	: BWindow(BRect(100, 100, 380, 249), "Password Window", B_MODAL_WINDOW_LOOK,
 		B_MODAL_APP_WINDOW_FEEL, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE),
-	fPrefs(prefs)
+	fSettings(settings)
 {
 	_Setup();
 
@@ -82,7 +82,7 @@ PasswordWindow::_Setup()
 void 
 PasswordWindow::Update() 
 {
-	if (fPrefs.IsNetworkPassword())
+	if (fSettings.IsNetworkPassword())
 		fUseNetwork->SetValue(B_CONTROL_ON);
 	else
 		fUseCustom->SetValue(B_CONTROL_ON);
@@ -97,16 +97,16 @@ PasswordWindow::MessageReceived(BMessage *message)
 {
 	switch (message->what) {
 		case kMsgDone:
-			fPrefs.SetLockMethod(fUseCustom->Value() ? "custom" : "network");
+			fSettings.SetLockMethod(fUseCustom->Value() ? "custom" : "network");
 			if (fUseCustom->Value()) {
 				if (strcmp(fPasswordControl->Text(),fConfirmControl->Text())) {
 					BAlert *alert=new BAlert("noMatch","Passwords don't match. Try again.","OK");
 					alert->Go();
 					break;
 				} 
-				fPrefs.SetPassword(crypt(fPasswordControl->Text(), fPasswordControl->Text()));
+				fSettings.SetPassword(crypt(fPasswordControl->Text(), fPasswordControl->Text()));
 			} else {
-				fPrefs.SetPassword("");
+				fSettings.SetPassword("");
 			}
 			fPasswordControl->SetText("");
 			fConfirmControl->SetText("");
@@ -120,7 +120,7 @@ PasswordWindow::MessageReceived(BMessage *message)
 		break;
 
 	case kMsgPasswordTypeChanged:
-		fPrefs.SetLockMethod(fUseCustom->Value() > 0 ? "custom" : "network");
+		fSettings.SetLockMethod(fUseCustom->Value() > 0 ? "custom" : "network");
 		Update();
 		break;
 

src/preferences/screensaver/PasswordWindow.h

@@ -6,11 +6,11 @@
  *		Michael Phipps
  *		Jérôme Duval, jerome.duval@free.fr
  */
-#ifndef PASSWORDWINDOW_H
+#ifndef PASSWORD_WINDOW_H
-#define PASSWORDWINDOW_H
+#define PASSWORD_WINDOW_H
 
 
-#include "ScreenSaverPrefs.h"
+#include "ScreenSaverSettings.h"
 
 #include <Window.h>
 
@@ -19,7 +19,7 @@ class BTextControl;
 
 class PasswordWindow : public BWindow {
 	public:
-		PasswordWindow(ScreenSaverPrefs &prefs);
+		PasswordWindow(ScreenSaverSettings &settings);
 
 		virtual void MessageReceived(BMessage *message);
 
@@ -30,7 +30,7 @@ class PasswordWindow : public BWindow {
 
 		BRadioButton *fUseNetwork, *fUseCustom;
 		BTextControl *fPasswordControl, *fConfirmControl;
-		ScreenSaverPrefs &fPrefs;
+		ScreenSaverSettings &fSettings;
 };
 
-#endif	// PASSWORDWINDOW_H
+#endif	// PASSWORD_WINDOW_H

src/preferences/screensaver/PreviewView.h

@@ -13,7 +13,6 @@
 #include <View.h>
 #include <Box.h>
 #include <ScreenSaverRunner.h>
-#include <ScreenSaverPrefs.h>
 
 class BScreenSaver;
 

src/preferences/screensaver/ScreenCornerSelector.h

@@ -9,7 +9,7 @@
 #define SCREEN_CORNER_SELECTOR_H
 
 
-#include "ScreenSaverPrefs.h"
+#include "ScreenSaverSettings.h"
 
 #include <View.h>
 

src/preferences/screensaver/ScreenSaverWindow.cpp

@@ -76,14 +76,14 @@ class TimeSlider : public BSlider {
 
 class FadeView : public BView {
 	public:
-		FadeView(BRect frame, const char* name, ScreenSaverPrefs& prefs);
+		FadeView(BRect frame, const char* name, ScreenSaverSettings& settings);
 
 		virtual void AttachedToWindow();
 };
 
 class ModulesView : public BView {
 	public:
-		ModulesView(BRect frame, const char* name, ScreenSaverPrefs& prefs);
+		ModulesView(BRect frame, const char* name, ScreenSaverSettings& settings);
 		virtual ~ModulesView();
 
 		virtual void DetachedFromWindow();
@@ -105,7 +105,7 @@ class ModulesView : public BView {
 		BButton*		fTestButton;
 		BButton*		fAddButton;
 
-		ScreenSaverPrefs& fPrefs;
+		ScreenSaverSettings& fSettings;
 		ScreenSaverRunner* fSaverRunner;
 		BString			fCurrentName;
 
@@ -235,7 +235,7 @@ TimeSlider::_TimeToString(bigtime_t useconds, BString& string)
 //	#pragma mark -
 
 
-FadeView::FadeView(BRect rect, const char* name, ScreenSaverPrefs& prefs)
+FadeView::FadeView(BRect rect, const char* name, ScreenSaverSettings& settings)
 	: BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW)
 {
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -256,9 +256,9 @@ FadeView::AttachedToWindow()
 //	#pragma mark -
 
 
-ModulesView::ModulesView(BRect rect, const char* name, ScreenSaverPrefs& prefs)
+ModulesView::ModulesView(BRect rect, const char* name, ScreenSaverSettings& settings)
 	: BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW),
-	fPrefs(prefs),
+	fSettings(settings),
 	fSaverRunner(NULL),
 	fSettingsView(NULL)
 {
@@ -360,9 +360,9 @@ ModulesView::MessageReceived(BMessage* message)
 				break;
 
 			if (!strcmp(item->Text(), "Blackness"))
-				fPrefs.SetModuleName("");
+				fSettings.SetModuleName("");
 			else
-				fPrefs.SetModuleName(item->Text());
+				fSettings.SetModuleName(item->Text());
 
 			_CloseSaver();
 			_OpenSaver();
@@ -371,9 +371,9 @@ ModulesView::MessageReceived(BMessage* message)
 
 		case kMsgTestSaver:
 			SaveState();
-			fPrefs.SaveSettings();
+			fSettings.SaveSettings();
 
-			be_roster->Launch(SCREEN_BLANKER_SIG, &fPrefs.GetSettings());
+			be_roster->Launch(SCREEN_BLANKER_SIG, &fSettings.GetSettings());
 			break;
 
 		case kMsgAddSaver:
@@ -395,7 +395,7 @@ ModulesView::SaveState()
 
 	BMessage state;
 	if (saver->SaveState(&state) == B_OK)
-		fPrefs.SetState(fCurrentName.String(), &state);
+		fSettings.SetState(fCurrentName.String(), &state);
 }
 
 
@@ -433,8 +433,8 @@ ModulesView::PopulateScreenSaverList()
 			ScreenSaverItem* item = new ScreenSaverItem(name, path.Path());
 			fListView->AddItem(item); 
 			
-			if (!strcmp(fPrefs.ModuleName(), item->Text())
+			if (!strcmp(fSettings.ModuleName(), item->Text())
-				|| (!strcmp(fPrefs.ModuleName(), "") 
+				|| (!strcmp(fSettings.ModuleName(), "") 
 					&& !strcmp(item->Text(), "Blackness")))
 				selectItem = item;
 		}
@@ -498,8 +498,8 @@ ModulesView::_OpenSaver()
 	// create new screen saver preview & config
 
    	BView* view = fPreviewView->AddPreview();
-	fCurrentName = fPrefs.ModuleName();
+	fCurrentName = fSettings.ModuleName();
-	fSaverRunner = new ScreenSaverRunner(Window(), view, true, fPrefs);
+	fSaverRunner = new ScreenSaverRunner(Window(), view, true, fSettings);
 	BScreenSaver* saver = _ScreenSaver();
 
 	BRect rect = fSettingsBox->Bounds().InsetByCopy(4, 4);
@@ -521,14 +521,14 @@ ModulesView::_OpenSaver()
 		// There are no settings at all, we add the module name here to
 		// let it look a bit better at least.
 		rect = BRect(15, 15, 20, 20);
-		BStringView* stringView = new BStringView(rect, "module", fPrefs.ModuleName()[0]
+		BStringView* stringView = new BStringView(rect, "module", fSettings.ModuleName()[0]
-			? fPrefs.ModuleName() : "Blackness");
+			? fSettings.ModuleName() : "Blackness");
 		stringView->SetFont(be_bold_font);
 		stringView->ResizeToPreferred();
 		fSettingsView->AddChild(stringView);
 
 		rect.OffsetBy(0, stringView->Bounds().Height() + 4);
-		stringView = new BStringView(rect, "info", saver || !fPrefs.ModuleName()[0]
+		stringView = new BStringView(rect, "info", saver || !fSettings.ModuleName()[0]
 			? "No options available" : "Could not load screen saver");
 		stringView->ResizeToPreferred();
 		fSettingsView->AddChild(stringView);
@@ -586,7 +586,7 @@ ScreenSaverWindow::ScreenSaverWindow()
 	: BWindow(BRect(50, 50, 496, 375), "Screen Saver",
 		B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS /*| B_NOT_ZOOMABLE | B_NOT_RESIZABLE*/)
 {
-	fPrefs.LoadSettings();
+	fSettings.LoadSettings();
 
 	BRect rect = Bounds();
 
@@ -602,32 +602,32 @@ ScreenSaverWindow::ScreenSaverWindow()
 	// Create the controls inside the tabs
 	rect = fTabView->ContainerView()->Bounds();
 	_SetupFadeTab(rect);
-	fModulesView = new ModulesView(rect, "Modules", fPrefs);
+	fModulesView = new ModulesView(rect, "Modules", fSettings);
 
 	fTabView->AddTab(fFadeView);
 	fTabView->AddTab(fModulesView);
 	background->AddChild(fTabView);
 
 	// Create the password editing window
-	fPasswordWindow = new PasswordWindow(fPrefs);
+	fPasswordWindow = new PasswordWindow(fSettings);
 	fPasswordWindow->Run();
 
 	// TODO: better limits!
 	fMinWidth = 430;
 	fMinHeight = 325;
 	SetMinimalSizeLimit(fMinWidth, fMinHeight);
-	MoveTo(fPrefs.WindowFrame().left, fPrefs.WindowFrame().top);
+	MoveTo(fSettings.WindowFrame().left, fSettings.WindowFrame().top);
-	ResizeTo(fPrefs.WindowFrame().Width(), fPrefs.WindowFrame().Height());
+	ResizeTo(fSettings.WindowFrame().Width(), fSettings.WindowFrame().Height());
 
-	fEnableCheckBox->SetValue(fPrefs.TimeFlags() & ENABLE_SAVER ? B_CONTROL_ON : B_CONTROL_OFF);
+	fEnableCheckBox->SetValue(fSettings.TimeFlags() & ENABLE_SAVER ? B_CONTROL_ON : B_CONTROL_OFF);
-	fRunSlider->SetTime(fPrefs.BlankTime());
+	fRunSlider->SetTime(fSettings.BlankTime());
-	fTurnOffSlider->SetTime(fPrefs.OffTime() + fPrefs.BlankTime());
+	fTurnOffSlider->SetTime(fSettings.OffTime() + fSettings.BlankTime());
-	fFadeNow->SetCorner(fPrefs.GetBlankCorner());
+	fFadeNow->SetCorner(fSettings.GetBlankCorner());
-	fFadeNever->SetCorner(fPrefs.GetNeverBlankCorner());
+	fFadeNever->SetCorner(fSettings.GetNeverBlankCorner());
-	fPasswordCheckBox->SetValue(fPrefs.LockEnable());
+	fPasswordCheckBox->SetValue(fSettings.LockEnable());
-	fPasswordSlider->SetTime(fPrefs.PasswordTime());
+	fPasswordSlider->SetTime(fSettings.PasswordTime());
 
-	fTabView->Select(fPrefs.WindowTab());
+	fTabView->Select(fSettings.WindowTab());
 
 	_UpdateTurnOffScreen();
 	_UpdateStatus();
@@ -643,7 +643,7 @@ ScreenSaverWindow::~ScreenSaverWindow()
 void
 ScreenSaverWindow::_SetupFadeTab(BRect rect)
 {
-	fFadeView = new FadeView(rect, "Fade", fPrefs);
+	fFadeView = new FadeView(rect, "Fade", fSettings);
 
 /*
 	font_height fontHeight;
@@ -732,7 +732,7 @@ ScreenSaverWindow::_SetupFadeTab(BRect rect)
 void
 ScreenSaverWindow::_UpdateTurnOffScreen()
 {
-	bool enabled = (fPrefs.TimeFlags() & ENABLE_DPMS_MASK) != 0;
+	bool enabled = (fSettings.TimeFlags() & ENABLE_DPMS_MASK) != 0;
 
 	BScreen screen(this);
 	uint32 dpmsCapabilities = screen.DPMSCapabilites();
@@ -766,19 +766,19 @@ ScreenSaverWindow::_UpdateStatus()
 	EnableUpdates();
 
 	// Update the saved preferences
-	fPrefs.SetWindowFrame(Frame());	
+	fSettings.SetWindowFrame(Frame());	
-	fPrefs.SetWindowTab(fTabView->Selection());
+	fSettings.SetWindowTab(fTabView->Selection());
-	fPrefs.SetTimeFlags((enabled ? ENABLE_SAVER : 0)
+	fSettings.SetTimeFlags((enabled ? ENABLE_SAVER : 0)
 		| (fTurnOffCheckBox->Value() ? fTurnOffScreenFlags : 0));
-	fPrefs.SetBlankTime(fRunSlider->Time());
+	fSettings.SetBlankTime(fRunSlider->Time());
-	bigtime_t offTime = fTurnOffSlider->Time() - fPrefs.BlankTime();
+	bigtime_t offTime = fTurnOffSlider->Time() - fSettings.BlankTime();
-	fPrefs.SetOffTime(offTime);
+	fSettings.SetOffTime(offTime);
-	fPrefs.SetSuspendTime(offTime);
+	fSettings.SetSuspendTime(offTime);
-	fPrefs.SetStandByTime(offTime);
+	fSettings.SetStandByTime(offTime);
-	fPrefs.SetBlankCorner(fFadeNow->Corner());
+	fSettings.SetBlankCorner(fFadeNow->Corner());
-	fPrefs.SetNeverBlankCorner(fFadeNever->Corner());
+	fSettings.SetNeverBlankCorner(fFadeNever->Corner());
-	fPrefs.SetLockEnable(fPasswordCheckBox->Value());
+	fSettings.SetLockEnable(fPasswordCheckBox->Value());
-	fPrefs.SetPasswordTime(fPasswordSlider->Time());
+	fSettings.SetPasswordTime(fPasswordSlider->Time());
 
 	// TODO - Tell the password window to update its stuff
 }
@@ -855,7 +855,7 @@ ScreenSaverWindow::QuitRequested()
 {
 	_UpdateStatus();
 	fModulesView->SaveState();
-	fPrefs.SaveSettings();
+	fSettings.SaveSettings();
 
 	be_app->PostMessage(B_QUIT_REQUESTED);
 	return true;

src/preferences/screensaver/ScreenSaverWindow.h

@@ -12,7 +12,7 @@
 
 
 #include "PasswordWindow.h"
-#include "ScreenSaverPrefs.h"
+#include "ScreenSaverSettings.h"
 
 #include <Box.h>
 #include <CheckBox.h>
@@ -45,7 +45,7 @@ class ScreenSaverWindow : public BWindow {
 		void _UpdateStatus();
 
 		float			fMinWidth, fMinHeight;
-		ScreenSaverPrefs fPrefs;
+		ScreenSaverSettings fSettings;
 		uint32			fTurnOffScreenFlags;
 
 		BView*			fFadeView;