Merge pull request #228 from Unity-Technologies/Uni-31847_prompt_user_for_integration_path

Uni-31847 Prompt user for integrations path

Author: inwoods

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -113,42 +113,6 @@ public override void OnInspectorGUI() {
             EditorGUILayout.LabelField("Integration", EditorStyles.boldLabel);
             EditorGUI.indentLevel++;
 
-            GUILayout.BeginHorizontal ();
-            EditorGUILayout.LabelField(new GUIContent (
-                "Integrations Path:",
-                "Installation path for 3D application integrations."), GUILayout.Width(LabelWidth - FieldOffset));
-
-            var IntegrationsPathLabel = ExportSettings.GetIntegrationSavePath();
-            EditorGUILayout.SelectableLabel(IntegrationsPathLabel,
-                EditorStyles.textField,
-                GUILayout.MinWidth(SelectableLabelMinWidth),
-                GUILayout.Height(EditorGUIUtility.singleLineHeight));
-            GUILayout.EndHorizontal();
-            GUILayout.BeginHorizontal();
-
-            GUILayout.Space(LabelWidth + BrowseButtonOffset);
-
-            if (GUILayout.Button(new GUIContent("...", "Browse to a new installation path for 3D application integrations"), EditorStyles.miniButton, GUILayout.Width(BrowseButtonWidth)))
-            {
-                string initialPath = ExportSettings.GetIntegrationSavePath();
-
-                string fullPath = EditorUtility.OpenFolderPanel(
-                        "Select Integrations Path", initialPath, null
-                        );
-
-                if (!string.IsNullOrEmpty(fullPath))
-                {
-                    ExportSettings.SetIntegrationSavePath(fullPath);
-
-                    // Make sure focus is removed from the selectable label
-                    // otherwise it won't update
-                    GUIUtility.hotControl = 0;
-                    GUIUtility.keyboardControl = 0;                    
-                }
-            }
-
-            GUILayout.EndHorizontal();
-
             GUILayout.BeginHorizontal ();
             EditorGUILayout.LabelField(new GUIContent (
                 "3D Application:",

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -757,8 +757,15 @@ private static bool GetIntegrationFolder(DCCIntegration dcc){
 
         private static bool DecompressIntegrationZipFile(string zipPath, DCCIntegration dcc)
         {
-            string unzipFolder;
-            unzipFolder = EditorTools.ExportSettings.GetIntegrationSavePath();
+            // prompt user to enter location to unzip file
+            var unzipFolder = EditorUtility.OpenFolderPanel(string.Format("Select Location to Save {0} Integration", dcc.DccDisplayName), EditorTools.ExportSettings.GetIntegrationSavePath(), "");
+            if (string.IsNullOrEmpty(unzipFolder))
+            {
+                // user has cancelled, do nothing
+                return false;
+            }
+
+            EditorTools.ExportSettings.instance.IntegrationSavePath = unzipFolder;
 
             // check that this is a valid location to unzip the file
             if (!DirectoryHasWritePermission (unzipFolder)) {