summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mainwindow.cpp2
-rw-r--r--src/modinfodialog.cpp204
-rw-r--r--src/modinfodialog.h17
-rw-r--r--src/modinfodialog.ui2
-rw-r--r--src/modinfodialogcategories.cpp4
-rw-r--r--src/modinfodialogcategories.h2
-rw-r--r--src/modinfodialogconflicts.cpp4
-rw-r--r--src/modinfodialogconflicts.h2
-rw-r--r--src/modinfodialogesps.cpp4
-rw-r--r--src/modinfodialogesps.h2
-rw-r--r--src/modinfodialogfiletree.cpp4
-rw-r--r--src/modinfodialogfiletree.h2
-rw-r--r--src/modinfodialogimages.cpp4
-rw-r--r--src/modinfodialogimages.h2
-rw-r--r--src/modinfodialognexus.cpp4
-rw-r--r--src/modinfodialognexus.h2
-rw-r--r--src/modinfodialogtab.cpp8
-rw-r--r--src/modinfodialogtab.h6
-rw-r--r--src/modinfodialogtextfiles.cpp12
-rw-r--r--src/modinfodialogtextfiles.h6
20 files changed, 182 insertions, 111 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 67dc8418..d75e8d9d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3230,7 +3230,7 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
//Open the tab first if we want to use the standard indexes of the tabs.
if (tab != -1) {
- dialog.setTab(tab);
+ dialog.setTab(ModInfoDialog::ETabs(tab));
}
dialog.restoreState(m_OrganizerCore.settings());
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index ad704ce8..c03739ca 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -104,7 +104,7 @@ ModInfoDialog::ModInfoDialog(
MainWindow* mw, OrganizerCore* core, PluginContainer* plugin) :
TutorableDialog("ModInfoDialog", mw),
ui(new Ui::ModInfoDialog), m_mainWindow(mw),
- m_core(core), m_plugin(plugin), m_initialTab(-1)
+ m_core(core), m_plugin(plugin), m_initialTab(ETabs(-1))
{
ui->setupUi(this);
@@ -123,7 +123,6 @@ ModInfoDialog::ModInfoDialog(
tabInfo.widget = ui->tabWidget->widget(i);
tabInfo.caption = ui->tabWidget->tabText(i);
tabInfo.icon = ui->tabWidget->tabIcon(i);
- tabInfo.realPos = i;
connect(
tabInfo.tab.get(), &ModInfoDialogTab::originModified,
@@ -159,7 +158,16 @@ std::vector<ModInfoDialog::TabInfo> ModInfoDialog::createTabs()
int ModInfoDialog::exec()
{
- update();
+ const auto selectFirst = (m_initialTab == -1);
+
+ update(true);
+
+ if (selectFirst) {
+ if (ui->tabWidget->count() > 0) {
+ ui->tabWidget->setCurrentIndex(0);
+ }
+ }
+
return TutorableDialog::exec();
}
@@ -185,33 +193,34 @@ void ModInfoDialog::setMod(const QString& name)
setMod(mod);
}
-void ModInfoDialog::setTab(int index)
+void ModInfoDialog::setTab(ETabs id)
{
if (!isVisible()) {
- m_initialTab = index;
+ m_initialTab = id;
return;
}
- switchToTab(index);
+ switchToTab(id);
}
-void ModInfoDialog::update()
+void ModInfoDialog::update(bool firstTime)
{
setWindowTitle(m_mod->name());
- setTabsVisibility();
+ setTabsVisibility(firstTime);
updateTabs();
feedFiles();
setTabsColors();
if (m_initialTab >= 0) {
switchToTab(m_initialTab);
- m_initialTab = -1;
+ m_initialTab = ETabs(-1);
}
}
-void ModInfoDialog::setTabsVisibility()
+void ModInfoDialog::setTabsVisibility(bool firstTime)
{
std::vector<bool> visibility(m_tabs.size());
+
bool changed = false;
for (std::size_t i=0; i<m_tabs.size(); ++i) {
@@ -234,26 +243,22 @@ void ModInfoDialog::setTabsVisibility()
visibility[i] = visible;
}
- if (!changed) {
+ if (!firstTime && !changed) {
return;
}
// remember selection
- const int sel = ui->tabWidget->currentIndex();
-
- // remove all tabs
- ui->tabWidget->clear();
-
- // add visible tabs
- for (std::size_t i=0; i<visibility.size(); ++i) {
- if (visibility[i]) {
- ui->tabWidget->addTab(m_tabs[i].widget, m_tabs[i].icon, m_tabs[i].caption);
+ const int selIndex = ui->tabWidget->currentIndex();
+ ETabs sel = ETabs(-1);
- if (static_cast<int>(i) == sel) {
- ui->tabWidget->setCurrentIndex(static_cast<int>(i));
- }
+ for (const auto& tabInfo : m_tabs) {
+ if (tabInfo.realPos == selIndex) {
+ sel = ETabs(tabInfo.tab->tabID());
+ break;
}
}
+
+ reAddTabs(visibility, sel);
}
void ModInfoDialog::updateTabs()
@@ -296,19 +301,16 @@ void ModInfoDialog::setTabsColors()
}
}
-void ModInfoDialog::switchToTab(std::size_t index)
+void ModInfoDialog::switchToTab(ETabs id)
{
- if (index >= m_tabs.size()) {
- qCritical() << "tab index " << index << "out of range";
- return;
- }
-
- if (ui->tabWidget->indexOf(m_tabs[index].widget) == -1) {
- qCritical() << "can't switch to tab " << index << ", not available";
- return;
+ for (const auto& tabInfo : m_tabs) {
+ if (tabInfo.tab->tabID() == id) {
+ ui->tabWidget->setCurrentIndex(tabInfo.realPos);
+ return;
+ }
}
- ui->tabWidget->setCurrentIndex(m_tabs[index].realPos);
+ qDebug() << "can't switch to tab " << id << ", not available";
}
MOShared::FilesOrigin* ModInfoDialog::getOrigin()
@@ -328,7 +330,10 @@ MOShared::FilesOrigin* ModInfoDialog::getOrigin()
void ModInfoDialog::saveState(Settings& s) const
{
- //s.directInterface().setValue("mod_info_tabs", saveTabState());
+ const auto tabState = saveTabState();
+ if (!tabState.isEmpty()) {
+ s.directInterface().setValue("mod_info_tabs", tabState);
+ }
for (const auto& tabInfo : m_tabs) {
tabInfo.tab->saveState(s);
@@ -337,55 +342,120 @@ void ModInfoDialog::saveState(Settings& s) const
void ModInfoDialog::restoreState(const Settings& s)
{
- //restoreTabState(s.directInterface().value("mod_info_tabs").toByteArray());
-
for (const auto& tabInfo : m_tabs) {
tabInfo.tab->restoreState(s);
}
}
-QByteArray ModInfoDialog::saveTabState() const
+QString ModInfoDialog::saveTabState() const
{
- QByteArray result;
- /*QDataStream stream(&result, QIODevice::WriteOnly);
- stream << ui->tabWidget->count();
- for (int i = 0; i < ui->tabWidget->count(); ++i) {
- stream << ui->tabWidget->widget(i)->objectName();
- }*/
+ if (static_cast<int>(m_tabs.size()) != ui->tabWidget->count()) {
+ // only save tab state when all tabs are visible
+ return {};
+ }
+
+ QString result;
+ QTextStream stream(&result);
+
+ for (int i=0; i<ui->tabWidget->count(); ++i) {
+ stream << ui->tabWidget->widget(i)->objectName() << " ";
+ }
+
+ return result.trimmed();
+}
+
+std::vector<QString> ModInfoDialog::getOrderedTabNames() const
+{
+ const auto value = Settings::instance()
+ .directInterface().value("mod_info_tabs");
+
+ std::vector<QString> v;
+
+ if (value.type() == QVariant::ByteArray) {
+ // old byte array
+ QDataStream stream(value.toByteArray());
+
+ int count = 0;
+ stream >> count;
+
+ for (int i=0; i<count; ++i) {
+ QString s;
+ stream >> s;
+ v.emplace_back(std::move(s));
+ }
+ } else {
+ // string list
+ QString string = value.toString();
+ QTextStream stream(&string);
- return result;
+ while (!stream.atEnd()) {
+ QString s;
+ stream >> s;
+ v.emplace_back(std::move(s));
+ }
+ }
+
+ return v;
}
-void ModInfoDialog::restoreTabState(const QByteArray &state)
+void ModInfoDialog::reAddTabs(const std::vector<bool>& visibility, ETabs sel)
{
- /*QDataStream stream(state);
- int count = 0;
- stream >> count;
+ Q_ASSERT(visibility.size() == m_tabs.size());
- QStringList tabIds;
+ // ordered tab names from settings
+ const auto orderedNames = getOrderedTabNames();
+
+ bool canSort = true;
+
+ // gathering visible tabs
+ std::vector<TabInfo*> visibleTabs;
+ for (std::size_t i=0; i<m_tabs.size(); ++i) {
+ if (visibility[i]) {
+ visibleTabs.push_back(&m_tabs[i]);
- // first, only determine the new mapping
- for (int newPos = 0; newPos < count; ++newPos) {
- QString tabId;
- stream >> tabId;
- tabIds.append(tabId);
- int oldPos = tabIndex(tabId);
- if (oldPos != -1) {
- m_realTabPos[newPos] = oldPos;
- } else {
- m_realTabPos[newPos] = newPos;
+ if (canSort) {
+ const auto objectName = m_tabs[i].widget->objectName();
+ auto itor = std::find(orderedNames.begin(), orderedNames.end(), objectName);
+ if (itor == orderedNames.end()) {
+ qCritical() << "can't sort tabs, '" << objectName << "' not found";
+ canSort = false;
+ }
+ }
}
}
- // then actually move the tabs
- QTabBar *tabBar = ui->tabWidget->tabBar();
- ui->tabWidget->blockSignals(true);
- for (int newPos = 0; newPos < count; ++newPos) {
- QString tabId = tabIds.at(newPos);
- int oldPos = tabIndex(tabId);
- tabBar->moveTab(oldPos, newPos);
+ // sorting tabs
+ if (canSort) {
+ std::sort(visibleTabs.begin(), visibleTabs.end(), [&](auto&& a, auto&& b){
+ auto aItor = std::find(orderedNames.begin(), orderedNames.end(), a->widget->objectName());
+ auto bItor = std::find(orderedNames.begin(), orderedNames.end(), b->widget->objectName());
+
+ // this was checked above
+ Q_ASSERT(aItor != orderedNames.end() && bItor != orderedNames.end());
+
+ return (aItor < bItor);
+ });
+ }
+
+
+ ui->tabWidget->clear();
+
+ // reset real positions
+ for (auto& tabInfo : m_tabs) {
+ tabInfo.realPos = -1;
+ }
+
+ // add visible tabs
+ for (std::size_t i=0; i<visibleTabs.size(); ++i) {
+ auto& tabInfo = *visibleTabs[i];
+
+ tabInfo.realPos = static_cast<int>(i);
+ ui->tabWidget->addTab(tabInfo.widget, tabInfo.icon, tabInfo.caption);
+
+ if (tabInfo.tab->tabID() == sel) {
+ ui->tabWidget->setCurrentIndex(static_cast<int>(i));
+ }
}
- ui->tabWidget->blockSignals(false);*/
}
int ModInfoDialog::tabIndex(const QString& tabId)
diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 1cefc71a..54e056b8 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -64,7 +64,6 @@ public:
TAB_FILETREE
};
-public:
/**
* @brief constructor
*
@@ -91,7 +90,7 @@ public:
void setMod(ModInfo::Ptr mod);
void setMod(const QString& name);
- void setTab(int index);
+ void setTab(ETabs id);
int exec() override;
@@ -125,20 +124,22 @@ private:
OrganizerCore* m_core;
PluginContainer* m_plugin;
std::vector<TabInfo> m_tabs;
- int m_initialTab;
+ ETabs m_initialTab;
std::vector<TabInfo> createTabs();
- void restoreTabState(const QByteArray &state);
- QByteArray saveTabState() const;
- void update();
+ void restoreTabState(const QString& state);
+ QString saveTabState() const;
+ void update(bool firstTime=false);
void onDeleteShortcut();
int tabIndex(const QString &tabId);
MOShared::FilesOrigin* getOrigin();
- void setTabsVisibility();
+ void setTabsVisibility(bool firstTime);
void updateTabs();
void feedFiles();
void setTabsColors();
- void switchToTab(std::size_t index);
+ void switchToTab(ETabs id);
+ void reAddTabs(const std::vector<bool>& visibility, ETabs sel);
+ std::vector<QString> getOrderedTabNames() const;
template <class T>
std::unique_ptr<ModInfoDialogTab> createTab(int index)
diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index 93550de3..40b3c7b4 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -1088,7 +1088,7 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabFiles1">
+ <widget class="QWidget" name="tabFiles">
<attribute name="title">
<string>Filetree</string>
</attribute>
diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
index bce1162b..4bd10028 100644
--- a/src/modinfodialogcategories.cpp
+++ b/src/modinfodialogcategories.cpp
@@ -5,8 +5,8 @@
CategoriesTab::CategoriesTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index)
- : ModInfoDialogTab(oc, plugin, parent, ui, index)
+ QWidget* parent, Ui::ModInfoDialog* ui, int id)
+ : ModInfoDialogTab(oc, plugin, parent, ui, id)
{
connect(
ui->categories, &QTreeWidget::itemChanged,
diff --git a/src/modinfodialogcategories.h b/src/modinfodialogcategories.h
index 29d0b2a5..738b4e4d 100644
--- a/src/modinfodialogcategories.h
+++ b/src/modinfodialogcategories.h
@@ -7,7 +7,7 @@ class CategoriesTab : public ModInfoDialogTab
public:
CategoriesTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index);
+ QWidget* parent, Ui::ModInfoDialog* ui, int id);
void clear() override;
void update() override;
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index ad3b5e5f..7f297ec3 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -133,8 +133,8 @@ public:
ConflictsTab::ConflictsTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index) :
- ModInfoDialogTab(oc, plugin, parent, ui, index),
+ QWidget* parent, Ui::ModInfoDialog* ui, int id) :
+ ModInfoDialogTab(oc, plugin, parent, ui, id),
m_general(this, ui, oc), m_advanced(this, ui, oc)
{
connect(
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index 38fa6a74..1f82a7c0 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -97,7 +97,7 @@ class ConflictsTab : public ModInfoDialogTab
public:
ConflictsTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index);
+ QWidget* parent, Ui::ModInfoDialog* ui, int id);
void update() override;
void clear() override;
diff --git a/src/modinfodialogesps.cpp b/src/modinfodialogesps.cpp
index d0dcaf2b..6c4fc4dd 100644
--- a/src/modinfodialogesps.cpp
+++ b/src/modinfodialogesps.cpp
@@ -124,8 +124,8 @@ private:
ESPsTab::ESPsTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index)
- : ModInfoDialogTab(oc, plugin, parent, ui, index)
+ QWidget* parent, Ui::ModInfoDialog* ui, int id)
+ : ModInfoDialogTab(oc, plugin, parent, ui, id)
{
QObject::connect(
ui->activateESP, &QToolButton::clicked, [&]{ onActivate(); });
diff --git a/src/modinfodialogesps.h b/src/modinfodialogesps.h
index d8c8997e..e82ed368 100644
--- a/src/modinfodialogesps.h
+++ b/src/modinfodialogesps.h
@@ -12,7 +12,7 @@ class ESPsTab : public ModInfoDialogTab
public:
ESPsTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index);
+ QWidget* parent, Ui::ModInfoDialog* ui, int id);
void clear() override;
bool feedFile(const QString& rootPath, const QString& fullPath) override;
diff --git a/src/modinfodialogfiletree.cpp b/src/modinfodialogfiletree.cpp
index dae37f25..b57f6b5d 100644
--- a/src/modinfodialogfiletree.cpp
+++ b/src/modinfodialogfiletree.cpp
@@ -15,8 +15,8 @@ const int max_scan_for_context_menu = 50;
FileTreeTab::FileTreeTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index)
- : ModInfoDialogTab(oc, plugin, parent, ui, index), m_fs(nullptr)
+ QWidget* parent, Ui::ModInfoDialog* ui, int id)
+ : ModInfoDialogTab(oc, plugin, parent, ui, id), m_fs(nullptr)
{
m_fs = new QFileSystemModel(this);
m_fs->setReadOnly(false);
diff --git a/src/modinfodialogfiletree.h b/src/modinfodialogfiletree.h
index d0c36edc..2145f298 100644
--- a/src/modinfodialogfiletree.h
+++ b/src/modinfodialogfiletree.h
@@ -8,7 +8,7 @@ class FileTreeTab : public ModInfoDialogTab
public:
FileTreeTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index);
+ QWidget* parent, Ui::ModInfoDialog* ui, int id);
void clear() override;
void update() override;
diff --git a/src/modinfodialogimages.cpp b/src/modinfodialogimages.cpp
index 9a60fc8e..f4cdade8 100644
--- a/src/modinfodialogimages.cpp
+++ b/src/modinfodialogimages.cpp
@@ -82,8 +82,8 @@ void ScalableImage::mousePressEvent(QMouseEvent* e)
ImagesTab::ImagesTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index) :
- ModInfoDialogTab(oc, plugin, parent, ui, index),
+ QWidget* parent, Ui::ModInfoDialog* ui, int id) :
+ ModInfoDialogTab(oc, plugin, parent, ui, id),
m_image(new ScalableImage)
{
ui->imagesImage->layout()->addWidget(m_image);
diff --git a/src/modinfodialogimages.h b/src/modinfodialogimages.h
index 60271da0..6603660a 100644
--- a/src/modinfodialogimages.h
+++ b/src/modinfodialogimages.h
@@ -36,7 +36,7 @@ class ImagesTab : public ModInfoDialogTab
public:
ImagesTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index);
+ QWidget* parent, Ui::ModInfoDialog* ui, int id);
void clear() override;
bool feedFile(const QString& rootPath, const QString& fullPath) override;
diff --git a/src/modinfodialognexus.cpp b/src/modinfodialognexus.cpp
index 61b868d1..172968ab 100644
--- a/src/modinfodialognexus.cpp
+++ b/src/modinfodialognexus.cpp
@@ -9,8 +9,8 @@
NexusTab::NexusTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index)
- : ModInfoDialogTab(oc, plugin, parent, ui, index), m_requestStarted(false)
+ QWidget* parent, Ui::ModInfoDialog* ui, int id)
+ : ModInfoDialogTab(oc, plugin, parent, ui, id), m_requestStarted(false)
{
ui->modID->setValidator(new QIntValidator(ui->modID));
ui->endorse->setVisible(core().settings().endorsementIntegration());
diff --git a/src/modinfodialognexus.h b/src/modinfodialognexus.h
index 7fe10171..ce1ef426 100644
--- a/src/modinfodialognexus.h
+++ b/src/modinfodialognexus.h
@@ -35,7 +35,7 @@ class NexusTab : public ModInfoDialogTab
public:
NexusTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index);
+ QWidget* parent, Ui::ModInfoDialog* ui, int id);
~NexusTab();
diff --git a/src/modinfodialogtab.cpp b/src/modinfodialogtab.cpp
index e50aec29..2f5fbdb8 100644
--- a/src/modinfodialogtab.cpp
+++ b/src/modinfodialogtab.cpp
@@ -5,9 +5,9 @@
ModInfoDialogTab::ModInfoDialogTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index) :
+ QWidget* parent, Ui::ModInfoDialog* ui, int id) :
ui(ui), m_core(oc), m_plugin(plugin), m_parent(parent),
- m_origin(nullptr), m_tabIndex(index), m_hasData(false)
+ m_origin(nullptr), m_tabID(id), m_hasData(false)
{
}
@@ -69,9 +69,9 @@ MOShared::FilesOrigin* ModInfoDialogTab::origin() const
return m_origin;
}
-int ModInfoDialogTab::tabIndex() const
+int ModInfoDialogTab::tabID() const
{
- return m_tabIndex;
+ return m_tabID;
}
bool ModInfoDialogTab::hasData() const
diff --git a/src/modinfodialogtab.h b/src/modinfodialogtab.h
index 8fe7d2d4..fae5bc41 100644
--- a/src/modinfodialogtab.h
+++ b/src/modinfodialogtab.h
@@ -37,7 +37,7 @@ public:
ModInfo::Ptr mod() const;
MOShared::FilesOrigin* origin() const;
- int tabIndex() const;
+ int tabID() const;
bool hasData() const;
signals:
@@ -49,7 +49,7 @@ protected:
ModInfoDialogTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index);
+ QWidget* parent, Ui::ModInfoDialog* ui, int id);
OrganizerCore& core();
PluginContainer& plugin();
@@ -66,7 +66,7 @@ private:
QWidget* m_parent;
ModInfo::Ptr m_mod;
MOShared::FilesOrigin* m_origin;
- int m_tabIndex;
+ int m_tabID;
bool m_hasData;
};
diff --git a/src/modinfodialogtextfiles.cpp b/src/modinfodialogtextfiles.cpp
index bd175c24..7c8e84c7 100644
--- a/src/modinfodialogtextfiles.cpp
+++ b/src/modinfodialogtextfiles.cpp
@@ -23,9 +23,9 @@ private:
GenericFilesTab::GenericFilesTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index,
+ QWidget* parent, Ui::ModInfoDialog* ui, int id,
QListWidget* list, QSplitter* sp, TextEditor* e)
- : ModInfoDialogTab(oc, plugin, parent, ui, index), m_list(list), m_editor(e)
+ : ModInfoDialogTab(oc, plugin, parent, ui, id), m_list(list), m_editor(e)
{
m_editor->setupToolbar();
@@ -115,9 +115,9 @@ void GenericFilesTab::select(FileListItem* item)
TextFilesTab::TextFilesTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index)
+ QWidget* parent, Ui::ModInfoDialog* ui, int id)
: GenericFilesTab(
- oc, plugin, parent, ui, index,
+ oc, plugin, parent, ui, id,
ui->textFileList, ui->tabTextSplitter, ui->textFileEditor)
{
}
@@ -139,9 +139,9 @@ bool TextFilesTab::wantsFile(const QString& rootPath, const QString& fullPath) c
IniFilesTab::IniFilesTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index)
+ QWidget* parent, Ui::ModInfoDialog* ui, int id)
: GenericFilesTab(
- oc, plugin, parent, ui, index,
+ oc, plugin, parent, ui, id,
ui->iniFileList, ui->tabIniSplitter, ui->iniFileEditor)
{
}
diff --git a/src/modinfodialogtextfiles.h b/src/modinfodialogtextfiles.h
index f618a6bb..75f31d88 100644
--- a/src/modinfodialogtextfiles.h
+++ b/src/modinfodialogtextfiles.h
@@ -23,7 +23,7 @@ protected:
GenericFilesTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index,
+ QWidget* parent, Ui::ModInfoDialog* ui, int id,
QListWidget* list, QSplitter* splitter, TextEditor* editor);
virtual bool wantsFile(const QString& rootPath, const QString& fullPath) const = 0;
@@ -39,7 +39,7 @@ class TextFilesTab : public GenericFilesTab
public:
TextFilesTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index);
+ QWidget* parent, Ui::ModInfoDialog* ui, int id);
protected:
bool wantsFile(const QString& rootPath, const QString& fullPath) const override;
@@ -51,7 +51,7 @@ class IniFilesTab : public GenericFilesTab
public:
IniFilesTab(
OrganizerCore& oc, PluginContainer& plugin,
- QWidget* parent, Ui::ModInfoDialog* ui, int index);
+ QWidget* parent, Ui::ModInfoDialog* ui, int id);
protected:
bool wantsFile(const QString& rootPath, const QString& fullPath) const override;
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-22 03:10:37 +0000