- plugins that failed to load are now reported as problems

- some wording fixes in the tutorial
- updated proxyPython to a modified interface

4 files changed, 198 insertions, 140 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 84e5b094..a8f69090 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -988,12 +988,14 @@ void MainWindow::loadPlugins()
     if (QLibrary::isLibrary(pluginName)) {
       QPluginLoader pluginLoader(pluginName);
       if (pluginLoader.instance() == NULL) {
+        m_UnloadedPlugins.push_back(pluginName);
         qCritical("failed to load plugin %s: %s",
                   pluginName.toUtf8().constData(), pluginLoader.errorString().toUtf8().constData());
       } else {
         if (registerPlugin(pluginLoader.instance())) {
           qDebug("loaded plugin \"%s\"", pluginName.toUtf8().constData());
         } else {
+          m_UnloadedPlugins.push_back(pluginName);
           qWarning("plugin \"%s\" failed to load", pluginName.toUtf8().constData());
         }
       }
@@ -1001,6 +1003,8 @@ void MainWindow::loadPlugins()
   }
 
   m_DownloadManager.setSupportedExtensions(m_InstallationManager.getSupportedExtensions());
+
+  m_DiagnosisPlugins.push_back(this);
 }
 
 IGameInfo &MainWindow::gameInfo() const
@@ -1936,6 +1940,46 @@ IDownloadManager *MainWindow::downloadManager()
   return &m_DownloadManager;
 }
 
+std::vector<unsigned int> MainWindow::activeProblems() const
+{
+  std::vector<unsigned int> problems;
+  if (m_UnloadedPlugins.size() != 0) {
+    problems.push_back(PROBLEM_PLUGINSNOTLOADED);
+  }
+  return problems;
+}
+
+QString MainWindow::shortDescription(unsigned int key) const
+{
+  switch (key) {
+    case PROBLEM_PLUGINSNOTLOADED: {
+      return tr("Some plugins could not be loaded");
+    } break;
+  }
+}
+
+QString MainWindow::fullDescription(unsigned int key) const
+{
+  switch (key) {
+    case PROBLEM_PLUGINSNOTLOADED: {
+      QString result = tr("The following Plugins could not be loaded. The reason may be missing dependencies (i.e. python) or an outdated version:<ul>");
+      foreach (const QString &plugin, m_UnloadedPlugins) {
+        result += "<li>" + plugin + "</li>";
+      }
+      result += "<ul>";
+      return result;
+    } break;
+  }
+}
+
+bool MainWindow::hasGuidedFix(unsigned int key) const
+{
+  return false;
+}
+
+void MainWindow::startGuidedFix(unsigned int key) const
+{
+}
 
 void MainWindow::installMod()
 {
@@ -3519,7 +3563,7 @@ void MainWindow::on_actionNexus_triggered()
   std::wstring nxmPath = ToWString(QApplication::applicationDirPath() + "/nxmhandler.exe");
   std::wstring executable = ToWString(QApplication::applicationFilePath());
   ::ShellExecuteW(NULL, L"open", nxmPath.c_str(),
-                  (std::wstring(L"reg ") + GameInfo::instance().getGameShortName() + L" " + executable).c_str(), NULL, SW_SHOWNORMAL);
+                  (std::wstring(L"reg ") + GameInfo::instance().getGameShortName() + L" \"" + executable + L"\"").c_str(), NULL, SW_SHOWNORMAL);
 
   ::ShellExecuteW(NULL, L"open", GameInfo::instance().getNexusPage().c_str(), NULL, NULL, SW_SHOWNORMAL);
   ui->tabWidget->setCurrentIndex(4);
diff --git a/src/mainwindow.h b/src/mainwindow.h
index d7d0a8e7..b70defbe 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -59,9 +59,10 @@ class QToolButton;
 class ModListSortProxy;
 class ModListGroupCategoriesProxy;
 
-class MainWindow : public QMainWindow, public MOBase::IOrganizer
+class MainWindow : public QMainWindow, public MOBase::IOrganizer, public MOBase::IPluginDiagnose
 {
   Q_OBJECT
+  Q_INTERFACES(MOBase::IPluginDiagnose)
 
 public:
   explicit MainWindow(const QString &exeName, QSettings &initSettings, QWidget *parent = 0);
@@ -109,6 +110,12 @@ public:
   virtual QString resolvePath(const QString &fileName) const;
   virtual MOBase::IDownloadManager *downloadManager();
 
+  virtual std::vector<unsigned int> activeProblems() const;
+  virtual QString shortDescription(unsigned int key) const;
+  virtual QString fullDescription(unsigned int key) const;
+  virtual bool hasGuidedFix(unsigned int key) const;
+  virtual void startGuidedFix(unsigned int key) const;
+
   void addPrimaryCategoryCandidates(QMenu *primaryCategoryMenu, ModInfo::Ptr info);
 
   void saveArchiveList();
@@ -236,6 +243,10 @@ private:
 
 private:
 
+  static const unsigned int PROBLEM_PLUGINSNOTLOADED = 1;
+
+private:
+
   Ui::MainWindow *ui;
 
   MOBase::TutorialControl m_Tutorial;
@@ -300,6 +311,7 @@ private:
   MOBase::IGameInfo *m_GameInfo;
 
   std::vector<MOBase::IPluginDiagnose*> m_DiagnosisPlugins;
+  std::vector<QString> m_UnloadedPlugins;
 
 private slots:
 
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index fcdbd63c..14f00336 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -413,155 +413,157 @@ p, li { white-space: pre-wrap; }
       <widget class="QWidget" name="layoutWidget_2">

        <layout class="QVBoxLayout" name="verticalLayout_2">

         <item>

-         <layout class="QHBoxLayout" name="horizontalLayout_5" stretch="1,0">

-          <item>

-           <widget class="QComboBox" name="executablesListBox">

-            <property name="sizePolicy">

-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

-              <horstretch>0</horstretch>

-              <verstretch>0</verstretch>

-             </sizepolicy>

-            </property>

-            <property name="minimumSize">

-             <size>

-              <width>0</width>

-              <height>40</height>

-             </size>

-            </property>

-            <property name="font">

-             <font>

-              <pointsize>9</pointsize>

-              <weight>75</weight>

-              <bold>true</bold>

-             </font>

-            </property>

-            <property name="toolTip">

-             <string>Pick a program to run.</string>

-            </property>

-            <property name="whatsThis">

-             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

+         <widget class="QFrame" name="startGroup">

+          <layout class="QHBoxLayout" name="horizontalLayout_5" stretch="1,0">

+           <item>

+            <widget class="QComboBox" name="executablesListBox">

+             <property name="sizePolicy">

+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

+               <horstretch>0</horstretch>

+               <verstretch>0</verstretch>

+              </sizepolicy>

+             </property>

+             <property name="minimumSize">

+              <size>

+               <width>0</width>

+               <height>40</height>

+              </size>

+             </property>

+             <property name="font">

+              <font>

+               <pointsize>9</pointsize>

+               <weight>75</weight>

+               <bold>true</bold>

+              </font>

+             </property>

+             <property name="toolTip">

+              <string>Pick a program to run.</string>

+             </property>

+             <property name="whatsThis">

+              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;

 p, li { white-space: pre-wrap; }

 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;

 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Choose the program to run. Once you start using ModOrganizer, you should always run your game and tools from here or through shortcuts created here, otherwise mods installed through MO will not be visible.&lt;/span&gt;&lt;/p&gt;

 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;You can add new Tools to this list, but I can't promise tools I haven't tested will work.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

-            </property>

-            <property name="iconSize">

-             <size>

-              <width>32</width>

-              <height>32</height>

-             </size>

-            </property>

-            <property name="frame">

-             <bool>false</bool>

-            </property>

-           </widget>

-          </item>

-          <item>

-           <layout class="QVBoxLayout" name="verticalLayout_12" stretch="0,0">

-            <item>

-             <widget class="QPushButton" name="startButton">

-              <property name="sizePolicy">

-               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

-                <horstretch>0</horstretch>

-                <verstretch>0</verstretch>

-               </sizepolicy>

-              </property>

-              <property name="minimumSize">

-               <size>

-                <width>120</width>

-                <height>0</height>

-               </size>

-              </property>

-              <property name="maximumSize">

-               <size>

-                <width>16777215</width>

-                <height>16777215</height>

-               </size>

-              </property>

-              <property name="font">

-               <font>

-                <pointsize>10</pointsize>

-                <weight>75</weight>

-                <bold>true</bold>

-               </font>

-              </property>

-              <property name="toolTip">

-               <string>Run program</string>

-              </property>

-              <property name="whatsThis">

-               <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

+             </property>

+             <property name="iconSize">

+              <size>

+               <width>32</width>

+               <height>32</height>

+              </size>

+             </property>

+             <property name="frame">

+              <bool>false</bool>

+             </property>

+            </widget>

+           </item>

+           <item>

+            <layout class="QVBoxLayout" name="verticalLayout_12" stretch="0,0">

+             <item>

+              <widget class="QPushButton" name="startButton">

+               <property name="sizePolicy">

+                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

+                 <horstretch>0</horstretch>

+                 <verstretch>0</verstretch>

+                </sizepolicy>

+               </property>

+               <property name="minimumSize">

+                <size>

+                 <width>120</width>

+                 <height>0</height>

+                </size>

+               </property>

+               <property name="maximumSize">

+                <size>

+                 <width>16777215</width>

+                 <height>16777215</height>

+                </size>

+               </property>

+               <property name="font">

+                <font>

+                 <pointsize>10</pointsize>

+                 <weight>75</weight>

+                 <bold>true</bold>

+                </font>

+               </property>

+               <property name="toolTip">

+                <string>Run program</string>

+               </property>

+               <property name="whatsThis">

+                <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;

 p, li { white-space: pre-wrap; }

 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;

 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Run the selected program with ModOrganizer enabled.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

-              </property>

-              <property name="locale">

-               <locale language="English" country="UnitedStates"/>

-              </property>

-              <property name="text">

-               <string>Run</string>

-              </property>

-              <property name="icon">

-               <iconset resource="resources.qrc">

-                <normaloff>:/MO/gui/run</normaloff>:/MO/gui/run</iconset>

-              </property>

-              <property name="iconSize">

-               <size>

-                <width>36</width>

-                <height>36</height>

-               </size>

-              </property>

-             </widget>

-            </item>

-            <item>

-             <widget class="QPushButton" name="linkButton">

-              <property name="sizePolicy">

-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">

-                <horstretch>0</horstretch>

-                <verstretch>0</verstretch>

-               </sizepolicy>

-              </property>

-              <property name="minimumSize">

-               <size>

-                <width>140</width>

-                <height>0</height>

-               </size>

-              </property>

-              <property name="maximumSize">

-               <size>

-                <width>16777215</width>

-                <height>16777215</height>

-               </size>

-              </property>

-              <property name="baseSize">

-               <size>

-                <width>0</width>

-                <height>0</height>

-               </size>

-              </property>

-              <property name="toolTip">

-               <string>Create a shortcut in your start menu or on the desktop to the specified program</string>

-              </property>

-              <property name="whatsThis">

-               <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

+               </property>

+               <property name="locale">

+                <locale language="English" country="UnitedStates"/>

+               </property>

+               <property name="text">

+                <string>Run</string>

+               </property>

+               <property name="icon">

+                <iconset resource="resources.qrc">

+                 <normaloff>:/MO/gui/run</normaloff>:/MO/gui/run</iconset>

+               </property>

+               <property name="iconSize">

+                <size>

+                 <width>36</width>

+                 <height>36</height>

+                </size>

+               </property>

+              </widget>

+             </item>

+             <item>

+              <widget class="QPushButton" name="linkButton">

+               <property name="sizePolicy">

+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">

+                 <horstretch>0</horstretch>

+                 <verstretch>0</verstretch>

+                </sizepolicy>

+               </property>

+               <property name="minimumSize">

+                <size>

+                 <width>140</width>

+                 <height>0</height>

+                </size>

+               </property>

+               <property name="maximumSize">

+                <size>

+                 <width>16777215</width>

+                 <height>16777215</height>

+                </size>

+               </property>

+               <property name="baseSize">

+                <size>

+                 <width>0</width>

+                 <height>0</height>

+                </size>

+               </property>

+               <property name="toolTip">

+                <string>Create a shortcut in your start menu or on the desktop to the specified program</string>

+               </property>

+               <property name="whatsThis">

+                <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;

 p, li { white-space: pre-wrap; }

 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;

 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;This creates a start menu shortcut that directly starts the selected program with the MO active.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

-              </property>

-              <property name="text">

-               <string>Shortcut</string>

-              </property>

-              <property name="icon">

-               <iconset resource="resources.qrc">

-                <normaloff>:/MO/gui/link</normaloff>:/MO/gui/link</iconset>

-              </property>

-             </widget>

-            </item>

-           </layout>

-          </item>

-         </layout>

+               </property>

+               <property name="text">

+                <string>Shortcut</string>

+               </property>

+               <property name="icon">

+                <iconset resource="resources.qrc">

+                 <normaloff>:/MO/gui/link</normaloff>:/MO/gui/link</iconset>

+               </property>

+              </widget>

+             </item>

+            </layout>

+           </item>

+          </layout>

+         </widget>

         </item>

         <item>

          <widget class="QTabWidget" name="tabWidget">

diff --git a/src/tutorials/tutorial_firststeps_main.js b/src/tutorials/tutorial_firststeps_main.js
index 150fde84..e952c95a 100644
--- a/src/tutorials/tutorial_firststeps_main.js
+++ b/src/tutorials/tutorial_firststeps_main.js
@@ -93,7 +93,7 @@ function getTutorialSteps()
     function() {

         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 \"ESPs\"-tab to get a list of plugins.")

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

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

             highlightItem("tabWidget", true)

         } else {

@@ -118,7 +118,7 @@ function getTutorialSteps()
 

     function() {

         tutorial.text = qsTr("Another special type of files are BSAs. These are bundles of game resources. "

-                             + "Please open the \"BSAs\"-tab.")

+                             + "Please open the \"Archives\"-tab.")

         if (tutorialControl.waitForTabOpen("tabWidget", 1)) {

             highlightItem("tabWidget", true)

         } else {