Merge pull request HaikuArchives#8 from atalax/master

Use find_directory to find the location of settings and backgrounds
owenca · Dec 24, 2014 · 5991814 · 5991814
2 parents ebffae4 + e8c7c4e
commit 5991814
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git a/backgrounds/Fire.jpg b/backgrounds/Fire.jpg
diff --git a/backgrounds/Sky.jpg b/backgrounds/Sky.jpg
diff --git a/backgrounds/Steel.jpg b/backgrounds/Steel.jpg
diff --git a/image-sources.txt b/image-sources.txt
@@ -0,0 +1,8 @@
+Steel.jpg
+http://commons.wikimedia.org/wiki/File:Diamond_Plate.jpg
+
+Sky.jpg
+http://commons.wikimedia.org/wiki/File:Sky-2.jpg
+
+Fire.jpg
+http://commons.wikimedia.org/wiki/File:FIRE_01.JPG
diff --git a/source/MainWindow.cpp b/source/MainWindow.cpp
@@ -12,6 +12,7 @@
 #include <Directory.h>
 #include <LayoutBuilder.h>
 #include <Box.h>
+#include <FindDirectory.h>
 #include "AboutWindow.h"
 #include "Preferences.h"
 #include "TileView.h"
@@ -46,16 +47,14 @@ MainWindow::MainWindow(void)
  	fGrid(NULL),
  	fWorkGrid(NULL)
 {
-	app_info ai;
-	be_app->GetAppInfo(&ai);
-	BPath path(&ai.ref);
-	path.GetParent(&path);
-	path.Append("backgrounds");
-	fBackPath = path.Path();
-	fBackPath << "/";
-
+	BPath path;
+	find_directory(B_USER_SETTINGS_DIRECTORY, &path);
+	path.Append("BeVexed");
+	fBackPath = BString(path.Path()) << "/backgrounds/";
+	fPrefPath = BString(path.Path()) << "/settings";
+
 	static const rgb_color beos_blue = {51,102,152,255};
-	LoadPreferences(PREFERENCES_PATH);
+	LoadPreferences(fPrefPath);
 
 	if(gPreferences.FindInt8("gridsize",(int8*)&fGridSize)!=B_OK)
 	{
@@ -202,7 +201,7 @@ MainWindow::MainWindow(void)
 bool MainWindow::QuitRequested(void)
 {
 	gPreferences.ReplacePoint("corner",Frame().LeftTop());
-	SavePreferences(PREFERENCES_PATH);
+	SavePreferences(fPrefPath);
 	be_app->PostMessage(B_QUIT_REQUESTED);
 	return true;
 }

diff --git a/source/MainWindow.h b/source/MainWindow.h
@@ -36,6 +36,7 @@ class MainWindow : public BWindow
 	uint8 fTileSize;
 
 	BString fBackPath;
+	BString fPrefPath;
 	BString fBackName;
 };
 

diff --git a/source/Preferences.h b/source/Preferences.h
@@ -11,8 +11,6 @@ extern BLocker prefsLock;
 extern BMessage gPreferences;
 extern BString gAppPath;
 
-#define PREFERENCES_PATH "/boot/home/config/settings/BeVexed"
-
 status_t SavePreferences(const char *path);
 status_t LoadPreferences(const char *path);