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

Perform settings checking again partially reverting 43917ef.

Browse Source 
Also storedSettings to prefs as it is shorter, easier to read the code.
This commit is contained in:
John Scipione
2013-03-16 11:30:42 -04:00
parent e1c882014b
commit 4c45b1d99e
1 changed files with 102 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/BarApp.cpp
+102 -78
View File
@@ -191,56 +191,44 @@ TBarApp::SaveSettings()
{ {
if (fSettingsFile->InitCheck() == B_OK) { if (fSettingsFile->InitCheck() == B_OK) {
fSettingsFile->Seek(0, SEEK_SET); fSettingsFile->Seek(0, SEEK_SET);
BMessage storedSettings; BMessage prefs;
prefs.AddBool("vertical", fSettings.vertical);
storedSettings.AddBool("vertical", fSettings.vertical); prefs.AddBool("left", fSettings.left);
storedSettings.AddBool("left", fSettings.left); prefs.AddBool("top", fSettings.top);
storedSettings.AddBool("top", fSettings.top); prefs.AddUInt32("state", fSettings.state);
storedSettings.AddUInt32("state", fSettings.state); prefs.AddFloat("width", fSettings.width);
storedSettings.AddFloat("width", fSettings.width); prefs.AddPoint("switcherLoc", fSettings.switcherLoc);
storedSettings.AddPoint("switcherLoc", fSettings.switcherLoc); prefs.AddBool("showClock", fSettings.showClock);
storedSettings.AddBool("showClock", fSettings.showClock);
// applications // applications
storedSettings.AddBool("trackerAlwaysFirst", prefs.AddBool("trackerAlwaysFirst", fSettings.trackerAlwaysFirst);
fSettings.trackerAlwaysFirst); prefs.AddBool("sortRunningApps", fSettings.sortRunningApps);
storedSettings.AddBool("sortRunningApps", fSettings.sortRunningApps); prefs.AddBool("superExpando", fSettings.superExpando);
storedSettings.AddBool("superExpando", fSettings.superExpando); prefs.AddBool("expandNewTeams", fSettings.expandNewTeams);
storedSettings.AddBool("expandNewTeams", fSettings.expandNewTeams); prefs.AddBool("hideLabels", fSettings.hideLabels);
storedSettings.AddBool("hideLabels", fSettings.hideLabels); prefs.AddInt32("iconSize", fSettings.iconSize);
storedSettings.AddInt32("iconSize", fSettings.iconSize);
// recent items // recent items
storedSettings.AddBool("recentDocsEnabled", prefs.AddBool("recentDocsEnabled", fSettings.recentDocsEnabled);
fSettings.recentDocsEnabled); prefs.AddBool("recentFoldersEnabled", fSettings.recentFoldersEnabled);
storedSettings.AddBool("recentFoldersEnabled", prefs.AddBool("recentAppsEnabled", fSettings.recentAppsEnabled);
fSettings.recentFoldersEnabled); prefs.AddInt32("recentDocsCount", fSettings.recentDocsCount);
storedSettings.AddBool("recentAppsEnabled", prefs.AddInt32("recentFoldersCount", fSettings.recentFoldersCount);
fSettings.recentAppsEnabled); prefs.AddInt32("recentAppsCount", fSettings.recentAppsCount);
storedSettings.AddInt32("recentDocsCount",
fSettings.recentDocsCount);
storedSettings.AddInt32("recentFoldersCount",
fSettings.recentFoldersCount);
storedSettings.AddInt32("recentAppsCount",
fSettings.recentAppsCount);
// window // window
storedSettings.AddBool("alwaysOnTop", fSettings.alwaysOnTop); prefs.AddBool("alwaysOnTop", fSettings.alwaysOnTop);
storedSettings.AddBool("autoRaise", fSettings.autoRaise); prefs.AddBool("autoRaise", fSettings.autoRaise);
storedSettings.AddBool("autoHide", fSettings.autoHide); prefs.AddBool("autoHide", fSettings.autoHide);
storedSettings.Flatten(fSettingsFile); prefs.Flatten(fSettingsFile);
} }
if (fClockSettingsFile->InitCheck() == B_OK) { if (fClockSettingsFile->InitCheck() == B_OK) {
fClockSettingsFile->Seek(0, SEEK_SET); fClockSettingsFile->Seek(0, SEEK_SET);
BMessage storedSettings; BMessage prefs;
prefs.AddBool("showSeconds", fClockSettings.showSeconds);
prefs.AddBool("showDayOfWeek", fClockSettings.showDayOfWeek);
prefs.AddBool("showTimeZone", fClockSettings.showTimeZone);
storedSettings.AddBool("showSeconds", prefs.Flatten(fClockSettingsFile);
fClockSettings.showSeconds);
storedSettings.AddBool("showDayOfWeek",
fClockSettings.showDayOfWeek);
storedSettings.AddBool("showTimeZone",
fClockSettings.showTimeZone);
storedSettings.Flatten(fClockSettingsFile);
} }
} }
@@ -298,43 +286,79 @@ TBarApp::InitSettings()
theDir.CreateFile(settingsFileName, fSettingsFile); theDir.CreateFile(settingsFileName, fSettingsFile);
} }
BMessage storedSettings; BMessage prefs;
if (fSettingsFile->InitCheck() == B_OK if (fSettingsFile->InitCheck() == B_OK
&& storedSettings.Unflatten(fSettingsFile) == B_OK) { && prefs.Unflatten(fSettingsFile) == B_OK) {
storedSettings.FindBool("vertical", &settings.vertical); if (prefs.FindBool("vertical", &settings.vertical) != B_OK)
storedSettings.FindBool("left", &settings.left); settings.vertical = fDefaultSettings.vertical;
storedSettings.FindBool("top", &settings.top); if (prefs.FindBool("left", &settings.left) != B_OK)
storedSettings.FindUInt32("state", &settings.state); settings.left = fDefaultSettings.left;
storedSettings.FindFloat("width", &settings.width); if (prefs.FindBool("top", &settings.top) != B_OK)
storedSettings.FindPoint("switcherLoc", &settings.switcherLoc); settings.top = fDefaultSettings.top;
storedSettings.FindBool("showClock", &settings.showClock); if (prefs.FindUInt32("state", &settings.state) != B_OK)
settings.state = fDefaultSettings.state;
if (prefs.FindFloat("width", &settings.width) != B_OK)
settings.width = fDefaultSettings.width;
if (prefs.FindPoint("switcherLoc", &settings.switcherLoc) != B_OK)
settings.switcherLoc = fDefaultSettings.switcherLoc;
if (prefs.FindBool("showClock", &settings.showClock) != B_OK)
settings.showClock = fDefaultSettings.showClock;
// applications // applications
storedSettings.FindBool("trackerAlwaysFirst", if (prefs.FindBool("trackerAlwaysFirst",
&settings.trackerAlwaysFirst); &settings.trackerAlwaysFirst) != B_OK) {
storedSettings.FindBool("sortRunningApps", settings.trackerAlwaysFirst
&settings.sortRunningApps); = fDefaultSettings.trackerAlwaysFirst;
storedSettings.FindBool("superExpando", &settings.superExpando); }
storedSettings.FindBool("expandNewTeams", if (prefs.FindBool("sortRunningApps",
&settings.expandNewTeams); &settings.sortRunningApps) != B_OK) {
storedSettings.FindBool("hideLabels", &settings.hideLabels); settings.sortRunningApps = fDefaultSettings.sortRunningApps;
storedSettings.FindInt32("iconSize", &settings.iconSize); }
if (prefs.FindBool("superExpando", &settings.superExpando) != B_OK)
settings.superExpando = fDefaultSettings.superExpando;
if (prefs.FindBool("expandNewTeams",
&settings.expandNewTeams) != B_OK) {
settings.expandNewTeams = fDefaultSettings.expandNewTeams;
}
if (prefs.FindBool("hideLabels", &settings.hideLabels) != B_OK)
settings.hideLabels = fDefaultSettings.hideLabels;
if (prefs.FindInt32("iconSize", &settings.iconSize) != B_OK)
settings.hideLabels = fDefaultSettings.hideLabels;
// recent items // recent items
storedSettings.FindBool("recentDocsEnabled", if (prefs.FindBool("recentDocsEnabled",
&settings.recentDocsEnabled); &settings.recentDocsEnabled) != B_OK) {
storedSettings.FindBool("recentFoldersEnabled", settings.recentDocsEnabled
&settings.recentFoldersEnabled); = fDefaultSettings.recentDocsEnabled;
storedSettings.FindBool("recentAppsEnabled", }
&settings.recentAppsEnabled); if (prefs.FindBool("recentFoldersEnabled",
storedSettings.FindInt32("recentDocsCount", &settings.recentFoldersEnabled) != B_OK) {
&settings.recentDocsCount); settings.recentFoldersEnabled
storedSettings.FindInt32("recentFoldersCount", = fDefaultSettings.recentFoldersEnabled;
&settings.recentFoldersCount); }
storedSettings.FindInt32("recentAppsCount", if (prefs.FindBool("recentAppsEnabled",
&settings.recentAppsCount); &settings.recentAppsEnabled) != B_OK) {
settings.recentAppsEnabled
= fDefaultSettings.recentAppsEnabled;
}
if (prefs.FindInt32("recentDocsCount",
&settings.recentDocsCount) != B_OK) {
settings.recentDocsCount = fDefaultSettings.recentDocsCount;
}
if (prefs.FindInt32("recentFoldersCount",
&settings.recentFoldersCount) != B_OK) {
settings.recentFoldersCount
= fDefaultSettings.recentFoldersCount;
}
if (prefs.FindInt32("recentAppsCount",
&settings.recentAppsCount) != B_OK) {
settings.recentAppsCount = fDefaultSettings.recentAppsCount;
}
// window // window
storedSettings.FindBool("alwaysOnTop", &settings.alwaysOnTop); if (prefs.FindBool("alwaysOnTop", &settings.alwaysOnTop) != B_OK)
storedSettings.FindBool("autoRaise", &settings.autoRaise); settings.alwaysOnTop = fDefaultSettings.alwaysOnTop;
storedSettings.FindBool("autoHide", &settings.autoHide); if (prefs.FindBool("autoRaise", &settings.autoRaise) != B_OK)
settings.autoRaise = fDefaultSettings.autoRaise;
if (prefs.FindBool("autoHide", &settings.autoHide) != B_OK)
settings.autoHide = fDefaultSettings.autoHide;
} }
filePath = dirPath; filePath = dirPath;
@@ -347,10 +371,10 @@ TBarApp::InitSettings()
} }
if (fClockSettingsFile->InitCheck() == B_OK if (fClockSettingsFile->InitCheck() == B_OK
&& storedSettings.Unflatten(fClockSettingsFile) == B_OK) { && prefs.Unflatten(fClockSettingsFile) == B_OK) {
storedSettings.FindBool("showSeconds", &clock.showSeconds); prefs.FindBool("showSeconds", &clock.showSeconds);
storedSettings.FindBool("showDayOfWeek", &clock.showDayOfWeek); prefs.FindBool("showDayOfWeek", &clock.showDayOfWeek);
storedSettings.FindBool("showTimeZone", &clock.showTimeZone); prefs.FindBool("showTimeZone", &clock.showTimeZone);
} }
} }