Merge pull request #1949 from ModOrganizer2/251rc1

Update version to 2.5.1 RC 1

src/categoriesdialog.cpp

@@ -148,8 +148,9 @@ void CategoriesDialog::commitChanges()
 
   for (int i = 0; i < ui->categoriesTable->rowCount(); ++i) {
     int index = ui->categoriesTable->verticalHeader()->logicalIndex(i);
-    QVariantList nexusData =
-        ui->categoriesTable->item(index, 3)->data(Qt::UserRole).toList();
+    QVariantList nexusData;
+    if (ui->categoriesTable->item(index, 3) != nullptr)
+      nexusData = ui->categoriesTable->item(index, 3)->data(Qt::UserRole).toList();
     std::vector<CategoryFactory::NexusCategory> nexusCats;
     for (auto nexusCat : nexusData) {
       nexusCats.push_back(CategoryFactory::NexusCategory(

src/moapplication.cpp

@@ -154,7 +154,6 @@ MOApplication::MOApplication(int& argc, char** argv) : QApplication(argc, argv)
     updateStyle(file);
   });
 
-  setStyle("fusion");
   m_defaultStyle = style()->objectName();
   setStyle(new ProxyStyle(style()));
   addDllsToPath();
@@ -355,7 +354,6 @@ int MOApplication::run(MOMultiProcess& multiProcess)
     log::debug("displaying main window");
     mainWindow.show();
     mainWindow.activateWindow();
-
     splash.close();
 
     tt.stop();

src/pluginlist.cpp

@@ -1245,8 +1245,6 @@ QVariant PluginList::fontData(const QModelIndex& modelIndex) const
     result.setWeight(QFont::Bold);
   if (m_ESPs[index].isLightFlagged || m_ESPs[index].hasLightExtension)
     result.setItalic(true);
-  if (m_ESPs[index].hasNoRecords)
-    result.setStrikeOut(true);
 
   return result;
 }
@@ -1476,6 +1474,10 @@ QVariant PluginList::iconData(const QModelIndex& modelIndex) const
     result.append(":/MO/gui/awaiting");
   }
 
+  if (esp.hasNoRecords) {
+    result.append(":/MO/gui/unchecked-checkbox");
+  }
+
   if (esp.isOverlayFlagged) {
     result.append(":/MO/gui/instance_switch");
   }

src/tutorials/tutorial_primer_main.js

@@ -104,7 +104,7 @@ function setupTooptips() {
   switch (tutorialControl.getTabName("tabWidget")) {
     case "espTab":
       tooltipWidget("espList", qsTr("Plugins (esp/esm/esl files) of the mods in the current profile. They need to be checked to be loaded."))
-      tooltipWidget("bossButton", qsTr("Automatically sort plugins using the bundled LOOT application."))
+      tooltipWidget("sortButton", qsTr("Automatically sort plugins using the bundled LOOT application."))
       tooltipWidget("restoreButton", qsTr("Restore a backup of your plugin list order."))
       tooltipWidget("saveButton", qsTr("Save a backup of your plugin list order."))
       tooltipWidget("activePluginsCounter", qsTr("Counter of your total active plugins. Hover to see a breakdown of plugin types."))

src/version.rc

@@ -3,14 +3,14 @@
 // If VS_FF_PRERELEASE is not set, MO labels the build as a release and uses VER_FILEVERSION to determine version number.
 // Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
 // Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
-#define VER_FILEVERSION     2,5,0
-#define VER_FILEVERSION_STR "2.5.0\0"
+#define VER_FILEVERSION     2,5,1
+#define VER_FILEVERSION_STR "2.5.1rc1\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
 PRODUCTVERSION  VER_FILEVERSION
 FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
-FILEFLAGS       (0)
+FILEFLAGS       VS_FF_PRERELEASE
 FILEOS          VOS__WINDOWS32
 FILETYPE        VFT_APP
 FILESUBTYPE     (0)