Merge remote-tracking branch 'upstream/master'

Author: Ungeziefi

src/modinfodialogimages.cpp

@@ -76,7 +76,10 @@ ImagesTab::ImagesTab(ModInfoDialogTabContext cx)
   ui->imagesShowDDS->setEnabled(m_ddsAvailable);
 
   ui->imagesThumbnails->setAutoFillBackground(false);
-  ui->imagesThumbnails->setAttribute(Qt::WA_OpaquePaintEvent, true);
+
+  if (ui->imagesThumbnails->palette().color(QPalette::Base) != Qt::transparent) {
+    ui->imagesThumbnails->setAttribute(Qt::WA_OpaquePaintEvent, true);
+  }
 
   {
     auto list = std::make_unique<QListWidget>();

src/pluginlist.cpp

@@ -210,6 +210,9 @@ void PluginList::refresh(const QString& profileName,
       bool forceDisabled =
           m_GamePlugin->loadOrderMechanism() == IPluginGame::LoadOrderMechanism::None &&
           !forceLoaded && !forceEnabled;
+      if (!lightPluginsAreSupported && filename.endsWith(".esl")) {
+        forceDisabled = true;
+      }
 
       bool archive = false;
       try {
@@ -1355,8 +1358,13 @@ QVariant PluginList::tooltipData(const QModelIndex& modelIndex) const
   }
 
   if (esp.forceDisabled) {
-    toolTip += "<br><br>" + tr("This game does not currently permit custom plugin "
-                               "loading. There may be manual workarounds.");
+    if (m_GamePlugin->feature<GamePlugins>() && esp.hasLightExtension &&
+        !m_GamePlugin->feature<GamePlugins>()->lightPluginsAreSupported()) {
+      toolTip += "<br><br>" + tr("Light plugins (ESL) are not supported by this game.");
+    } else {
+      toolTip += "<br><br>" + tr("This game does not currently permit custom plugin "
+                                 "loading. There may be manual workarounds.");
+    }
   }
 
   // additional info
@@ -1804,7 +1812,7 @@ PluginList::ESPInfo::ESPInfo(const QString& name, bool forceLoaded, bool forceEn
     ESP::File file(ToWString(fullPath));
     auto extension     = name.right(3).toLower();
     hasMasterExtension = (extension == "esm");
-    hasLightExtension  = lightSupported && (extension == "esl");
+    hasLightExtension  = (extension == "esl");
     isMasterFlagged    = file.isMaster();
     isOverlayFlagged   = overlaySupported && file.isOverlay();
     isLightFlagged =

src/problemsdialog.cpp

@@ -56,7 +56,6 @@ void ProblemsDialog::runDiagnosis()
       m_hasProblems = true;
 
       if (diagnose->hasGuidedFix(key)) {
-        newItem->setText(1, tr("Fix"));
         QPushButton* fixButton = new QPushButton(tr("Fix"));
         fixButton->setProperty("fix",
                                QVariant::fromValue(reinterpret_cast<void*>(diagnose)));

src/settingsdialog.ui

@@ -2216,7 +2216,7 @@ For the other games this is not a sufficient replacement for AI!</string>
        <item>
         <widget class="LinkLabel" name="diagnosticsExplainedLabel">
          <property name="toolTip">
-          <string>Hint: right click link and copy link location</string>
+          <string>Click a link to open the location</string>
          </property>
          <property name="text">
           <string>

src/settingsdialogdiagnostics.cpp

@@ -15,15 +15,18 @@ DiagnosticsSettingsTab::DiagnosticsSettingsTab(Settings& s, SettingsDialog& d)
 
   ui->dumpsMaxEdit->setValue(settings().diagnostics().maxCoreDumps());
 
-  QString logsPath = qApp->property("dataPath").toString() + "/" +
-                     QString::fromStdWString(AppConfig::logPath());
+  QString logsPath = QUrl::fromLocalFile(qApp->property("dataPath").toString() + "/" +
+                                         QString::fromStdWString(AppConfig::logPath()))
+                         .toString();
 
   ui->diagnosticsExplainedLabel->setText(
       ui->diagnosticsExplainedLabel->text()
           .replace("LOGS_FULL_PATH", logsPath)
           .replace("LOGS_DIR", QString::fromStdWString(AppConfig::logPath()))
           .replace("DUMPS_FULL_PATH",
-                   QString::fromStdWString(OrganizerCore::getGlobalCoreDumpPath()))
+                   QUrl::fromLocalFile(
+                       QString::fromStdWString(OrganizerCore::getGlobalCoreDumpPath()))
+                       .toString())
           .replace("DUMPS_DIR", QString::fromStdWString(AppConfig::dumpsDir())));
 }