i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final changes for ScreenSaver Preferences app

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7258 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Phipps
2004-04-20 02:06:39 +00:00
parent 048f424d11
commit 775cef0314
2 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/screensaver/ScreenSaver.cpp
+10
View File
@@ -125,3 +125,13 @@ void
BScreenSaver::_ReservedScreenSaver8() { BScreenSaver::_ReservedScreenSaver8() {
} }
extern "C" {
void ReservedScreenSaver1__12BScreenSaver () {}
void ReservedScreenSaver2__12BScreenSaver () {}
void ReservedScreenSaver3__12BScreenSaver () {}
void ReservedScreenSaver4__12BScreenSaver () {}
void ReservedScreenSaver5__12BScreenSaver () {}
void ReservedScreenSaver6__12BScreenSaver () {}
void ReservedScreenSaver7__12BScreenSaver () {}
void ReservedScreenSaver8__12BScreenSaver () {}
}
src/kits/screensaver/ScreenSaverPrefs.cpp
+13 -5
View File
@@ -61,6 +61,7 @@ bool ScreenSaverPrefs::parseSettings (BMessage *msg) {
msg->FindRect("windowframe",&windowFrame); msg->FindRect("windowframe",&windowFrame);
msg->FindBool("lockenable",&lockenable); msg->FindBool("lockenable",&lockenable);
msg->FindString("lockmethod",&strPtr); msg->FindString("lockmethod",&strPtr);
if (strPtr) {
isNetworkPWD=(strcmp("custom",strPtr)); isNetworkPWD=(strcmp("custom",strPtr));
// Get the password. Either from the settings file or the networking file. // Get the password. Either from the settings file or the networking file.
if (isNetworkPWD) { if (isNetworkPWD) {
@@ -82,7 +83,8 @@ bool ScreenSaverPrefs::parseSettings (BMessage *msg) {
if (strPtr) if (strPtr)
strncpy(password,strPtr,B_PATH_NAME_LENGTH-1); strncpy(password,strPtr,B_PATH_NAME_LENGTH-1);
} }
} else
password[0]='\0';
if (B_OK != msg->FindString("modulename",&strPtr)) if (B_OK != msg->FindString("modulename",&strPtr))
blankTime=-1; // If the module doesn't exist, never blank. blankTime=-1; // If the module doesn't exist, never blank.
if (strPtr) if (strPtr)
@@ -96,8 +98,8 @@ bool ScreenSaverPrefs::parseSettings (BMessage *msg) {
return true; return true;
} }
void ScreenSaverPrefs::SaveSettings (void) { BMessage *ScreenSaverPrefs::GetSettings (void) {
BMessage msg; msg.MakeEmpty();
msg.AddRect("windowframe",windowFrame); msg.AddRect("windowframe",windowFrame);
msg.AddInt32("windowtab",windowTab); msg.AddInt32("windowtab",windowTab);
msg.AddInt32("timeflags",timeFlags); msg.AddInt32("timeflags",timeFlags);
@@ -113,9 +115,15 @@ void ScreenSaverPrefs::SaveSettings (void) {
BString stateMsgName("modulesettings_"); BString stateMsgName("modulesettings_");
stateMsgName+=moduleName; stateMsgName+=moduleName;
msg.AddMessage(stateMsgName.String(),&stateMsg); msg.AddMessage(stateMsgName.String(),&stateMsg);
return &msg;
}
void ScreenSaverPrefs::SaveSettings (void) {
GetSettings();
BPath path; BPath path;
find_directory(B_USER_SETTINGS_DIRECTORY,&path); find_directory(B_USER_SETTINGS_DIRECTORY,&path);
path.Append("OBOS_Screen_Saver",true); path.Append("ScreenSaver_settings",true);
BFile file(path.Path(),B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE); BFile file(path.Path(),B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE);
msg.Flatten(&file); if ((file.InitCheck()!=B_OK) || (msg.Flatten(&file)!=B_OK))
printf ("Problem with saving preferences file!\n");
} }