From 482f13a50b921e61d34d09f72a7fb4216efe742b Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Mon, 8 Sep 2014 20:37:23 +0200
Subject: - re-enabled building of loot_cli and started developing against the
 new api - extended set of default categories - more tolerand bbcode parser -
 added a few colors for the bbcode parser - more fixes to qt5 compatibility -
 started work on ability to unloading (and thus re-loading) of plugins - names
 of plugins are no longer localizable (because those names are also used to
 store settings) - added settings to disable individual diagnosis settings -
 path of dependencies is now configured in a .pri file instead of environment
 variablees - bugfix: if the modid-input is canceled, the id was saved as -1
 and wasn't re-requested from the user - bugfix: moving files with the
 SHFileOperation-Api didn't update the vfs correctly (still not perfect but
 better) - bugfix: attempt to remove the deleter-file seems to have caused
 error messages for some users - bugfix: fixed a couple of cases that might
 have caused the tutorial to hang

---
 src/tutorials/TutorialOverlay.qml         |  6 +++---
 src/tutorials/tutorial_firststeps_main.js | 35 +++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 14 deletions(-)

(limited to 'src/tutorials')

diff --git a/src/tutorials/TutorialOverlay.qml b/src/tutorials/TutorialOverlay.qml
index 34959d7d..f2aad027 100644
--- a/src/tutorials/TutorialOverlay.qml
+++ b/src/tutorials/TutorialOverlay.qml
@@ -1,4 +1,3 @@
-// import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
 import QtQuick 1.1
 import "tutorials.js" as Logic
 
@@ -21,10 +20,11 @@ Rectangle  {
     function enableBackground(enabled) {
         disabledBackground.visible = enabled
     }
-
+/*
     signal nextStep
 
-    onNextStep: {
+    onNextStep: {*/
+    function nextStep() {
         if (step == 0) {
             Logic.init()
         }
diff --git a/src/tutorials/tutorial_firststeps_main.js b/src/tutorials/tutorial_firststeps_main.js
index 4f9c1a74..5ee4e790 100644
--- a/src/tutorials/tutorial_firststeps_main.js
+++ b/src/tutorials/tutorial_firststeps_main.js
@@ -15,19 +15,24 @@ function getTutorialSteps()
 
     function() {
         tutorial.text = qsTr("The highlighted button provides hints on solving problems MO recognized automatically.")
-        if (!tutorialControl.waitForAction("actionProblems")) {
-            highlightAction("actionProblems", false)
-            waitForClick()
-        } else {
+        if (tutorialControl.waitForAction("actionProblems")) {
             tutorial.text += qsTr("\nThere IS a problem now but you may want to hold off on fixing it until after completing the tutorial.")
             highlightAction("actionProblems", true)
+        } else {
+            highlightAction("actionProblems", false)
+            waitForClick()
         }
     },
 
     function() {
+        console.log("next")
         tutorial.text = qsTr("This button provides multiple sources of information and further tutorials.")
-        highlightItem("actionHelp", true)
-        tutorialControl.waitForButton("actionHelp")
+        if (tutorialControl.waitForButton("actionHelp")) {
+          highlightItem("actionHelp", true)
+        } else {
+          console.error("help button broken")
+          waitForClick()
+        }
     },
 
     function() {
@@ -47,12 +52,16 @@ function getTutorialSteps()
     function() {
         tutorial.text = qsTr("Before we start installing mods, let's have a quick look at the settings.")
         manager.activateTutorial("SettingsDialog", "tutorial_firststeps_settings.js")
-        highlightAction("actionSettings", true)
-        tutorialControl.waitForAction("actionSettings")
+        if (tutorialControl.waitForAction("actionSettings")) {
+            highlightAction("actionSettings", true)
+        } else {
+          console.error("settings action broken")
+          waitForClick()
+        }
     },
 
     function() {
-         tutorial.text = qsTr("Now it's time to install a few mods!"
+        tutorial.text = qsTr("Now it's time to install a few mods!"
                             + "Please go along with this because we need a few mods installed to demonstrate other features")
         waitForClick()
     },
@@ -61,8 +70,12 @@ function getTutorialSteps()
         tutorial.text = qsTr("There are a few ways to get mods into ModOrganizer. "
                            + "If you associated MO with NXM links in the settings you can now use your regular browser to send downloads from Nexus to MO. "
                            + "Click on \"Nexus\" to open nexus, find a mod and click the green download buttons on Nexus saying \"Download with Manager\".")
-        highlightAction("actionNexus", true)
-        tutorialControl.waitForAction("actionNexus")
+        if (tutorialControl.waitForAction("actionNexus")) {
+            highlightAction("actionNexus", true)
+        } else {
+          console.error("browser action broken")
+          waitForClick()
+        }
     },
 
     function() {
-- 
cgit v1.3.1