From 7b4582c1b1f495100f0baa83767878c37cf9724e Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Mon, 23 Jun 2014 20:23:59 +0200
Subject: - adjusted mod load order in hook.dll to match the one from the UI -
 bugfix: fnis checker took files in archives into consideration for hashing

---
 src/mainwindow.cpp                        |  1 +
 src/organizer.pro                         |  3 ++-
 src/tutorials/tutorial_firststeps_main.js | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e6723fc1..08fdcee7 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -4009,6 +4009,7 @@ void MainWindow::linkToolbar()
   const Executable &selectedExecutable = ui->executablesListBox->itemData(ui->executablesListBox->currentIndex()).value<Executable>();
   Executable &exe = m_ExecutablesList.find(selectedExecutable.m_Title);
   exe.m_Toolbar = !exe.m_Toolbar;
+  ui->linkButton->menu()->actions().at(2)->setIcon(exe.m_Toolbar ? QIcon(":/MO/gui/remove") : QIcon(":/MO/gui/link"));
   updateToolBar();
 }
 
diff --git a/src/organizer.pro b/src/organizer.pro
index 70d8e021..bf5d948d 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -321,7 +321,8 @@ OTHER_FILES += \
     dark.qss \
     stylesheets/dark.qss \
     tutorials/tutorial_window_installer.js \
-    tutorials/tutorials_installdialog.qml
+    tutorials/tutorials_installdialog.qml \
+    tutorials/tutorial_firststeps_settings.js
 
 
 # leak detection with vld
diff --git a/src/tutorials/tutorial_firststeps_main.js b/src/tutorials/tutorial_firststeps_main.js
index 97330a48..ae3f6923 100644
--- a/src/tutorials/tutorial_firststeps_main.js
+++ b/src/tutorials/tutorial_firststeps_main.js
@@ -46,6 +46,7 @@ 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")
     },
@@ -57,15 +58,21 @@ function getTutorialSteps()
     },
 
     function() {
-        tutorial.text = qsTr("There are a few ways to get mods into ModOrganizer. You can use your regular browser to send download from Nexus to MO. "
-                           + "Click on \"Nexus\" to open the appropriate nexusmods page. This will also register ModOrganizer as the downloader "
-                           + "for \"nxm links\" for the game MO is managing. \"nxm links\" are the green buttons on Nexus saying \"Download with Manager\".")
+        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 download 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")
     },
 
     function() {
-        tutorial.text = qsTr("Downloads will appear here. Please download at least one mod, then double click it to install.")
+        tutorial.text = qsTr("You can also install mods from disk using the \"Install Mod\" button.")
+        highlightAction("actionInstallMod", false)
+        waitForClick()
+    },
+
+    function() {
+        tutorial.text = qsTr("Downloads will appear here. You have to download at least one mod to proceed.")
         applicationWindow.modInstalled.connect(nextStep)
         highlightItem("downloadView", true)
     },
@@ -77,13 +84,6 @@ function getTutorialSteps()
         waitForClick()
     },
 
-    function() {
-        tutorial.text = qsTr("This is how to get mods from Nexus.\n"
-                             + "You can also install mods from disk using the \"Install Mod\" button.")
-        highlightAction("actionInstallMod", false)
-        waitForClick()
-    },
-
     function() {
         unhighlight()
         tutorial.text = qsTr("Now you know all about downloading and installing mods but they are not enabled yet...")
-- 
cgit v1.3.1