From ec2d8f6f59187b4e3c92c3edf645697bfef1c830 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 8 Mar 2010 12:11:56 +0000
Subject: [PATCH] *Core:  *Folders X11

git-svn-id: svn://ultimatepp.org/upp/trunk@2196 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/App.cpp        | 64 +++++++++++++++++++++++++-------------
 uppsrc/CtrlLib/FileSel.cpp |  2 +-
 uppsrc/CtrlLib/FileSel.h   |  2 +-
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/uppsrc/Core/App.cpp b/uppsrc/Core/App.cpp
index 8f1cc6100..baee7d9bf 100644
--- a/uppsrc/Core/App.cpp
+++ b/uppsrc/Core/App.cpp
@@ -473,6 +473,7 @@ String GetDownloadFolder()
 #endif
 
 #ifdef PLATFORM_POSIX
+
 String GetPathXdg(String xdgConfigHome, String xdgConfigDirs)
 {
 	String ret = "";
@@ -481,22 +482,39 @@ String GetPathXdg(String xdgConfigHome, String xdgConfigDirs)
   	else if (FileExists(ret = AppendFileName(xdgConfigDirs, "user-dirs.dirs"))) ;
   	return ret;
 }
+
 String GetPathDataXdg(String fileConfig, const char *folder) 
 {
-	StringParse fileData = LoadFile(fileConfig);
-	
-	if (!fileData.GoAfter(folder)) return "";
-	if (!fileData.GoAfter("=")) return "";
-	
-	String ret = "";
-	StringParse path = fileData.GetText();
-	if(path.GoAfter("$HOME/")) 
-		ret = AppendFileName(GetHomeDirectory(), path.Right());
-	else if (!FileExists(path))
-		ret = AppendFileName(GetHomeDirectory(), path);
-	
-	return ret;		
+	TextSettings settings;
+	settings.Load(fileConfig);
+	String v = settings.Get(folder);
+	if(*v == '\"')
+		v = v.Mid(1);
+	if(*v.Last() == '\"')
+		v.Trim(v.GetCount() - 1);
+	String r;
+	const char *s = v;
+	while(*s) {
+		if(*s == '$') {
+			CParser p(s + 1);
+			p.NoSkipSpaces();
+			p.Spaces();
+			if(p.IsId()) {
+				String id = p.ReadId();
+				r.Cat(GetEnv(id));
+				s = p.GetPtr();
+			}
+			else {
+				r.Cat('$');
+				s++;
+			}
+		}
+		else
+			r.Cat(*s++);
+	}
+	return r;
 }
+
 String GetShellFolder(const char *local, const char *users) 
 {
  	String xdgConfigHome = GetEnv("XDG_CONFIG_HOME");
@@ -512,7 +530,8 @@ String GetShellFolder(const char *local, const char *users)
   	else
   		return ret;
 }
-String GetDesktopFolder()	
+
+String GetDesktopFolder()
 {
 	String ret = GetShellFolder("XDG_DESKTOP_DIR", "DESKTOP");
 	if (ret.IsEmpty())
@@ -520,14 +539,15 @@ String GetDesktopFolder()
 	else
 		return ret;
 }
-String GetProgramsFolder()	{return String("/usr/bin");}
-String GetAppDataFolder()	{return GetHomeDirectory();};
-String GetMusicFolder()		{return GetShellFolder("XDG_MUSIC_DIR", "MUSIC");}
-String GetPicturesFolder()	{return GetShellFolder("XDG_PICTURES_DIR", "PICTURES");}
-String GetVideoFolder()		{return GetShellFolder("XDG_VIDEOS_DIR", "VIDEOS");}
-String GetDocumentsFolder()	{return GetShellFolder("XDG_DOCUMENTS_DIR", "DOCUMENTS");}
-String GetTemplatesFolder()	{return GetShellFolder("XDG_TEMPLATES_DIR", "XDG_TEMPLATES_DIR");}
-String GetDownloadFolder()	{return GetShellFolder("XDG_DOWNLOAD_DIR", "XDG_DOWNLOAD_DIR");
+
+String GetProgramsFolder()  { return String("/usr/bin"); }
+String GetAppDataFolder()   { return GetHomeDirectory(); }
+String GetMusicFolder()	    { return GetShellFolder("XDG_MUSIC_DIR", "MUSIC"); }
+String GetPicturesFolder()  { return GetShellFolder("XDG_PICTURES_DIR", "PICTURES"); }
+String GetVideoFolder()     { return GetShellFolder("XDG_VIDEOS_DIR", "VIDEOS"); }
+String GetDocumentsFolder() { return GetShellFolder("XDG_DOCUMENTS_DIR", "DOCUMENTS"); }
+String GetTemplatesFolder() { return GetShellFolder("XDG_TEMPLATES_DIR", "XDG_TEMPLATES_DIR"); }
+String GetDownloadFolder()  { return GetShellFolder("XDG_DOWNLOAD_DIR", "XDG_DOWNLOAD_DIR"); }
 
 #endif
 
diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp
index 2d8cd3e8b..616068e2f 100644
--- a/uppsrc/CtrlLib/FileSel.cpp
+++ b/uppsrc/CtrlLib/FileSel.cpp
@@ -1455,7 +1455,7 @@ FileSel& FileSel::Preview(const Display& d)
 	return Preview(preview_display);
 }
 
-FileSel& FileSel::AddPlace(const String& path, Image& m, const String& name)
+FileSel& FileSel::AddPlace(const String& path, const Image& m, const String& name)
 {
 	if(path.GetCount()) {
 		places.Add(NormalizePath(path), m, name);
diff --git a/uppsrc/CtrlLib/FileSel.h b/uppsrc/CtrlLib/FileSel.h
index 673fd6a26..c8dcb820c 100644
--- a/uppsrc/CtrlLib/FileSel.h
+++ b/uppsrc/CtrlLib/FileSel.h
@@ -252,7 +252,7 @@ public:
 	FileSel& Preview(Ctrl& ctrl);
 	FileSel& Preview(const Display& d);
 	FileSel& ClearPlaces();
-	FileSel& AddPlace(const String& path, Image& m, const String& name);
+	FileSel& AddPlace(const String& path, const Image& m, const String& name);
 	FileSel& AddPlace(const String& path, const String& name);
 	FileSel& AddPlace(const String& path);
 	FileSel& AddPlaceSeparator();