Address feedback

Co-Authored-By: RogPodge <[email protected]>

Author: MaxWang-MS

Assets/MRTK/Core/Inspectors/Setup/MixedRealityEditorSettings.cs

@@ -86,10 +86,16 @@ private static void ShowProjectConfigurationDialog()
         {
             if (!EditorApplication.isPlayingOrWillChangePlaymode
                 && !IgnoreProjectConfigForSession
-                && !MixedRealityProjectPreferences.IgnoreSettingsPrompt
-                && !MixedRealityProjectConfigurator.IsProjectConfigured())
+                && !MixedRealityProjectPreferences.IgnoreSettingsPrompt)
             {
-                MixedRealityProjectConfiguratorWindow.ShowWindowOnInit();
+                if (!XRSettingsUtilities.XREnabled)
+                {
+                    MixedRealityProjectConfiguratorWindow.ShowWindowOnInit(false);
+                }
+                else if (!MixedRealityProjectConfigurator.IsProjectConfigured())
+                {
+                    MixedRealityProjectConfiguratorWindow.ShowWindowOnInit(true);
+                }
             }
         }
 
@@ -100,7 +106,7 @@ private static void LogConfigurationWarnings()
         {
             if (!XRSettingsUtilities.XREnabled)
             {
-                Debug.LogWarning("XR supported is not enabled in the project!");
+                Debug.LogWarning("There is no prperly configured XR pipeline in the project! Please run the configurator by clicking on Mixed Reality (menu bar) -> Toolkit -> Utilities -> Configure Project for MRTK if the current settings are not desired.");
             }
 
             if (!MixedRealityOptimizeUtils.IsOptimalRenderingPath())

Assets/MRTK/Core/Inspectors/Setup/MixedRealityProjectConfiguratorWindow.cs

@@ -19,7 +19,7 @@ public class MixedRealityProjectConfiguratorWindow : EditorWindow
     {
         private const float Default_Window_Height = 500.0f;
         private const float Default_Window_Width = 300.0f;
-        private const string XRPipelineDocsUrl = "TO DO";
+        private const string XRPipelineDocsUrl = "Pipeline docs not yet available";
         private const string XRSDKUnityDocsUrl = "https://docs.unity3d.com/Manual/configuring-project-for-xr.html";
         private const string MSOpenXRPluginUrl = "https://aka.ms/openxr-unity-install";
         private readonly GUIContent ApplyButtonContent = new GUIContent("Apply", "Apply configurations to this Unity Project");
@@ -68,18 +68,25 @@ private static void resetNullableBoolState()
             isTMPEssentialsImported = null;
         }
 
-        [MenuItem("Mixed Reality/Toolkit/Utilities/Run Configurator...", false, 499)]
+        [MenuItem("Mixed Reality/Toolkit/Utilities/Configure Project for MRTK", false, 499)]
         public static void ShowWindowFromMenu()
         {
             currentStage = ConfigurationStage.Init;
             ShowWindow();
         }
 
-        public static void ShowWindowOnInit()
+        public static void ShowWindowOnInit(bool switchToConfigurationStage)
         {
             if (!IsOpen && currentStage == ConfigurationStage.Done)
             {
-                currentStage = ConfigurationStage.ProjectConfiguration;
+                if (switchToConfigurationStage)
+                {
+                    currentStage = ConfigurationStage.ProjectConfiguration;
+                }
+                else
+                {
+                    currentStage = ConfigurationStage.Init;
+                }
             }
 
             ShowWindow();
@@ -567,7 +574,7 @@ private void RenderConfigurationCompleted()
         {
             EditorGUILayout.LabelField("MRTK Setup Completed!", MixedRealityStylesUtility.BoldLargeTitleStyle);
             CreateSpace(5);
-            EditorGUILayout.LabelField("You have finished setting up the project for Mixed Reality Toolkit. You may go through this process again by clicking on Mixed Reality (menu bar) -> Toolkit -> Utilities -> Run Configurator..."
+            EditorGUILayout.LabelField("You have finished setting up the project for Mixed Reality Toolkit. You may go through this process again by clicking on Mixed Reality (menu bar) -> Toolkit -> Utilities -> Configure Project for MRTK"
                 + $"\n\nIf there are certain settings not set according to the recommendation you may see this configurator popping up again. You may use the Ignore or Later button to suppress the behavior. "
                 + "\n\nWe hope you enjoy using MRTK. Please find the links to our documentation and API references below. If you encountered something looking like a bug please report by opening an issue in our repository. "
                 + "\n\nThese links are accessible through Mixed Reality (menu bar) -> Toolkit -> Help.", EditorStyles.wordWrappedLabel);

Assets/MRTK/Core/Utilities/Editor/XRSettingsUtilities.cs

@@ -36,10 +36,7 @@ public static bool XREnabled
         /// <summary>
         /// Checks whether the XRSDK pipeline is properly set up to enable XR.
         /// </summary>
-        /// <remarks>
-        /// <para>Returns true if using the Unity OpenXR plugin along with the Microsoft plugin or using the built-in plugins.
-        /// Returns false if the only enabled plugin is Unity OpenXR and the Microsoft one is not present, or there is no enabled plugin.</para>
-        /// </remarks>
+        /// <remarks>Returns true if one or more XR SDK plugins are enabled.</remarks>
         public static bool XRSDKEnabled
         {
             get