Editor Utility Tools Update

Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPrefs.cs

@@ -12,20 +12,20 @@ namespace HoloToolkit.Unity
     public static class BuildDeployPrefs
     {
         // Constants
-        private const string EditorPrefs_BuildDir = "BuildDeployWindow_BuildDir";
-        private const string EditorPrefs_BuildConfig = "BuildDeployWindow_BuildConfig";
-        private const string EditorPrefs_ForceRebuild = "BuildDeployWindow_ForceBuild";
-        private const string EditorPrefs_IncrementBuildVersion = "BuildDeployWindow_IncrementBuildVersion";
-        private const string EditorPrefs_MSBuildVer = "BuildDeployWindow_MSBuildVer";
-        private const string EditorPrefs_TargetIPs = "BuildDeployWindow_DestIPs";
-        private const string EditorPrefs_DeviceUser = "BuildDeployWindow_DeviceUser";
-        private const string EditorPrefs_DevicePwd = "BuildDeployWindow_DevicePwd";
-        private const string EditorPrefs_FullReinstall = "BuildDeployWindow_FullReinstall";
+        private const string EditorPrefs_BuildDir = "_BuildDeployWindow_BuildDir";
+        private const string EditorPrefs_BuildConfig = "_BuildDeployWindow_BuildConfig";
+        private const string EditorPrefs_ForceRebuild = "_BuildDeployWindow_ForceBuild";
+        private const string EditorPrefs_IncrementBuildVersion = "_BuildDeployWindow_IncrementBuildVersion";
+        private const string EditorPrefs_MSBuildVer = "_BuildDeployWindow_MSBuildVer";
+        private const string EditorPrefs_TargetIPs = "_BuildDeployWindow_DestIPs";
+        private const string EditorPrefs_DeviceUser = "_BuildDeployWindow_DeviceUser";
+        private const string EditorPrefs_DevicePwd = "_BuildDeployWindow_DevicePwd";
+        private const string EditorPrefs_FullReinstall = "_BuildDeployWindow_FullReinstall";
 
         public static string BuildDirectory
         {
-            get { return GetEditorPref(EditorPrefs_BuildDir, "WindowsStoreApp"); }
-            set { EditorPrefs.SetString(EditorPrefs_BuildDir, value); }
+            get { return GetEditorPref(EditorPrefs_BuildDir, "UWP"); }
+            set { GetEditorPref(EditorPrefs_BuildDir, value); }
         }
 
         public static string AbsoluteBuildDirectory
@@ -36,70 +36,70 @@ public static string AbsoluteBuildDirectory
         public static string MsBuildVersion
         {
             get { return GetEditorPref(EditorPrefs_MSBuildVer, BuildDeployTools.DefaultMSBuildVersion); }
-            set { EditorPrefs.SetString(EditorPrefs_MSBuildVer, value); }
+            set { GetEditorPref(EditorPrefs_MSBuildVer, value); }
         }
 
         public static string BuildConfig
         {
             get { return GetEditorPref(EditorPrefs_BuildConfig, "Debug"); }
-            set { EditorPrefs.SetString(EditorPrefs_BuildConfig, value); }
+            set { GetEditorPref(EditorPrefs_BuildConfig, value); }
         }
 
         public static bool ForceRebuild
         {
             get { return GetEditorPref(EditorPrefs_ForceRebuild, false); }
-            set { EditorPrefs.SetBool(EditorPrefs_ForceRebuild, value); }
+            set { GetEditorPref(EditorPrefs_ForceRebuild, value); }
         }
 
         public static bool IncrementBuildVersion
         {
             get { return GetEditorPref(EditorPrefs_IncrementBuildVersion, true); }
-            set { EditorPrefs.SetBool(EditorPrefs_IncrementBuildVersion, value); }
+            set { GetEditorPref(EditorPrefs_IncrementBuildVersion, value); }
         }
 
         public static string TargetIPs
         {
             get { return GetEditorPref(EditorPrefs_TargetIPs, "127.0.0.1"); }
-            set { EditorPrefs.SetString(EditorPrefs_TargetIPs, value); }
+            set { GetEditorPref(EditorPrefs_TargetIPs, value); }
         }
 
         public static string DeviceUser
         {
             get { return GetEditorPref(EditorPrefs_DeviceUser, ""); }
-            set { EditorPrefs.SetString(EditorPrefs_DeviceUser, value); }
+            set { GetEditorPref(EditorPrefs_DeviceUser, value); }
         }
 
         public static string DevicePassword
         {
             get { return GetEditorPref(EditorPrefs_DevicePwd, ""); }
-            set { EditorPrefs.SetString(EditorPrefs_DevicePwd, value); }
+            set { GetEditorPref(EditorPrefs_DevicePwd, value); }
         }
 
         public static bool FullReinstall
         {
             get { return GetEditorPref(EditorPrefs_FullReinstall, true); }
-            set { EditorPrefs.SetBool(EditorPrefs_FullReinstall, value); }
+            set { GetEditorPref(EditorPrefs_FullReinstall, value); }
         }
 
         private static string GetEditorPref(string key, string defaultValue)
         {
-            if (EditorPrefs.HasKey(key))
+            if (EditorPrefs.HasKey(Application.productName + key))
             {
-                return EditorPrefs.GetString(key);
+                return EditorPrefs.GetString(Application.productName + key);
             }
 
-            EditorPrefs.SetString(key, defaultValue);
+            EditorPrefs.SetString(Application.productName + key, defaultValue);
             return defaultValue;
         }
 
         private static bool GetEditorPref(string key, bool defaultValue)
         {
-            if (EditorPrefs.HasKey(key))
+            if (EditorPrefs.HasKey(Application.productName + key))
             {
-                return EditorPrefs.GetBool(key);
+                return EditorPrefs.GetBool(Application.productName + key);
             }
 
-            EditorPrefs.SetBool(key, defaultValue);
+            EditorPrefs.SetBool(Application.productName + key, defaultValue);
             return defaultValue;
         }
     }

Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs

@@ -110,12 +110,10 @@ private bool HoloLensUsbConnected
         [MenuItem("HoloToolkit/Build Window", false, 0)]
         public static void OpenWindow()
         {
-            var window = GetWindow<BuildDeployWindow>("Build Window");
-
-            if (window != null)
-            {
-                window.Show();
-            }
+            // Dock it next to the Scene View.
+            var window = GetWindow<BuildDeployWindow>(typeof(SceneView));
+            window.titleContent = new GUIContent("Build Window");
+            window.Show();
         }
 
         private void OnEnable()

Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/Editor/RoomMeshExporter.cs

@@ -9,7 +9,7 @@ namespace HoloToolkit.Unity
 {
     public static class RoomMeshExporter
     {
-        private const string ExportDirectoryKey = "ExportDirectory";
+        private const string ExportDirectoryKey = "_ExportDirectory";
         private const string ExportDirectoryDefault = "MeshExport";
         private const string ExportDialogErrorTitle = "Export Error";
         private const string WavefrontFileExtension = ".obj";
@@ -27,7 +27,7 @@ public static string ExportDirectory
                     value = ExportDirectoryDefault;
                 }
 
-                EditorPrefs.SetString(ExportDirectoryKey, value);
+                EditorPrefs.SetString(Application.productName + ExportDirectoryKey, value);
             }
         }