Merge pull request #294 from Modorganizer2/Develop

Release 2.1.2

1 files changed, 17 insertions, 3 deletions

diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
index 8bf438f1..bd863f52 100644
--- a/src/pluginlist.cpp
+++ b/src/pluginlist.cpp
@@ -140,8 +140,15 @@ void PluginList::highlightPlugins(const QItemSelection &selected, const MOShared
 

 void PluginList::refresh(const QString &profileName

                          , const DirectoryEntry &baseDirectory

-                         , const QString &lockedOrderFile)

+                         , const QString &lockedOrderFile

+                         , bool force)

 {

+  if (force) {

+    m_ESPs.clear();

+    m_ESPsByName.clear();

+    m_ESPsByPriority.clear();

+  }

+

   ChangeBracket<PluginList> layoutChange(this);

 

   QStringList primaryPlugins = m_GamePlugin->primaryPlugins();

@@ -871,8 +878,12 @@ QVariant PluginList::data(const QModelIndex &modelIndex, int role) const
         text += "<br><b>" + tr("Enabled Masters") + "</b>: " + SetJoin(enabledMasters, ", ");

       }

       if (m_ESPs[index].m_HasIni) {

-        text += "<br>There is an ini file connected to this esp. Its settings will be added to your game settings, overwriting "

-                "in case of conflicts.";

+        text += "<br>" + tr("There is an ini file connected to this esp. "

+                            "Its settings will be added to your game settings, overwriting in case of conflicts.");

+      }

+      if (m_ESPs[index].m_IsLightFlagged && !m_ESPs[index].m_IsLight) {

+          text += "<br><br>" + tr("This ESP is flagged as an ESL. "

+                                  "It will adhere to the ESP load order but the records will be loaded in ESL space.");

       }

       toolTip += text;

     }

@@ -895,6 +906,9 @@ QVariant PluginList::data(const QModelIndex &modelIndex, int role) const
     if (m_ESPs[index].m_HasIni) {

       result.append(":/MO/gui/attachment");

     }

+    if (m_ESPs[index].m_IsLightFlagged && !m_ESPs[index].m_IsLight) {

+        result.append(":/MO/gui/awaiting");

+    }

     return result;

   }

   return QVariant();