summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/iuserinterface.h5
-rw-r--r--src/mainwindow.cpp37
-rw-r--r--src/mainwindow.h7
-rw-r--r--src/modinfodialog.cpp60
-rw-r--r--src/modinfodialog.h50
-rw-r--r--src/modinfodialogfwd.h50
-rw-r--r--src/modinfodialognexus.cpp2
-rw-r--r--src/modinfodialognexus.h2
-rw-r--r--src/modinfodialogtab.cpp7
-rw-r--r--src/modinfodialogtab.h20
-rw-r--r--src/organizercore.cpp8
12 files changed, 132 insertions, 118 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d27f444..929ee296 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -166,6 +166,7 @@ SET(organizer_HDRS
modinfodialogconflicts.h
modinfodialogesps.h
modinfodialogfiletree.h
+ modinfodialogfwd.h
modinfodialogimages.h
modinfodialognexus.h
modinfodialogtab.h
@@ -379,6 +380,7 @@ set(modinfo\\dialog
modinfodialogconflicts
modinfodialogesps
modinfodialogfiletree
+ modinfodialogfwd
modinfodialogimages
modinfodialognexus
modinfodialogtab
diff --git a/src/iuserinterface.h b/src/iuserinterface.h
index 034fa029..bba8de2b 100644
--- a/src/iuserinterface.h
+++ b/src/iuserinterface.h
@@ -2,7 +2,7 @@
#define IUSERINTERFACE_H
-#include "modinfo.h"
+#include "modinfodialogfwd.h"
#include "ilockedwaitingforprocess.h"
#include <iplugintool.h>
#include <ipluginmodpage.h>
@@ -29,7 +29,8 @@ public:
virtual bool closeWindow() = 0;
virtual void setWindowEnabled(bool enabled) = 0;
- virtual void displayModInformation(ModInfo::Ptr modInfo, unsigned int index, int tab) = 0;
+ virtual void displayModInformation(
+ ModInfoPtr modInfo, unsigned int modIndex, ModInfoTabIDs tabID) = 0;
virtual void updateBSAList(const QStringList &defaultArchives, const QStringList &activeArchives) = 0;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7ab555fa..a596c542 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3192,7 +3192,8 @@ void MainWindow::overwriteClosed(int)
}
-void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index, int tab)
+void MainWindow::displayModInformation(
+ ModInfo::Ptr modInfo, unsigned int modIndex, ModInfoTabIDs tabID)
{
if (!m_OrganizerCore.modList()->modInfoAboutToChange(modInfo)) {
qDebug("A different mod information dialog is open. If this is incorrect, please restart MO");
@@ -3227,8 +3228,8 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
connect(&dialog, SIGNAL(originModified(int)), this, SLOT(originModified(int)));
//Open the tab first if we want to use the standard indexes of the tabs.
- if (tab != -1) {
- dialog.setTab(ModInfoDialog::ETabs(tab));
+ if (tabID != ModInfoTabIDs::None) {
+ dialog.setTab(tabID);
}
dialog.restoreState(m_OrganizerCore.settings());
@@ -3247,7 +3248,7 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
m_OrganizerCore.modList()->modInfoChanged(modInfo);
}
- if (m_OrganizerCore.currentProfile()->modEnabled(index)
+ if (m_OrganizerCore.currentProfile()->modEnabled(modIndex)
&& !modInfo->hasFlag(ModInfo::FLAG_FOREIGN)) {
FilesOrigin& origin = m_OrganizerCore.directoryStructure()->getOriginByName(ToWString(modInfo->name()));
origin.enable(false);
@@ -3258,7 +3259,7 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
m_OrganizerCore.directoryRefresher()->addModToStructure(m_OrganizerCore.directoryStructure()
, modInfo->name()
- , m_OrganizerCore.currentProfile()->getModPriority(index)
+ , m_OrganizerCore.currentProfile()->getModPriority(modIndex)
, modInfo->absolutePath()
, modInfo->stealFiles()
, modInfo->archives());
@@ -3347,7 +3348,7 @@ ModInfo::Ptr MainWindow::previousModInList()
return {};
}
-void MainWindow::displayModInformation(const QString &modName, int tab)
+void MainWindow::displayModInformation(const QString &modName, ModInfoTabIDs tabID)
{
unsigned int index = ModInfo::getIndex(modName);
if (index == UINT_MAX) {
@@ -3356,14 +3357,14 @@ void MainWindow::displayModInformation(const QString &modName, int tab)
}
ModInfo::Ptr modInfo = ModInfo::getByIndex(index);
- displayModInformation(modInfo, index, tab);
+ displayModInformation(modInfo, index, tabID);
}
-void MainWindow::displayModInformation(int row, int tab)
+void MainWindow::displayModInformation(int row, ModInfoTabIDs tabID)
{
ModInfo::Ptr modInfo = ModInfo::getByIndex(row);
- displayModInformation(modInfo, row, tab);
+ displayModInformation(modInfo, row, tabID);
}
@@ -4048,16 +4049,18 @@ void MainWindow::on_modList_doubleClicked(const QModelIndex &index)
try {
m_ContextRow = m_ModListSortProxy->mapToSource(index).row();
sourceIdx.column();
- int tab = -1;
+
+ auto tab = ModInfoTabIDs::None;
+
switch (sourceIdx.column()) {
- case ModList::COL_NOTES: tab = ModInfoDialog::TAB_NOTES; break;
- case ModList::COL_VERSION: tab = ModInfoDialog::TAB_NEXUS; break;
- case ModList::COL_MODID: tab = ModInfoDialog::TAB_NEXUS; break;
- case ModList::COL_GAME: tab = ModInfoDialog::TAB_NEXUS; break;
- case ModList::COL_CATEGORY: tab = ModInfoDialog::TAB_CATEGORIES; break;
- case ModList::COL_FLAGS: tab = ModInfoDialog::TAB_CONFLICTS; break;
- default: tab = -1;
+ case ModList::COL_NOTES: tab = ModInfoTabIDs::Notes; break;
+ case ModList::COL_VERSION: tab = ModInfoTabIDs::Nexus; break;
+ case ModList::COL_MODID: tab = ModInfoTabIDs::Nexus; break;
+ case ModList::COL_GAME: tab = ModInfoTabIDs::Nexus; break;
+ case ModList::COL_CATEGORY: tab = ModInfoTabIDs::Categories; break;
+ case ModList::COL_FLAGS: tab = ModInfoTabIDs::Conflicts; break;
}
+
displayModInformation(sourceIdx.row(), tab);
// workaround to cancel the editor that might have opened because of
// selection-click
diff --git a/src/mainwindow.h b/src/mainwindow.h
index f204211e..00f15a2b 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -151,7 +151,8 @@ public:
virtual void disconnectPlugins();
- void displayModInformation(ModInfo::Ptr modInfo, unsigned int index, int tab);
+ void displayModInformation(
+ ModInfo::Ptr modInfo, unsigned int modIndex, ModInfoTabIDs tabID) override;
bool confirmExit();
@@ -235,7 +236,7 @@ private:
QList<MOBase::IOrganizer::FileInfo> findFileInfos(const QString &path, const std::function<bool (const MOBase::IOrganizer::FileInfo &)> &filter) const;
bool modifyExecutablesDialog();
- void displayModInformation(int row, int tab = -1);
+ void displayModInformation(int row, ModInfoTabIDs tab=ModInfoTabIDs::None);
void testExtractBSA(int modIndex);
void writeDataToFile(QFile &file, const QString &directory, const MOShared::DirectoryEntry &directoryEntry);
@@ -551,7 +552,7 @@ private slots:
void editCategories();
void deselectFilters();
- void displayModInformation(const QString &modName, int tab);
+ void displayModInformation(const QString &modName, ModInfoTabIDs tabID);
void modRenamed(const QString &oldName, const QString &newName);
void modRemoved(const QString &fileName);
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 4ef010e4..c8ffa35b 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -131,7 +131,7 @@ ModInfoDialog::ModInfoDialog(
ModInfo::Ptr mod) :
TutorableDialog("ModInfoDialog", mw),
ui(new Ui::ModInfoDialog), m_mainWindow(mw),
- m_core(core), m_plugin(plugin), m_initialTab(ETabs(-1)),
+ m_core(core), m_plugin(plugin), m_initialTab(ModInfoTabIDs::None),
m_arrangingTabs(false)
{
ui->setupUi(this);
@@ -155,16 +155,11 @@ ModInfoDialog::ModInfoDialog(
connect(
tabInfo.tab.get(), &ModInfoDialogTab::originModified,
- [this, i](int originID) {
- onOriginModified(originID);
- });
+ [this](int originID){ onOriginModified(originID); });
connect(
tabInfo.tab.get(), &ModInfoDialogTab::modOpen,
- [&](const QString& name){
- setMod(name);
- update();
- });
+ [&](const QString& name){ setMod(name); update(); });
connect(
tabInfo.tab.get(), &ModInfoDialogTab::hasDataChanged,
@@ -172,12 +167,7 @@ ModInfoDialog::ModInfoDialog(
connect(
tabInfo.tab.get(), &ModInfoDialogTab::wantsFocus,
- [&, i=static_cast<std::size_t>(i)]
- {
- if (i < m_tabs.size()) {
- switchToTab(ETabs(m_tabs[i].tab->tabID()));
- }
- });
+ [&, id=tabInfo.tab->tabID()]{ switchToTab(id); });
}
connect(ui->tabWidget, &QTabWidget::currentChanged, [&]{ onTabChanged(); });
@@ -187,32 +177,32 @@ ModInfoDialog::ModInfoDialog(
ModInfoDialog::~ModInfoDialog() = default;
template <class T>
-std::unique_ptr<ModInfoDialogTab> createTab(ModInfoDialog& d, int index)
+std::unique_ptr<ModInfoDialogTab> createTab(ModInfoDialog& d, ModInfoTabIDs id)
{
return std::make_unique<T>(ModInfoDialogTabContext(
- *d.m_core, *d.m_plugin, &d, d.ui.get(), index, d.m_mod, d.getOrigin()));
+ *d.m_core, *d.m_plugin, &d, d.ui.get(), id, d.m_mod, d.getOrigin()));
}
std::vector<ModInfoDialog::TabInfo> ModInfoDialog::createTabs()
{
std::vector<TabInfo> v;
- v.push_back(createTab<TextFilesTab>(*this, TAB_TEXTFILES));
- v.push_back(createTab<IniFilesTab>(*this, TAB_INIFILES));
- v.push_back(createTab<ImagesTab>(*this, TAB_IMAGES));
- v.push_back(createTab<ESPsTab>(*this, TAB_ESPS));
- v.push_back(createTab<ConflictsTab>(*this, TAB_CONFLICTS));
- v.push_back(createTab<CategoriesTab>(*this, TAB_CATEGORIES));
- v.push_back(createTab<NexusTab>(*this, TAB_NEXUS));
- v.push_back(createTab<NotesTab>(*this, TAB_NOTES));
- v.push_back(createTab<FileTreeTab>(*this, TAB_FILETREE));
+ v.push_back(createTab<TextFilesTab>(*this, ModInfoTabIDs::TextFiles));
+ v.push_back(createTab<IniFilesTab>(*this, ModInfoTabIDs::IniFiles));
+ v.push_back(createTab<ImagesTab>(*this, ModInfoTabIDs::Images));
+ v.push_back(createTab<ESPsTab>(*this, ModInfoTabIDs::Esps));
+ v.push_back(createTab<ConflictsTab>(*this, ModInfoTabIDs::Conflicts));
+ v.push_back(createTab<CategoriesTab>(*this, ModInfoTabIDs::Categories));
+ v.push_back(createTab<NexusTab>(*this, ModInfoTabIDs::Nexus));
+ v.push_back(createTab<NotesTab>(*this, ModInfoTabIDs::Notes));
+ v.push_back(createTab<FileTreeTab>(*this, ModInfoTabIDs::Filetree));
return v;
}
int ModInfoDialog::exec()
{
- const auto selectFirst = (m_initialTab == -1);
+ const auto selectFirst = (m_initialTab == ModInfoTabIDs::None);
update(true);
@@ -252,7 +242,7 @@ void ModInfoDialog::setMod(const QString& name)
setMod(mod);
}
-void ModInfoDialog::setTab(ETabs id)
+void ModInfoDialog::setTab(ModInfoTabIDs id)
{
if (!isVisible()) {
m_initialTab = id;
@@ -288,9 +278,9 @@ void ModInfoDialog::update(bool firstTime)
updateTabs();
- if (m_initialTab >= 0) {
+ if (m_initialTab != ModInfoTabIDs::None) {
switchToTab(m_initialTab);
- m_initialTab = ETabs(-1);
+ m_initialTab = ModInfoTabIDs::None;
}
if (ui->tabWidget->currentIndex() == oldTab) {
@@ -335,11 +325,11 @@ void ModInfoDialog::setTabsVisibility(bool firstTime)
// remember selection
const int selIndex = ui->tabWidget->currentIndex();
- ETabs sel = ETabs(-1);
+ auto sel = ModInfoTabIDs::None;
for (const auto& tabInfo : m_tabs) {
if (tabInfo.realPos == selIndex) {
- sel = ETabs(tabInfo.tab->tabID());
+ sel = tabInfo.tab->tabID();
break;
}
}
@@ -420,7 +410,7 @@ void ModInfoDialog::setTabsColors()
}
}
-void ModInfoDialog::switchToTab(ETabs id)
+void ModInfoDialog::switchToTab(ModInfoTabIDs id)
{
for (const auto& tabInfo : m_tabs) {
if (tabInfo.tab->tabID() == id) {
@@ -429,7 +419,8 @@ void ModInfoDialog::switchToTab(ETabs id)
}
}
- qDebug() << "can't switch to tab " << id << ", not available";
+ qDebug()
+ << "can't switch to tab ID " << static_cast<int>(id) << ", not available";
}
MOShared::FilesOrigin* ModInfoDialog::getOrigin()
@@ -525,7 +516,8 @@ std::vector<QString> ModInfoDialog::getOrderedTabNames() const
return v;
}
-void ModInfoDialog::reAddTabs(const std::vector<bool>& visibility, ETabs sel)
+void ModInfoDialog::reAddTabs(
+ const std::vector<bool>& visibility, ModInfoTabIDs sel)
{
Q_ASSERT(visibility.size() == m_tabs.size());
diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 9eb00a3b..effb5d98 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -24,6 +24,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include "modinfo.h"
#include "tutorabledialog.h"
#include "filerenamer.h"
+#include "modinfodialogfwd.h"
namespace Ui { class ModInfoDialog; }
namespace MOShared { class FilesOrigin; }
@@ -34,32 +35,6 @@ class Settings;
class ModInfoDialogTab;
class MainWindow;
-bool canPreviewFile(PluginContainer& pluginContainer, bool isArchive, const QString& filename);
-bool canOpenFile(bool isArchive, const QString& filename);
-bool canExploreFile(bool isArchive, const QString& filename);
-bool canHideFile(bool isArchive, const QString& filename);
-bool canUnhideFile(bool isArchive, const QString& filename);
-
-FileRenamer::RenameResults hideFile(FileRenamer& renamer, const QString &oldName);
-FileRenamer::RenameResults unhideFile(FileRenamer& renamer, const QString &oldName);
-
-int naturalCompare(const QString& a, const QString& b);
-
-
-class ElideLeftDelegate : public QStyledItemDelegate
-{
-public:
- using QStyledItemDelegate::QStyledItemDelegate;
-
-protected:
- void initStyleOption(QStyleOptionViewItem* o, const QModelIndex& i) const
- {
- QStyledItemDelegate::initStyleOption(o, i);
- o->textElideMode = Qt::ElideLeft;
- }
-};
-
-
/**
* this is a larger dialog used to visualise information about the mod.
* @todo this would probably a good place for a plugin-system
@@ -70,21 +45,9 @@ class ModInfoDialog : public MOBase::TutorableDialog
template <class T>
friend std::unique_ptr<ModInfoDialogTab> createTab(
- ModInfoDialog& d, int index);
+ ModInfoDialog& d, ModInfoTabIDs index);
public:
- enum ETabs {
- TAB_TEXTFILES,
- TAB_INIFILES,
- TAB_IMAGES,
- TAB_ESPS,
- TAB_CONFLICTS,
- TAB_CATEGORIES,
- TAB_NEXUS,
- TAB_NOTES,
- TAB_FILETREE
- };
-
ModInfoDialog(
MainWindow* mw, OrganizerCore* core, PluginContainer* plugin,
ModInfo::Ptr mod);
@@ -93,7 +56,8 @@ public:
void setMod(ModInfo::Ptr mod);
void setMod(const QString& name);
- void setTab(ETabs id);
+
+ void setTab(ModInfoTabIDs id);
int exec() override;
@@ -130,7 +94,7 @@ private:
OrganizerCore* m_core;
PluginContainer* m_plugin;
std::vector<TabInfo> m_tabs;
- ETabs m_initialTab;
+ ModInfoTabIDs m_initialTab;
bool m_arrangingTabs;
std::vector<TabInfo> createTabs();
@@ -144,8 +108,8 @@ private:
void updateTabs(bool becauseOriginChanged=false);
void feedFiles(bool becauseOriginChanged);
void setTabsColors();
- void switchToTab(ETabs id);
- void reAddTabs(const std::vector<bool>& visibility, ETabs sel);
+ void switchToTab(ModInfoTabIDs id);
+ void reAddTabs(const std::vector<bool>& visibility, ModInfoTabIDs sel);
std::vector<QString> getOrderedTabNames() const;
bool tryClose();
diff --git a/src/modinfodialogfwd.h b/src/modinfodialogfwd.h
new file mode 100644
index 00000000..9ede766f
--- /dev/null
+++ b/src/modinfodialogfwd.h
@@ -0,0 +1,50 @@
+#ifndef MODINFODIALOGFWD_H
+#define MODINFODIALOGFWD_H
+
+#include "filerenamer.h"
+
+class ModInfo;
+using ModInfoPtr = QSharedPointer<ModInfo>;
+
+enum class ModInfoTabIDs
+{
+ None = -1,
+ TextFiles = 0,
+ IniFiles,
+ Images,
+ Esps,
+ Conflicts,
+ Categories,
+ Nexus,
+ Notes,
+ Filetree
+};
+
+class PluginContainer;
+
+bool canPreviewFile(PluginContainer& pluginContainer, bool isArchive, const QString& filename);
+bool canOpenFile(bool isArchive, const QString& filename);
+bool canExploreFile(bool isArchive, const QString& filename);
+bool canHideFile(bool isArchive, const QString& filename);
+bool canUnhideFile(bool isArchive, const QString& filename);
+
+FileRenamer::RenameResults hideFile(FileRenamer& renamer, const QString &oldName);
+FileRenamer::RenameResults unhideFile(FileRenamer& renamer, const QString &oldName);
+
+int naturalCompare(const QString& a, const QString& b);
+
+
+class ElideLeftDelegate : public QStyledItemDelegate
+{
+public:
+ using QStyledItemDelegate::QStyledItemDelegate;
+
+protected:
+ void initStyleOption(QStyleOptionViewItem* o, const QModelIndex& i) const
+ {
+ QStyledItemDelegate::initStyleOption(o, i);
+ o->textElideMode = Qt::ElideLeft;
+ }
+};
+
+#endif // MODINFODIALOGFWD_H
diff --git a/src/modinfodialognexus.cpp b/src/modinfodialognexus.cpp
index 81546f58..04683c89 100644
--- a/src/modinfodialognexus.cpp
+++ b/src/modinfodialognexus.cpp
@@ -108,7 +108,7 @@ void NexusTab::firstActivation()
updateWebpage();
}
-void NexusTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
+void NexusTab::setMod(ModInfoPtr mod, MOShared::FilesOrigin* origin)
{
cleanup();
diff --git a/src/modinfodialognexus.h b/src/modinfodialognexus.h
index 6478375b..7f894dbf 100644
--- a/src/modinfodialognexus.h
+++ b/src/modinfodialognexus.h
@@ -40,7 +40,7 @@ public:
void clear() override;
void update() override;
void firstActivation() override;
- void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin) override;
+ void setMod(ModInfoPtr mod, MOShared::FilesOrigin* origin) override;
bool usesOriginFiles() const override;
private:
diff --git a/src/modinfodialogtab.cpp b/src/modinfodialogtab.cpp
index 554df6df..9748d059 100644
--- a/src/modinfodialogtab.cpp
+++ b/src/modinfodialogtab.cpp
@@ -2,6 +2,7 @@
#include "ui_modinfodialog.h"
#include "texteditor.h"
#include "directoryentry.h"
+#include "modinfo.h"
ModInfoDialogTab::ModInfoDialogTab(ModInfoDialogTabContext cx) :
ui(cx.ui), m_core(cx.core), m_plugin(cx.plugin), m_parent(cx.parent),
@@ -74,7 +75,7 @@ bool ModInfoDialogTab::usesOriginFiles() const
return true;
}
-void ModInfoDialogTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
+void ModInfoDialogTab::setMod(ModInfoPtr mod, MOShared::FilesOrigin* origin)
{
m_mod = mod;
m_origin = origin;
@@ -86,7 +87,7 @@ ModInfo& ModInfoDialogTab::mod() const
return *m_mod;
}
-ModInfo::Ptr ModInfoDialogTab::modPtr() const
+ModInfoPtr ModInfoDialogTab::modPtr() const
{
Q_ASSERT(m_mod);
return m_mod;
@@ -97,7 +98,7 @@ MOShared::FilesOrigin* ModInfoDialogTab::origin() const
return m_origin;
}
-int ModInfoDialogTab::tabID() const
+ModInfoTabIDs ModInfoDialogTab::tabID() const
{
return m_tabID;
}
diff --git a/src/modinfodialogtab.h b/src/modinfodialogtab.h
index eb574de0..283d9e73 100644
--- a/src/modinfodialogtab.h
+++ b/src/modinfodialogtab.h
@@ -1,7 +1,7 @@
#ifndef MODINFODIALOGTAB_H
#define MODINFODIALOGTAB_H
-#include "modinfo.h"
+#include "modinfodialogfwd.h"
#include <QObject>
namespace MOShared { class FilesOrigin; }
@@ -18,8 +18,8 @@ struct ModInfoDialogTabContext
PluginContainer& plugin;
QWidget* parent;
Ui::ModInfoDialog* ui;
- int id;
- ModInfo::Ptr mod;
+ ModInfoTabIDs id;
+ ModInfoPtr mod;
MOShared::FilesOrigin* origin;
ModInfoDialogTabContext(
@@ -27,8 +27,8 @@ struct ModInfoDialogTabContext
PluginContainer& plugin,
QWidget* parent,
Ui::ModInfoDialog* ui,
- int id,
- ModInfo::Ptr mod,
+ ModInfoTabIDs id,
+ ModInfoPtr mod,
MOShared::FilesOrigin* origin) :
core(core), plugin(plugin), parent(parent), ui(ui), id(id),
mod(mod), origin(origin)
@@ -96,7 +96,7 @@ public:
// derived classes can override this to connect to events on the mod for
// examples (see NexusTab), but must call the base class implementation
//
- virtual void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin);
+ virtual void setMod(ModInfoPtr mod, MOShared::FilesOrigin* origin);
// this tab should clear its user interface; clear() will always be called
// before feedFile() and update()
@@ -195,7 +195,7 @@ public:
// returns the currently selected mod, can never be empty
//
- ModInfo::Ptr modPtr() const;
+ ModInfoPtr modPtr() const;
// returns the origin of the selected mod; this can be null for mods that
// don't have an origin, like deactivated mods
@@ -203,7 +203,7 @@ public:
MOShared::FilesOrigin* origin() const;
- int tabID() const;
+ ModInfoTabIDs tabID() const;
bool hasData() const;
signals:
@@ -249,9 +249,9 @@ private:
OrganizerCore& m_core;
PluginContainer& m_plugin;
QWidget* m_parent;
- ModInfo::Ptr m_mod;
+ ModInfoPtr m_mod;
MOShared::FilesOrigin* m_origin;
- int m_tabID;
+ ModInfoTabIDs m_tabID;
bool m_hasData;
bool m_firstActivation;
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index e073924b..99ddda1d 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -966,8 +966,8 @@ MOBase::IModInterface *OrganizerCore::installMod(const QString &fileName,
"want to configure them now?"),
QMessageBox::Yes | QMessageBox::No)
== QMessageBox::Yes)) {
- m_UserInterface->displayModInformation(modInfo, modIndex,
- ModInfoDialog::TAB_INIFILES);
+ m_UserInterface->displayModInformation(
+ modInfo, modIndex, ModInfoTabIDs::IniFiles);
}
m_ModInstalled(modName);
m_DownloadManager.markInstalled(fileName);
@@ -1033,8 +1033,8 @@ void OrganizerCore::installDownload(int index)
"want to configure them now?"),
QMessageBox::Yes | QMessageBox::No)
== QMessageBox::Yes)) {
- m_UserInterface->displayModInformation(modInfo, modIndex,
- ModInfoDialog::TAB_INIFILES);
+ m_UserInterface->displayModInformation(
+ modInfo, modIndex, ModInfoTabIDs::IniFiles);
}
m_ModInstalled(modName);
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-22 03:02:32 +0000