From ec326b759459c29e29e172efefda13b8a5de51ca Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 16 Mar 2016 16:40:20 +0000
Subject: [PATCH] ide: Instant setup now scans through more dirs

git-svn-id: svn://ultimatepp.org/upp/trunk@9606 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/FileSel.cpp  | 24 ++++++++++++------------
 uppsrc/ide/InstantSetup.cpp | 29 +++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp
index 2146852d2..554b07354 100644
--- a/uppsrc/CtrlLib/FileSel.cpp
+++ b/uppsrc/CtrlLib/FileSel.cpp
@@ -289,7 +289,7 @@ Image GetFileIcon(const String& folder, const String& filename, bool isdir, bool
 			llayout      = SystemImage("applications-development", true);
 			
 			fileImage    = SystemImage("application-x-egon");
-		} 
+		}
 		else {
 			file         = GnomeImage("fs-regular");
 			lfile        = GnomeImage("fs-regular", true);
@@ -316,7 +316,7 @@ Image GetFileIcon(const String& folder, const String& filename, bool isdir, bool
 			translation  = SystemImage("preferences-desktop-locale");
 			ltranslation = SystemImage("preferences-desktop-locale", true);
 			layout       = SystemImage("applications-development");
-			llayout      = SystemImage("applications-development", true);			
+			llayout      = SystemImage("applications-development", true);
 
 			fileImage    = SystemImage("image-x-generic");
 		}
@@ -324,13 +324,13 @@ Image GetFileIcon(const String& folder, const String& filename, bool isdir, bool
 		init = true;
 	}
 	if (filename == "Help Topics")
-		return large ? lhelp : help; 
+		return large ? lhelp : help;
 	if(isdir) {
 		Image img = dir;
 		if(AppendFileName(folder, filename) == GetHomeDirectory())
 			return large ? lhome : home;
 		else
-		if(AppendFileName(folder, filename) ==  GetDesktopFolder ()) 
+		if(AppendFileName(folder, filename) ==  GetDesktopFolder ())
 			return large ? ldesktop : desktop;
 		else
 		if(AppendFileName(folder, filename) == GetMusicFolder ())
@@ -369,14 +369,14 @@ Image GetFileIcon(const String& folder, const String& filename, bool isdir, bool
 	// Binary - files extensions (It seems that KDE has problem with multimedia MIME icons handling)
 	if (KDE) {
 		if (m.ext == ".bmp" || m.ext == ".dib" ||
-	    	m.ext == ".gif" ||
-	    	m.ext == ".jpg" || m.ext == ".jpeg" || m.ext == ".jpe" ||
-	    	m.ext == ".png" ||
-	    	m.ext == ".tif" || m.ext == ".tiff" ||
-	    	m.ext == ".svg" ||
-	    	m.ext == ".ico" ||
-	    	m.ext == ".xcf")
-	    	return fileImage;
+			m.ext == ".gif" ||
+			m.ext == ".jpg" || m.ext == ".jpeg" || m.ext == ".jpe" ||
+			m.ext == ".png" ||
+			m.ext == ".tif" || m.ext == ".tiff" ||
+			m.ext == ".svg" ||
+			m.ext == ".ico" ||
+			m.ext == ".xcf")
+			return fileImage;
 		if (m.ext == ".aac" || m.ext == ".ogg" || m.ext == ".mp3")  return fileMusic;
 	}
 
diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp
index 17aea8069..07c3d7f5d 100644
--- a/uppsrc/ide/InstantSetup.cpp
+++ b/uppsrc/ide/InstantSetup.cpp
@@ -15,7 +15,7 @@ class DirFinder {
 	void ScanDirs(const char *dir);
 
 public:
-	void Dir(const String& d) { dirs.Add(d); }
+	void Dir(const String& d) { dirs.Add(d); DDUMP(d); }
 
 	String ScanForDir(const String& dir, const char *ccontains, const char *cfiles, const char *csubdirs);
 };
@@ -116,13 +116,26 @@ void bmSet(VectorMap<String, String>& bm, const char *id, const String& val)
 void InstantSetup()
 {
 	DirFinder df;
-	String pf = GetProgramsFolderX86();
-	df.Dir(pf + "/microsoft visual studio 14.0/vc/bin");
-	df.Dir(pf + "/windows kits/10");
-	df.Dir(pf + "/windows kits");
-	df.Dir(pf + "/microsoft visual studio 14.0");
-	df.Dir(pf);
-	df.Dir(GetProgramsFolder());
+
+	Array<FileSystemInfo::FileInfo> root = StdFileSystemInfo().Find(Null);
+	for(int i = 0; i < root.GetCount(); i++) {
+		if(root[i].root_style == FileSystemInfo::ROOT_FIXED) {
+			int drive = *root[i].filename;
+			String pf = GetProgramsFolderX86();
+			pf.Set(0, drive);
+			df.Dir(pf + "/microsoft visual studio 14.0/vc/bin");
+			df.Dir(pf + "/windows kits/10");
+			df.Dir(pf + "/windows kits");
+			df.Dir(pf + "/microsoft visual studio 14.0");
+			df.Dir(pf);
+			pf = GetProgramsFolder();
+			pf.Set(0, drive);
+			df.Dir(pf);
+		}
+	}
+	for(int i = 0; i < root.GetCount(); i++)
+		if(root[i].root_style == FileSystemInfo::ROOT_FIXED)
+			df.Dir(root[i].filename);
 	
 	String default_method;