From 6027da7a0b086be1fceac65d44800bda4e85dc22 Mon Sep 17 00:00:00 2001
From: Konstantin Hudyakov <konstantin.hudyakov@jetbrains.com>
Date: Tue, 20 Feb 2024 13:19:08 +0200
Subject: [PATCH] IFT-549 Enable the Main Toolbar forcefully in onboarding
 lessons

Previously we have enabled the navigation bar to make the actions of the IDE header visible, but in the New UI it makes no sense. So, we have to enable the Main Toolbar now.

GitOrigin-RevId: cc29207ecc86dd56280556b9a3b43df240acb53f
---
 .../lesson/essential/OnboardingTourLessonBase.kt   | 10 +++++-----
 .../lesson/essensial/PythonOnboardingTourLesson.kt | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/OnboardingTourLessonBase.kt b/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/OnboardingTourLessonBase.kt
index b1b8271792f8..730a33320d93 100644
--- a/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/OnboardingTourLessonBase.kt
+++ b/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/OnboardingTourLessonBase.kt
@@ -102,7 +102,7 @@ abstract class OnboardingTourLessonBase(id: String) : KLesson(id, JavaLessonsBun
 
   private var backupPopupLocation: Point? = null
   private var hideToolStripesPreference = false
-  private var showNavigationBarPreference = true
+  private var showMainToolbarPreference = true
 
   @NlsSafe
   private var jdkAtStart: String = "undefined"
@@ -171,7 +171,7 @@ abstract class OnboardingTourLessonBase(id: String) : KLesson(id, JavaLessonsBun
     backupPopupLocation = null
 
     uiSettings.hideToolStripes = hideToolStripesPreference
-    uiSettings.showNavigationBar = showNavigationBarPreference
+    uiSettings.showNewMainToolbar = showMainToolbarPreference
     uiSettings.fireUISettingsChanged()
 
     if (!lessonEndInfo.lessonPassed) {
@@ -435,7 +435,7 @@ abstract class OnboardingTourLessonBase(id: String) : KLesson(id, JavaLessonsBun
   private fun LessonContext.checkUiSettings() {
     showInvalidDebugLayoutWarning()
 
-    if (!uiSettings.hideToolStripes && (uiSettings.showNavigationBar || uiSettings.showMainToolbar)) {
+    if (!uiSettings.hideToolStripes && uiSettings.showNewMainToolbar) {
       // a small hack to have same tasks count. It is needed to track statistics result.
       task { }
       task { }
@@ -449,9 +449,9 @@ abstract class OnboardingTourLessonBase(id: String) : KLesson(id, JavaLessonsBun
 
     prepareRuntimeTask {
       hideToolStripesPreference = uiSettings.hideToolStripes
-      showNavigationBarPreference = uiSettings.showNavigationBar
+      showMainToolbarPreference = uiSettings.showNewMainToolbar
       uiSettings.hideToolStripes = false
-      uiSettings.showNavigationBar = true
+      uiSettings.showNewMainToolbar = true
       uiSettings.fireUISettingsChanged()
     }
   }
diff --git a/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/essensial/PythonOnboardingTourLesson.kt b/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/essensial/PythonOnboardingTourLesson.kt
index f60cc4edcf70..3aaf83832a3b 100644
--- a/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/essensial/PythonOnboardingTourLesson.kt
+++ b/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/essensial/PythonOnboardingTourLesson.kt
@@ -31,6 +31,8 @@ import com.intellij.openapi.ui.popup.Balloon
 import com.intellij.openapi.util.WindowStateService
 import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.openapi.wm.impl.status.TextPanel
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
+import com.intellij.python.featuresTrainer.ift.PythonLessonsUtil
 import com.intellij.ui.IdeUICustomization
 import com.intellij.ui.UIBundle
 import com.intellij.ui.components.fields.ExtendableTextField
@@ -44,8 +46,6 @@ import com.intellij.xdebugger.XDebuggerManager
 import com.jetbrains.python.PyBundle
 import com.jetbrains.python.PyPsiBundle
 import com.jetbrains.python.sdk.pythonSdk
-import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
-import com.intellij.python.featuresTrainer.ift.PythonLessonsUtil
 import training.FeaturesTrainerIcons
 import training.dsl.*
 import training.dsl.LessonUtil.adjustSearchEverywherePosition
@@ -91,7 +91,7 @@ class PythonOnboardingTourLesson :
 
   private var backupPopupLocation: Point? = null
   private var hideToolStripesPreference = false
-  private var showNavigationBarPreference = true
+  private var showMainToolbarPreference = true
 
   private var usedInterpreterAtStart: String = "undefined"
 
@@ -178,7 +178,7 @@ class PythonOnboardingTourLesson :
     backupPopupLocation = null
 
     uiSettings.hideToolStripes = hideToolStripesPreference
-    uiSettings.showNavigationBar = showNavigationBarPreference
+    uiSettings.showNewMainToolbar = showMainToolbarPreference
     uiSettings.fireUISettingsChanged()
 
     if (!lessonEndInfo.lessonPassed) {
@@ -367,7 +367,7 @@ class PythonOnboardingTourLesson :
   private fun LessonContext.checkUiSettings() {
     showInvalidDebugLayoutWarning()
 
-    if (!uiSettings.hideToolStripes && (uiSettings.showNavigationBar || uiSettings.showMainToolbar)) {
+    if (!uiSettings.hideToolStripes && uiSettings.showNewMainToolbar) {
       // a small hack to have same tasks count. It is needed to track statistics result.
       task { }
       task { }
@@ -381,9 +381,9 @@ class PythonOnboardingTourLesson :
 
     prepareRuntimeTask {
       hideToolStripesPreference = uiSettings.hideToolStripes
-      showNavigationBarPreference = uiSettings.showNavigationBar
+      showMainToolbarPreference = uiSettings.showNewMainToolbar
       uiSettings.hideToolStripes = false
-      uiSettings.showNavigationBar = true
+      uiSettings.showNewMainToolbar = true
       uiSettings.fireUISettingsChanged()
     }
   }