Fix the rest of the settings

This commit is contained in:
John Scipione 2012-04-07 21:23:39 -04:00
parent e73a037077
commit c7bb0d08da

View File

@ -279,51 +279,92 @@ TBarApp::InitSettings()
BMessage storedSettings;
if (fSettingsFile->InitCheck() == B_OK
&& storedSettings.Unflatten(fSettingsFile) == B_OK) {
storedSettings.FindBool("vertical", &settings.vertical);
storedSettings.FindBool("left", &settings.left);
storedSettings.FindBool("top", &settings.top);
storedSettings.FindBool("ampmMode", &settings.ampmMode);
if (storedSettings.FindBool("vertical", &settings.vertical) < B_OK)
settings.vertical = true;
if (storedSettings.FindBool("left", &settings.left) < B_OK)
settings.left = false;
if (storedSettings.FindBool("top", &settings.top) < B_OK)
settings.top = true;
if (storedSettings.FindBool("ampmMode", &settings.ampmMode) < B_OK)
settings.ampmMode = true;
if (storedSettings.FindInt32("state", (int32*)&settings.state)
< B_OK) {
settings.state = kExpandoState;
}
storedSettings.FindFloat("width", &settings.width);
storedSettings.FindBool("showTime", &settings.showTime);
if (storedSettings.FindFloat("width", &settings.width) < B_OK)
settings.width = 0;
if (storedSettings.FindBool("showTime", &settings.showTime) < B_OK)
settings.showTime = true;
if (storedSettings.FindPoint("switcherLoc", &settings.switcherLoc)
< B_OK) {
settings.switcherLoc = BPoint(5000, 5000);
}
storedSettings.FindInt32("recentAppsCount",
&settings.recentAppsCount);
storedSettings.FindInt32("recentDocsCount",
&settings.recentDocsCount);
storedSettings.FindBool("timeShowSeconds",
&settings.timeShowSeconds);
storedSettings.FindInt32("recentFoldersCount",
&settings.recentFoldersCount);
storedSettings.FindBool("alwaysOnTop", &settings.alwaysOnTop);
storedSettings.FindBool("timeFullDate", &settings.timeFullDate);
storedSettings.FindBool("trackerAlwaysFirst",
&settings.trackerAlwaysFirst);
storedSettings.FindBool("sortRunningApps",
&settings.sortRunningApps);
storedSettings.FindBool("superExpando", &settings.superExpando);
storedSettings.FindBool("expandNewTeams", &settings.expandNewTeams);
storedSettings.FindBool("hideLabels", &settings.hideLabels);
if (storedSettings.FindInt32("recentAppsCount",
&settings.recentAppsCount) < B_OK) {
settings.recentAppsCount = 10;
}
if (storedSettings.FindInt32("recentDocsCount",
&settings.recentDocsCount) < B_OK) {
settings.recentDocsCount = 10;
}
if (storedSettings.FindBool("timeShowSeconds",
&settings.timeShowSeconds) < B_OK) {
settings.timeShowSeconds = false;
}
if (storedSettings.FindInt32("recentFoldersCount",
&settings.recentFoldersCount) < B_OK) {
settings.recentFoldersCount = 10;
}
if (storedSettings.FindBool("alwaysOnTop", &settings.alwaysOnTop)
< B_OK) {
settings.alwaysOnTop = false;
}
if (storedSettings.FindBool("timeFullDate", &settings.timeFullDate)
< B_OK) {
settings.timeFullDate = false;
}
if (storedSettings.FindBool("trackerAlwaysFirst",
&settings.trackerAlwaysFirst) < B_OK) {
settings.trackerAlwaysFirst = false;
}
if (storedSettings.FindBool("sortRunningApps",
&settings.sortRunningApps) < B_OK) {
settings.sortRunningApps = false;
}
if (storedSettings.FindBool("superExpando", &settings.superExpando)
< B_OK) {
settings.superExpando = false;
}
if (storedSettings.FindBool("expandNewTeams",
&settings.expandNewTeams) < B_OK) {
settings.expandNewTeams = false;
}
if (storedSettings.FindBool("hideLabels", &settings.hideLabels)
< B_OK) {
settings.hideLabels = false;
}
if (storedSettings.FindInt32("iconSize", (int32*)&settings.iconSize)
< B_OK) {
settings.iconSize = kMinimumIconSize;
}
storedSettings.FindInt32("iconSize", (int32*)&settings.iconSize);
storedSettings.FindBool("autoRaise", &settings.autoRaise);
storedSettings.FindBool("autoHide", &settings.autoHide);
storedSettings.FindBool("recentAppsEnabled",
&settings.recentAppsEnabled);
storedSettings.FindBool("recentDocsEnabled",
&settings.recentDocsEnabled);
storedSettings.FindBool("recentFoldersEnabled",
&settings.recentFoldersEnabled);
if (storedSettings.FindBool("autoRaise", &settings.autoRaise)
< B_OK) {
settings.autoRaise = false;
}
if (storedSettings.FindBool("autoHide", &settings.autoHide) < B_OK)
settings.autoHide = false;
if (storedSettings.FindBool("recentAppsEnabled",
&settings.recentAppsEnabled) < B_OK) {
settings.recentAppsEnabled = true;
}
if (storedSettings.FindBool("recentDocsEnabled",
&settings.recentDocsEnabled) < B_OK) {
settings.recentDocsEnabled = true;
}
if (storedSettings.FindBool("recentFoldersEnabled",
&settings.recentFoldersEnabled) < B_OK) {
settings.recentFoldersEnabled = true;
}
}
}