From 5b855f2e19071c542339090d8635ef9efff848ba Mon Sep 17 00:00:00 2001 From: Qudix <17361645+Qudix@users.noreply.github.com> Date: Thu, 24 Feb 2022 18:34:10 -0600 Subject: Add `isMasterFlagged` `isLight` `isLightFlagged` Note: The behavior of isMaster has been changed to match isLightFlagged --- src/pluginlist.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src/pluginlist.cpp') diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp index 52434e89..80653595 100644 --- a/src/pluginlist.cpp +++ b/src/pluginlist.cpp @@ -933,6 +933,17 @@ bool PluginList::isMaster(const QString &name) const } } +bool PluginList::isMasterFlagged(const QString& name) const +{ + auto iter = m_ESPsByName.find(name); + if (iter == m_ESPsByName.end()) { + return false; + } + else { + return m_ESPs[iter->second].isMasterFlagged; + } +} + bool PluginList::isLight(const QString &name) const { auto iter = m_ESPsByName.find(name); @@ -1693,8 +1704,9 @@ PluginList::ESPInfo::ESPInfo(const QString &name, bool enabled, { try { ESP::File file(ToWString(fullPath)); - isMaster = file.isMaster(); auto extension = name.right(3).toLower(); + isMaster = (extension == "esm"); + isMasterFlagged = file.isMaster(); isLight = lightPluginsAreSupported && (extension == "esl"); isLightFlagged = lightPluginsAreSupported && file.isLight(); @@ -1707,6 +1719,7 @@ PluginList::ESPInfo::ESPInfo(const QString &name, bool enabled, } catch (const std::exception &e) { log::error("failed to parse plugin file {}: {}", fullPath, e.what()); isMaster = false; + isMasterFlagged = false; isLight = false; isLightFlagged = false; } -- cgit v1.3.1 From 0b9c96e845e24229170a73d69914f4e2283b3716 Mon Sep 17 00:00:00 2001 From: Qudix <17361645+Qudix@users.noreply.github.com> Date: Thu, 24 Feb 2022 19:54:31 -0600 Subject: Rename isX to isXFile, and deprecate isMaster Also made sure to not change existing behaviour --- src/pluginlist.cpp | 44 ++++++++++++++++++++++---------------------- src/pluginlist.h | 8 ++++---- src/pluginlistproxy.cpp | 13 +++++++++---- src/pluginlistproxy.h | 7 +++++-- src/pluginlistview.cpp | 4 ++-- 5 files changed, 42 insertions(+), 34 deletions(-) (limited to 'src/pluginlist.cpp') diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp index 80653595..2805e04e 100644 --- a/src/pluginlist.cpp +++ b/src/pluginlist.cpp @@ -69,9 +69,9 @@ static bool ByName(const PluginList::ESPInfo& LHS, const PluginList::ESPInfo& RH static bool ByPriority(const PluginList::ESPInfo& LHS, const PluginList::ESPInfo& RHS) { - if (LHS.isMaster && !RHS.isMaster) { + if (LHS.isMasterFlagged && !RHS.isMasterFlagged) { return true; - } else if (!LHS.isMaster && RHS.isMaster) { + } else if (!LHS.isMasterFlagged && RHS.isMasterFlagged) { return false; } else { return LHS.priority < RHS.priority; @@ -326,7 +326,7 @@ void PluginList::fixPluginRelationships() // Count the types of plugins int masterCount = 0; for (auto plugin : m_ESPs) { - if (plugin.isLight || plugin.isMaster) { + if (plugin.isLightFile || plugin.isMasterFlagged) { masterCount++; } } @@ -334,7 +334,7 @@ void PluginList::fixPluginRelationships() // Ensure masters are up top and normal plugins are down below for (int i = 0; i < m_ESPs.size(); i++) { ESPInfo& plugin = m_ESPs[i]; - if (plugin.isLight || plugin.isMaster) { + if (plugin.isLightFile || plugin.isMasterFlagged) { if (plugin.priority > masterCount) { int newPriority = masterCount + 1; setPluginPriority(i, newPriority); @@ -923,13 +923,13 @@ int PluginList::loadOrder(const QString &name) const } } -bool PluginList::isMaster(const QString &name) const +bool PluginList::isMasterFile(const QString &name) const { auto iter = m_ESPsByName.find(name); if (iter == m_ESPsByName.end()) { return false; } else { - return m_ESPs[iter->second].isMaster; + return m_ESPs[iter->second].isMasterFile; } } @@ -944,13 +944,13 @@ bool PluginList::isMasterFlagged(const QString& name) const } } -bool PluginList::isLight(const QString &name) const +bool PluginList::isLightFile(const QString &name) const { auto iter = m_ESPsByName.find(name); if (iter == m_ESPsByName.end()) { return false; } else { - return m_ESPs[iter->second].isLight; + return m_ESPs[iter->second].isLightFile; } } @@ -1049,7 +1049,7 @@ void PluginList::generatePluginIndexes() ++numSkipped; continue; } - if (lightPluginsSupported && (m_ESPs[i].isLight || m_ESPs[i].isLightFlagged)) { + if (lightPluginsSupported && (m_ESPs[i].isLightFile || m_ESPs[i].isLightFlagged)) { int ESLpos = 254 + ((numESLs + 1) / 4096); m_ESPs[i].index = QString("%1:%2").arg(ESLpos, 2, 16, QChar('0')).arg((numESLs) % 4096, 3, 16, QChar('0')).toUpper(); ++numESLs; @@ -1178,10 +1178,10 @@ QVariant PluginList::fontData(const QModelIndex &modelIndex) const QFont result; - if (m_ESPs[index].isMaster) { + if (m_ESPs[index].isMasterFile || m_ESPs[index].isMasterFlagged) { result.setItalic(true); result.setWeight(QFont::Bold); - } else if (m_ESPs[index].isLight || m_ESPs[index].isLightFlagged) { + } else if (m_ESPs[index].isLightFile || m_ESPs[index].isLightFlagged) { result.setItalic(true); } @@ -1263,7 +1263,7 @@ QVariant PluginList::tooltipData(const QModelIndex &modelIndex) const "be added to your game settings, overwriting in case of conflicts."); } - if (esp.isLightFlagged && !esp.isLight) { + if (esp.isLightFlagged && !esp.isLightFile) { toolTip += "

" + tr( "This ESP is flagged as an ESL. It will adhere to the ESP load " @@ -1385,7 +1385,7 @@ QVariant PluginList::iconData(const QModelIndex &modelIndex) const result.append(":/MO/gui/archive_conflict_neutral"); } - if (esp.isLightFlagged && !esp.isLight) { + if (esp.isLightFlagged && !esp.isLightFile) { result.append(":/MO/gui/awaiting"); } @@ -1521,18 +1521,18 @@ void PluginList::setPluginPriority(int row, int &newPriority, bool isForced) else if (newPriorityTemp >= static_cast(m_ESPsByPriority.size())) newPriorityTemp = static_cast(m_ESPsByPriority.size()) - 1; - if (!m_ESPs[row].isMaster && !m_ESPs[row].isLight) { + if (!m_ESPs[row].isMasterFlagged && !m_ESPs[row].isLightFile) { // don't allow esps to be moved above esms while ((newPriorityTemp < static_cast(m_ESPsByPriority.size() - 1)) && - (m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isMaster || - m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isLight)) { + (m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isMasterFlagged || + m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isLightFile)) { ++newPriorityTemp; } } else { // don't allow esms to be moved below esps while ((newPriorityTemp > 0) && - !m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isMaster && - !m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isLight) { + !m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isMasterFlagged && + !m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isLightFile) { --newPriorityTemp; } // also don't allow "regular" esms to be moved above primary plugins @@ -1705,9 +1705,9 @@ PluginList::ESPInfo::ESPInfo(const QString &name, bool enabled, try { ESP::File file(ToWString(fullPath)); auto extension = name.right(3).toLower(); - isMaster = (extension == "esm"); + isMasterFile = (extension == "esm"); isMasterFlagged = file.isMaster(); - isLight = lightPluginsAreSupported && (extension == "esl"); + isLightFile = lightPluginsAreSupported && (extension == "esl"); isLightFlagged = lightPluginsAreSupported && file.isLight(); author = QString::fromLatin1(file.author().c_str()); @@ -1718,9 +1718,9 @@ PluginList::ESPInfo::ESPInfo(const QString &name, bool enabled, } } catch (const std::exception &e) { log::error("failed to parse plugin file {}: {}", fullPath, e.what()); - isMaster = false; + isMasterFile = false; isMasterFlagged = false; - isLight = false; + isLightFile = false; isLightFlagged = false; } } diff --git a/src/pluginlist.h b/src/pluginlist.h index 451db257..c2f3796c 100644 --- a/src/pluginlist.h +++ b/src/pluginlist.h @@ -232,9 +232,9 @@ public: int priority(const QString &name) const; int loadOrder(const QString &name) const; bool setPriority(const QString& name, int newPriority); - bool isMaster(const QString &name) const; + bool isMasterFile(const QString &name) const; bool isMasterFlagged(const QString& name) const; - bool isLight(const QString &name) const; + bool isLightFile(const QString &name) const; bool isLightFlagged(const QString &name) const; QStringList masters(const QString &name) const; QString origin(const QString &name) const; @@ -320,9 +320,9 @@ private: int loadOrder; FILETIME time; QString originName; - bool isMaster; + bool isMasterFile; bool isMasterFlagged; - bool isLight; + bool isLightFile; bool isLightFlagged; bool modSelected; QString author; diff --git a/src/pluginlistproxy.cpp b/src/pluginlistproxy.cpp index ec1dc0bd..3f8f740d 100644 --- a/src/pluginlistproxy.cpp +++ b/src/pluginlistproxy.cpp @@ -63,9 +63,9 @@ void PluginListProxy::setLoadOrder(const QStringList& pluginList) return m_Proxied->setLoadOrder(pluginList); } -bool PluginListProxy::isMaster(const QString& name) const +bool PluginListProxy::isMasterFile(const QString& name) const { - return m_Proxied->isMaster(name); + return m_Proxied->isMasterFile(name); } bool PluginListProxy::isMasterFlagged(const QString& name) const @@ -73,9 +73,9 @@ bool PluginListProxy::isMasterFlagged(const QString& name) const return m_Proxied->isMasterFlagged(name); } -bool PluginListProxy::isLight(const QString& name) const +bool PluginListProxy::isLightFile(const QString& name) const { - return m_Proxied->isLight(name); + return m_Proxied->isLightFile(name); } bool PluginListProxy::isLightFlagged(const QString& name) const @@ -83,6 +83,11 @@ bool PluginListProxy::isLightFlagged(const QString& name) const return m_Proxied->isLightFlagged(name); } +bool PluginListProxy::isMaster(const QString& name) const +{ + return m_Proxied->isMasterFlagged(name); +} + QStringList PluginListProxy::masters(const QString& name) const { return m_Proxied->masters(name); diff --git a/src/pluginlistproxy.h b/src/pluginlistproxy.h index fc883882..3c53ef36 100644 --- a/src/pluginlistproxy.h +++ b/src/pluginlistproxy.h @@ -21,9 +21,9 @@ public: bool setPriority(const QString& name, int newPriority) override; int loadOrder(const QString& name) const override; void setLoadOrder(const QStringList& pluginList) override; - bool isMaster(const QString& name) const override; + bool isMasterFile(const QString& name) const override; bool isMasterFlagged(const QString& name) const override; - bool isLight(const QString& name) const override; + bool isLightFile(const QString& name) const override; bool isLightFlagged(const QString& name) const override; QStringList masters(const QString& name) const override; QString origin(const QString& name) const override; @@ -31,6 +31,9 @@ public: bool onPluginMoved(const std::function& func) override; bool onPluginStateChanged(const std::function&)>& func) override; + // DEPRECATED + [[deprecated]] bool isMaster(const QString& name) const override; + private: friend class OrganizerProxy; diff --git a/src/pluginlistview.cpp b/src/pluginlistview.cpp index b2d778a2..887f9aec 100644 --- a/src/pluginlistview.cpp +++ b/src/pluginlistview.cpp @@ -71,12 +71,12 @@ void PluginListView::updatePluginCount() for (QString plugin : list->pluginNames()) { bool active = list->isEnabled(plugin); bool visible = m_sortProxy->filterMatchesPlugin(plugin); - if (list->isLight(plugin) || list->isLightFlagged(plugin)) { + if (list->isLightFile(plugin) || list->isLightFlagged(plugin)) { lightMasterCount++; activeLightMasterCount += active; activeVisibleCount += visible && active; } - else if (list->isMaster(plugin) || list->isMasterFlagged(plugin)) { + else if (list->isMasterFile(plugin) || list->isMasterFlagged(plugin)) { masterCount++; activeMasterCount += active; activeVisibleCount += visible && active; -- cgit v1.3.1 From 8fb36b0b28e605216fe51834b983f27e32d67c67 Mon Sep 17 00:00:00 2001 From: Qudix <17361645+Qudix@users.noreply.github.com> Date: Sat, 19 Mar 2022 20:00:43 -0500 Subject: Change `isXFile` to `hasXExtension` --- src/pluginlist.cpp | 83 +++++++++++++++++++++++++------------------------ src/pluginlist.h | 13 ++++---- src/pluginlistproxy.cpp | 40 ++++++++++++------------ src/pluginlistproxy.h | 13 ++++---- src/pluginlistview.cpp | 4 +-- 5 files changed, 78 insertions(+), 75 deletions(-) (limited to 'src/pluginlist.cpp') diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp index 2805e04e..9a19fb2c 100644 --- a/src/pluginlist.cpp +++ b/src/pluginlist.cpp @@ -326,7 +326,7 @@ void PluginList::fixPluginRelationships() // Count the types of plugins int masterCount = 0; for (auto plugin : m_ESPs) { - if (plugin.isLightFile || plugin.isMasterFlagged) { + if (plugin.hasLightExtension || plugin.isMasterFlagged) { masterCount++; } } @@ -334,7 +334,7 @@ void PluginList::fixPluginRelationships() // Ensure masters are up top and normal plugins are down below for (int i = 0; i < m_ESPs.size(); i++) { ESPInfo& plugin = m_ESPs[i]; - if (plugin.isLightFile || plugin.isMasterFlagged) { + if (plugin.hasLightExtension || plugin.isMasterFlagged) { if (plugin.priority > masterCount) { int newPriority = masterCount + 1; setPluginPriority(i, newPriority); @@ -923,68 +923,71 @@ int PluginList::loadOrder(const QString &name) const } } -bool PluginList::isMasterFile(const QString &name) const +QStringList PluginList::masters(const QString &name) const { auto iter = m_ESPsByName.find(name); if (iter == m_ESPsByName.end()) { - return false; + return QStringList(); } else { - return m_ESPs[iter->second].isMasterFile; + QStringList result; + for (const QString &master : m_ESPs[iter->second].masters) { + result.append(master); + } + return result; } } -bool PluginList::isMasterFlagged(const QString& name) const +QString PluginList::origin(const QString &name) const { auto iter = m_ESPsByName.find(name); if (iter == m_ESPsByName.end()) { - return false; - } - else { - return m_ESPs[iter->second].isMasterFlagged; + return QString(); + } else { + return m_ESPs[iter->second].originName; } } -bool PluginList::isLightFile(const QString &name) const +bool PluginList::hasMasterExtension(const QString& name) const { auto iter = m_ESPsByName.find(name); if (iter == m_ESPsByName.end()) { return false; - } else { - return m_ESPs[iter->second].isLightFile; + } + else { + return m_ESPs[iter->second].hasMasterExtension; } } -bool PluginList::isLightFlagged(const QString &name) const +bool PluginList::hasLightExtension(const QString& name) const { auto iter = m_ESPsByName.find(name); if (iter == m_ESPsByName.end()) { return false; - } else { - return m_ESPs[iter->second].isLightFlagged; + } + else { + return m_ESPs[iter->second].hasLightExtension; } } -QStringList PluginList::masters(const QString &name) const +bool PluginList::isMasterFlagged(const QString& name) const { auto iter = m_ESPsByName.find(name); if (iter == m_ESPsByName.end()) { - return QStringList(); - } else { - QStringList result; - for (const QString &master : m_ESPs[iter->second].masters) { - result.append(master); - } - return result; + return false; + } + else { + return m_ESPs[iter->second].isMasterFlagged; } } -QString PluginList::origin(const QString &name) const +bool PluginList::isLightFlagged(const QString& name) const { auto iter = m_ESPsByName.find(name); if (iter == m_ESPsByName.end()) { - return QString(); - } else { - return m_ESPs[iter->second].originName; + return false; + } + else { + return m_ESPs[iter->second].isLightFlagged; } } @@ -1049,7 +1052,7 @@ void PluginList::generatePluginIndexes() ++numSkipped; continue; } - if (lightPluginsSupported && (m_ESPs[i].isLightFile || m_ESPs[i].isLightFlagged)) { + if (lightPluginsSupported && (m_ESPs[i].hasLightExtension || m_ESPs[i].isLightFlagged)) { int ESLpos = 254 + ((numESLs + 1) / 4096); m_ESPs[i].index = QString("%1:%2").arg(ESLpos, 2, 16, QChar('0')).arg((numESLs) % 4096, 3, 16, QChar('0')).toUpper(); ++numESLs; @@ -1178,10 +1181,10 @@ QVariant PluginList::fontData(const QModelIndex &modelIndex) const QFont result; - if (m_ESPs[index].isMasterFile || m_ESPs[index].isMasterFlagged) { + if (m_ESPs[index].hasMasterExtension || m_ESPs[index].isMasterFlagged) { result.setItalic(true); result.setWeight(QFont::Bold); - } else if (m_ESPs[index].isLightFile || m_ESPs[index].isLightFlagged) { + } else if (m_ESPs[index].hasLightExtension || m_ESPs[index].isLightFlagged) { result.setItalic(true); } @@ -1263,7 +1266,7 @@ QVariant PluginList::tooltipData(const QModelIndex &modelIndex) const "be added to your game settings, overwriting in case of conflicts."); } - if (esp.isLightFlagged && !esp.isLightFile) { + if (esp.isLightFlagged && !esp.hasLightExtension) { toolTip += "

" + tr( "This ESP is flagged as an ESL. It will adhere to the ESP load " @@ -1385,7 +1388,7 @@ QVariant PluginList::iconData(const QModelIndex &modelIndex) const result.append(":/MO/gui/archive_conflict_neutral"); } - if (esp.isLightFlagged && !esp.isLightFile) { + if (esp.isLightFlagged && !esp.hasLightExtension) { result.append(":/MO/gui/awaiting"); } @@ -1521,18 +1524,18 @@ void PluginList::setPluginPriority(int row, int &newPriority, bool isForced) else if (newPriorityTemp >= static_cast(m_ESPsByPriority.size())) newPriorityTemp = static_cast(m_ESPsByPriority.size()) - 1; - if (!m_ESPs[row].isMasterFlagged && !m_ESPs[row].isLightFile) { + if (!m_ESPs[row].isMasterFlagged && !m_ESPs[row].hasLightExtension) { // don't allow esps to be moved above esms while ((newPriorityTemp < static_cast(m_ESPsByPriority.size() - 1)) && (m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isMasterFlagged || - m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isLightFile)) { + m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).hasLightExtension)) { ++newPriorityTemp; } } else { // don't allow esms to be moved below esps while ((newPriorityTemp > 0) && !m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isMasterFlagged && - !m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isLightFile) { + !m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).hasLightExtension) { --newPriorityTemp; } // also don't allow "regular" esms to be moved above primary plugins @@ -1705,9 +1708,9 @@ PluginList::ESPInfo::ESPInfo(const QString &name, bool enabled, try { ESP::File file(ToWString(fullPath)); auto extension = name.right(3).toLower(); - isMasterFile = (extension == "esm"); + hasMasterExtension = (extension == "esm"); + hasLightExtension = lightPluginsAreSupported && (extension == "esl"); isMasterFlagged = file.isMaster(); - isLightFile = lightPluginsAreSupported && (extension == "esl"); isLightFlagged = lightPluginsAreSupported && file.isLight(); author = QString::fromLatin1(file.author().c_str()); @@ -1718,9 +1721,9 @@ PluginList::ESPInfo::ESPInfo(const QString &name, bool enabled, } } catch (const std::exception &e) { log::error("failed to parse plugin file {}: {}", fullPath, e.what()); - isMasterFile = false; + hasMasterExtension = false; + hasLightExtension = false; isMasterFlagged = false; - isLightFile = false; isLightFlagged = false; } } diff --git a/src/pluginlist.h b/src/pluginlist.h index c2f3796c..965f8cfe 100644 --- a/src/pluginlist.h +++ b/src/pluginlist.h @@ -232,14 +232,15 @@ public: int priority(const QString &name) const; int loadOrder(const QString &name) const; bool setPriority(const QString& name, int newPriority); - bool isMasterFile(const QString &name) const; - bool isMasterFlagged(const QString& name) const; - bool isLightFile(const QString &name) const; - bool isLightFlagged(const QString &name) const; QStringList masters(const QString &name) const; QString origin(const QString &name) const; void setLoadOrder(const QStringList& pluginList); + bool hasMasterExtension(const QString& name) const; + bool hasLightExtension(const QString& name) const; + bool isMasterFlagged(const QString& name) const; + bool isLightFlagged(const QString& name) const; + boost::signals2::connection onRefreshed(const std::function& callback); boost::signals2::connection onPluginMoved(const std::function& func); boost::signals2::connection onPluginStateChanged(const std::function&)> &func); @@ -320,9 +321,9 @@ private: int loadOrder; FILETIME time; QString originName; - bool isMasterFile; + bool hasMasterExtension; + bool hasLightExtension; bool isMasterFlagged; - bool isLightFile; bool isLightFlagged; bool modSelected; QString author; diff --git a/src/pluginlistproxy.cpp b/src/pluginlistproxy.cpp index 3f8f740d..604aab3e 100644 --- a/src/pluginlistproxy.cpp +++ b/src/pluginlistproxy.cpp @@ -63,26 +63,6 @@ void PluginListProxy::setLoadOrder(const QStringList& pluginList) return m_Proxied->setLoadOrder(pluginList); } -bool PluginListProxy::isMasterFile(const QString& name) const -{ - return m_Proxied->isMasterFile(name); -} - -bool PluginListProxy::isMasterFlagged(const QString& name) const -{ - return m_Proxied->isMasterFlagged(name); -} - -bool PluginListProxy::isLightFile(const QString& name) const -{ - return m_Proxied->isLightFile(name); -} - -bool PluginListProxy::isLightFlagged(const QString& name) const -{ - return m_Proxied->isLightFlagged(name); -} - bool PluginListProxy::isMaster(const QString& name) const { return m_Proxied->isMasterFlagged(name); @@ -112,3 +92,23 @@ bool PluginListProxy::onPluginStateChanged(const std::functionhasMasterExtension(name); +} + +bool PluginListProxy::hasLightExtension(const QString& name) const +{ + return m_Proxied->hasLightExtension(name); +} + +bool PluginListProxy::isMasterFlagged(const QString& name) const +{ + return m_Proxied->isMasterFlagged(name); +} + +bool PluginListProxy::isLightFlagged(const QString& name) const +{ + return m_Proxied->isLightFlagged(name); +} diff --git a/src/pluginlistproxy.h b/src/pluginlistproxy.h index 3c53ef36..202b8484 100644 --- a/src/pluginlistproxy.h +++ b/src/pluginlistproxy.h @@ -8,7 +8,6 @@ class OrganizerProxy; class PluginListProxy : public MOBase::IPluginList { - public: PluginListProxy(OrganizerProxy* oproxy, PluginList* pluginlist); @@ -21,18 +20,18 @@ public: bool setPriority(const QString& name, int newPriority) override; int loadOrder(const QString& name) const override; void setLoadOrder(const QStringList& pluginList) override; - bool isMasterFile(const QString& name) const override; - bool isMasterFlagged(const QString& name) const override; - bool isLightFile(const QString& name) const override; - bool isLightFlagged(const QString& name) const override; + [[deprecated]] bool isMaster(const QString& name) const override; QStringList masters(const QString& name) const override; QString origin(const QString& name) const override; + bool onRefreshed(const std::function& callback) override; bool onPluginMoved(const std::function& func) override; bool onPluginStateChanged(const std::function&)>& func) override; - // DEPRECATED - [[deprecated]] bool isMaster(const QString& name) const override; + bool hasMasterExtension(const QString& name) const override; + bool hasLightExtension(const QString& name) const override; + bool isMasterFlagged(const QString& name) const override; + bool isLightFlagged(const QString& name) const override; private: diff --git a/src/pluginlistview.cpp b/src/pluginlistview.cpp index 887f9aec..c7183d0b 100644 --- a/src/pluginlistview.cpp +++ b/src/pluginlistview.cpp @@ -71,12 +71,12 @@ void PluginListView::updatePluginCount() for (QString plugin : list->pluginNames()) { bool active = list->isEnabled(plugin); bool visible = m_sortProxy->filterMatchesPlugin(plugin); - if (list->isLightFile(plugin) || list->isLightFlagged(plugin)) { + if (list->hasLightExtension(plugin) || list->isLightFlagged(plugin)) { lightMasterCount++; activeLightMasterCount += active; activeVisibleCount += visible && active; } - else if (list->isMasterFile(plugin) || list->isMasterFlagged(plugin)) { + else if (list->hasMasterExtension(plugin) || list->isMasterFlagged(plugin)) { masterCount++; activeMasterCount += active; activeVisibleCount += visible && active; -- cgit v1.3.1