diff options
| author | Jeremy Rimpo <jeremy.rimpo@servermonkey.com> | 2023-11-17 03:36:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-17 03:36:55 -0600 |
| commit | 828c9c8157047aeff72a0d6149e407971970288a (patch) | |
| tree | 614ae113eee2bdc01f89a228a9219ba8fe7093e8 /src | |
| parent | 1b4ed397474b4f9f4e85a4381e1f0164cc4edeca (diff) | |
| parent | 773e3acd588209537877f7068b60c4125c86c630 (diff) | |
Merge pull request #1921 from ModOrganizer2/rc_fixes
A few fixes for RC 1
Diffstat (limited to 'src')
| -rw-r--r-- | src/modlist.cpp | 2 | ||||
| -rw-r--r-- | src/modlistcontextmenu.cpp | 4 | ||||
| -rw-r--r-- | src/modlistviewactions.cpp | 6 | ||||
| -rw-r--r-- | src/pluginlist.cpp | 2 | ||||
| -rw-r--r-- | src/version.rc | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/src/modlist.cpp b/src/modlist.cpp index 7a951369..8945dea1 100644 --- a/src/modlist.cpp +++ b/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(); diff --git a/src/modlistcontextmenu.cpp b/src/modlistcontextmenu.cpp index d4630ec3..fefb1d73 100644 --- a/src/modlistcontextmenu.cpp +++ b/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); }); diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp index cbac9c6c..a38e876b 100644 --- a/src/modlistviewactions.cpp +++ b/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) { diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp index 50b5c69c..6cb4ca13 100644 --- a/src/pluginlist.cpp +++ b/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; diff --git a/src/version.rc b/src/version.rc index 00060b2d..46720095 100644 --- a/src/version.rc +++ b/src/version.rc @@ -4,7 +4,7 @@ // 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-rc1\0" +#define VER_FILEVERSION_STR "2.5.0rc2\0" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION |