Rework methods to detect the current tab to use the object name

5 files changed, 16 insertions, 14 deletions

diff --git a/src/tutorials/tutorial_conflictresolution_main.js b/src/tutorials/tutorial_conflictresolution_main.js
index 404afe5d..a2aa278d 100644
--- a/src/tutorials/tutorial_conflictresolution_main.js
+++ b/src/tutorials/tutorial_conflictresolution_main.js
@@ -65,7 +65,7 @@ function getTutorialSteps() {
         },

         function() {

             tutorial.text = qsTr("Option A: Switch to the \"Data\"-tab if necessary")

-            if (!tutorialControl.waitForTabOpen("tabWidget", 2)) {

+            if (!tutorialControl.waitForTabOpen("tabWidget", "dataTab")) {

                 highlightItem("tabWidget", false)

                 waitForClick()

             } else {

@@ -107,7 +107,7 @@ function getTutorialSteps() {
         function() {

             tutorial.text = qsTr("Please open the \"Plugins\"-tab...")

             highlightItem("tabWidget", true)

-            if (!tutorialControl.waitForTabOpen("tabWidget", 0)) {

+            if (!tutorialControl.waitForTabOpen("tabWidget", "espTab")) {

                 nextStep()

             }

         },

diff --git a/src/tutorials/tutorial_conflictresolution_modinfo.js b/src/tutorials/tutorial_conflictresolution_modinfo.js
index b5ef461e..04691ef6 100644
--- a/src/tutorials/tutorial_conflictresolution_modinfo.js
+++ b/src/tutorials/tutorial_conflictresolution_modinfo.js
@@ -3,7 +3,7 @@ function getTutorialSteps() {
         function() {

             tutorial.text = qsTr("Please switch to the \"Conflicts\"-Tab.")

             highlightItem("tabWidget", true)

-            if (!tutorialControl.waitForTabOpen("tabWidget", 4)) {

+            if (!tutorialControl.waitForTabOpen("tabWidget", "tabConflicts")) {

                 nextStep()

             }

         },

diff --git a/src/tutorials/tutorial_firststeps_main.js b/src/tutorials/tutorial_firststeps_main.js
index 45e7e649..47545d24 100644
--- a/src/tutorials/tutorial_firststeps_main.js
+++ b/src/tutorials/tutorial_firststeps_main.js
@@ -122,7 +122,7 @@ function getTutorialSteps()
         tutorial.text = qsTr("...but most contain plugins. These are plugins for the game and are required "

                             +"to add stuff to the game (new weapons, armors, quests, areas, ...). "

                             +"Please open the \"Plugins\"-tab to get a list of plugins.")

-        if (tutorialControl.waitForTabOpen("tabWidget", 0)) {

+        if (tutorialControl.waitForTabOpen("tabWidget", "espTab")) {

             highlightItem("tabWidget", true)

         } else {

             waitForClick()

diff --git a/src/tutorials/tutorial_firststeps_settings.js b/src/tutorials/tutorial_firststeps_settings.js
index 1dd77d2e..ed49d97f 100644
--- a/src/tutorials/tutorial_firststeps_settings.js
+++ b/src/tutorials/tutorial_firststeps_settings.js
@@ -4,7 +4,7 @@ function getTutorialSteps()
         function() {

             highlightItem("tabWidget", true)

             tutorial.text = qsTr("You can use your regular browser to download from Nexus.\nPlease open the \"Nexus\"-tab")

-            tutorialControl.waitForTabOpen("tabWidget", 2)

+            tutorialControl.waitForTabOpen("tabWidget", "tabNexus")

         },

 

         function() {

@@ -16,9 +16,11 @@ function getTutorialSteps()
 

         function() {

             highlightItem("nexusBox", false)

-            tutorial.text = qsTr("You can also store your Nexus-credentials "

-                                +"here for automatic login. The password is "

-                                +"stored unencrypted on your disk!")

+            tutorial.text = qsTr("Use this interface to obtain an API key from NexusMods."

+                                +"This is used for all API connections - downloads, updates"

+                                +"etc. MO2 uses the Windows Credential Manager to store"

+                                +"this data securely. If the SSO page on Nexus is failing,"

+                                +"use the manual entry and copy the API key from your profile.")

             waitForClick()

         }

     ]

diff --git a/src/tutorials/tutorial_primer_main.js b/src/tutorials/tutorial_primer_main.js
index dd305c0c..7972cca4 100644
--- a/src/tutorials/tutorial_primer_main.js
+++ b/src/tutorials/tutorial_primer_main.js
@@ -99,8 +99,8 @@ function setupTooptips() {
   tooltipAction("actionUpdate", qsTr("Activates if there is an update for MO. Please note that if, for any reason, MO can't communicate with NMM, this will not work either."))

   tooltipAction("actionHelp", qsTr("Access more information about MO2, including these tutorials, a link to the development discord, information about the devs and dependencies."))

 

-  switch (manager.findControl("tabWidget").currentIndex) {

-    case 0:

+  switch (tutorialControl.getTabName("tabWidget")) {

+    case "espTab":

       tooltipWidget("espList", qsTr("Plugins (esp/esm/esl files) of the mods in the current profile. They need to be checked to be loaded."))

       tooltipWidget("bossButton", qsTr("Automatically sort plugins using the bundled LOOT application."))

       tooltipWidget("restoreButton", qsTr("Restore a backup of your plugin list order."))

@@ -108,16 +108,16 @@ function setupTooptips() {
       tooltipWidget("activePluginsCounter", qsTr("Counter of your total active plugins. Hover to see a breakdown of plugin types."))

       tooltipWidget("espFilterEdit", qsTr("Quickly filter plugin list as you type."))

       break

-    case 1:

+    case "bsaTab":

       tooltipWidget("bsaList", qsTr("All the asset archives (.bsa files) for all active mods."))

       break

-    case 2:

+    case "dataTab":

       tooltipWidget("dataTree", qsTr("The directory tree and all files that the program will see."))

       break

-    case 3:

+    case "savesTab":

       tooltipWidget("savegameList", qsTr("Save game browser. Shows all the saves for the current profile and whether or not the current mod-load status is correct."))

       break

-    case 4:

+    case "downloadTab":

       tooltipWidget("downloadView", qsTr("Shows the mods that have been downloaded and if they’ve been installed."))

       break

   }