Merge pull request #1959 from ModOrganizer2/category_alternate_source

Use primary game source for categories if defined

src/aboutdialog.ui

@@ -127,7 +127,7 @@
          <item>
           <widget class="QLabel" name="label_3">
            <property name="text">
-            <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright © 2011-2016 Sebastian Herbord&lt;br/&gt;Copyright © 2016-2021 Mod Organizer 2 Contributors&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright © 2011-2016 Sebastian Herbord&lt;br/&gt;Copyright © 2016-2023 Mod Organizer 2 Contributors&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
           </widget>
          </item>

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/mainwindow.cpp

@@ -2842,8 +2842,14 @@ void MainWindow::refreshNexusCategories(CategoriesDialog* dialog)
 {
   NexusInterface& nexus = NexusInterface::instance();
   nexus.setPluginContainer(&m_PluginContainer);
-  nexus.requestGameInfo(Settings::instance().game().plugin()->gameShortName(), dialog,
-                        QVariant(), QString());
+  if (!Settings::instance().game().plugin()->primarySources().isEmpty()) {
+    nexus.requestGameInfo(
+        Settings::instance().game().plugin()->primarySources().first(), dialog,
+        QVariant(), QString());
+  } else {
+    nexus.requestGameInfo(Settings::instance().game().plugin()->gameShortName(), dialog,
+                          QVariant(), QString());
+  }
 }
 
 void MainWindow::categoriesSaved()

src/modlist.cpp

@@ -208,7 +208,7 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
       if (modInfo->hasAutomaticPriority()) {
         return QVariant();  // hide priority for mods where it's fixed
       } else {
-        return m_Profile->getModPriority(modIndex);
+        return QString::number(m_Profile->getModPriority(modIndex));
       }
     } else if (column == COL_MODID) {
       int modID = modInfo->nexusId();

src/modlistcontextmenu.cpp

@@ -561,7 +561,9 @@ void ModListContextMenu::addRegularActions(ModInfo::Ptr mod)
     }
   }
 
-  if (mod->nexusId() > 0 && !mod->installationFile().isEmpty()) {
+  if (mod->nexusId() > 0 &&
+      (mod->getNexusCategory() > 0 || !mod->installationFile().isEmpty()) &&
+      !mod->isSeparator()) {
     addAction(tr("Remap Category (From Nexus)"), [=]() {
       m_actions.remapCategory(m_selected);
     });

src/modlistviewactions.cpp

@@ -279,7 +279,9 @@ void ModListViewActions::assignCategories() const
   }
   for (auto mod : m_core.modList()->allMods()) {
     ModInfo::Ptr modInfo = ModInfo::getByName(mod);
-    int nexusCategory    = modInfo->getNexusCategory();
+    if (modInfo->isSeparator())
+      continue;
+    int nexusCategory = modInfo->getNexusCategory();
     if (!nexusCategory) {
       QSettings downloadMeta(m_core.downloadsPath() + "/" +
                                  modInfo->installationFile() + ".meta",
@@ -1125,6 +1127,8 @@ void ModListViewActions::remapCategory(const QModelIndexList& indices) const
 {
   for (auto& idx : indices) {
     ModInfo::Ptr modInfo = ModInfo::getByIndex(idx.data(ModList::IndexRole).toInt());
+    if (modInfo->isSeparator())
+      continue;
 
     int categoryID = modInfo->getNexusCategory();
     if (!categoryID) {

src/pluginlist.cpp

@@ -1185,7 +1185,7 @@ QVariant PluginList::displayData(const QModelIndex& modelIndex) const
     return m_ESPs[index].name;
 
   case COL_PRIORITY:
-    return m_ESPs[index].priority;
+    return QString::number(m_ESPs[index].priority);
 
   case COL_MODINDEX:
     return m_ESPs[index].index;
@@ -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/stylesheets/Night Eyes.qss

@@ -1,4 +1,4 @@
-/* Night Eyes theme v1.0.1 for Mod Organizer 2 by Ciathyza */
+/* Night Eyes theme v1.2.0 for Mod Organizer 2 by Ciathyza */
 /* https://github.com/ciathyza/mo2-themes */
 
 /* Main Window ---------------------------------------------------------------- */
@@ -23,22 +23,21 @@ QMainWindow::separator
 QAbstractItemView
 {
 	background: #141414;
-	alternate-background-color: #1A1A1A;
+	alternate-background-color: #141414;
 	show-decoration-selected: 1;
-	selection-background-color: #251100;
-	selection-color: #AAAAAA;
+	selection-background-color: #001133;
+	selection-color: #0099EE;
 }
 
 QAbstractItemView::item:hover
 {
-	background: #242424;
-	color: #FFCC88;
+	color: #FFFFFF;
 }
 
 QAbstractItemView::item:selected
 {
-	background: #251100;
-	color: #FFCC88;
+	background: #001133;
+	color: #0099EE;
 }
 
 QAbstractScrollArea::corner
@@ -54,6 +53,7 @@ LinkLabel
   qproperty-linkColor: #3399FF;
 }
 
+
 /* Toolbar -------------------------------------------------------------------- */
 
 QToolBar
@@ -99,20 +99,20 @@ QTreeView
 
 QTreeView::branch:hover
 {
-	background: #242424;
-	color: #FFCC88;
+	background: #181818;
+	color: #FFFFFF;
 }
 
 QTreeView::branch:selected
 {
-	background: #251100;
-	color: #FFCC88;
+	background: #001133;
+	color: #0099EE;
 }
 
 QTreeView::item:selected
 {
-	background: #251100;
-	color: #FFCC88;
+	background: #001133;
+	color: #0099EE;
 }
 
 QTreeView::branch:has-children:!has-siblings:closed,
@@ -142,8 +142,8 @@ QListView::item:hover
 
 QListView::item:selected
 {
-	background: #251100;
-	color: #FFCC88;
+	background: #001133;
+	color: #0099EE;
 }
 
 QTextEdit
@@ -397,6 +397,7 @@ QHeaderView
 	background: #181818;
 }
 
+/* Table View Tab Headers */
 QHeaderView::section
 {
     background: #141414;
@@ -435,12 +436,14 @@ QHeaderView::down-arrow
 
 /* Context Menus, Toolbar Dropdowns, & Tooltips ------------------------------- */
 
-QMenuBar {
+QMenuBar
+{
 	background: #181818;
 	border: 1px solid #181818;
 }
 
-QMenuBar::item:selected {
+QMenuBar::item:selected
+{
 	background: #242424;
 	color: #FFCC88;
 }
@@ -492,6 +495,7 @@ QToolTip
 
 QStatusBar::item {border: None;}
 
+
 /* Progress Bars (Downloads) -------------------------------------------------- */
 
 QProgressBar
@@ -632,13 +636,13 @@ QListWidget::item#executablesListBox
 QWidget#downloadTab QAbstractScrollArea
 {
 	/* background of the entire downloads tab */
-	background: #242424;
+	background: #141414;
 }
 
 DownloadListView QFrame
 {
 	/* an entry on the Downloads tab */
-	background: #141414;
+	background: #181818;
 }
 
 DownloadListView QFrame#frame
@@ -659,19 +663,23 @@ DownloadListView QFrame:clicked
 
 /* compact downloads view */
 
-DownloadListView[downloadView=standard]::item {
+DownloadListView[downloadView=standard]::item
+{
 	padding: 16px;
 }
 
-DownloadListView[downloadView=compact]::item {
+DownloadListView[downloadView=compact]::item
+{
 	padding: 4px;
 }
 
-DownloadListView::item:hover {
+DownloadListView::item:hover
+{
     padding: 0px;
 }
 
-DownloadListView::item:selected {
+DownloadListView::item:selected
+{
     padding: 0px;
 }
 
@@ -683,10 +691,12 @@ QProgressBar
 	margin: 0px;
 }
 
-QAbstractItemView[filtered=true] {
+QAbstractItemView[filtered=true]
+{
 	border: 2px solid #f00 !important;
 }
 
-QLineEdit[valid-filter=false] {
+QLineEdit[valid-filter=false]
+{
 	background-color: #661111 !important;
 }