From a72573b385a941adf7d662b8df5c8e35309fdd45 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 21 Jun 2019 22:42:14 -0400
Subject: split categories tab

---
 src/modinfodialogcategories.cpp | 129 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 src/modinfodialogcategories.cpp

(limited to 'src/modinfodialogcategories.cpp')

diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
new file mode 100644
index 00000000..7df13aea
--- /dev/null
+++ b/src/modinfodialogcategories.cpp
@@ -0,0 +1,129 @@
+#include "modinfodialogcategories.h"
+#include "ui_modinfodialog.h"
+#include "categories.h"
+#include "modinfo.h"
+
+CategoriesTab::CategoriesTab(QWidget*, Ui::ModInfoDialog* ui)
+  : ui(ui)
+{
+  connect(
+    ui->categoriesTree, &QTreeWidget::itemChanged,
+    [&](auto* item, int col){ onCategoryChanged(item, col); });
+
+  connect(
+    ui->primaryCategoryBox,
+    static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    [&](int index){ onPrimaryChanged(index); });
+}
+
+void CategoriesTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
+{
+  m_mod = mod;
+}
+
+void CategoriesTab::clear()
+{
+  ui->categoriesTree->clear();
+  ui->primaryCategoryBox->clear();
+}
+
+void CategoriesTab::update()
+{
+  clear();
+
+  add(
+    CategoryFactory::instance(), m_mod->getCategories(),
+    ui->categoriesTree->invisibleRootItem(), 0);
+
+  updatePrimary();
+}
+
+void CategoriesTab::add(
+  const CategoryFactory &factory, const std::set<int>& enabledCategories,
+  QTreeWidgetItem* root, int rootLevel)
+{
+  for (int i=0; i<static_cast<int>(factory.numCategories()); ++i) {
+    if (factory.getParentID(i) != rootLevel) {
+      continue;
+    }
+
+    int categoryID = factory.getCategoryID(i);
+
+    QTreeWidgetItem *newItem
+      = new QTreeWidgetItem(QStringList(factory.getCategoryName(i)));
+
+    newItem->setFlags(newItem->flags() | Qt::ItemIsUserCheckable);
+
+    newItem->setCheckState(0, enabledCategories.find(categoryID)
+      != enabledCategories.end()
+      ? Qt::Checked
+      : Qt::Unchecked);
+
+    newItem->setData(0, Qt::UserRole, categoryID);
+
+    if (factory.hasChildren(i)) {
+      add(factory, enabledCategories, newItem, categoryID);
+    }
+
+    root->addChild(newItem);
+  }
+}
+
+void CategoriesTab::updatePrimary()
+{
+  ui->primaryCategoryBox->clear();
+
+  int primaryCategory = m_mod->getPrimaryCategory();
+
+  addChecked(ui->categoriesTree->invisibleRootItem());
+
+  for (int i = 0; i < ui->primaryCategoryBox->count(); ++i) {
+    if (ui->primaryCategoryBox->itemData(i).toInt() == primaryCategory) {
+      ui->primaryCategoryBox->setCurrentIndex(i);
+      break;
+    }
+  }
+}
+
+void CategoriesTab::addChecked(QTreeWidgetItem* tree)
+{
+  for (int i = 0; i < tree->childCount(); ++i) {
+    QTreeWidgetItem *child = tree->child(i);
+    if (child->checkState(0) == Qt::Checked) {
+      ui->primaryCategoryBox->addItem(child->text(0), child->data(0, Qt::UserRole));
+      addChecked(child);
+    }
+  }
+}
+
+void CategoriesTab::save(QTreeWidgetItem* currentNode)
+{
+  for (int i = 0; i < currentNode->childCount(); ++i) {
+    QTreeWidgetItem *childNode = currentNode->child(i);
+
+    m_mod->setCategory(
+      childNode->data(0, Qt::UserRole).toInt(), childNode->checkState(0));
+
+    save(childNode);
+  }
+}
+
+void CategoriesTab::onCategoryChanged(QTreeWidgetItem* item, int)
+{
+  QTreeWidgetItem *parent = item->parent();
+
+  while ((parent != nullptr) && ((parent->flags() & Qt::ItemIsUserCheckable) != 0) && (parent->checkState(0) == Qt::Unchecked)) {
+    parent->setCheckState(0, Qt::Checked);
+    parent = parent->parent();
+  }
+
+  updatePrimary();
+  save(ui->categoriesTree->invisibleRootItem());
+}
+
+void CategoriesTab::onPrimaryChanged(int index)
+{
+  if (index != -1) {
+    m_mod->setPrimaryCategory(ui->primaryCategoryBox->itemData(index).toInt());
+  }
+}
-- 
cgit v1.3.1


From 8d1c121f648f2f6a8e0a5e2ad76cd245e318290d Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sun, 23 Jun 2019 02:24:34 -0400
Subject: split nexus tab added OrganizerCore::loggedInAction() to execute a
 function only when logged in, replaces a bunch of copy/pasted stuff in
 mainwindow moved common variables in ModInfoDialogTab moved DescriptionPage
 to modinfodialognexus.h, renamed to NexusTabWebpage, deleted now empty
 descriptionpage.h

---
 src/CMakeLists.txt              |   5 +-
 src/descriptionpage.h           |  28 -----
 src/mainwindow.cpp              | 167 ++++++------------------
 src/modinfodialog.cpp           | 233 +++-------------------------------
 src/modinfodialog.h             |  29 -----
 src/modinfodialog.ui            | 222 +++++++++++++++-----------------
 src/modinfodialogcategories.cpp |  43 +++----
 src/modinfodialogcategories.h   |   8 +-
 src/modinfodialogconflicts.cpp  |  91 ++++++--------
 src/modinfodialogconflicts.h    |  17 +--
 src/modinfodialogesps.cpp       |   8 +-
 src/modinfodialogesps.h         |   7 +-
 src/modinfodialogimages.cpp     |   6 +-
 src/modinfodialogimages.h       |   5 +-
 src/modinfodialognexus.cpp      | 273 ++++++++++++++++++++++++++++++++++++++++
 src/modinfodialognexus.h        |  67 ++++++++++
 src/modinfodialogtab.cpp        |  39 +++++-
 src/modinfodialogtab.h          |  25 +++-
 src/modinfodialogtextfiles.cpp  |  26 ++--
 src/modinfodialogtextfiles.h    |  12 +-
 src/modinforegular.cpp          |  20 ++-
 src/modinforegular.h            |   1 +
 src/organizercore.cpp           |  15 +++
 src/organizercore.h             |   1 +
 24 files changed, 690 insertions(+), 658 deletions(-)
 delete mode 100644 src/descriptionpage.h
 create mode 100644 src/modinfodialognexus.cpp
 create mode 100644 src/modinfodialognexus.h

(limited to 'src/modinfodialogcategories.cpp')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ebfaddd..7dc39fd9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,6 +58,7 @@ SET(organizer_SRCS
 	modinfodialogconflicts.cpp
 	modinfodialogesps.cpp
 	modinfodialogimages.cpp
+	modinfodialognexus.cpp
 	modinfodialogtab.cpp
 	modinfodialogtextfiles.cpp
     modinfo.cpp
@@ -164,6 +165,7 @@ SET(organizer_HDRS
 	modinfodialogconflicts.h
 	modinfodialogesps.h
 	modinfodialogimages.h
+	modinfodialognexus.h
 	modinfodialogtab.h
 	modinfodialogtextfiles.h
     modinfo.h
@@ -223,7 +225,6 @@ SET(organizer_HDRS
     instancemanager.h
     usvfsconnector.h
     eventfilter.h
-    descriptionpage.h
     moshortcut.h
     listdialog.h
     lcdnumber.h
@@ -368,6 +369,7 @@ set(modinfo
 	modinfodialogconflicts
 	modinfodialogesps
 	modinfodialogimages
+	modinfodialognexus
 	modinfodialogtab
 	modinfodialogtextfiles
 	modinfoforeign
@@ -424,7 +426,6 @@ set(utilities
 )
 
 set(widgets
-	descriptionpage
 	expanderwidget
 	genericicondelegate
 	filerenamer
diff --git a/src/descriptionpage.h b/src/descriptionpage.h
deleted file mode 100644
index f6158ee0..00000000
--- a/src/descriptionpage.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <QWebEnginePage>
-
-#ifndef DESCRIPTIONPAGE_H
-#define DESCRIPTIONPAGE_H
-
-class DescriptionPage : public QWebEnginePage
-{
-    Q_OBJECT
-
-public:
-    DescriptionPage(QObject* parent = 0) : QWebEnginePage(parent){}
-
-    bool acceptNavigationRequest(const QUrl & url, QWebEnginePage::NavigationType type, bool isMainFrame)
-    {
-        if (type == QWebEnginePage::NavigationTypeLinkClicked)
-        {
-            emit linkClicked(url);
-            return false;
-        }
-        return true;
-    }
-
-signals:
-    void linkClicked(const QUrl&);
-
-};
-
-#endif //DESCRIPTIONPAGE_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index da7c721d..8eb0838e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3073,66 +3073,34 @@ void MainWindow::backupMod_clicked()
 
 void MainWindow::resumeDownload(int downloadIndex)
 {
-  if (NexusInterface::instance(&m_PluginContainer)->getAccessManager()->validated()) {
+  m_OrganizerCore.loggedInAction(this, [this, downloadIndex] {
     m_OrganizerCore.downloadManager()->resumeDownload(downloadIndex);
-  } else {
-    QString apiKey;
-    if (m_OrganizerCore.settings().getNexusApiKey(apiKey)) {
-      m_OrganizerCore.doAfterLogin([this, downloadIndex] () {
-        this->resumeDownload(downloadIndex);
-      });
-      NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
-    } else {
-      MessageDialog::showMessage(tr("You need to be logged in with Nexus to resume a download"), this);
-    }
-  }
+  });
 }
 
 
 void MainWindow::endorseMod(ModInfo::Ptr mod)
 {
-  if (NexusInterface::instance(&m_PluginContainer)->getAccessManager()->validated()) {
+  m_OrganizerCore.loggedInAction(this, [this, mod] {
     mod->endorse(true);
-  } else {
-    QString apiKey;
-    if (m_OrganizerCore.settings().getNexusApiKey(apiKey)) {
-      m_OrganizerCore.doAfterLogin([&]() { this->endorseMod(mod); });
-      NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
-    } else {
-      MessageDialog::showMessage(tr("You need to be logged in with Nexus to endorse"), this);
-    }
-  }
+  });
 }
 
 
 void MainWindow::endorse_clicked()
 {
   QItemSelectionModel *selection = ui->modList->selectionModel();
-  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
-    if (NexusInterface::instance(&m_PluginContainer)->getAccessManager()->validated()) {
+
+  m_OrganizerCore.loggedInAction(this, [this] {
+    QItemSelectionModel *selection = ui->modList->selectionModel();
+    if (selection->hasSelection() && selection->selectedRows().count() > 1) {
       MessageDialog::showMessage(tr("Endorsing multiple mods will take a while. Please wait..."), this);
-      for (QModelIndex idx : selection->selectedRows()) {
-        ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt())->endorse(true);
-      }
     }
-    else {
-      QString apiKey;
-      if (m_OrganizerCore.settings().getNexusApiKey(apiKey)) {
-        MessageDialog::showMessage(tr("Endorsing multiple mods will take a while. Please wait..."), this);
-        for (QModelIndex idx : selection->selectedRows()) {
-          ModInfo::Ptr modInfo = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
-          m_OrganizerCore.doAfterLogin([&]() { this->endorseMod(modInfo); });
-        }
-        NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
-      } else {
-        MessageDialog::showMessage(tr("You need to be logged in with Nexus to endorse"), this);
-        return;
-      }
+
+    for (QModelIndex idx : selection->selectedRows()) {
+      ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt())->endorse(true);
     }
-  }
-  else {
-    endorseMod(ModInfo::getByIndex(m_ContextRow));
-  }
+  });
 }
 
 void MainWindow::dontendorse_clicked()
@@ -3151,114 +3119,53 @@ void MainWindow::dontendorse_clicked()
 
 void MainWindow::unendorseMod(ModInfo::Ptr mod)
 {
-  if (NexusInterface::instance(&m_PluginContainer)->getAccessManager()->validated()) {
-    ModInfo::getByIndex(m_ContextRow)->endorse(false);
-  } else {
-    QString apiKey;
-    if (m_OrganizerCore.settings().getNexusApiKey(apiKey)) {
-      m_OrganizerCore.doAfterLogin([&]() { this->unendorseMod(mod); });
-      NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
-    } else {
-      MessageDialog::showMessage(tr("You need to be logged in with Nexus to endorse"), this);
-    }
-  }
+  m_OrganizerCore.loggedInAction(this, [mod] {
+    mod->endorse(false);
+  });
 }
 
 
 void MainWindow::unendorse_clicked()
 {
-  QItemSelectionModel *selection = ui->modList->selectionModel();
-  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
-    if (NexusInterface::instance(&m_PluginContainer)->getAccessManager()->validated()) {
+  m_OrganizerCore.loggedInAction(this, [this] {
+    QItemSelectionModel *selection = ui->modList->selectionModel();
+    if (selection->hasSelection() && selection->selectedRows().count() > 1) {
       MessageDialog::showMessage(tr("Unendorsing multiple mods will take a while. Please wait..."), this);
-      for (QModelIndex idx : selection->selectedRows()) {
-        ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt())->endorse(false);
-      }
-    } else {
-      QString apiKey;
-      if (m_OrganizerCore.settings().getNexusApiKey(apiKey)) {
-        MessageDialog::showMessage(tr("Unendorsing multiple mods will take a while. Please wait..."), this);
-        for (QModelIndex idx : selection->selectedRows()) {
-          ModInfo::Ptr modInfo = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
-          m_OrganizerCore.doAfterLogin([&]() { this->unendorseMod(modInfo); });
-        }
-        NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
-      } else {
-        MessageDialog::showMessage(tr("You need to be logged in with Nexus to endorse"), this);
-        return;
-      }
     }
-  }
-  else {
-    unendorseMod(ModInfo::getByIndex(m_ContextRow));
-  }
+
+    for (QModelIndex idx : selection->selectedRows()) {
+      ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt())->endorse(false);
+    }
+  });
 }
 
 
 void MainWindow::trackMod(ModInfo::Ptr mod, bool doTrack)
 {
-  if (NexusInterface::instance(&m_PluginContainer)->getAccessManager()->validated()) {
-    ModInfo::getByIndex(m_ContextRow)->track(doTrack);
-  } else {
-    QString apiKey;
-    if (m_OrganizerCore.settings().getNexusApiKey(apiKey)) {
-      m_OrganizerCore.doAfterLogin([&]() { this->trackMod(mod, doTrack); });
-      NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
-    } else {
-      MessageDialog::showMessage(tr("You need to be logged in with Nexus to track"), this);
-    }
-  }
+  m_OrganizerCore.loggedInAction(this, [mod, doTrack] {
+    mod->track(doTrack);
+  });
 }
 
 
 void MainWindow::track_clicked()
 {
-  QItemSelectionModel *selection = ui->modList->selectionModel();
-  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
-    if (NexusInterface::instance(&m_PluginContainer)->getAccessManager()->validated()) {
-      for (auto idx : selection->selectedRows()) {
-        ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt())->track(true);
-      }
-    } else {
-      QString apiKey;
-      if (m_OrganizerCore.settings().getNexusApiKey(apiKey)) {
-        for (auto idx : selection->selectedRows()) {
-          auto modInfo = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
-          m_OrganizerCore.doAfterLogin([&]() { this->trackMod(modInfo, true); });
-        }
-        NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
-      } else {
-        MessageDialog::showMessage(tr("You need to be logged in with Nexus to track"), this);
-      }
+  m_OrganizerCore.loggedInAction(this, [this] {
+    QItemSelectionModel *selection = ui->modList->selectionModel();
+    for (auto idx : selection->selectedRows()) {
+      ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt())->track(true);
     }
-  } else {
-    trackMod(ModInfo::getByIndex(m_ContextRow), true);
-  }
+  });
 }
 
 void MainWindow::untrack_clicked()
 {
-  QItemSelectionModel *selection = ui->modList->selectionModel();
-  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
-    if (NexusInterface::instance(&m_PluginContainer)->getAccessManager()->validated()) {
-      for (auto idx : selection->selectedRows()) {
-        ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt())->track(false);
-      }
-    } else {
-      QString apiKey;
-      if (m_OrganizerCore.settings().getNexusApiKey(apiKey)) {
-        for (auto idx : selection->selectedRows()) {
-          auto modInfo = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
-          m_OrganizerCore.doAfterLogin([&]() { this->trackMod(modInfo, false); });
-        }
-        NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
-      } else {
-        MessageDialog::showMessage(tr("You need to be logged in with Nexus to track"), this);
-      }
+  m_OrganizerCore.loggedInAction(this, [this] {
+    QItemSelectionModel *selection = ui->modList->selectionModel();
+    for (auto idx : selection->selectedRows()) {
+      ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt())->track(false);
     }
-  } else {
-    trackMod(ModInfo::getByIndex(m_ContextRow), false);
-  }
+  });
 }
 
 void MainWindow::validationFailed(const QString &error)
@@ -3316,13 +3223,11 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
   } else {
     modInfo->saveMeta();
     ModInfoDialog dialog(modInfo, m_OrganizerCore.directoryStructure(), modInfo->hasFlag(ModInfo::FLAG_FOREIGN), &m_OrganizerCore, &m_PluginContainer, this);
-    connect(&dialog, SIGNAL(linkActivated(QString)), this, SLOT(linkClicked(QString)));
     connect(&dialog, SIGNAL(downloadRequest(QString)), &m_OrganizerCore, SLOT(downloadRequestedNXM(QString)));
     connect(&dialog, SIGNAL(modOpen(QString, int)), this, SLOT(displayModInformation(QString, int)), Qt::QueuedConnection);
     connect(&dialog, SIGNAL(modOpenNext(int)), this, SLOT(modOpenNext(int)), Qt::QueuedConnection);
     connect(&dialog, SIGNAL(modOpenPrev(int)), this, SLOT(modOpenPrev(int)), Qt::QueuedConnection);
     connect(&dialog, SIGNAL(originModified(int)), this, SLOT(originModified(int)));
-    connect(&dialog, SIGNAL(endorseMod(ModInfo::Ptr)), this, SLOT(endorseMod(ModInfo::Ptr)));
 
 	//Open the tab first if we want to use the standard indexes of the tabs.
 	if (tab != -1) {
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 3263a511..30110d14 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -43,6 +43,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "modinfodialogesps.h"
 #include "modinfodialogconflicts.h"
 #include "modinfodialogcategories.h"
+#include "modinfodialognexus.h"
 
 #include <QDir>
 #include <QDirIterator>
@@ -145,7 +146,6 @@ FileRenamer::RenameResults unhideFile(FileRenamer& renamer, const QString &oldNa
 
 ModInfoDialog::ModInfoDialog(ModInfo::Ptr modInfo, const DirectoryEntry *directory, bool unmanaged, OrganizerCore *organizerCore, PluginContainer *pluginContainer, QWidget *parent)
   : TutorableDialog("ModInfoDialog", parent), ui(new Ui::ModInfoDialog), m_ModInfo(modInfo),
-  m_RequestStarted(false),
   m_NewFolderAction(nullptr), m_OpenAction(nullptr), m_PreviewAction(nullptr),
   m_RenameAction(nullptr), m_DeleteAction(nullptr), m_HideAction(nullptr),
   m_UnhideAction(nullptr), m_Directory(directory), m_Origin(nullptr),
@@ -173,38 +173,9 @@ ModInfoDialog::ModInfoDialog(ModInfo::Ptr modInfo, const DirectoryEntry *directo
 
   m_RootPath = modInfo->absolutePath();
 
-  QString metaFileName = m_RootPath.mid(0).append("/meta.ini");
-  m_Settings = new QSettings(metaFileName, QSettings::IniFormat);
-
-  QLineEdit *modIDEdit = findChild<QLineEdit*>("modIDEdit");
-  ui->modIDEdit->setValidator(new QIntValidator(modIDEdit));
-  ui->modIDEdit->setText(QString("%1").arg(modInfo->getNexusID()));
-
-  connect(ui->modIDEdit, SIGNAL(linkClicked(QString)), this, SLOT(linkClicked(QString)));
-
-  QString gameName = modInfo->getGameName();
-  ui->sourceGameEdit->addItem(organizerCore->managedGame()->gameName(), organizerCore->managedGame()->gameShortName());
-  if (organizerCore->managedGame()->validShortNames().size() == 0) {
-    ui->sourceGameEdit->setDisabled(true);
-  } else {
-    for (auto game : pluginContainer->plugins<IPluginGame>()) {
-      for (QString gameName : organizerCore->managedGame()->validShortNames()) {
-        if (game->gameShortName().compare(gameName, Qt::CaseInsensitive) == 0) {
-          ui->sourceGameEdit->addItem(game->gameName(), game->gameShortName());
-          break;
-        }
-      }
-    }
-  }
-  ui->sourceGameEdit->setCurrentIndex(ui->sourceGameEdit->findData(gameName));
-
   ui->commentsEdit->setText(modInfo->comments());
   ui->notesEdit->setText(modInfo->notes());
 
-  ui->descriptionView->setPage(new DescriptionPage());
-
-  connect(m_ModInfo.data(), SIGNAL(modDetailsUpdated(bool)), this, SLOT(modDetailsUpdated(bool)));
-  connect(ui->descriptionView->page(), SIGNAL(linkClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
   //TODO: No easy way to delegate links
   //ui->descriptionView->page()->acceptNavigationRequest(QWebEnginePage::DelegateAllLinks);
 
@@ -246,14 +217,12 @@ ModInfoDialog::ModInfoDialog(ModInfo::Ptr modInfo, const DirectoryEntry *directo
     ui->tabWidget->setTabEnabled(TAB_IMAGES, true);
     ui->tabWidget->setTabEnabled(TAB_ESPS, true);
     ui->tabWidget->setTabEnabled(TAB_CONFLICTS, true);
+    ui->tabWidget->setTabEnabled(TAB_CATEGORIES, true);
+    ui->tabWidget->setTabEnabled(TAB_NEXUS, true);
 
     initFiletree(modInfo);
   }
 
-  ui->endorseBtn->setVisible(Settings::instance().endorsementIntegration());
-  ui->endorseBtn->setEnabled((m_ModInfo->endorsedState() == ModInfo::ENDORSED_FALSE) ||
-                             (m_ModInfo->endorsedState() == ModInfo::ENDORSED_NEVER));
-
   // activate first enabled tab
   for (int i = 0; i < ui->tabWidget->count(); ++i) {
     if (ui->tabWidget->isTabEnabled(i)) {
@@ -262,10 +231,6 @@ ModInfoDialog::ModInfoDialog(ModInfo::Ptr modInfo, const DirectoryEntry *directo
     }
   }
 
-  if (ui->tabWidget->currentIndex() == TAB_NEXUS) {
-    activateNexusTab();
-  }
-
   for (auto& tab : m_tabs) {
     tab->setMod(m_ModInfo, m_Origin);
   }
@@ -281,27 +246,28 @@ ModInfoDialog::~ModInfoDialog()
   else
     m_ModInfo->setNotes(ui->notesEdit->toHtml());
 
-  delete ui->descriptionView->page();
-  delete ui->descriptionView;
   delete ui;
-  delete m_Settings;
 }
 
-std::vector<std::unique_ptr<ModInfoDialogTab>> ModInfoDialog::createTabs()
+template <class... Ts>
+std::vector<std::unique_ptr<ModInfoDialogTab>> createTabsImpl(
+  OrganizerCore& oc, PluginContainer& plugin,
+  ModInfoDialog* self, Ui::ModInfoDialog* ui)
 {
   std::vector<std::unique_ptr<ModInfoDialogTab>> v;
-
-  v.push_back(std::make_unique<TextFilesTab>(this, ui));
-  v.push_back(std::make_unique<IniFilesTab>(this, ui));
-  v.push_back(std::make_unique<ImagesTab>(this, ui));
-  v.push_back(std::make_unique<ESPsTab>(this, ui));
-  v.push_back(std::make_unique<ConflictsTab>(
-    this, ui, *m_OrganizerCore, *m_PluginContainer));
-  v.push_back(std::make_unique<CategoriesTab>(this, ui));
+  (v.push_back(std::make_unique<Ts>(oc, plugin, self, ui)), ...);
 
   return v;
 }
 
+std::vector<std::unique_ptr<ModInfoDialogTab>> ModInfoDialog::createTabs()
+{
+  return createTabsImpl<
+    TextFilesTab, IniFilesTab, ImagesTab, ESPsTab,
+    ConflictsTab, CategoriesTab, NexusTab>(
+      *m_OrganizerCore, *m_PluginContainer, this, ui);
+}
+
 int ModInfoDialog::exec()
 {
   refreshLists();
@@ -434,7 +400,6 @@ void ModInfoDialog::refreshFiles()
   }
 }
 
-
 void ModInfoDialog::on_closeButton_clicked()
 {
   for (auto& tab : m_tabs) {
@@ -446,19 +411,6 @@ void ModInfoDialog::on_closeButton_clicked()
   close();
 }
 
-
-
-QString ModInfoDialog::getModVersion() const
-{
-  return m_Settings->value("version", "").toString();
-}
-
-
-const int ModInfoDialog::getModID() const
-{
-  return m_Settings->value("modid", 0).toInt();
-}
-
 void ModInfoDialog::openTab(int tab)
 {
   QTabWidget *tabWidget = findChild<QTabWidget*>("tabWidget");
@@ -467,40 +419,6 @@ void ModInfoDialog::openTab(int tab)
   }
 }
 
-void ModInfoDialog::on_visitNexusLabel_linkActivated(const QString &link)
-{
-  emit linkActivated(link);
-}
-
-void ModInfoDialog::linkClicked(const QUrl &url)
-{
-  //Ideally we'd ask the mod for the game and the web service then pass the game
-  //and URL to the web service
-  if (NexusInterface::instance(m_PluginContainer)->isURLGameRelated(url)) {
-    emit linkActivated(url.toString());
-  } else {
-    shell::OpenLink(url);
-  }
-}
-
-void ModInfoDialog::linkClicked(QString url)
-{
-  emit linkActivated(url);
-}
-
-
-void ModInfoDialog::refreshNexusData(int modID)
-{
-  if ((!m_RequestStarted) && (modID > 0)) {
-    m_RequestStarted = true;
-
-    m_ModInfo->updateNXMInfo();
-
-    MessageDialog::showMessage(tr("Info requested, please wait"), this);
-  }
-}
-
-
 QString ModInfoDialog::getFileCategory(int categoryID)
 {
   switch (categoryID) {
@@ -514,111 +432,8 @@ QString ModInfoDialog::getFileCategory(int categoryID)
   }
 }
 
-
-void ModInfoDialog::updateVersionColor()
-{
-//  QPalette versionColor;
-  if (m_ModInfo->getVersion() != m_ModInfo->getNewestVersion()) {
-    ui->versionEdit->setStyleSheet("color: red");
-//    versionColor.setColor(QPalette::Text, Qt::red);
-    ui->versionEdit->setToolTip(tr("Current Version: %1").arg(m_ModInfo->getNewestVersion().canonicalString()));
-  } else {
-    ui->versionEdit->setStyleSheet("color: green");
-//    versionColor.setColor(QPalette::Text, Qt::green);
-    ui->versionEdit->setToolTip(tr("No update available"));
-  }
-//  ui->versionEdit->setPalette(versionColor);
-}
-
-
-void ModInfoDialog::modDetailsUpdated(bool success)
-{
-  QString nexusDescription = m_ModInfo->getNexusDescription();
-  QString descriptionAsHTML = "<html>"
-    "<head><style class=\"nexus-description\">body {font-style: sans-serif; background: #707070; } a { color: #5EA2E5; }</style></head>"
-    "<body>%1</body>"
-    "</html>";
-
-  if (!nexusDescription.isEmpty()) {
-    descriptionAsHTML = descriptionAsHTML.arg(BBCode::convertToHTML(nexusDescription));
-  } else {
-    descriptionAsHTML = descriptionAsHTML.arg(tr("<div style=\"text-align: center;\"><h1>Uh oh!</h1><p>Sorry, there is no description available for this mod. :(</p></div>"));
-  }
-
-  ui->descriptionView->page()->setHtml(descriptionAsHTML);
-
-  updateVersionColor();
-}
-
-
-void ModInfoDialog::activateNexusTab()
-{
-  QLineEdit *modIDEdit = findChild<QLineEdit*>("modIDEdit");
-  int modID = modIDEdit->text().toInt();
-  if (modID > 0) {
-    QString nexusLink = NexusInterface::instance(m_PluginContainer)->getModURL(modID, m_ModInfo->getGameName());
-    QLabel *visitNexusLabel = findChild<QLabel*>("visitNexusLabel");
-    visitNexusLabel->setText(tr("<a href=\"%1\">Visit on Nexus</a>").arg(nexusLink));
-    visitNexusLabel->setToolTip(nexusLink);
-    m_ModInfo->setURL(nexusLink);
-
-    if (m_ModInfo->getNexusDescription().isEmpty() || QDateTime::currentDateTimeUtc() >= m_ModInfo->getLastNexusQuery().addDays(1)) {
-      refreshNexusData(modID);
-    } else {
-      modDetailsUpdated(true);
-    }
-  } else
-    modDetailsUpdated(true);
-  QLineEdit *versionEdit = findChild<QLineEdit*>("versionEdit");
-  QString currentVersion = m_Settings->value("version", "???").toString();
-  versionEdit->setText(currentVersion);
-  ui->customUrlLineEdit->setText(m_ModInfo->getURL());
-}
-
-
 void ModInfoDialog::on_tabWidget_currentChanged(int index)
 {
-  if (index == TAB_NEXUS || m_RealTabPos[index] == TAB_NEXUS) {
-    activateNexusTab();
-  }
-}
-
-
-void ModInfoDialog::on_modIDEdit_editingFinished()
-{
-  int oldID = m_Settings->value("modid", 0).toInt();
-  int modID = ui->modIDEdit->text().toInt();
-  if (oldID != modID){
-    m_ModInfo->setNexusID(modID);
-
-    ui->descriptionView->page()->setHtml("");
-    if (modID != 0) {
-      m_RequestStarted = false;
-      refreshNexusData(modID);
-    }
-  }
-}
-
-void ModInfoDialog::on_sourceGameEdit_currentIndexChanged(int)
-{
-  for (auto game : m_PluginContainer->plugins<IPluginGame>()) {
-    if (game->gameName() == ui->sourceGameEdit->currentText()) {
-      m_ModInfo->setGameName(game->gameShortName());
-      return;
-    }
-  }
-}
-
-void ModInfoDialog::on_versionEdit_editingFinished()
-{
-  VersionInfo version(ui->versionEdit->text());
-  m_ModInfo->setVersion(version);
-  updateVersionColor();
-}
-
-void ModInfoDialog::on_customUrlLineEdit_editingFinished()
-{
-  m_ModInfo->setURL(ui->customUrlLineEdit->text());
 }
 
 bool ModInfoDialog::recursiveDelete(const QModelIndex &index)
@@ -975,22 +790,6 @@ void ModInfoDialog::on_fileTree_customContextMenuRequested(const QPoint &pos)
   menu.exec(ui->fileTree->viewport()->mapToGlobal(pos));
 }
 
-
-void ModInfoDialog::on_refreshButton_clicked()
-{
-  if (m_ModInfo->getNexusID() > 0) {
-    QLineEdit *modIDEdit = findChild<QLineEdit*>("modIDEdit");
-    int modID = modIDEdit->text().toInt();
-    refreshNexusData(modID);
-  } else
-    qInfo("Mod has no valid Nexus ID, info can't be updated.");
-}
-
-void ModInfoDialog::on_endorseBtn_clicked()
-{
-  emit endorseMod(m_ModInfo);
-}
-
 void ModInfoDialog::on_nextButton_clicked()
 {
 	int currentTab = ui->tabWidget->currentIndex();
diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 384aafce..7b96d21a 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -138,18 +138,11 @@ public:
   void restoreState(const Settings& s);
 
 signals:
-
-  void linkActivated(const QString &link);
   void downloadRequest(const QString &link);
   void modOpen(const QString &modName, int tab);
   void modOpenNext(int tab=-1);
   void modOpenPrev(int tab=-1);
   void originModified(int originID);
-  void endorseMod(ModInfo::Ptr nexusID);
-
-public slots:
-
-  void modDetailsUpdated(bool success);
 
 private:
 
@@ -157,10 +150,6 @@ private:
 
   void refreshLists();
 
-  void updateVersionColor();
-
-  void refreshNexusData(int modID);
-  void activateNexusTab();
   QString getFileCategory(int categoryID);
   bool recursiveDelete(const QModelIndex &index);
   void deleteFile(const QModelIndex &index);
@@ -168,9 +157,6 @@ private:
   int tabIndex(const QString &tabId);
 
 private slots:
-  void linkClicked(const QUrl &url);
-  void linkClicked(QString url);
-
   void delete_activated();
 
   void createDirectoryTriggered();
@@ -183,20 +169,10 @@ private slots:
 
   void on_openInExplorerButton_clicked();
   void on_closeButton_clicked();
-  void on_visitNexusLabel_linkActivated(const QString &link);
-  void on_modIDEdit_editingFinished();
-  void on_sourceGameEdit_currentIndexChanged(int);
-  void on_versionEdit_editingFinished();
-  void on_customUrlLineEdit_editingFinished();
   void on_tabWidget_currentChanged(int index);
   void on_fileTree_customContextMenuRequested(const QPoint &pos);
 
-  void on_refreshButton_clicked();
-
-  void on_endorseBtn_clicked();
-
   void on_nextButton_clicked();
-
   void on_prevButton_clicked();
 
 private:
@@ -217,11 +193,6 @@ private:
   QTreeView *m_FileTree;
   QModelIndexList m_FileSelection;
 
-  QSettings *m_Settings;
-
-  std::set<int> m_RequestIDs;
-  bool m_RequestStarted;
-
   QAction *m_NewFolderAction;
   QAction *m_OpenAction;
   QAction *m_PreviewAction;
diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index c8ffd470..29a7400f 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -829,7 +829,7 @@ text-align: left;</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_7">
        <item>
-        <widget class="QTreeWidget" name="categoriesTree">
+        <widget class="QTreeWidget" name="categories">
          <property name="animated">
           <bool>true</bool>
          </property>
@@ -853,13 +853,13 @@ text-align: left;</string>
           </widget>
          </item>
          <item>
-          <widget class="QComboBox" name="primaryCategoryBox"/>
+          <widget class="QComboBox" name="primaryCategories"/>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabNexus">
+     <widget class="QWidget" name="tabNexus1">
       <attribute name="icon">
        <iconset resource="resources.qrc">
         <normaloff>:/MO/gui/resources/internet-web-browser.png</normaloff>:/MO/gui/resources/internet-web-browser.png</iconset>
@@ -870,6 +870,60 @@ text-align: left;</string>
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_6">
+         <item>
+          <widget class="QToolButton" name="refresh">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="toolTip">
+            <string>Refresh</string>
+           </property>
+           <property name="whatsThis">
+            <string>Refresh all information from Nexus.</string>
+           </property>
+           <property name="text">
+            <string>Refresh</string>
+           </property>
+           <property name="icon">
+            <iconset resource="resources.qrc">
+             <normaloff>:/MO/gui/refresh</normaloff>:/MO/gui/refresh</iconset>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="openInBrowser">
+           <property name="text">
+            <string>Open in Browser</string>
+           </property>
+           <property name="icon">
+            <iconset resource="resources.qrc">
+             <normaloff>:/MO/gui/resources/internet-web-browser.png</normaloff>:/MO/gui/resources/internet-web-browser.png</iconset>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="endorse">
+           <property name="text">
+            <string>Endorse</string>
+           </property>
+           <property name="icon">
+            <iconset resource="resources.qrc">
+             <normaloff>:/MO/gui/icon_favorite</normaloff>:/MO/gui/icon_favorite</iconset>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QLabel" name="label_3">
            <property name="text">
@@ -878,7 +932,7 @@ text-align: left;</string>
           </widget>
          </item>
          <item>
-          <widget class="ModIDLineEdit" name="modIDEdit">
+          <widget class="ModIDLineEdit" name="modID">
            <property name="toolTip">
             <string>Mod ID for this mod on Nexus.</string>
            </property>
@@ -891,22 +945,6 @@ p, li { white-space: pre-wrap; }
            </property>
           </widget>
          </item>
-         <item>
-          <spacer name="horizontalSpacer_4">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>10</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
          <item>
           <widget class="QLabel" name="label_10">
            <property name="text">
@@ -915,7 +953,7 @@ p, li { white-space: pre-wrap; }
           </widget>
          </item>
          <item>
-          <widget class="QComboBox" name="sourceGameEdit">
+          <widget class="QComboBox" name="sourceGame">
            <property name="toolTip">
             <string>Source game for this mod.</string>
            </property>
@@ -925,20 +963,7 @@ p, li { white-space: pre-wrap; }
           </widget>
          </item>
          <item>
-          <spacer name="horizontalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="versionLabel">
+          <widget class="QLabel" name="versionLabel1">
            <property name="whatsThis">
             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -952,7 +977,7 @@ p, li { white-space: pre-wrap; }
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="versionEdit">
+          <widget class="QLineEdit" name="version">
            <property name="maximumSize">
             <size>
              <width>150</width>
@@ -967,102 +992,61 @@ p, li { white-space: pre-wrap; }
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="0,1">
-         <item>
-          <widget class="QPushButton" name="refreshButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="toolTip">
-            <string>Refresh</string>
-           </property>
-           <property name="whatsThis">
-            <string>Refresh all information from Nexus.</string>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset resource="resources.qrc">
-             <normaloff>:/MO/gui/refresh</normaloff>:/MO/gui/refresh</iconset>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_4">
-           <property name="text">
-            <string>Description</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QWebEngineView" name="descriptionView">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>200</height>
-          </size>
+        <widget class="QFrame" name="frame">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
          </property>
-         <property name="url">
-          <url>
-           <string>about:blank</string>
-          </url>
+         <property name="frameShadow">
+          <enum>QFrame::Sunken</enum>
          </property>
+         <layout class="QVBoxLayout" name="verticalLayout_24">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QWebEngineView" name="browser">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>200</height>
+             </size>
+            </property>
+            <property name="url">
+             <url>
+              <string>about:blank</string>
+             </url>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_7">
-         <item>
-          <widget class="QLabel" name="visitNexusLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>1</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="openExternalLinks">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="endorseBtn">
-           <property name="text">
-            <string>Endorse</string>
-           </property>
-           <property name="icon">
-            <iconset resource="resources.qrc">
-             <normaloff>:/MO/gui/icon_favorite</normaloff>:/MO/gui/icon_favorite</iconset>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_14">
          <item>
           <widget class="QLabel" name="label_11">
            <property name="text">
-            <string>Web page URL (only used if invalid Nexus ID) :</string>
+            <string>URL</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="customUrlLineEdit"/>
+          <widget class="QLineEdit" name="url"/>
          </item>
         </layout>
        </item>
diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
index 7df13aea..69c7c6b5 100644
--- a/src/modinfodialogcategories.cpp
+++ b/src/modinfodialogcategories.cpp
@@ -3,28 +3,25 @@
 #include "categories.h"
 #include "modinfo.h"
 
-CategoriesTab::CategoriesTab(QWidget*, Ui::ModInfoDialog* ui)
-  : ui(ui)
+CategoriesTab::CategoriesTab(
+  OrganizerCore& oc, PluginContainer& plugin,
+  QWidget* parent, Ui::ModInfoDialog* ui)
+    : ModInfoDialogTab(oc, plugin, parent, ui)
 {
   connect(
-    ui->categoriesTree, &QTreeWidget::itemChanged,
+    ui->categories, &QTreeWidget::itemChanged,
     [&](auto* item, int col){ onCategoryChanged(item, col); });
 
   connect(
-    ui->primaryCategoryBox,
+    ui->primaryCategories,
     static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
     [&](int index){ onPrimaryChanged(index); });
 }
 
-void CategoriesTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
-{
-  m_mod = mod;
-}
-
 void CategoriesTab::clear()
 {
-  ui->categoriesTree->clear();
-  ui->primaryCategoryBox->clear();
+  ui->categories->clear();
+  ui->primaryCategories->clear();
 }
 
 void CategoriesTab::update()
@@ -32,8 +29,8 @@ void CategoriesTab::update()
   clear();
 
   add(
-    CategoryFactory::instance(), m_mod->getCategories(),
-    ui->categoriesTree->invisibleRootItem(), 0);
+    CategoryFactory::instance(), mod()->getCategories(),
+    ui->categories->invisibleRootItem(), 0);
 
   updatePrimary();
 }
@@ -71,15 +68,15 @@ void CategoriesTab::add(
 
 void CategoriesTab::updatePrimary()
 {
-  ui->primaryCategoryBox->clear();
+  ui->primaryCategories->clear();
 
-  int primaryCategory = m_mod->getPrimaryCategory();
+  int primaryCategory = mod()->getPrimaryCategory();
 
-  addChecked(ui->categoriesTree->invisibleRootItem());
+  addChecked(ui->categories->invisibleRootItem());
 
-  for (int i = 0; i < ui->primaryCategoryBox->count(); ++i) {
-    if (ui->primaryCategoryBox->itemData(i).toInt() == primaryCategory) {
-      ui->primaryCategoryBox->setCurrentIndex(i);
+  for (int i = 0; i < ui->primaryCategories->count(); ++i) {
+    if (ui->primaryCategories->itemData(i).toInt() == primaryCategory) {
+      ui->primaryCategories->setCurrentIndex(i);
       break;
     }
   }
@@ -90,7 +87,7 @@ void CategoriesTab::addChecked(QTreeWidgetItem* tree)
   for (int i = 0; i < tree->childCount(); ++i) {
     QTreeWidgetItem *child = tree->child(i);
     if (child->checkState(0) == Qt::Checked) {
-      ui->primaryCategoryBox->addItem(child->text(0), child->data(0, Qt::UserRole));
+      ui->primaryCategories->addItem(child->text(0), child->data(0, Qt::UserRole));
       addChecked(child);
     }
   }
@@ -101,7 +98,7 @@ void CategoriesTab::save(QTreeWidgetItem* currentNode)
   for (int i = 0; i < currentNode->childCount(); ++i) {
     QTreeWidgetItem *childNode = currentNode->child(i);
 
-    m_mod->setCategory(
+    mod()->setCategory(
       childNode->data(0, Qt::UserRole).toInt(), childNode->checkState(0));
 
     save(childNode);
@@ -118,12 +115,12 @@ void CategoriesTab::onCategoryChanged(QTreeWidgetItem* item, int)
   }
 
   updatePrimary();
-  save(ui->categoriesTree->invisibleRootItem());
+  save(ui->categories->invisibleRootItem());
 }
 
 void CategoriesTab::onPrimaryChanged(int index)
 {
   if (index != -1) {
-    m_mod->setPrimaryCategory(ui->primaryCategoryBox->itemData(index).toInt());
+    mod()->setPrimaryCategory(ui->primaryCategories->itemData(index).toInt());
   }
 }
diff --git a/src/modinfodialogcategories.h b/src/modinfodialogcategories.h
index c0644c7f..76426a5d 100644
--- a/src/modinfodialogcategories.h
+++ b/src/modinfodialogcategories.h
@@ -5,16 +5,14 @@ class CategoryFactory;
 class CategoriesTab : public ModInfoDialogTab
 {
 public:
-  CategoriesTab(QWidget* parent, Ui::ModInfoDialog* ui);
+  CategoriesTab(
+    OrganizerCore& oc, PluginContainer& plugin,
+    QWidget* parent, Ui::ModInfoDialog* ui);
 
   void clear() override;
-  void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin) override;
   void update() override;
 
 private:
-  Ui::ModInfoDialog* ui;
-  ModInfo::Ptr m_mod;
-
   void add(
     const CategoryFactory& factory, const std::set<int>& enabledCategories,
     QTreeWidgetItem* root, int rootLevel);
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index d2dca492..4176ac3e 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -116,10 +116,10 @@ public:
 
 
 ConflictsTab::ConflictsTab(
-  QWidget* parent, Ui::ModInfoDialog* ui,
-  OrganizerCore& oc, PluginContainer& plugin) :
-    m_parent(parent), ui(ui), m_core(oc), m_plugin(plugin),
-    m_origin(nullptr), m_general(this, ui, oc), m_advanced(this, ui, oc)
+  OrganizerCore& oc, PluginContainer& plugin,
+  QWidget* parent, Ui::ModInfoDialog* ui) :
+    ModInfoDialogTab(oc, plugin, parent, ui),
+    m_general(this, ui, oc), m_advanced(this, ui, oc)
 {
   connect(
     &m_general, &GeneralConflictsTab::modOpen,
@@ -130,15 +130,6 @@ ConflictsTab::ConflictsTab(
     [&](const QString& name){ emitModOpen(name); });
 }
 
-void ConflictsTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
-{
-  m_mod = mod;
-  m_origin = origin;
-
-  m_general.setMod(mod, origin);
-  m_advanced.setMod(mod, origin);
-}
-
 void ConflictsTab::update()
 {
   m_general.update();
@@ -186,7 +177,7 @@ void ConflictsTab::changeItemsVisibility(
     flags |= FileRenamer::MULTIPLE;
   }
 
-  FileRenamer renamer(m_parent, flags);
+  FileRenamer renamer(parentWidget(), flags);
 
   for (const auto* item : items) {
     if (stop) {
@@ -242,8 +233,8 @@ void ConflictsTab::changeItemsVisibility(
   if (changed) {
     qDebug().nospace() << "triggering refresh";
 
-    if (m_origin) {
-      emit originModified(m_origin->getID());
+    if (origin()) {
+      emit originModified(origin()->getID());
     }
 
     update();
@@ -256,7 +247,7 @@ void ConflictsTab::openItems(const QList<QTreeWidgetItem*>& items)
   // in case this changes
   for (auto* item : items) {
     if (auto* ci=dynamic_cast<ConflictItem*>(item)) {
-      m_core.executeFileVirtualized(m_parent, ci->fileName());
+      core().executeFileVirtualized(parentWidget(), ci->fileName());
     }
   }
 }
@@ -267,7 +258,7 @@ void ConflictsTab::previewItems(const QList<QTreeWidgetItem*>& items)
   // in case this changes
   for (auto* item : items) {
     if (auto* ci=dynamic_cast<ConflictItem*>(item)) {
-      m_core.previewFileWithAlternatives(m_parent, ci->fileName());
+      core().previewFileWithAlternatives(parentWidget(), ci->fileName());
     }
   }
 }
@@ -355,7 +346,7 @@ ConflictsTab::Actions ConflictsTab::createMenuActions(
     enableHide = ci->canHide();
     enableUnhide = ci->canUnhide();
     enableOpen = ci->canOpen();
-    enablePreview = ci->canPreview(m_plugin);
+    enablePreview = ci->canPreview(plugin());
     enableGoto = ci->hasAlts();
   }
   else {
@@ -394,21 +385,21 @@ ConflictsTab::Actions ConflictsTab::createMenuActions(
 
   Actions actions;
 
-  actions.hide = new QAction(tr("Hide"), m_parent);
+  actions.hide = new QAction(tr("Hide"), parentWidget());
   actions.hide->setEnabled(enableHide);
 
   // note that it is possible for hidden files to appear if they override other
   // hidden files from another mod
-  actions.unhide = new QAction(tr("Unhide"), m_parent);
+  actions.unhide = new QAction(tr("Unhide"), parentWidget());
   actions.unhide->setEnabled(enableUnhide);
 
-  actions.open = new QAction(tr("Open/Execute"), m_parent);
+  actions.open = new QAction(tr("Open/Execute"), parentWidget());
   actions.open->setEnabled(enableOpen);
 
-  actions.preview = new QAction(tr("Preview"), m_parent);
+  actions.preview = new QAction(tr("Preview"), parentWidget());
   actions.preview->setEnabled(enablePreview);
 
-  actions.gotoMenu = new QMenu(tr("Go to..."), m_parent);
+  actions.gotoMenu = new QMenu(tr("Go to..."), parentWidget());
   actions.gotoMenu->setEnabled(enableGoto);
 
   if (enableGoto) {
@@ -421,7 +412,7 @@ ConflictsTab::Actions ConflictsTab::createMenuActions(
 std::vector<QAction*> ConflictsTab::createGotoActions(
   const QList<QTreeWidgetItem*>& selection)
 {
-  if (!m_origin || selection.size() != 1) {
+  if (!origin() || selection.size() != 1) {
     return {};
   }
 
@@ -430,26 +421,26 @@ std::vector<QAction*> ConflictsTab::createGotoActions(
     return {};
   }
 
-  auto file = m_origin->findFile(item->fileIndex());
+  auto file = origin()->findFile(item->fileIndex());
   if (!file) {
     return {};
   }
 
 
   std::vector<QString> mods;
-  const auto& ds = *m_core.directoryStructure();
+  const auto& ds = *core().directoryStructure();
 
   // add all alternatives
   for (const auto& alt : file->getAlternatives()) {
     const auto& o = ds.getOriginByID(alt.first);
-    if (o.getID() != m_origin->getID()) {
+    if (o.getID() != origin()->getID()) {
       mods.push_back(ToQString(o.getName()));
     }
   }
 
   // add the real origin if different from this mod
   const FilesOrigin& realOrigin = ds.getOriginByID(file->getOrigin());
-  if (realOrigin.getID() != m_origin->getID()) {
+  if (realOrigin.getID() != origin()->getID()) {
     mods.push_back(ToQString(realOrigin.getName()));
   }
 
@@ -460,7 +451,7 @@ std::vector<QAction*> ConflictsTab::createGotoActions(
   std::vector<QAction*> actions;
 
   for (const auto& name : mods) {
-    actions.push_back(new QAction(name, m_parent));
+    actions.push_back(new QAction(name, parentWidget()));
   }
 
   return actions;
@@ -469,7 +460,7 @@ std::vector<QAction*> ConflictsTab::createGotoActions(
 
 GeneralConflictsTab::GeneralConflictsTab(
   ConflictsTab* tab, Ui::ModInfoDialog* ui, OrganizerCore& oc)
-    : m_tab(tab), ui(ui), m_core(oc), m_origin(nullptr)
+    : m_tab(tab), ui(ui), m_core(oc)
 {
   m_expanders.overwrite.set(ui->overwriteExpander, ui->overwriteTree, true);
   m_expanders.overwritten.set(ui->overwrittenExpander, ui->overwrittenTree, true);
@@ -560,12 +551,6 @@ void GeneralConflictsTab::restoreState(const Settings& s)
     .value("mod_info_conflicts_general_overwritten").toByteArray());
 }
 
-void GeneralConflictsTab::setMod(ModInfo::Ptr mod, FilesOrigin* origin)
-{
-  m_mod = mod;
-  m_origin = origin;
-}
-
 void GeneralConflictsTab::update()
 {
   clear();
@@ -574,10 +559,10 @@ void GeneralConflictsTab::update()
   int numOverwrite = 0;
   int numOverwritten = 0;
 
-  if (m_origin != nullptr) {
-    const auto rootPath = m_mod->absolutePath();
+  if (m_tab->origin() != nullptr) {
+    const auto rootPath = m_tab->mod()->absolutePath();
 
-    for (const auto& file : m_origin->getFiles()) {
+    for (const auto& file : m_tab->origin()->getFiles()) {
       const QString relativeName = QDir::fromNativeSeparators(ToQString(file->getRelativePath()));
       const QString fileName = relativeName.mid(0).prepend(rootPath);
 
@@ -585,7 +570,7 @@ void GeneralConflictsTab::update()
       const int fileOrigin = file->getOrigin(archive);
       const auto& alternatives = file->getAlternatives();
 
-      if (fileOrigin == m_origin->getID()) {
+      if (fileOrigin == m_tab->origin()->getID()) {
         if (!alternatives.empty()) {
           ui->overwriteTree->addTopLevelItem(createOverwriteItem(
             file->getIndex(), archive, fileName, relativeName, alternatives));
@@ -684,7 +669,7 @@ void GeneralConflictsTab::onOverwrittenActivated(QTreeWidgetItem *item, int)
 
 AdvancedConflictsTab::AdvancedConflictsTab(
   ConflictsTab* tab, Ui::ModInfoDialog* ui, OrganizerCore& oc)
-    : m_tab(tab), ui(ui), m_core(oc), m_origin(nullptr)
+    : m_tab(tab), ui(ui), m_core(oc)
 {
   // left-elide the overwrites column so that the nearest are visible
   ui->conflictsAdvancedList->setItemDelegateForColumn(
@@ -760,20 +745,14 @@ void AdvancedConflictsTab::restoreState(const Settings& s)
   }
 }
 
-void AdvancedConflictsTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
-{
-  m_mod = mod;
-  m_origin = origin;
-}
-
 void AdvancedConflictsTab::update()
 {
   clear();
 
-  if (m_origin != nullptr) {
-    const auto rootPath = m_mod->absolutePath();
+  if (m_tab->origin() != nullptr) {
+    const auto rootPath = m_tab->mod()->absolutePath();
 
-    for (const auto& file : m_origin->getFiles()) {
+    for (const auto& file : m_tab->origin()->getFiles()) {
       const QString relativeName = QDir::fromNativeSeparators(ToQString(file->getRelativePath()));
       const QString fileName = relativeName.mid(0).prepend(rootPath);
 
@@ -813,14 +792,14 @@ QTreeWidgetItem* AdvancedConflictsTab::createItem(
         // fills 'before' and 'after' with all the alternatives that come
         // before and after this mod in terms of priority
 
-        if (altOrigin.getPriority() < m_origin->getPriority()) {
+        if (altOrigin.getPriority() < m_tab->origin()->getPriority()) {
           // add all the mods having a lower priority than this one
           if (!before.isEmpty()) {
             before += ", ";
           }
 
           before += ToQString(altOrigin.getName());
-        } else if (altOrigin.getPriority() > m_origin->getPriority()) {
+        } else if (altOrigin.getPriority() > m_tab->origin()->getPriority()) {
           // add all the mods having a higher priority than this one
           if (!after.isEmpty()) {
             after += ", ";
@@ -832,7 +811,7 @@ QTreeWidgetItem* AdvancedConflictsTab::createItem(
         // keep track of the nearest mods that come before and after this one
         // in terms of priority
 
-        if (altOrigin.getPriority() < m_origin->getPriority()) {
+        if (altOrigin.getPriority() < m_tab->origin()->getPriority()) {
           // the alternative has a lower priority than this mod
 
           if (altOrigin.getPriority() > beforePrio) {
@@ -843,7 +822,7 @@ QTreeWidgetItem* AdvancedConflictsTab::createItem(
           }
         }
 
-        if (altOrigin.getPriority() > m_origin->getPriority()) {
+        if (altOrigin.getPriority() > m_tab->origin()->getPriority()) {
           // the alternative has a higher priority than this mod
 
           if (altOrigin.getPriority() < afterPrio) {
@@ -869,7 +848,7 @@ QTreeWidgetItem* AdvancedConflictsTab::createItem(
 
       // if no mods overwrite this file, the primary origin is the same as this
       // mod, so ignore that
-      if (realOrigin.getID() != m_origin->getID()) {
+      if (realOrigin.getID() != m_tab->origin()->getID()) {
         if (!after.isEmpty()) {
           after += ", ";
         }
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index 212a196d..20362575 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -21,7 +21,6 @@ public:
   void saveState(Settings& s);
   void restoreState(const Settings& s);
 
-  void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin);
   void update();
 
 signals:
@@ -36,8 +35,6 @@ private:
   ConflictsTab* m_tab;
   Ui::ModInfoDialog* ui;
   OrganizerCore& m_core;
-  ModInfo::Ptr m_mod;
-  MOShared::FilesOrigin* m_origin;
   Expanders m_expanders;
 
   QTreeWidgetItem* createOverwriteItem(
@@ -74,7 +71,6 @@ public:
   void saveState(Settings& s);
   void restoreState(const Settings& s);
 
-  void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin);
   void update();
 
 signals:
@@ -84,8 +80,6 @@ private:
   ConflictsTab* m_tab;
   Ui::ModInfoDialog* ui;
   OrganizerCore& m_core;
-  ModInfo::Ptr m_mod;
-  MOShared::FilesOrigin* m_origin;
   FilterWidget m_filter;
 
   QTreeWidgetItem* createItem(
@@ -101,10 +95,9 @@ class ConflictsTab : public ModInfoDialogTab
 
 public:
   ConflictsTab(
-    QWidget* parent, Ui::ModInfoDialog* ui,
-    OrganizerCore& oc, PluginContainer& plugin);
+    OrganizerCore& oc, PluginContainer& plugin,
+    QWidget* parent, Ui::ModInfoDialog* ui);
 
-  void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin) override;
   void update() override;
 
   void clear() override;
@@ -136,12 +129,6 @@ private:
     }
   };
 
-  QWidget* m_parent;
-  Ui::ModInfoDialog* ui;
-  OrganizerCore& m_core;
-  PluginContainer& m_plugin;
-  ModInfo::Ptr m_mod;
-  MOShared::FilesOrigin* m_origin;
   GeneralConflictsTab m_general;
   AdvancedConflictsTab m_advanced;
 
diff --git a/src/modinfodialogesps.cpp b/src/modinfodialogesps.cpp
index cb3dcc84..ea7eb3b0 100644
--- a/src/modinfodialogesps.cpp
+++ b/src/modinfodialogesps.cpp
@@ -122,8 +122,10 @@ private:
 };
 
 
-ESPsTab::ESPsTab(QWidget* parent, Ui::ModInfoDialog* ui)
-  : m_parent(parent), ui(ui)
+ESPsTab::ESPsTab(
+  OrganizerCore& oc, PluginContainer& plugin,
+  QWidget* parent, Ui::ModInfoDialog* ui)
+    : ModInfoDialogTab(oc, plugin, parent, ui)
 {
   QObject::connect(
     ui->activateESP, &QToolButton::clicked, [&]{ onActivate(); });
@@ -187,7 +189,7 @@ void ESPsTab::onActivate()
     bool okClicked = false;
 
     newName = QInputDialog::getText(
-      m_parent,
+      parentWidget(),
       QObject::tr("File Exists"),
       QObject::tr("A file with that name exists, please enter a new one"),
       QLineEdit::Normal, file.fileName(), &okClicked);
diff --git a/src/modinfodialogesps.h b/src/modinfodialogesps.h
index d71ad3ff..e1a7a4f7 100644
--- a/src/modinfodialogesps.h
+++ b/src/modinfodialogesps.h
@@ -10,15 +10,14 @@ class ESPsTab : public ModInfoDialogTab
   Q_OBJECT;
 
 public:
-  ESPsTab(QWidget* parent, Ui::ModInfoDialog* ui);
+  ESPsTab(
+    OrganizerCore& oc, PluginContainer& plugin,
+    QWidget* parent, Ui::ModInfoDialog* ui);
 
   void clear() override;
   bool feedFile(const QString& rootPath, const QString& fullPath) override;
 
 private:
-  QWidget* m_parent;
-  Ui::ModInfoDialog* ui;
-
   void onActivate();
   void onDeactivate();
 
diff --git a/src/modinfodialogimages.cpp b/src/modinfodialogimages.cpp
index 752c8d0c..1c7dcc1f 100644
--- a/src/modinfodialogimages.cpp
+++ b/src/modinfodialogimages.cpp
@@ -80,8 +80,10 @@ void ScalableImage::mousePressEvent(QMouseEvent* e)
 }
 
 
-ImagesTab::ImagesTab(QWidget*, Ui::ModInfoDialog* ui)
-  : ui(ui), m_image(new ScalableImage)
+ImagesTab::ImagesTab(
+  OrganizerCore& oc, PluginContainer& plugin,
+  QWidget* parent, Ui::ModInfoDialog* ui)
+    : ModInfoDialogTab(oc, plugin, parent, ui), m_image(new ScalableImage)
 {
   ui->imagesImage->layout()->addWidget(m_image);
   ui->imagesThumbnails->setLayout(new QVBoxLayout);
diff --git a/src/modinfodialogimages.h b/src/modinfodialogimages.h
index 708045c8..7853935a 100644
--- a/src/modinfodialogimages.h
+++ b/src/modinfodialogimages.h
@@ -34,13 +34,14 @@ class ImagesTab : public ModInfoDialogTab
   Q_OBJECT;
 
 public:
-  ImagesTab(QWidget* parent, Ui::ModInfoDialog* ui);
+  ImagesTab(
+    OrganizerCore& oc, PluginContainer& plugin,
+    QWidget* parent, Ui::ModInfoDialog* ui);
 
   void clear() override;
   bool feedFile(const QString& rootPath, const QString& fullPath) override;
 
 private:
-  Ui::ModInfoDialog* ui;
   ScalableImage* m_image;
 
   void add(const QString& fullPath);
diff --git a/src/modinfodialognexus.cpp b/src/modinfodialognexus.cpp
new file mode 100644
index 00000000..753d43de
--- /dev/null
+++ b/src/modinfodialognexus.cpp
@@ -0,0 +1,273 @@
+#include "modinfodialognexus.h"
+#include "ui_modinfodialog.h"
+#include "settings.h"
+#include "organizercore.h"
+#include "iplugingame.h"
+#include "bbcode.h"
+#include <versioninfo.h>
+#include <utility.h>
+
+NexusTab::NexusTab(
+  OrganizerCore& oc, PluginContainer& plugin,
+  QWidget* parent, Ui::ModInfoDialog* ui)
+    : ModInfoDialogTab(oc, plugin, parent, ui), m_requestStarted(false)
+{
+  ui->modID->setValidator(new QIntValidator(ui->modID));
+  ui->endorse->setVisible(core().settings().endorsementIntegration());
+
+  connect(ui->modID, &QLineEdit::editingFinished, [&]{ onModIDChanged(); });
+  connect(ui->version, &QLineEdit::editingFinished, [&]{ onVersionChanged(); });
+  connect(ui->openInBrowser, &QToolButton::clicked, [&]{ onOpenLink(); });
+  connect(ui->url, &QLineEdit::editingFinished, [&]{ onUrlChanged(); });
+  connect(ui->endorse, &QToolButton::clicked, [&]{ onEndorse(); });
+  connect(ui->refresh, &QToolButton::clicked, [&]{ updateWebpage(); });
+
+  connect(
+    ui->sourceGame,
+    static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    [&]{ onSourceGameChanged(); });
+}
+
+NexusTab::~NexusTab()
+{
+  cleanup();
+}
+
+void NexusTab::cleanup()
+{
+  if (m_modConnection) {
+    disconnect(m_modConnection);
+    m_modConnection = {};
+  }
+}
+
+void NexusTab::clear()
+{
+  ui->modID->clear();
+  ui->sourceGame->clear();
+  ui->version->clear();
+  ui->browser->setPage(new NexusTabWebpage(ui->browser));
+  ui->url->clear();
+}
+
+void NexusTab::update()
+{
+  clear();
+
+  ui->modID->setText(QString("%1").arg(mod()->getNexusID()));
+
+  QString gameName = mod()->getGameName();
+  ui->sourceGame->addItem(
+    core().managedGame()->gameName(),
+    core().managedGame()->gameShortName());
+
+  if (core().managedGame()->validShortNames().size() == 0) {
+    ui->sourceGame->setDisabled(true);
+  } else {
+    for (auto game : plugin().plugins<MOBase::IPluginGame>()) {
+      for (QString gameName : core().managedGame()->validShortNames()) {
+        if (game->gameShortName().compare(gameName, Qt::CaseInsensitive) == 0) {
+          ui->sourceGame->addItem(game->gameName(), game->gameShortName());
+          break;
+        }
+      }
+    }
+  }
+
+  ui->sourceGame->setCurrentIndex(ui->sourceGame->findData(gameName));
+
+  auto* page = new NexusTabWebpage(ui->browser);
+  ui->browser->setPage(page);
+
+  connect(
+    page, &NexusTabWebpage::linkClicked,
+    [&](const QUrl& url){ MOBase::shell::OpenLink(url); });
+
+  ui->endorse->setEnabled(
+    (mod()->endorsedState() == ModInfo::ENDORSED_FALSE) ||
+    (mod()->endorsedState() == ModInfo::ENDORSED_NEVER));
+
+  updateWebpage();
+}
+
+void NexusTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
+{
+  cleanup();
+
+  ModInfoDialogTab::setMod(mod, origin);
+
+  m_modConnection = connect(
+    mod.data(), &ModInfo::modDetailsUpdated, [&]{ onModChanged(); });
+}
+
+void NexusTab::updateVersionColor()
+{
+  if (mod()->getVersion() != mod()->getNewestVersion()) {
+    ui->version->setStyleSheet("color: red");
+    ui->version->setToolTip(tr("Current Version: %1").arg(
+      mod()->getNewestVersion().canonicalString()));
+  } else {
+    ui->version->setStyleSheet("color: green");
+    ui->version->setToolTip(tr("No update available"));
+  }
+}
+
+void NexusTab::updateWebpage()
+{
+  const int modID = mod()->getNexusID();
+
+  if (modID > 0) {
+    const QString nexusLink = NexusInterface::instance(&plugin())
+      ->getModURL(modID, mod()->getGameName());
+
+    ui->openInBrowser->setToolTip(nexusLink);
+    mod()->setURL(nexusLink);
+    refreshData(modID);
+  } else {
+    onModChanged();
+  }
+
+  ui->version->setText(mod()->getVersion().displayString());
+  ui->url->setText(mod()->getURL());
+}
+
+void NexusTab::onModChanged()
+{
+  m_requestStarted = false;
+
+  const QString nexusDescription = mod()->getNexusDescription();
+
+  QString descriptionAsHTML = R"(
+<html>
+  <head>
+    <style class=\"nexus-description\">
+    body
+    {
+      font-style: sans-serif;
+      background: #707070;
+    }
+
+    a
+    {
+      color: #5EA2E5;
+    }
+    </style>
+  </head>
+  <body>%1</body>
+</html>)";
+
+  if (nexusDescription.isEmpty()) {
+    descriptionAsHTML = descriptionAsHTML.arg(tr(
+      "<div style=\"text-align: center;\">"
+      "<h1>Uh oh!</h1>"
+      "<p>Sorry, there is no description available for this mod. :(</p>"
+      "</div>"));
+
+  } else {
+    descriptionAsHTML = descriptionAsHTML.arg(
+      BBCode::convertToHTML(nexusDescription));
+  }
+
+  ui->browser->page()->setHtml(descriptionAsHTML);
+  updateVersionColor();
+}
+
+void NexusTab::onModIDChanged()
+{
+  const int oldID = mod()->getNexusID();
+  const int newID = ui->modID->text().toInt();
+
+  if (oldID != newID){
+    mod()->setNexusID(newID);
+    mod()->setLastNexusQuery(QDateTime::fromSecsSinceEpoch(0));
+
+    ui->browser->page()->setHtml("");
+
+    if (newID != 0) {
+      refreshData(newID);
+    }
+  }
+}
+
+void NexusTab::onSourceGameChanged()
+{
+  for (auto game : plugin().plugins<MOBase::IPluginGame>()) {
+    if (game->gameName() == ui->sourceGame->currentText()) {
+      mod()->setGameName(game->gameShortName());
+      mod()->setLastNexusQuery(QDateTime::fromSecsSinceEpoch(0));
+      refreshData(mod()->getNexusID());
+      return;
+    }
+  }
+}
+
+void NexusTab::onVersionChanged()
+{
+  MOBase::VersionInfo version(ui->version->text());
+  mod()->setVersion(version);
+  updateVersionColor();
+}
+
+void NexusTab::onUrlChanged()
+{
+  mod()->setURL(ui->url->text());
+  mod()->setLastNexusQuery(QDateTime::fromSecsSinceEpoch(0));
+}
+
+void NexusTab::onOpenLink()
+{
+  const int modID = mod()->getNexusID();
+
+  if (modID > 0) {
+    const QString nexusLink = NexusInterface::instance(&plugin())
+     ->getModURL(modID, mod()->getGameName());
+
+    MOBase::shell::OpenLink(QUrl(nexusLink));
+  }
+}
+
+void NexusTab::onRefreshBrowser()
+{
+  const auto modID = mod()->getNexusID();
+
+  if (modID > 0) {
+    refreshData(modID);
+  } else
+    qInfo("Mod has no valid Nexus ID, info can't be updated.");
+}
+
+void NexusTab::onEndorse()
+{
+  core().loggedInAction(parentWidget(), [m=mod()]{ m->endorse(true); });
+}
+
+void NexusTab::refreshData(int modID)
+{
+  if (tryRefreshData(modID)) {
+    m_requestStarted = true;
+  } else {
+    onModChanged();
+  }
+
+  //MessageDialog::showMessage(tr("Info requested, please wait"), this);
+}
+
+bool NexusTab::tryRefreshData(int modID)
+{
+  if (modID <= 0) {
+    qDebug() << "NexusTab: can't refresh, no mod id";
+    return false;
+  }
+
+  if (m_requestStarted) {
+    qDebug() << "NexusTab: a refresh request is already running";
+    return false;
+  }
+
+  if (!mod()->updateNXMInfo()) {
+    qDebug() << "NexusTab: nexus description does not need an update";
+    return false;
+  }
+
+  return true;
+}
diff --git a/src/modinfodialognexus.h b/src/modinfodialognexus.h
new file mode 100644
index 00000000..2e328c6d
--- /dev/null
+++ b/src/modinfodialognexus.h
@@ -0,0 +1,67 @@
+#ifndef MODINFODIALOGNEXUS_H
+#define MODINFODIALOGNEXUS_H
+
+#include "modinfodialogtab.h"
+
+class NexusTabWebpage : public QWebEnginePage
+{
+  Q_OBJECT
+
+public:
+  NexusTabWebpage(QObject* parent = 0)
+    : QWebEnginePage(parent)
+  {
+  }
+
+  bool acceptNavigationRequest(
+    const QUrl & url, QWebEnginePage::NavigationType type, bool) override
+  {
+    if (type == QWebEnginePage::NavigationTypeLinkClicked)
+    {
+      emit linkClicked(url);
+      return false;
+    }
+
+    return true;
+  }
+
+signals:
+  void linkClicked(const QUrl&);
+};
+
+
+class NexusTab : public ModInfoDialogTab
+{
+public:
+  NexusTab(
+    OrganizerCore& oc, PluginContainer& plugin,
+    QWidget* parent, Ui::ModInfoDialog* ui);
+
+  ~NexusTab();
+
+  void clear() override;
+  void update() override;
+  void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin) override;
+
+private:
+  QMetaObject::Connection m_modConnection;
+  bool m_requestStarted;
+
+  void cleanup();
+  void updateVersionColor();
+  void updateWebpage();
+
+  void refreshData(int modID);
+  bool tryRefreshData(int modID);
+
+  void onModChanged();
+  void onOpenLink();
+  void onModIDChanged();
+  void onSourceGameChanged();
+  void onVersionChanged();
+  void onRefreshBrowser();
+  void onEndorse();
+  void onUrlChanged();
+};
+
+#endif // MODINFODIALOGNEXUS_H
diff --git a/src/modinfodialogtab.cpp b/src/modinfodialogtab.cpp
index 6dcff0ac..ae0de5e8 100644
--- a/src/modinfodialogtab.cpp
+++ b/src/modinfodialogtab.cpp
@@ -1,5 +1,12 @@
 #include "modinfodialogtab.h"
 
+ModInfoDialogTab::ModInfoDialogTab(
+  OrganizerCore& oc, PluginContainer& plugin,
+  QWidget* parent, Ui::ModInfoDialog* ui)
+    : ui(ui), m_core(oc), m_plugin(plugin), m_parent(parent), m_origin(nullptr)
+{
+}
+
 bool ModInfoDialogTab::feedFile(const QString&, const QString&)
 {
   // no-op
@@ -21,14 +28,40 @@ void ModInfoDialogTab::restoreState(const Settings& s)
   // no-op
 }
 
-void ModInfoDialogTab::setMod(ModInfo::Ptr, MOShared::FilesOrigin*)
+void ModInfoDialogTab::update()
 {
   // no-op
 }
 
-void ModInfoDialogTab::update()
+void ModInfoDialogTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
 {
-  // no-op
+  m_mod = mod;
+  m_origin = origin;
+}
+
+ModInfo::Ptr ModInfoDialogTab::mod() const
+{
+  return m_mod;
+}
+
+MOShared::FilesOrigin* ModInfoDialogTab::origin() const
+{
+  return m_origin;
+}
+
+OrganizerCore& ModInfoDialogTab::core()
+{
+  return m_core;
+}
+
+PluginContainer& ModInfoDialogTab::plugin()
+{
+  return m_plugin;
+}
+
+QWidget* ModInfoDialogTab::parentWidget()
+{
+  return m_parent;
 }
 
 void ModInfoDialogTab::emitOriginModified(int originID)
diff --git a/src/modinfodialogtab.h b/src/modinfodialogtab.h
index ead29d10..dd851b31 100644
--- a/src/modinfodialogtab.h
+++ b/src/modinfodialogtab.h
@@ -8,13 +8,13 @@ namespace MOShared { class FilesOrigin; }
 namespace Ui { class ModInfoDialog; }
 
 class Settings;
+class OrganizerCore;
 
 class ModInfoDialogTab : public QObject
 {
   Q_OBJECT;
 
 public:
-  ModInfoDialogTab() = default;
   ModInfoDialogTab(const ModInfoDialogTab&) = delete;
   ModInfoDialogTab& operator=(const ModInfoDialogTab&) = delete;
   ModInfoDialogTab(ModInfoDialogTab&&) = default;
@@ -22,21 +22,42 @@ public:
   virtual ~ModInfoDialogTab() = default;
 
   virtual void clear() = 0;
+  virtual void update();
   virtual bool feedFile(const QString& rootPath, const QString& filename);
   virtual bool canClose();
   virtual void saveState(Settings& s);
   virtual void restoreState(const Settings& s);
 
   virtual void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin);
-  virtual void update();
+
+  ModInfo::Ptr mod() const;
+  MOShared::FilesOrigin* origin() const;
 
 signals:
   void originModified(int originID);
   void modOpen(QString name);
 
 protected:
+  Ui::ModInfoDialog* ui;
+
+  ModInfoDialogTab(
+    OrganizerCore& oc, PluginContainer& plugin,
+    QWidget* parent, Ui::ModInfoDialog* ui);
+
+  OrganizerCore& core();
+  PluginContainer& plugin();
+
+  QWidget* parentWidget();
+
   void emitOriginModified(int originID);
   void emitModOpen(QString name);
+
+private:
+  OrganizerCore& m_core;
+  PluginContainer& m_plugin;
+  QWidget* m_parent;
+  ModInfo::Ptr m_mod;
+  MOShared::FilesOrigin* m_origin;
 };
 
 #endif // MODINFODIALOGTAB_H
diff --git a/src/modinfodialogtextfiles.cpp b/src/modinfodialogtextfiles.cpp
index 0dd6f06e..f48557b0 100644
--- a/src/modinfodialogtextfiles.cpp
+++ b/src/modinfodialogtextfiles.cpp
@@ -22,8 +22,10 @@ private:
 
 
 GenericFilesTab::GenericFilesTab(
-  QWidget* parent, QListWidget* list, QSplitter* sp, TextEditor* e)
-    : m_parent(parent), m_list(list), m_editor(e)
+  OrganizerCore& oc, PluginContainer& plugin,
+  QWidget* parent, Ui::ModInfoDialog* ui,
+  QListWidget* list, QSplitter* sp, TextEditor* e)
+    : ModInfoDialogTab(oc, plugin, parent, ui), m_list(list), m_editor(e)
 {
   m_editor->setupToolbar();
 
@@ -49,7 +51,7 @@ bool GenericFilesTab::canClose()
   }
 
   const int res = QMessageBox::question(
-    m_parent,
+    parentWidget(),
     QObject::tr("Save changes?"),
     QObject::tr("Save changes to \"%1\"?").arg(m_editor->filename()),
     QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
@@ -109,9 +111,12 @@ void GenericFilesTab::select(FileListItem* item)
 }
 
 
-TextFilesTab::TextFilesTab(QWidget* parent, Ui::ModInfoDialog* ui)
-  : GenericFilesTab(
-    parent, ui->textFileList, ui->tabTextSplitter, ui->textFileEditor)
+TextFilesTab::TextFilesTab(
+  OrganizerCore& oc, PluginContainer& plugin,
+  QWidget* parent, Ui::ModInfoDialog* ui)
+    : GenericFilesTab(
+        oc, plugin, parent, ui,
+        ui->textFileList, ui->tabTextSplitter, ui->textFileEditor)
 {
 }
 
@@ -130,9 +135,12 @@ bool TextFilesTab::wantsFile(const QString& rootPath, const QString& fullPath) c
   return false;
 }
 
-IniFilesTab::IniFilesTab(QWidget* parent, Ui::ModInfoDialog* ui)
-  : GenericFilesTab(
-      parent, ui->iniFileList, ui->tabIniSplitter, ui->iniFileEditor)
+IniFilesTab::IniFilesTab(
+  OrganizerCore& oc, PluginContainer& plugin,
+  QWidget* parent, Ui::ModInfoDialog* ui)
+    : GenericFilesTab(
+        oc, plugin, parent, ui,
+        ui->iniFileList, ui->tabIniSplitter, ui->iniFileEditor)
 {
 }
 
diff --git a/src/modinfodialogtextfiles.h b/src/modinfodialogtextfiles.h
index 11691d64..0dc5ec89 100644
--- a/src/modinfodialogtextfiles.h
+++ b/src/modinfodialogtextfiles.h
@@ -18,12 +18,12 @@ public:
   bool feedFile(const QString& rootPath, const QString& fullPath) override;
 
 protected:
-  QWidget* m_parent;
   QListWidget* m_list;
   TextEditor* m_editor;
 
   GenericFilesTab(
-    QWidget* parent,
+    OrganizerCore& oc, PluginContainer& plugin,
+    QWidget* parent, Ui::ModInfoDialog* ui,
     QListWidget* list, QSplitter* splitter, TextEditor* editor);
 
   virtual bool wantsFile(const QString& rootPath, const QString& fullPath) const = 0;
@@ -37,7 +37,9 @@ private:
 class TextFilesTab : public GenericFilesTab
 {
 public:
-  TextFilesTab(QWidget* parent, Ui::ModInfoDialog* ui);
+  TextFilesTab(
+    OrganizerCore& oc, PluginContainer& plugin,
+    QWidget* parent, Ui::ModInfoDialog* ui);
 
 protected:
   bool wantsFile(const QString& rootPath, const QString& fullPath) const override;
@@ -47,7 +49,9 @@ protected:
 class IniFilesTab : public GenericFilesTab
 {
 public:
-  IniFilesTab(QWidget* parent, Ui::ModInfoDialog* ui);
+  IniFilesTab(
+    OrganizerCore& oc, PluginContainer& plugin,
+    QWidget* parent, Ui::ModInfoDialog* ui);
 
 protected:
   bool wantsFile(const QString& rootPath, const QString& fullPath) const override;
diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
index a271c4e8..babbd665 100644
--- a/src/modinforegular.cpp
+++ b/src/modinforegular.cpp
@@ -118,7 +118,7 @@ void ModInfoRegular::readMeta()
       m_EndorsedState = metaFile.value("endorsed", false).toBool() ? ENDORSED_TRUE : ENDORSED_FALSE;
     }
   }
-  
+
   QString categoriesString = metaFile.value("category", "").toString();
 
   QStringList categories = categoriesString.split(',', QString::SkipEmptyParts);
@@ -291,15 +291,27 @@ void ModInfoRegular::nxmRequestFailed(QString, int, int, QVariant userData, QNet
 
 bool ModInfoRegular::updateNXMInfo()
 {
-  QDateTime time = QDateTime::currentDateTimeUtc();
-  QDateTime target = m_LastNexusQuery.addDays(1);
-  if (m_NexusID > 0 && time >= target) {
+  if (needsDescriptionUpdate()) {
     m_NexusBridge.requestDescription(m_GameName, m_NexusID, QVariant());
     return true;
   }
+
   return false;
 }
 
+bool ModInfoRegular::needsDescriptionUpdate() const
+{
+  if (m_NexusID > 0) {
+    QDateTime time = QDateTime::currentDateTimeUtc();
+    QDateTime target = m_LastNexusQuery.addDays(1);
+
+    if (time >= target) {
+      return true;
+    }
+  }
+
+  return false;
+}
 
 void ModInfoRegular::setCategory(int categoryID, bool active)
 {
diff --git a/src/modinforegular.h b/src/modinforegular.h
index f70487a2..cfe713ca 100644
--- a/src/modinforegular.h
+++ b/src/modinforegular.h
@@ -464,6 +464,7 @@ private:
   mutable std::vector<ModInfo::EContent> m_CachedContent;
   mutable QTime m_LastContentCheck;
 
+  bool needsDescriptionUpdate() const;
 };
 
 
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 2cad9ce8..e073924b 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -2204,6 +2204,21 @@ void OrganizerCore::updateModsInDirectoryStructure(QMap<unsigned int, ModInfo::P
   }
 }
 
+void OrganizerCore::loggedInAction(QWidget* parent, std::function<void ()> f)
+{
+  if (NexusInterface::instance(m_PluginContainer)->getAccessManager()->validated()) {
+    f();
+  } else {
+    QString apiKey;
+    if (settings().getNexusApiKey(apiKey)) {
+      doAfterLogin([f]{ f(); });
+      NexusInterface::instance(m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
+    } else {
+      MessageDialog::showMessage(tr("You need to be logged in with Nexus"), parent);
+    }
+  }
+}
+
 void OrganizerCore::requestDownload(const QUrl &url, QNetworkReply *reply)
 {
   if (m_PluginContainer != nullptr) {
diff --git a/src/organizercore.h b/src/organizercore.h
index a4a57496..4dd11831 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -146,6 +146,7 @@ public:
   void updateModsInDirectoryStructure(QMap<unsigned int, ModInfo::Ptr> modInfos);
 
   void doAfterLogin(const std::function<void()> &function) { m_PostLoginTasks.append(function); }
+  void loggedInAction(QWidget* parent, std::function<void ()> f);
 
   static QString findJavaInstallation(const QString& jarFile={});
 
-- 
cgit v1.3.1


From 949e451379d63fe4c6bff82a7a059c6792fbebb5 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sun, 23 Jun 2019 06:48:35 -0400
Subject: added missing icons now passing tab index to allow enabling/disabling
 depending on mod type modinfodialog cleanup

---
 src/modinfodialog.cpp           | 173 +++++++++++----------------------
 src/modinfodialog.h             |  48 +++------
 src/modinfodialog.ui            |   5 +-
 src/modinfodialogcategories.cpp |   9 +-
 src/modinfodialogcategories.h   |   3 +-
 src/modinfodialogconflicts.cpp  |  11 ++-
 src/modinfodialogconflicts.h    |   4 +-
 src/modinfodialogesps.cpp       |   4 +-
 src/modinfodialogesps.h         |   2 +-
 src/modinfodialogfiletree.cpp   |   4 +-
 src/modinfodialogfiletree.h     |   2 +-
 src/modinfodialogimages.cpp     |   5 +-
 src/modinfodialogimages.h       |   2 +-
 src/modinfodialognexus.cpp      |   4 +-
 src/modinfodialognexus.h        |   2 +-
 src/modinfodialogtab.cpp        |  29 +++++-
 src/modinfodialogtab.h          |  11 ++-
 src/modinfodialogtextfiles.cpp  |  12 +--
 src/modinfodialogtextfiles.h    |   6 +-
 src/resources.qrc               | 210 ++++++++++++++++++++--------------------
 20 files changed, 258 insertions(+), 288 deletions(-)

(limited to 'src/modinfodialogcategories.cpp')

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 71e514b2..be7d4aa4 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -19,24 +19,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "modinfodialog.h"
 #include "ui_modinfodialog.h"
-#include "mainwindow.h"
-
-#include "modidlineedit.h"
-#include "iplugingame.h"
-#include "nexusinterface.h"
-#include "report.h"
-#include "utility.h"
-#include "messagedialog.h"
-#include "bbcode.h"
-#include "questionboxmemory.h"
-#include "settings.h"
-#include "categories.h"
+#include "plugincontainer.h"
 #include "organizercore.h"
-#include "pluginlistsortproxy.h"
-#include "previewgenerator.h"
-#include "previewdialog.h"
-#include "texteditor.h"
-
 #include "modinfodialogtextfiles.h"
 #include "modinfodialogimages.h"
 #include "modinfodialogesps.h"
@@ -45,23 +29,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "modinfodialognexus.h"
 #include "modinfodialogfiletree.h"
 
-#include <QDir>
-#include <QDirIterator>
-#include <QPushButton>
-#include <QInputDialog>
-#include <QMessageBox>
-#include <QMenu>
-#include <QFileSystemModel>
-#include <QInputDialog>
-#include <QPointer>
-#include <QFileDialog>
-#include <QShortcut>
-
-#include <Shlwapi.h>
-
-#include <sstream>
-
-
 using namespace MOBase;
 using namespace MOShared;
 
@@ -144,13 +111,32 @@ FileRenamer::RenameResults unhideFile(FileRenamer& renamer, const QString &oldNa
 }
 
 
-ModInfoDialog::ModInfoDialog(ModInfo::Ptr modInfo, bool unmanaged, OrganizerCore *organizerCore, PluginContainer *pluginContainer, QWidget *parent)
-  : TutorableDialog("ModInfoDialog", parent), ui(new Ui::ModInfoDialog), m_ModInfo(modInfo),
-   m_Origin(nullptr), m_OrganizerCore(organizerCore), m_PluginContainer(pluginContainer)
+ModInfoDialog::ModInfoDialog(
+  ModInfo::Ptr modInfo, bool unmanaged, OrganizerCore *organizerCore,
+  PluginContainer *pluginContainer, QWidget *parent) :
+    TutorableDialog("ModInfoDialog", parent), ui(new Ui::ModInfoDialog),
+    m_ModInfo(modInfo), m_RootPath(modInfo->absolutePath()),
+    m_OrganizerCore(organizerCore), m_PluginContainer(pluginContainer),
+    m_Origin(nullptr)
 {
   ui->setupUi(this);
 
+  auto* ds = m_OrganizerCore->directoryStructure();
+  if (ds->originExists(ToWString(m_ModInfo->name()))) {
+    m_Origin = &ds->getOriginByName(ToWString(m_ModInfo->name()));
+    if (m_Origin->isDisabled()) {
+      m_Origin = nullptr;
+    }
+  }
+
+  this->setWindowTitle(m_ModInfo->name());
+  this->setWindowModality(Qt::WindowModal);
+
+  auto* sc = new QShortcut(QKeySequence::Delete, this);
+  connect(sc, &QShortcut::activated, [&]{ onDeleteShortcut(); });
+
   m_tabs = createTabs();
+  bool tabSelected = false;
 
   for (std::size_t i=0; i<m_tabs.size(); ++i) {
     connect(
@@ -163,64 +149,20 @@ ModInfoDialog::ModInfoDialog(ModInfo::Ptr modInfo, bool unmanaged, OrganizerCore
         close();
         emit modOpen(name, static_cast<int>(i));
       });
-  }
 
-  this->setWindowTitle(modInfo->name());
-  this->setWindowModality(Qt::WindowModal);
+    bool enabled = true;
 
-  m_RootPath = modInfo->absolutePath();
-
-  auto* sc = new QShortcut(QKeySequence::Delete, this);
-  connect(sc, &QShortcut::activated, [&]{ onDeleteShortcut(); });
-
-  auto* ds = m_OrganizerCore->directoryStructure();
-  if (ds->originExists(ToWString(modInfo->name()))) {
-    m_Origin = &ds->getOriginByName(ToWString(modInfo->name()));
-    if (m_Origin->isDisabled()) {
-      m_Origin = nullptr;
+    if (unmanaged) {
+      enabled = m_tabs[i]->canHandleUnmanaged();
+    } else if (m_ModInfo->hasFlag(ModInfo::FLAG_SEPARATOR)) {
+      enabled = m_tabs[i]->canHandleSeparators();
     }
-  }
 
-  if (modInfo->hasFlag(ModInfo::FLAG_SEPARATOR))
-  {
-    ui->tabWidget->setTabEnabled(TAB_TEXTFILES, false);
-    ui->tabWidget->setTabEnabled(TAB_INIFILES, false);
-    ui->tabWidget->setTabEnabled(TAB_IMAGES, false);
-    ui->tabWidget->setTabEnabled(TAB_ESPS, false);
-    ui->tabWidget->setTabEnabled(TAB_CONFLICTS, false);
-    ui->tabWidget->setTabEnabled(TAB_CATEGORIES, true);
-    ui->tabWidget->setTabEnabled(TAB_NEXUS, false);
-    ui->tabWidget->setTabEnabled(TAB_NOTES, true);
-    ui->tabWidget->setTabEnabled(TAB_FILETREE, false);
-  }
-  else if (unmanaged)
-  {
-    ui->tabWidget->setTabEnabled(TAB_TEXTFILES, false);
-    ui->tabWidget->setTabEnabled(TAB_INIFILES, false);
-    ui->tabWidget->setTabEnabled(TAB_IMAGES, false);
-    ui->tabWidget->setTabEnabled(TAB_ESPS, false);
-    ui->tabWidget->setTabEnabled(TAB_CONFLICTS, true);
-    ui->tabWidget->setTabEnabled(TAB_CATEGORIES, false);
-    ui->tabWidget->setTabEnabled(TAB_NEXUS, false);
-    ui->tabWidget->setTabEnabled(TAB_NOTES, false);
-    ui->tabWidget->setTabEnabled(TAB_FILETREE, false);
-  } else {
-    ui->tabWidget->setTabEnabled(TAB_TEXTFILES, true);
-    ui->tabWidget->setTabEnabled(TAB_INIFILES, true);
-    ui->tabWidget->setTabEnabled(TAB_IMAGES, true);
-    ui->tabWidget->setTabEnabled(TAB_ESPS, true);
-    ui->tabWidget->setTabEnabled(TAB_CONFLICTS, true);
-    ui->tabWidget->setTabEnabled(TAB_CATEGORIES, true);
-    ui->tabWidget->setTabEnabled(TAB_NEXUS, true);
-    ui->tabWidget->setTabEnabled(TAB_NOTES, true);
-    ui->tabWidget->setTabEnabled(TAB_FILETREE, true);
-  }
+    ui->tabWidget->setTabEnabled(static_cast<int>(i), enabled);
 
-  // activate first enabled tab
-  for (int i = 0; i < ui->tabWidget->count(); ++i) {
-    if (ui->tabWidget->isTabEnabled(i)) {
-      ui->tabWidget->setCurrentIndex(i);
-      break;
+    if (!tabSelected && enabled) {
+      ui->tabWidget->setCurrentIndex(static_cast<int>(i));
+      tabSelected = true;
     }
   }
 
@@ -234,23 +176,21 @@ ModInfoDialog::~ModInfoDialog()
   delete ui;
 }
 
-template <class... Ts>
-std::vector<std::unique_ptr<ModInfoDialogTab>> createTabsImpl(
-  OrganizerCore& oc, PluginContainer& plugin,
-  ModInfoDialog* self, Ui::ModInfoDialog* ui)
+std::vector<std::unique_ptr<ModInfoDialogTab>> ModInfoDialog::createTabs()
 {
   std::vector<std::unique_ptr<ModInfoDialogTab>> v;
-  (v.push_back(std::make_unique<Ts>(oc, plugin, self, ui)), ...);
 
-  return v;
-}
+  v.push_back(createTab<TextFilesTab>(TAB_TEXTFILES));
+  v.push_back(createTab<IniFilesTab>(TAB_INIFILES));
+  v.push_back(createTab<ImagesTab>(TAB_IMAGES));
+  v.push_back(createTab<ESPsTab>(TAB_ESPS));
+  v.push_back(createTab<ConflictsTab>(TAB_CONFLICTS));
+  v.push_back(createTab<CategoriesTab>(TAB_CATEGORIES));
+  v.push_back(createTab<NexusTab>(TAB_NEXUS));
+  v.push_back(createTab<NotesTab>(TAB_NOTES));
+  v.push_back(createTab<FileTreeTab>(TAB_FILETREE));
 
-std::vector<std::unique_ptr<ModInfoDialogTab>> ModInfoDialog::createTabs()
-{
-  return createTabsImpl<
-    TextFilesTab, IniFilesTab, ImagesTab, ESPsTab,
-    ConflictsTab, CategoriesTab, NexusTab, NotesTab, FileTreeTab>(
-      *m_OrganizerCore, *m_PluginContainer, this, ui);
+  return v;
 }
 
 int ModInfoDialog::exec()
@@ -259,16 +199,6 @@ int ModInfoDialog::exec()
   return TutorableDialog::exec();
 }
 
-int ModInfoDialog::tabIndex(const QString &tabId)
-{
-  for (int i = 0; i < ui->tabWidget->count(); ++i) {
-    if (ui->tabWidget->widget(i)->objectName() == tabId) {
-      return i;
-    }
-  }
-  return -1;
-}
-
 void ModInfoDialog::saveState(Settings& s) const
 {
   s.directInterface().setValue("mod_info_tabs", saveTabState());
@@ -309,7 +239,7 @@ void ModInfoDialog::restoreTabState(const QByteArray &state)
   }
 
   // then actually move the tabs
-  QTabBar *tabBar = ui->tabWidget->findChild<QTabBar*>("qt_tabwidget_tabbar"); // magic name = bad
+  QTabBar *tabBar = ui->tabWidget->tabBar();
   ui->tabWidget->blockSignals(true);
   for (int newPos = 0; newPos < count; ++newPos) {
     QString tabId = tabIds.at(newPos);
@@ -331,6 +261,16 @@ QByteArray ModInfoDialog::saveTabState() const
   return result;
 }
 
+int ModInfoDialog::tabIndex(const QString& tabId)
+{
+  for (int i = 0; i < ui->tabWidget->count(); ++i) {
+    if (ui->tabWidget->widget(i)->objectName() == tabId) {
+      return i;
+    }
+  }
+  return -1;
+}
+
 void ModInfoDialog::onDeleteShortcut()
 {
   for (auto& t : m_tabs) {
@@ -373,9 +313,8 @@ void ModInfoDialog::on_closeButton_clicked()
 
 void ModInfoDialog::openTab(int tab)
 {
-  QTabWidget *tabWidget = findChild<QTabWidget*>("tabWidget");
-  if (tabWidget->isTabEnabled(tab)) {
-    tabWidget->setCurrentIndex(tab);
+  if (ui->tabWidget->isTabEnabled(tab)) {
+    ui->tabWidget->setCurrentIndex(tab);
   }
 }
 
diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 49007c87..020e7958 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -23,36 +23,15 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "modinfo.h"
 #include "tutorabledialog.h"
-#include "plugincontainer.h"
-#include "organizercore.h"
-#include "filterwidget.h"
 #include "filerenamer.h"
-#include "expanderwidget.h"
-
-#include <QDialog>
-#include <QSignalMapper>
-#include <QSettings>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QModelIndex>
-#include <QAction>
-#include <QPlainTextEdit>
-#include <QListWidgetItem>
-#include <QTreeWidgetItem>
-#include <QTextCodec>
-#include <set>
-#include <directoryentry.h>
-
-namespace Ui {
-    class ModInfoDialog;
-}
-
-class QFileSystemModel;
-class QTreeView;
-class CategoryFactory;
-class TextEditor;
-class ModInfoDialogTab;
 
+namespace Ui { class ModInfoDialog; }
+namespace MOShared { class FilesOrigin; }
+
+class PluginContainer;
+class OrganizerCore;
+class Settings;
+class ModInfoDialogTab;
 
 
 bool canPreviewFile(PluginContainer& pluginContainer, bool isArchive, const QString& filename);
@@ -131,9 +110,6 @@ signals:
   void modOpenPrev(int tab=-1);
   void originModified(int originID);
 
-private:
-  int tabIndex(const QString &tabId);
-
 private slots:
   void on_closeButton_clicked();
   void on_tabWidget_currentChanged(int index);
@@ -141,8 +117,6 @@ private slots:
   void on_prevButton_clicked();
 
 private:
-  using FileEntry = MOShared::FileEntry;
-
   Ui::ModInfoDialog *ui;
   ModInfo::Ptr m_ModInfo;
   std::vector<std::unique_ptr<ModInfoDialogTab>> m_tabs;
@@ -157,6 +131,14 @@ private:
   void restoreTabState(const QByteArray &state);
   QByteArray saveTabState() const;
   void onDeleteShortcut();
+  int tabIndex(const QString &tabId);
+
+  template <class T>
+  std::unique_ptr<ModInfoDialogTab> createTab(int index)
+  {
+    return std::make_unique<T>(
+      *m_OrganizerCore, *m_PluginContainer, this, ui, index);
+  }
 };
 
 #endif // MODINFODIALOG_H
diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index 65b89621..93550de3 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -20,7 +20,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex">
-      <number>8</number>
+      <number>0</number>
      </property>
      <property name="movable">
       <bool>true</bool>
@@ -1148,6 +1148,9 @@ p, li { white-space: pre-wrap; }
          <property name="selectionMode">
           <enum>QAbstractItemView::ExtendedSelection</enum>
          </property>
+         <property name="uniformRowHeights">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
index 69c7c6b5..321c22b8 100644
--- a/src/modinfodialogcategories.cpp
+++ b/src/modinfodialogcategories.cpp
@@ -5,8 +5,8 @@
 
 CategoriesTab::CategoriesTab(
   OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui)
-    : ModInfoDialogTab(oc, plugin, parent, ui)
+  QWidget* parent, Ui::ModInfoDialog* ui, int index)
+    : ModInfoDialogTab(oc, plugin, parent, ui, index)
 {
   connect(
     ui->categories, &QTreeWidget::itemChanged,
@@ -35,6 +35,11 @@ void CategoriesTab::update()
   updatePrimary();
 }
 
+bool CategoriesTab::canHandleSeparators() const
+{
+  return true;
+}
+
 void CategoriesTab::add(
   const CategoryFactory &factory, const std::set<int>& enabledCategories,
   QTreeWidgetItem* root, int rootLevel)
diff --git a/src/modinfodialogcategories.h b/src/modinfodialogcategories.h
index 76426a5d..29d0b2a5 100644
--- a/src/modinfodialogcategories.h
+++ b/src/modinfodialogcategories.h
@@ -7,10 +7,11 @@ class CategoriesTab : public ModInfoDialogTab
 public:
   CategoriesTab(
     OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui);
+    QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
   void clear() override;
   void update() override;
+  bool canHandleSeparators() const override;
 
 private:
   void add(
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index adde27ca..15bb7ed4 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -2,6 +2,8 @@
 #include "ui_modinfodialog.h"
 #include "modinfodialog.h"
 #include "utility.h"
+#include "settings.h"
+#include "organizercore.h"
 
 using namespace MOShared;
 using namespace MOBase;
@@ -131,8 +133,8 @@ public:
 
 ConflictsTab::ConflictsTab(
   OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui) :
-    ModInfoDialogTab(oc, plugin, parent, ui),
+  QWidget* parent, Ui::ModInfoDialog* ui, int index) :
+    ModInfoDialogTab(oc, plugin, parent, ui, index),
     m_general(this, ui, oc), m_advanced(this, ui, oc)
 {
   connect(
@@ -174,6 +176,11 @@ void ConflictsTab::restoreState(const Settings& s)
   m_advanced.restoreState(s);
 }
 
+bool ConflictsTab::canHandleUnmanaged() const
+{
+  return true;
+}
+
 void ConflictsTab::changeItemsVisibility(
   const QList<QTreeWidgetItem*>& items, bool visible)
 {
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index 9c011163..a05682ba 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -5,6 +5,7 @@
 #include "expanderwidget.h"
 #include "filterwidget.h"
 #include "directoryentry.h"
+#include <QTreeWidget>
 
 class ConflictsTab;
 class OrganizerCore;
@@ -96,13 +97,14 @@ class ConflictsTab : public ModInfoDialogTab
 public:
   ConflictsTab(
     OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui);
+    QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
   void update() override;
 
   void clear() override;
   void saveState(Settings& s) override;
   void restoreState(const Settings& s) override;
+  bool canHandleUnmanaged() const override;
 
   void openItems(const QList<QTreeWidgetItem*>& items);
   void previewItems(const QList<QTreeWidgetItem*>& items);
diff --git a/src/modinfodialogesps.cpp b/src/modinfodialogesps.cpp
index ea7eb3b0..dd4fff0b 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)
-    : ModInfoDialogTab(oc, plugin, parent, ui)
+  QWidget* parent, Ui::ModInfoDialog* ui, int index)
+    : ModInfoDialogTab(oc, plugin, parent, ui, index)
 {
   QObject::connect(
     ui->activateESP, &QToolButton::clicked, [&]{ onActivate(); });
diff --git a/src/modinfodialogesps.h b/src/modinfodialogesps.h
index e1a7a4f7..d8c8997e 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);
+    QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
   void clear() override;
   bool feedFile(const QString& rootPath, const QString& fullPath) override;
diff --git a/src/modinfodialogfiletree.cpp b/src/modinfodialogfiletree.cpp
index b73a9e24..3e233ccc 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)
-    : ModInfoDialogTab(oc, plugin, parent, ui), m_fs(nullptr)
+  QWidget* parent, Ui::ModInfoDialog* ui, int index)
+    : ModInfoDialogTab(oc, plugin, parent, ui, index), m_fs(nullptr)
 {
   m_fs = new QFileSystemModel(this);
   m_fs->setReadOnly(false);
diff --git a/src/modinfodialogfiletree.h b/src/modinfodialogfiletree.h
index dcc096fe..d0c36edc 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);
+    QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
   void clear() override;
   void update() override;
diff --git a/src/modinfodialogimages.cpp b/src/modinfodialogimages.cpp
index 1c7dcc1f..332a0984 100644
--- a/src/modinfodialogimages.cpp
+++ b/src/modinfodialogimages.cpp
@@ -82,8 +82,9 @@ void ScalableImage::mousePressEvent(QMouseEvent* e)
 
 ImagesTab::ImagesTab(
   OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui)
-    : ModInfoDialogTab(oc, plugin, parent, ui), m_image(new ScalableImage)
+  QWidget* parent, Ui::ModInfoDialog* ui, int index) :
+    ModInfoDialogTab(oc, plugin, parent, ui, index),
+    m_image(new ScalableImage)
 {
   ui->imagesImage->layout()->addWidget(m_image);
   ui->imagesThumbnails->setLayout(new QVBoxLayout);
diff --git a/src/modinfodialogimages.h b/src/modinfodialogimages.h
index 7853935a..689b8e93 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);
+    QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
   void clear() override;
   bool feedFile(const QString& rootPath, const QString& fullPath) override;
diff --git a/src/modinfodialognexus.cpp b/src/modinfodialognexus.cpp
index 55b55439..9d51871c 100644
--- a/src/modinfodialognexus.cpp
+++ b/src/modinfodialognexus.cpp
@@ -9,8 +9,8 @@
 
 NexusTab::NexusTab(
   OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui)
-    : ModInfoDialogTab(oc, plugin, parent, ui), m_requestStarted(false)
+  QWidget* parent, Ui::ModInfoDialog* ui, int index)
+    : ModInfoDialogTab(oc, plugin, parent, ui, index), 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 2e328c6d..7fe10171 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);
+    QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
   ~NexusTab();
 
diff --git a/src/modinfodialogtab.cpp b/src/modinfodialogtab.cpp
index 58745220..1b7fadbb 100644
--- a/src/modinfodialogtab.cpp
+++ b/src/modinfodialogtab.cpp
@@ -5,8 +5,9 @@
 
 ModInfoDialogTab::ModInfoDialogTab(
   OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui)
-    : ui(ui), m_core(oc), m_plugin(plugin), m_parent(parent), m_origin(nullptr)
+  QWidget* parent, Ui::ModInfoDialog* ui, int index) :
+    ui(ui), m_core(oc), m_plugin(plugin), m_parent(parent),
+    m_origin(nullptr), m_tabIndex(index)
 {
 }
 
@@ -42,6 +43,16 @@ bool ModInfoDialogTab::deleteRequested()
   return false;
 }
 
+bool ModInfoDialogTab::canHandleSeparators() const
+{
+  return false;
+}
+
+bool ModInfoDialogTab::canHandleUnmanaged() const
+{
+  return false;
+}
+
 void ModInfoDialogTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
 {
   m_mod = mod;
@@ -58,6 +69,11 @@ MOShared::FilesOrigin* ModInfoDialogTab::origin() const
   return m_origin;
 }
 
+int ModInfoDialogTab::tabIndex() const
+{
+  return m_tabIndex;
+}
+
 OrganizerCore& ModInfoDialogTab::core()
 {
   return m_core;
@@ -88,8 +104,8 @@ void ModInfoDialogTab::emitModOpen(QString name)
 
 NotesTab::NotesTab(
   OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui)
-   : ModInfoDialogTab(oc, plugin, parent, ui)
+  QWidget* parent, Ui::ModInfoDialog* ui, int index)
+   : ModInfoDialogTab(oc, plugin, parent, ui, index)
 {
   connect(ui->commentsEdit, &QLineEdit::editingFinished, [&]{ onComments(); });
   connect(ui->notesEdit, &HTMLEditor::editingFinished, [&]{ onNotes(); });
@@ -107,6 +123,11 @@ void NotesTab::update()
   ui->notesEdit->setText(mod()->notes());
 }
 
+bool NotesTab::canHandleSeparators() const
+{
+  return true;
+}
+
 void NotesTab::onComments()
 {
   mod()->setComments(ui->commentsEdit->text());
diff --git a/src/modinfodialogtab.h b/src/modinfodialogtab.h
index 0dc977a8..1f99344f 100644
--- a/src/modinfodialogtab.h
+++ b/src/modinfodialogtab.h
@@ -29,11 +29,16 @@ public:
   virtual void restoreState(const Settings& s);
   virtual bool deleteRequested();
 
+  virtual bool canHandleSeparators() const;
+  virtual bool canHandleUnmanaged() const;
+
   virtual void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin);
 
   ModInfo::Ptr mod() const;
   MOShared::FilesOrigin* origin() const;
 
+  int tabIndex() const;
+
 signals:
   void originModified(int originID);
   void modOpen(QString name);
@@ -43,7 +48,7 @@ protected:
 
   ModInfoDialogTab(
     OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui);
+    QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
   OrganizerCore& core();
   PluginContainer& plugin();
@@ -59,6 +64,7 @@ private:
   QWidget* m_parent;
   ModInfo::Ptr m_mod;
   MOShared::FilesOrigin* m_origin;
+  int m_tabIndex;
 };
 
 
@@ -67,10 +73,11 @@ class NotesTab : public ModInfoDialogTab
 public:
   NotesTab(
     OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui);
+    QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
   void clear() override;
   void update() override;
+  bool canHandleSeparators() const override;
 
 private:
   void onComments();
diff --git a/src/modinfodialogtextfiles.cpp b/src/modinfodialogtextfiles.cpp
index f48557b0..fddfafba 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,
+  QWidget* parent, Ui::ModInfoDialog* ui, int index,
   QListWidget* list, QSplitter* sp, TextEditor* e)
-    : ModInfoDialogTab(oc, plugin, parent, ui), m_list(list), m_editor(e)
+    : ModInfoDialogTab(oc, plugin, parent, ui, index), m_list(list), m_editor(e)
 {
   m_editor->setupToolbar();
 
@@ -113,9 +113,9 @@ void GenericFilesTab::select(FileListItem* item)
 
 TextFilesTab::TextFilesTab(
   OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui)
+  QWidget* parent, Ui::ModInfoDialog* ui, int index)
     : GenericFilesTab(
-        oc, plugin, parent, ui,
+        oc, plugin, parent, ui, index,
         ui->textFileList, ui->tabTextSplitter, ui->textFileEditor)
 {
 }
@@ -137,9 +137,9 @@ bool TextFilesTab::wantsFile(const QString& rootPath, const QString& fullPath) c
 
 IniFilesTab::IniFilesTab(
   OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui)
+  QWidget* parent, Ui::ModInfoDialog* ui, int index)
     : GenericFilesTab(
-        oc, plugin, parent, ui,
+        oc, plugin, parent, ui, index,
         ui->iniFileList, ui->tabIniSplitter, ui->iniFileEditor)
 {
 }
diff --git a/src/modinfodialogtextfiles.h b/src/modinfodialogtextfiles.h
index 0dc5ec89..f618a6bb 100644
--- a/src/modinfodialogtextfiles.h
+++ b/src/modinfodialogtextfiles.h
@@ -23,7 +23,7 @@ protected:
 
   GenericFilesTab(
     OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui,
+    QWidget* parent, Ui::ModInfoDialog* ui, int index,
     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);
+    QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
 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);
+    QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
 protected:
   bool wantsFile(const QString& rootPath, const QString& fullPath) const override;
diff --git a/src/resources.qrc b/src/resources.qrc
index 8645b27e..6fc33293 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -1,106 +1,108 @@
 <RCC>
-    <qresource prefix="/MO/gui">
-        <file>resources/help-browser.png</file>
-        <file alias="add">resources/list-add.png</file>
-        <file>resources/document-save.png</file>
-        <file>resources/edit-find-replace.png</file>
-        <file>resources/go-jump.png</file>
-        <file>resources/media-playback-start.png</file>
-        <file alias="remove">resources/process-stop.png</file>
-        <file>resources/system-search.png</file>
-        <file>resources/view-refresh.png</file>
-        <file alias="installer">resources/system-installer.png</file>
-        <file>resources/start-here.png</file>
-        <file>resources/list-remove.png</file>
-        <file>resources/document-properties.png</file>
-        <file>resources/go-up.png</file>
-        <file>resources/go-down.png</file>
-        <file>resources/switch-instance-icon.png</file>
-        <file alias="profiles">resources/contact-new.png</file>
-        <file alias="settings">resources/preferences-system.png</file>
-        <file alias="executable">resources/application-x-executable.png</file>
-        <file alias="information">resources/dialog-information.png</file>
-        <file alias="locked">resources/emblem-readonly.png</file>
-        <file alias="next">resources/go-next_16.png</file>
-        <file alias="previous">resources/go-previous_16.png</file>
-        <file alias="refresh">resources/view-refresh_16.png</file>
-        <file alias="update_available">resources/software-update-available.png</file>
-        <file alias="important">resources/emblem-important.png</file>
-        <file alias="check">resources/check.png</file>
-        <file alias="warning">resources/dialog-warning.png</file>
-        <file alias="emblem_backup">resources/symbol-backup.png</file>
-        <file alias="icon_tools">resources/applications-accessories.png</file>
-        <file alias="problem">resources/emblem-unreadable.png</file>
-        <file>resources/internet-web-browser.png</file>
-        <file alias="update">resources/system-software-update.png</file>
-        <file alias="help">resources/help-browser_32.png</file>
-        <file>resources/system-installer.png</file>
-        <file alias="icon_executable">resources/function.png</file>
-        <file alias="plugins">resources/plugins.png</file>
-        <file alias="edit_clear">resources/edit-clear.png</file>
-        <file alias="link">resources/dynamic-blue-right.png</file>
-        <file alias="icon_favorite">resources/icon-favorite.png</file>
-        <file alias="emblem_notendorsed">resources/emblem-favorite.png</file>
-        <file alias="emblem_conflict">resources/error.png</file>
-        <file alias="run">resources/show.png</file>
-        <file alias="splash">splash.png</file>
-        <file alias="emblem_conflict_mixed">resources/conflict-mixed.png</file>
-        <file alias="emblem_conflict_overwrite">resources/conflict-overwrite.png</file>
-        <file alias="emblem_conflict_overwritten">resources/conflict-overwritten.png</file>
-        <file alias="emblem_conflict_redundant">resources/conflict-redundant.png</file>
-        <file alias="archive_loose_conflict_mixed">resources/conflict-mixed-blue.png</file>
-        <file alias="archive_loose_conflict_overwrite">resources/conflict-overwrite-blue.png</file>
-        <file alias="archive_loose_conflict_overwritten">resources/red-archive-conflict-loser.png</file>
-        <file alias="emblem_notes">resources/accessories-text-editor.png</file>
-        <file alias="version_date">resources/x-office-calendar.png</file>
-        <file alias="warning_16">resources/dialog-warning_16.png</file>
-        <file alias="attachment">resources/mail-attachment.png</file>
-        <file alias="backup">resources/document-save_32.png</file>
-        <file alias="restore">resources/edit-undo.png</file>
-        <file alias="sort">resources/arrange-boxes.png</file>
-        <file alias="badge_1">resources/badge_1.png</file>
-        <file alias="badge_2">resources/badge_2.png</file>
-        <file alias="badge_3">resources/badge_3.png</file>
-        <file alias="badge_4">resources/badge_4.png</file>
-        <file alias="badge_5">resources/badge_5.png</file>
-        <file alias="badge_6">resources/badge_6.png</file>
-        <file alias="badge_7">resources/badge_7.png</file>
-        <file alias="badge_8">resources/badge_8.png</file>
-        <file alias="badge_9">resources/badge_9.png</file>
-        <file alias="badge_more">resources/badge_more.png</file>
-        <file alias="active">resources/status_active.png</file>
-        <file alias="awaiting">resources/status_awaiting.png</file>
-        <file alias="inactive">resources/status_inactive.png</file>
-        <file alias="app_icon">resources/mo_icon.png</file>
-        <file alias="package">resources/package.png</file>
-        <file alias="instance_switch">resources/switch-instance-icon.png</file>
-        <file alias="open_folder">resources/open-Folder-Icon.png</file>
-        <file alias="multiply_red">resources/multiply-red.png</file>
-        <file alias="archive_conflict_loser">resources/archive-conflict-loser.png</file>
-        <file alias="archive_conflict_mixed">resources/archive-conflict-mixed.png</file>
-        <file alias="archive_conflict_neutral">resources/archive-conflict-neutral.png</file>
-        <file alias="archive_conflict_winner">resources/archive-conflict-winner.png</file>
-        <file alias="alternate_game_alt">resources/game-warning.png</file>
-        <file alias="alternate_game">resources/game-warning-16.png</file>
-        <file alias="tracked">resources/tracked.png</file>
-    </qresource>
-    <qresource prefix="/MO/gui/content">
-        <file alias="plugin">resources/contents/jigsaw-piece.png</file>
-        <file alias="skyproc">resources/contents/hand-of-god.png</file>
-        <file alias="texture">resources/contents/empty-chessboard.png</file>
-        <file alias="music">resources/contents/double-quaver.png</file>
-        <file alias="sound">resources/contents/lyre.png</file>
-        <file alias="interface">resources/contents/usable.png</file>
-        <file alias="skse">resources/contents/checkbox-tree.png</file>
-        <file alias="script">resources/contents/tinker.png</file>
-        <file alias="mesh">resources/contents/breastplate.png</file>
-        <file alias="string">resources/contents/conversation.png</file>
-        <file alias="bsa">resources/contents/locked-chest.png</file>
-        <file alias="menu">resources/contents/config.png</file>
-        <file alias="inifile">resources/contents/feather-and-scroll.png</file>
-        <file alias="modgroup">resources/contents/xedit.png</file>
-    </qresource>
-    <qresource prefix="/qt/etc">
-        <file>qt.conf</file>
-    </qresource>
+  <qresource prefix="/MO/gui">
+    <file alias="save">resources/save.svg</file>
+    <file alias="word-wrap">resources/word-wrap.svg</file>
+    <file>resources/help-browser.png</file>
+    <file alias="add">resources/list-add.png</file>
+    <file>resources/document-save.png</file>
+    <file>resources/edit-find-replace.png</file>
+    <file>resources/go-jump.png</file>
+    <file>resources/media-playback-start.png</file>
+    <file alias="remove">resources/process-stop.png</file>
+    <file>resources/system-search.png</file>
+    <file>resources/view-refresh.png</file>
+    <file alias="installer">resources/system-installer.png</file>
+    <file>resources/start-here.png</file>
+    <file>resources/list-remove.png</file>
+    <file>resources/document-properties.png</file>
+    <file>resources/go-up.png</file>
+    <file>resources/go-down.png</file>
+    <file>resources/switch-instance-icon.png</file>
+    <file alias="profiles">resources/contact-new.png</file>
+    <file alias="settings">resources/preferences-system.png</file>
+    <file alias="executable">resources/application-x-executable.png</file>
+    <file alias="information">resources/dialog-information.png</file>
+    <file alias="locked">resources/emblem-readonly.png</file>
+    <file alias="next">resources/go-next_16.png</file>
+    <file alias="previous">resources/go-previous_16.png</file>
+    <file alias="refresh">resources/view-refresh_16.png</file>
+    <file alias="update_available">resources/software-update-available.png</file>
+    <file alias="important">resources/emblem-important.png</file>
+    <file alias="check">resources/check.png</file>
+    <file alias="warning">resources/dialog-warning.png</file>
+    <file alias="emblem_backup">resources/symbol-backup.png</file>
+    <file alias="icon_tools">resources/applications-accessories.png</file>
+    <file alias="problem">resources/emblem-unreadable.png</file>
+    <file>resources/internet-web-browser.png</file>
+    <file alias="update">resources/system-software-update.png</file>
+    <file alias="help">resources/help-browser_32.png</file>
+    <file>resources/system-installer.png</file>
+    <file alias="icon_executable">resources/function.png</file>
+    <file alias="plugins">resources/plugins.png</file>
+    <file alias="edit_clear">resources/edit-clear.png</file>
+    <file alias="link">resources/dynamic-blue-right.png</file>
+    <file alias="icon_favorite">resources/icon-favorite.png</file>
+    <file alias="emblem_notendorsed">resources/emblem-favorite.png</file>
+    <file alias="emblem_conflict">resources/error.png</file>
+    <file alias="run">resources/show.png</file>
+    <file alias="splash">splash.png</file>
+    <file alias="emblem_conflict_mixed">resources/conflict-mixed.png</file>
+    <file alias="emblem_conflict_overwrite">resources/conflict-overwrite.png</file>
+    <file alias="emblem_conflict_overwritten">resources/conflict-overwritten.png</file>
+    <file alias="emblem_conflict_redundant">resources/conflict-redundant.png</file>
+    <file alias="archive_loose_conflict_mixed">resources/conflict-mixed-blue.png</file>
+    <file alias="archive_loose_conflict_overwrite">resources/conflict-overwrite-blue.png</file>
+    <file alias="archive_loose_conflict_overwritten">resources/red-archive-conflict-loser.png</file>
+    <file alias="emblem_notes">resources/accessories-text-editor.png</file>
+    <file alias="version_date">resources/x-office-calendar.png</file>
+    <file alias="warning_16">resources/dialog-warning_16.png</file>
+    <file alias="attachment">resources/mail-attachment.png</file>
+    <file alias="backup">resources/document-save_32.png</file>
+    <file alias="restore">resources/edit-undo.png</file>
+    <file alias="sort">resources/arrange-boxes.png</file>
+    <file alias="badge_1">resources/badge_1.png</file>
+    <file alias="badge_2">resources/badge_2.png</file>
+    <file alias="badge_3">resources/badge_3.png</file>
+    <file alias="badge_4">resources/badge_4.png</file>
+    <file alias="badge_5">resources/badge_5.png</file>
+    <file alias="badge_6">resources/badge_6.png</file>
+    <file alias="badge_7">resources/badge_7.png</file>
+    <file alias="badge_8">resources/badge_8.png</file>
+    <file alias="badge_9">resources/badge_9.png</file>
+    <file alias="badge_more">resources/badge_more.png</file>
+    <file alias="active">resources/status_active.png</file>
+    <file alias="awaiting">resources/status_awaiting.png</file>
+    <file alias="inactive">resources/status_inactive.png</file>
+    <file alias="app_icon">resources/mo_icon.png</file>
+    <file alias="package">resources/package.png</file>
+    <file alias="instance_switch">resources/switch-instance-icon.png</file>
+    <file alias="open_folder">resources/open-Folder-Icon.png</file>
+    <file alias="multiply_red">resources/multiply-red.png</file>
+    <file alias="archive_conflict_loser">resources/archive-conflict-loser.png</file>
+    <file alias="archive_conflict_mixed">resources/archive-conflict-mixed.png</file>
+    <file alias="archive_conflict_neutral">resources/archive-conflict-neutral.png</file>
+    <file alias="archive_conflict_winner">resources/archive-conflict-winner.png</file>
+    <file alias="alternate_game_alt">resources/game-warning.png</file>
+    <file alias="alternate_game">resources/game-warning-16.png</file>
+    <file alias="tracked">resources/tracked.png</file>
+  </qresource>
+  <qresource prefix="/MO/gui/content">
+    <file alias="plugin">resources/contents/jigsaw-piece.png</file>
+    <file alias="skyproc">resources/contents/hand-of-god.png</file>
+    <file alias="texture">resources/contents/empty-chessboard.png</file>
+    <file alias="music">resources/contents/double-quaver.png</file>
+    <file alias="sound">resources/contents/lyre.png</file>
+    <file alias="interface">resources/contents/usable.png</file>
+    <file alias="skse">resources/contents/checkbox-tree.png</file>
+    <file alias="script">resources/contents/tinker.png</file>
+    <file alias="mesh">resources/contents/breastplate.png</file>
+    <file alias="string">resources/contents/conversation.png</file>
+    <file alias="bsa">resources/contents/locked-chest.png</file>
+    <file alias="menu">resources/contents/config.png</file>
+    <file alias="inifile">resources/contents/feather-and-scroll.png</file>
+    <file alias="modgroup">resources/contents/xedit.png</file>
+  </qresource>
+  <qresource prefix="/qt/etc">
+    <file>qt.conf</file>
+  </qresource>
 </RCC>
-- 
cgit v1.3.1


From eb8140afadc5aa4e6d1d2611f69dc6e38f469978 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 24 Jun 2019 07:28:02 -0400
Subject: grey out tab names when they have no data remove tabs if they're
 can't handle the selected mod next/previous now load mods in place without
 reopening the dialog tab reordering is broken

---
 src/mainwindow.cpp              | 104 +++++++-----
 src/mainwindow.h                |   5 +-
 src/modinfodialog.cpp           | 358 ++++++++++++++++++++++++++--------------
 src/modinfodialog.h             |  60 ++++---
 src/modinfodialogcategories.cpp |   2 +
 src/modinfodialogconflicts.cpp  |   7 +-
 src/modinfodialogconflicts.h    |   3 +-
 src/modinfodialogesps.cpp       |   2 +
 src/modinfodialogfiletree.cpp   |   4 +-
 src/modinfodialogimages.cpp     |  12 +-
 src/modinfodialogimages.h       |   2 +-
 src/modinfodialognexus.cpp      |   2 +
 src/modinfodialogtab.cpp        |  22 ++-
 src/modinfodialogtab.h          |   3 +
 src/modinfodialogtextfiles.cpp  |   2 +
 15 files changed, 375 insertions(+), 213 deletions(-)

(limited to 'src/modinfodialogcategories.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f9bfaafb..67dc8418 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3223,18 +3223,14 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
   } else {
     modInfo->saveMeta();
 
-    ModInfoDialog dialog(
-      modInfo, modInfo->hasFlag(ModInfo::FLAG_FOREIGN),
-      &m_OrganizerCore, &m_PluginContainer, this);
-
-    connect(&dialog, SIGNAL(modOpen(QString, int)), this, SLOT(displayModInformation(QString, int)), Qt::QueuedConnection);
-    connect(&dialog, SIGNAL(modOpenNext(int)), this, SLOT(modOpenNext(int)), Qt::QueuedConnection);
-    connect(&dialog, SIGNAL(modOpenPrev(int)), this, SLOT(modOpenPrev(int)), Qt::QueuedConnection);
+    ModInfoDialog dialog(this, &m_OrganizerCore, &m_PluginContainer);
     connect(&dialog, SIGNAL(originModified(int)), this, SLOT(originModified(int)));
 
+    dialog.setMod(modInfo);
+
 	  //Open the tab first if we want to use the standard indexes of the tabs.
 	  if (tab != -1) {
-		  dialog.openTab(tab);
+		  dialog.setTab(tab);
 	  }
 
     dialog.restoreState(m_OrganizerCore.settings());
@@ -3244,16 +3240,6 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
       dialog.restoreGeometry(settings.value(key).toByteArray());
     }
 
-	  //If no tab was specified use the first tab from the left based on the user order.
-	  if (tab == -1) {
-		  for (int i = 0; i < dialog.findChild<QTabWidget*>("tabWidget")->count(); ++i) {
-			  if (dialog.findChild<QTabWidget*>("tabWidget")->isTabEnabled(i)) {
-				  dialog.findChild<QTabWidget*>("tabWidget")->setCurrentIndex(i);
-				  break;
-			  }
-		  }
-	  }
-
     dialog.exec();
     dialog.saveState(m_OrganizerCore.settings());
     settings.setValue(key, dialog.saveGeometry());
@@ -3296,43 +3282,71 @@ void MainWindow::setWindowEnabled(bool enabled)
 }
 
 
-void MainWindow::modOpenNext(int tab)
+ModInfo::Ptr MainWindow::nextModInList()
 {
-  QModelIndex index = m_ModListSortProxy->mapFromSource(m_OrganizerCore.modList()->index(m_ContextRow, 0));
-  index = m_ModListSortProxy->index((index.row() + 1) % m_ModListSortProxy->rowCount(), 0);
+  const QModelIndex start = m_ModListSortProxy->mapFromSource(
+    m_OrganizerCore.modList()->index(m_ContextRow, 0));
+
+  auto index = start;
+
+  for (;;) {
+    index = m_ModListSortProxy->index((index.row() + 1) % m_ModListSortProxy->rowCount(), 0);
+    m_ContextRow = m_ModListSortProxy->mapToSource(index).row();
+
+    if (index == start || !index.isValid()) {
+      // wrapped around, give up
+      break;
+    }
+
+    ModInfo::Ptr mod = ModInfo::getByIndex(m_ContextRow);
 
-  m_ContextRow = m_ModListSortProxy->mapToSource(index).row();
-  ModInfo::Ptr mod = ModInfo::getByIndex(m_ContextRow);
-  std::vector<ModInfo::EFlag> flags = mod->getFlags();
-  if ((std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end()) ||
-      (std::find(flags.begin(), flags.end(), ModInfo::FLAG_BACKUP) != flags.end()) ||
-      (std::find(flags.begin(), flags.end(), ModInfo::FLAG_SEPARATOR) != flags.end())) {
     // skip overwrite and backups and separators
-    modOpenNext(tab);
-  } else {
-    displayModInformation(m_ContextRow,tab);
+    if (mod->hasFlag(ModInfo::FLAG_OVERWRITE) ||
+        mod->hasFlag(ModInfo::FLAG_BACKUP) ||
+        mod->hasFlag(ModInfo::FLAG_SEPARATOR)) {
+      continue;
+    }
+
+    return mod;
   }
+
+  return {};
 }
 
-void MainWindow::modOpenPrev(int tab)
+ModInfo::Ptr MainWindow::previousModInList()
 {
-  QModelIndex index = m_ModListSortProxy->mapFromSource(m_OrganizerCore.modList()->index(m_ContextRow, 0));
-  int row = index.row() - 1;
-  if (row == -1) {
-    row = m_ModListSortProxy->rowCount() - 1;
-  }
+  const QModelIndex start = m_ModListSortProxy->mapFromSource(
+    m_OrganizerCore.modList()->index(m_ContextRow, 0));
+
+  auto index = start;
+
+  for (;;) {
+    int row = index.row() - 1;
+    if (row == -1) {
+      row = m_ModListSortProxy->rowCount() - 1;
+    }
+
+    index = m_ModListSortProxy->index(row, 0);
+    m_ContextRow = m_ModListSortProxy->mapToSource(index).row();
+
+    if (index == start || !index.isValid()) {
+      // wrapped around, give up
+      break;
+    }
 
-  m_ContextRow = m_ModListSortProxy->mapToSource(m_ModListSortProxy->index(row, 0)).row();
-  ModInfo::Ptr mod = ModInfo::getByIndex(m_ContextRow);
-  std::vector<ModInfo::EFlag> flags = mod->getFlags();
-  if ((std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end()) ||
-      (std::find(flags.begin(), flags.end(), ModInfo::FLAG_BACKUP) != flags.end()) ||
-      (std::find(flags.begin(), flags.end(), ModInfo::FLAG_SEPARATOR) != flags.end())) {
     // skip overwrite and backups and separators
-    modOpenPrev(tab);
-  } else {
-    displayModInformation(m_ContextRow,tab);
+    ModInfo::Ptr mod = ModInfo::getByIndex(m_ContextRow);
+
+    if (mod->hasFlag(ModInfo::FLAG_OVERWRITE) ||
+        mod->hasFlag(ModInfo::FLAG_BACKUP) ||
+        mod->hasFlag(ModInfo::FLAG_SEPARATOR)) {
+      continue;
+    }
+
+    return mod;
   }
+
+  return {};
 }
 
 void MainWindow::displayModInformation(const QString &modName, int tab)
diff --git a/src/mainwindow.h b/src/mainwindow.h
index b6283a26..f204211e 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -160,6 +160,9 @@ public:
 
   virtual MOBase::DelayedFileWriterBase &archivesWriter() override { return m_ArchiveListWriter; }
 
+  ModInfo::Ptr nextModInList();
+  ModInfo::Ptr previousModInList();
+
 public slots:
 
   void displayColumnSelection(const QPoint &pos);
@@ -549,8 +552,6 @@ private slots:
   void deselectFilters();
 
   void displayModInformation(const QString &modName, int tab);
-  void modOpenNext(int tab=-1);
-  void modOpenPrev(int tab=-1);
 
   void modRenamed(const QString &oldName, const QString &newName);
   void modRemoved(const QString &fileName);
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index be7d4aa4..ad704ce8 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -21,6 +21,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "ui_modinfodialog.h"
 #include "plugincontainer.h"
 #include "organizercore.h"
+#include "mainwindow.h"
 #include "modinfodialogtextfiles.h"
 #include "modinfodialogimages.h"
 #include "modinfodialogesps.h"
@@ -34,23 +35,6 @@ using namespace MOShared;
 
 const int max_scan_for_context_menu = 50;
 
-
-class ModFileListWidget : public QListWidgetItem {
-  friend bool operator<(const ModFileListWidget &LHS, const ModFileListWidget &RHS);
-public:
-  ModFileListWidget(const QString &text, int sortValue, QListWidget *parent = 0)
-    : QListWidgetItem(text, parent, QListWidgetItem::UserType + 1), m_SortValue(sortValue) {}
-private:
-  int m_SortValue;
-};
-
-
-static bool operator<(const ModFileListWidget &LHS, const ModFileListWidget &RHS)
-{
-  return LHS.m_SortValue < RHS.m_SortValue;
-}
-
-
 bool canPreviewFile(
   PluginContainer& pluginContainer, bool isArchive, const QString& filename)
 {
@@ -111,74 +95,54 @@ FileRenamer::RenameResults unhideFile(FileRenamer& renamer, const QString &oldNa
 }
 
 
+ModInfoDialog::TabInfo::TabInfo(std::unique_ptr<ModInfoDialogTab> tab)
+  : tab(std::move(tab)), realPos(-1), widget(nullptr)
+{
+}
+
 ModInfoDialog::ModInfoDialog(
-  ModInfo::Ptr modInfo, bool unmanaged, OrganizerCore *organizerCore,
-  PluginContainer *pluginContainer, QWidget *parent) :
-    TutorableDialog("ModInfoDialog", parent), ui(new Ui::ModInfoDialog),
-    m_ModInfo(modInfo), m_RootPath(modInfo->absolutePath()),
-    m_OrganizerCore(organizerCore), m_PluginContainer(pluginContainer),
-    m_Origin(nullptr)
+  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)
 {
   ui->setupUi(this);
 
-  auto* ds = m_OrganizerCore->directoryStructure();
-  if (ds->originExists(ToWString(m_ModInfo->name()))) {
-    m_Origin = &ds->getOriginByName(ToWString(m_ModInfo->name()));
-    if (m_Origin->isDisabled()) {
-      m_Origin = nullptr;
-    }
-  }
-
-  this->setWindowTitle(m_ModInfo->name());
-  this->setWindowModality(Qt::WindowModal);
-
   auto* sc = new QShortcut(QKeySequence::Delete, this);
   connect(sc, &QShortcut::activated, [&]{ onDeleteShortcut(); });
 
   m_tabs = createTabs();
-  bool tabSelected = false;
 
-  for (std::size_t i=0; i<m_tabs.size(); ++i) {
+  for (int i=0; i<ui->tabWidget->count(); ++i) {
+    if (static_cast<std::size_t>(i) >= m_tabs.size()) {
+      qCritical() << "mod info dialog has more tabs than expected";
+      break;
+    }
+
+    auto& tabInfo = m_tabs[static_cast<std::size_t>(i)];
+    tabInfo.widget = ui->tabWidget->widget(i);
+    tabInfo.caption = ui->tabWidget->tabText(i);
+    tabInfo.icon = ui->tabWidget->tabIcon(i);
+    tabInfo.realPos = i;
+
     connect(
-      m_tabs[i].get(), &ModInfoDialogTab::originModified,
+      tabInfo.tab.get(), &ModInfoDialogTab::originModified,
       [&](int originID){ emit originModified(originID); });
 
     connect(
-      m_tabs[i].get(), &ModInfoDialogTab::modOpen,
+      tabInfo.tab.get(), &ModInfoDialogTab::modOpen,
       [&](const QString& name){
-        close();
-        emit modOpen(name, static_cast<int>(i));
+        setMod(name);
+        update();
       });
-
-    bool enabled = true;
-
-    if (unmanaged) {
-      enabled = m_tabs[i]->canHandleUnmanaged();
-    } else if (m_ModInfo->hasFlag(ModInfo::FLAG_SEPARATOR)) {
-      enabled = m_tabs[i]->canHandleSeparators();
-    }
-
-    ui->tabWidget->setTabEnabled(static_cast<int>(i), enabled);
-
-    if (!tabSelected && enabled) {
-      ui->tabWidget->setCurrentIndex(static_cast<int>(i));
-      tabSelected = true;
-    }
-  }
-
-  for (auto& tab : m_tabs) {
-    tab->setMod(m_ModInfo, m_Origin);
   }
 }
 
-ModInfoDialog::~ModInfoDialog()
-{
-  delete ui;
-}
+ModInfoDialog::~ModInfoDialog() = default;
 
-std::vector<std::unique_ptr<ModInfoDialogTab>> ModInfoDialog::createTabs()
+std::vector<ModInfoDialog::TabInfo> ModInfoDialog::createTabs()
 {
-  std::vector<std::unique_ptr<ModInfoDialogTab>> v;
+  std::vector<TabInfo> v;
 
   v.push_back(createTab<TextFilesTab>(TAB_TEXTFILES));
   v.push_back(createTab<IniFilesTab>(TAB_INIFILES));
@@ -195,31 +159,206 @@ std::vector<std::unique_ptr<ModInfoDialogTab>> ModInfoDialog::createTabs()
 
 int ModInfoDialog::exec()
 {
-  refreshLists();
+  update();
   return TutorableDialog::exec();
 }
 
+void ModInfoDialog::setMod(ModInfo::Ptr mod)
+{
+  m_mod = mod;
+}
+
+void ModInfoDialog::setMod(const QString& name)
+{
+  unsigned int index = ModInfo::getIndex(name);
+  if (index == UINT_MAX) {
+    qCritical() << "failed to resolve mod name " << name;
+    return;
+  }
+
+  auto mod = ModInfo::getByIndex(index);
+  if (!mod) {
+    qCritical() << "mod by index " << index << " is null";
+    return;
+  }
+
+  setMod(mod);
+}
+
+void ModInfoDialog::setTab(int index)
+{
+  if (!isVisible()) {
+    m_initialTab = index;
+    return;
+  }
+
+  switchToTab(index);
+}
+
+void ModInfoDialog::update()
+{
+  setWindowTitle(m_mod->name());
+  setTabsVisibility();
+  updateTabs();
+  feedFiles();
+  setTabsColors();
+
+  if (m_initialTab >= 0) {
+    switchToTab(m_initialTab);
+    m_initialTab = -1;
+  }
+}
+
+void ModInfoDialog::setTabsVisibility()
+{
+  std::vector<bool> visibility(m_tabs.size());
+  bool changed = false;
+
+  for (std::size_t i=0; i<m_tabs.size(); ++i) {
+    const auto& tabInfo = m_tabs[i];
+
+    bool visible = true;
+
+    if (m_mod->hasFlag(ModInfo::FLAG_FOREIGN)) {
+      visible = tabInfo.tab->canHandleUnmanaged();
+    } else if (m_mod->hasFlag(ModInfo::FLAG_SEPARATOR)) {
+      visible = tabInfo.tab->canHandleSeparators();
+    }
+
+    const auto currentlyVisible = (ui->tabWidget->indexOf(tabInfo.widget) != -1);
+
+    if (visible != currentlyVisible) {
+      changed = true;
+    }
+
+    visibility[i] = visible;
+  }
+
+  if (!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);
+
+      if (static_cast<int>(i) == sel) {
+        ui->tabWidget->setCurrentIndex(static_cast<int>(i));
+      }
+    }
+  }
+}
+
+void ModInfoDialog::updateTabs()
+{
+  auto* origin = getOrigin();
+
+  for (auto& tabInfo : m_tabs) {
+    tabInfo.tab->setMod(m_mod, origin);
+    tabInfo.tab->clear();
+    tabInfo.tab->update();
+  }
+}
+
+void ModInfoDialog::feedFiles()
+{
+  const auto rootPath = m_mod->absolutePath();
+
+  if (rootPath.length() > 0) {
+    QDirIterator dirIterator(rootPath, QDir::Files, QDirIterator::Subdirectories);
+    while (dirIterator.hasNext()) {
+      QString fileName = dirIterator.next();
+
+      for (auto& tabInfo : m_tabs) {
+        if (tabInfo.tab->feedFile(rootPath, fileName)) {
+          break;
+        }
+      }
+    }
+  }
+}
+
+void ModInfoDialog::setTabsColors()
+{
+  for (const auto& tabInfo : m_tabs) {
+    const auto c = tabInfo.tab->hasData() ?
+      QColor::Invalid :
+      ui->tabWidget->palette().color(QPalette::Disabled, QPalette::WindowText);
+
+    ui->tabWidget->tabBar()->setTabTextColor(tabInfo.realPos, c);
+  }
+}
+
+void ModInfoDialog::switchToTab(std::size_t index)
+{
+  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;
+  }
+
+  ui->tabWidget->setCurrentIndex(m_tabs[index].realPos);
+}
+
+MOShared::FilesOrigin* ModInfoDialog::getOrigin()
+{
+  MOShared::FilesOrigin* origin = nullptr;
+
+  auto* ds = m_core->directoryStructure();
+  if (ds->originExists(ToWString(m_mod->name()))) {
+    auto* origin = &ds->getOriginByName(ToWString(m_mod->name()));
+    if (!origin->isDisabled()) {
+      return origin;
+    }
+  }
+
+  return nullptr;
+}
+
 void ModInfoDialog::saveState(Settings& s) const
 {
-  s.directInterface().setValue("mod_info_tabs", saveTabState());
+  //s.directInterface().setValue("mod_info_tabs", saveTabState());
 
-  for (const auto& tab : m_tabs) {
-    tab->saveState(s);
+  for (const auto& tabInfo : m_tabs) {
+    tabInfo.tab->saveState(s);
   }
 }
 
 void ModInfoDialog::restoreState(const Settings& s)
 {
-  restoreTabState(s.directInterface().value("mod_info_tabs").toByteArray());
+  //restoreTabState(s.directInterface().value("mod_info_tabs").toByteArray());
 
-  for (const auto& tab : m_tabs) {
-    tab->restoreState(s);
+  for (const auto& tabInfo : m_tabs) {
+    tabInfo.tab->restoreState(s);
   }
 }
 
+QByteArray 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();
+  }*/
+
+  return result;
+}
+
 void ModInfoDialog::restoreTabState(const QByteArray &state)
 {
-  QDataStream stream(state);
+  /*QDataStream stream(state);
   int count = 0;
   stream >> count;
 
@@ -232,9 +371,9 @@ void ModInfoDialog::restoreTabState(const QByteArray &state)
     tabIds.append(tabId);
     int oldPos = tabIndex(tabId);
     if (oldPos != -1) {
-      m_RealTabPos[newPos] = oldPos;
+      m_realTabPos[newPos] = oldPos;
     } else {
-      m_RealTabPos[newPos] = newPos;
+      m_realTabPos[newPos] = newPos;
     }
   }
 
@@ -246,19 +385,7 @@ void ModInfoDialog::restoreTabState(const QByteArray &state)
     int oldPos = tabIndex(tabId);
     tabBar->moveTab(oldPos, newPos);
   }
-  ui->tabWidget->blockSignals(false);
-}
-
-QByteArray 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();
-  }
-
-  return result;
+  ui->tabWidget->blockSignals(false);*/
 }
 
 int ModInfoDialog::tabIndex(const QString& tabId)
@@ -273,37 +400,17 @@ int ModInfoDialog::tabIndex(const QString& tabId)
 
 void ModInfoDialog::onDeleteShortcut()
 {
-  for (auto& t : m_tabs) {
-    if (t->deleteRequested()) {
+  for (auto& tabInfo : m_tabs) {
+    if (tabInfo.tab->deleteRequested()) {
       break;
     }
   }
 }
 
-void ModInfoDialog::refreshLists()
-{
-  for (auto& tab : m_tabs) {
-    tab->update();
-  }
-
-  if (m_RootPath.length() > 0) {
-    QDirIterator dirIterator(m_RootPath, QDir::Files, QDirIterator::Subdirectories);
-    while (dirIterator.hasNext()) {
-      QString fileName = dirIterator.next();
-
-      for (auto& tab : m_tabs) {
-        if (tab->feedFile(m_RootPath, fileName)) {
-          break;
-        }
-      }
-    }
-  }
-}
-
 void ModInfoDialog::on_closeButton_clicked()
 {
-  for (auto& tab : m_tabs) {
-    if (!tab->canClose()) {
+  for (auto& tabInfo : m_tabs) {
+    if (!tabInfo.tab->canClose()) {
       return;
     }
   }
@@ -311,31 +418,28 @@ void ModInfoDialog::on_closeButton_clicked()
   close();
 }
 
-void ModInfoDialog::openTab(int tab)
-{
-  if (ui->tabWidget->isTabEnabled(tab)) {
-    ui->tabWidget->setCurrentIndex(tab);
-  }
-}
-
 void ModInfoDialog::on_tabWidget_currentChanged(int index)
 {
 }
 
 void ModInfoDialog::on_nextButton_clicked()
 {
-	int currentTab = ui->tabWidget->currentIndex();
-	int tab = m_RealTabPos[currentTab];
+  auto mod = m_mainWindow->nextModInList();
+  if (mod == m_mod) {
+    return;
+  }
 
-    emit modOpenNext(tab);
-    this->accept();
+  setMod(mod);
+  update();
 }
 
 void ModInfoDialog::on_prevButton_clicked()
 {
-	int currentTab = ui->tabWidget->currentIndex();
-	int tab = m_RealTabPos[currentTab];
+  auto mod = m_mainWindow->previousModInList();
+  if (mod == m_mod) {
+    return;
+  }
 
-    emit modOpenPrev(tab);
-    this->accept();
+  setMod(mod);
+  update();
 }
diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 020e7958..1cefc71a 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -32,7 +32,7 @@ class PluginContainer;
 class OrganizerCore;
 class Settings;
 class ModInfoDialogTab;
-
+class MainWindow;
 
 bool canPreviewFile(PluginContainer& pluginContainer, bool isArchive, const QString& filename);
 bool canOpenFile(bool isArchive, const QString& filename);
@@ -71,10 +71,7 @@ public:
   * @param modInfo info structure about the mod to display
   * @param parent parend widget
   **/
-  explicit ModInfoDialog(
-    ModInfo::Ptr modInfo,
-    bool unmanaged, OrganizerCore *organizerCore, PluginContainer *pluginContainer,
-    QWidget *parent = 0);
+  ModInfoDialog(MainWindow* mw, OrganizerCore* core, PluginContainer* plugin);
 
   ~ModInfoDialog();
 
@@ -92,12 +89,9 @@ public:
    **/
   const int getModID() const;
 
-  /**
-   * @brief open the specified tab in the dialog if it's enabled
-   *
-   * @param tab the tab to activate
-   **/
-  void openTab(int tab);
+  void setMod(ModInfo::Ptr mod);
+  void setMod(const QString& name);
+  void setTab(int index);
 
   int exec() override;
 
@@ -105,9 +99,6 @@ public:
   void restoreState(const Settings& s);
 
 signals:
-  void modOpen(const QString &modName, int tab);
-  void modOpenNext(int tab=-1);
-  void modOpenPrev(int tab=-1);
   void originModified(int originID);
 
 private slots:
@@ -117,27 +108,42 @@ private slots:
   void on_prevButton_clicked();
 
 private:
-  Ui::ModInfoDialog *ui;
-  ModInfo::Ptr m_ModInfo;
-  std::vector<std::unique_ptr<ModInfoDialogTab>> m_tabs;
-  QString m_RootPath;
-  OrganizerCore *m_OrganizerCore;
-  PluginContainer *m_PluginContainer;
-  MOShared::FilesOrigin *m_Origin;
-  std::map<int, int> m_RealTabPos;
-
-  std::vector<std::unique_ptr<ModInfoDialogTab>> createTabs();
-  void refreshLists();
+  struct TabInfo
+  {
+    std::unique_ptr<ModInfoDialogTab> tab;
+    int realPos;
+    QWidget* widget;
+    QString caption;
+    QIcon icon;
+
+    TabInfo(std::unique_ptr<ModInfoDialogTab> tab);
+  };
+
+  std::unique_ptr<Ui::ModInfoDialog> ui;
+  MainWindow* m_mainWindow;
+  ModInfo::Ptr m_mod;
+  OrganizerCore* m_core;
+  PluginContainer* m_plugin;
+  std::vector<TabInfo> m_tabs;
+  int m_initialTab;
+
+  std::vector<TabInfo> createTabs();
   void restoreTabState(const QByteArray &state);
   QByteArray saveTabState() const;
+  void update();
   void onDeleteShortcut();
   int tabIndex(const QString &tabId);
+  MOShared::FilesOrigin* getOrigin();
+  void setTabsVisibility();
+  void updateTabs();
+  void feedFiles();
+  void setTabsColors();
+  void switchToTab(std::size_t index);
 
   template <class T>
   std::unique_ptr<ModInfoDialogTab> createTab(int index)
   {
-    return std::make_unique<T>(
-      *m_OrganizerCore, *m_PluginContainer, this, ui, index);
+    return std::make_unique<T>(*m_core, *m_plugin, this, ui.get(), index);
   }
 };
 
diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
index 321c22b8..bce1162b 100644
--- a/src/modinfodialogcategories.cpp
+++ b/src/modinfodialogcategories.cpp
@@ -22,6 +22,7 @@ void CategoriesTab::clear()
 {
   ui->categories->clear();
   ui->primaryCategories->clear();
+  setHasData(false);
 }
 
 void CategoriesTab::update()
@@ -33,6 +34,7 @@ void CategoriesTab::update()
     ui->categories->invisibleRootItem(), 0);
 
   updatePrimary();
+  setHasData(ui->primaryCategories->count() > 0);
 }
 
 bool CategoriesTab::canHandleSeparators() const
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 15bb7ed4..dde00354 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -148,7 +148,7 @@ ConflictsTab::ConflictsTab(
 
 void ConflictsTab::update()
 {
-  m_general.update();
+  setHasData(m_general.update());
   m_advanced.update();
 }
 
@@ -156,6 +156,7 @@ void ConflictsTab::clear()
 {
   m_general.clear();
   m_advanced.clear();
+  setHasData(false);
 }
 
 void ConflictsTab::saveState(Settings& s)
@@ -572,7 +573,7 @@ void GeneralConflictsTab::restoreState(const Settings& s)
     .value("mod_info_conflicts_general_overwritten").toByteArray());
 }
 
-void GeneralConflictsTab::update()
+bool GeneralConflictsTab::update()
 {
   clear();
 
@@ -616,6 +617,8 @@ void GeneralConflictsTab::update()
   ui->overwriteCount->display(numOverwrite);
   ui->overwrittenCount->display(numOverwritten);
   ui->noConflictCount->display(numNonConflicting);
+
+  return (numOverwrite > 0 || numOverwritten > 0);
 }
 
 QTreeWidgetItem* GeneralConflictsTab::createOverwriteItem(
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index a05682ba..38fa6a74 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -22,7 +22,7 @@ public:
   void saveState(Settings& s);
   void restoreState(const Settings& s);
 
-  void update();
+  bool update();
 
 signals:
   void modOpen(QString name);
@@ -100,7 +100,6 @@ public:
     QWidget* parent, Ui::ModInfoDialog* ui, int index);
 
   void update() override;
-
   void clear() override;
   void saveState(Settings& s) override;
   void restoreState(const Settings& s) override;
diff --git a/src/modinfodialogesps.cpp b/src/modinfodialogesps.cpp
index dd4fff0b..d0dcaf2b 100644
--- a/src/modinfodialogesps.cpp
+++ b/src/modinfodialogesps.cpp
@@ -138,6 +138,7 @@ void ESPsTab::clear()
 {
   ui->inactiveESPList->clear();
   ui->activeESPList->clear();
+  setHasData(false);
 }
 
 bool ESPsTab::feedFile(const QString& rootPath, const QString& fullPath)
@@ -158,6 +159,7 @@ bool ESPsTab::feedFile(const QString& rootPath, const QString& fullPath)
         ui->inactiveESPList->addItem(item);
       }
 
+      setHasData(true);
       return true;
     }
   }
diff --git a/src/modinfodialogfiletree.cpp b/src/modinfodialogfiletree.cpp
index 3e233ccc..dae37f25 100644
--- a/src/modinfodialogfiletree.cpp
+++ b/src/modinfodialogfiletree.cpp
@@ -49,7 +49,9 @@ FileTreeTab::FileTreeTab(
 void FileTreeTab::clear()
 {
   m_fs->setRootPath({});
-  //ui->filetree->
+
+  // always has data; even if the mod is empty, it still has a meta.ini
+  setHasData(true);
 }
 
 void FileTreeTab::update()
diff --git a/src/modinfodialogimages.cpp b/src/modinfodialogimages.cpp
index 332a0984..9a60fc8e 100644
--- a/src/modinfodialogimages.cpp
+++ b/src/modinfodialogimages.cpp
@@ -105,6 +105,7 @@ void ImagesTab::clear()
   }
 
   static_cast<QVBoxLayout*>(ui->imagesThumbnails->layout())->addStretch(1);
+  setHasData(false);
 }
 
 bool ImagesTab::feedFile(const QString& rootPath, const QString& fullPath)
@@ -115,7 +116,10 @@ bool ImagesTab::feedFile(const QString& rootPath, const QString& fullPath)
 
   for (const auto* e : extensions) {
     if (fullPath.endsWith(e, Qt::CaseInsensitive)) {
-      add(fullPath);
+      if (add(fullPath)) {
+        setHasData(true);
+      }
+
       return true;
     }
   }
@@ -123,13 +127,13 @@ bool ImagesTab::feedFile(const QString& rootPath, const QString& fullPath)
   return false;
 }
 
-void ImagesTab::add(const QString& fullPath)
+bool ImagesTab::add(const QString& fullPath)
 {
   QImage image = QImage(fullPath);
 
   if (image.isNull()) {
     qWarning() << "ImagesTab: '" << fullPath << "' is not a valid image";
-    return;
+    return false;
   }
 
   auto* thumbnail = new ScalableImage(std::move(image));
@@ -140,6 +144,8 @@ void ImagesTab::add(const QString& fullPath)
 
   static_cast<QVBoxLayout*>(ui->imagesThumbnails->layout())->insertWidget(
     ui->imagesThumbnails->layout()->count() - 1, thumbnail);
+
+  return true;
 }
 
 void ImagesTab::onClicked(const QImage& original)
diff --git a/src/modinfodialogimages.h b/src/modinfodialogimages.h
index 689b8e93..60271da0 100644
--- a/src/modinfodialogimages.h
+++ b/src/modinfodialogimages.h
@@ -44,7 +44,7 @@ public:
 private:
   ScalableImage* m_image;
 
-  void add(const QString& fullPath);
+  bool add(const QString& fullPath);
   void onClicked(const QImage& image);
 };
 
diff --git a/src/modinfodialognexus.cpp b/src/modinfodialognexus.cpp
index 9d51871c..61b868d1 100644
--- a/src/modinfodialognexus.cpp
+++ b/src/modinfodialognexus.cpp
@@ -48,6 +48,7 @@ void NexusTab::clear()
   ui->version->clear();
   ui->browser->setPage(new NexusTabWebpage(ui->browser));
   ui->url->clear();
+  setHasData(false);
 }
 
 void NexusTab::update()
@@ -88,6 +89,7 @@ void NexusTab::update()
     (mod()->endorsedState() == ModInfo::ENDORSED_NEVER));
 
   updateWebpage();
+  setHasData(mod()->getNexusID() >= 0);
 }
 
 void NexusTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
diff --git a/src/modinfodialogtab.cpp b/src/modinfodialogtab.cpp
index 1b7fadbb..e50aec29 100644
--- a/src/modinfodialogtab.cpp
+++ b/src/modinfodialogtab.cpp
@@ -7,7 +7,7 @@ ModInfoDialogTab::ModInfoDialogTab(
   OrganizerCore& oc, PluginContainer& plugin,
   QWidget* parent, Ui::ModInfoDialog* ui, int index) :
     ui(ui), m_core(oc), m_plugin(plugin), m_parent(parent),
-    m_origin(nullptr), m_tabIndex(index)
+    m_origin(nullptr), m_tabIndex(index), m_hasData(false)
 {
 }
 
@@ -74,6 +74,11 @@ int ModInfoDialogTab::tabIndex() const
   return m_tabIndex;
 }
 
+bool ModInfoDialogTab::hasData() const
+{
+  return m_hasData;
+}
+
 OrganizerCore& ModInfoDialogTab::core()
 {
   return m_core;
@@ -101,6 +106,11 @@ void ModInfoDialogTab::emitModOpen(QString name)
   emit modOpen(name);
 }
 
+void ModInfoDialogTab::setHasData(bool b)
+{
+  m_hasData = b;
+}
+
 
 NotesTab::NotesTab(
   OrganizerCore& oc, PluginContainer& plugin,
@@ -115,12 +125,18 @@ void NotesTab::clear()
 {
   ui->commentsEdit->clear();
   ui->notesEdit->clear();
+  setHasData(false);
 }
 
 void NotesTab::update()
 {
-  ui->commentsEdit->setText(mod()->comments());
-  ui->notesEdit->setText(mod()->notes());
+  const auto comments = mod()->comments();
+  const auto notes = mod()->notes();
+
+  ui->commentsEdit->setText(comments);
+  ui->notesEdit->setText(notes);
+
+  setHasData(!comments.isEmpty() || !notes.isEmpty());
 }
 
 bool NotesTab::canHandleSeparators() const
diff --git a/src/modinfodialogtab.h b/src/modinfodialogtab.h
index 1f99344f..8fe7d2d4 100644
--- a/src/modinfodialogtab.h
+++ b/src/modinfodialogtab.h
@@ -38,6 +38,7 @@ public:
   MOShared::FilesOrigin* origin() const;
 
   int tabIndex() const;
+  bool hasData() const;
 
 signals:
   void originModified(int originID);
@@ -57,6 +58,7 @@ protected:
 
   void emitOriginModified();
   void emitModOpen(QString name);
+  void setHasData(bool b);
 
 private:
   OrganizerCore& m_core;
@@ -65,6 +67,7 @@ private:
   ModInfo::Ptr m_mod;
   MOShared::FilesOrigin* m_origin;
   int m_tabIndex;
+  bool m_hasData;
 };
 
 
diff --git a/src/modinfodialogtextfiles.cpp b/src/modinfodialogtextfiles.cpp
index fddfafba..bd175c24 100644
--- a/src/modinfodialogtextfiles.cpp
+++ b/src/modinfodialogtextfiles.cpp
@@ -42,6 +42,7 @@ void GenericFilesTab::clear()
 {
   m_list->clear();
   select(nullptr);
+  setHasData(false);
 }
 
 bool GenericFilesTab::canClose()
@@ -76,6 +77,7 @@ bool GenericFilesTab::feedFile(const QString& rootPath, const QString& fullPath)
   for (const auto* e : extensions) {
     if (wantsFile(rootPath, fullPath)) {
       m_list->addItem(new FileListItem(rootPath, fullPath));
+      setHasData(true);
       return true;
     }
   }
-- 
cgit v1.3.1


From 581cfacbbdee17f2b4df8195487e5934702a430e Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 24 Jun 2019 09:29:41 -0400
Subject: changed "tab index" to "tab id", this was confusing the order in the
 widget and the id from the enum fixed reordering

---
 src/mainwindow.cpp              |   2 +-
 src/modinfodialog.cpp           | 208 +++++++++++++++++++++++++++-------------
 src/modinfodialog.h             |  17 ++--
 src/modinfodialog.ui            |   2 +-
 src/modinfodialogcategories.cpp |   4 +-
 src/modinfodialogcategories.h   |   2 +-
 src/modinfodialogconflicts.cpp  |   4 +-
 src/modinfodialogconflicts.h    |   2 +-
 src/modinfodialogesps.cpp       |   4 +-
 src/modinfodialogesps.h         |   2 +-
 src/modinfodialogfiletree.cpp   |   4 +-
 src/modinfodialogfiletree.h     |   2 +-
 src/modinfodialogimages.cpp     |   4 +-
 src/modinfodialogimages.h       |   2 +-
 src/modinfodialognexus.cpp      |   4 +-
 src/modinfodialognexus.h        |   2 +-
 src/modinfodialogtab.cpp        |   8 +-
 src/modinfodialogtab.h          |   6 +-
 src/modinfodialogtextfiles.cpp  |  12 +--
 src/modinfodialogtextfiles.h    |   6 +-
 20 files changed, 184 insertions(+), 113 deletions(-)

(limited to 'src/modinfodialogcategories.cpp')

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);
+
+    while (!stream.atEnd()) {
+      QString s;
+      stream >> s;
+      v.emplace_back(std::move(s));
+    }
+  }
 
-  return result;
+  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;
-
-  QStringList tabIds;
-
-  // 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;
+  Q_ASSERT(visibility.size() == m_tabs.size());
+
+  // 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]);
+
+      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;
-- 
cgit v1.3.1


From f14f2bad3ba7440d6f36657f32d00c89cae54623 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 24 Jun 2019 10:35:31 -0400
Subject: don't update invisible tabs update tabs when origin changes change
 setting name because 2.2.0 can't handle the text list

---
 src/modinfodialog.cpp           | 57 ++++++++++++++++++++++++++++-------------
 src/modinfodialog.h             |  7 ++---
 src/modinfodialogcategories.cpp |  5 ++++
 src/modinfodialogcategories.h   |  1 +
 src/modinfodialognexus.cpp      |  5 ++++
 src/modinfodialognexus.h        |  1 +
 src/modinfodialogtab.cpp        | 10 ++++++++
 src/modinfodialogtab.h          |  3 +++
 8 files changed, 68 insertions(+), 21 deletions(-)

(limited to 'src/modinfodialogcategories.cpp')

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index c03739ca..4c169cc4 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -100,6 +100,12 @@ ModInfoDialog::TabInfo::TabInfo(std::unique_ptr<ModInfoDialogTab> tab)
 {
 }
 
+bool ModInfoDialog::TabInfo::isVisible() const
+{
+  return (realPos != -1);
+}
+
+
 ModInfoDialog::ModInfoDialog(
   MainWindow* mw, OrganizerCore* core, PluginContainer* plugin) :
     TutorableDialog("ModInfoDialog", mw),
@@ -126,7 +132,9 @@ ModInfoDialog::ModInfoDialog(
 
     connect(
       tabInfo.tab.get(), &ModInfoDialogTab::originModified,
-      [&](int originID){ emit originModified(originID); });
+      [this, i](int originID) {
+        onOriginModified(static_cast<std::size_t>(i), originID);
+      });
 
     connect(
       tabInfo.tab.get(), &ModInfoDialogTab::modOpen,
@@ -207,9 +215,8 @@ void ModInfoDialog::update(bool firstTime)
 {
   setWindowTitle(m_mod->name());
   setTabsVisibility(firstTime);
+
   updateTabs();
-  feedFiles();
-  setTabsColors();
 
   if (m_initialTab >= 0) {
     switchToTab(m_initialTab);
@@ -261,18 +268,29 @@ void ModInfoDialog::setTabsVisibility(bool firstTime)
   reAddTabs(visibility, sel);
 }
 
-void ModInfoDialog::updateTabs()
+void ModInfoDialog::updateTabs(bool becauseOriginChanged)
 {
   auto* origin = getOrigin();
 
   for (auto& tabInfo : m_tabs) {
+    if (!tabInfo.isVisible()) {
+      continue;
+    }
+
+    if (becauseOriginChanged && !tabInfo.tab->usesOriginFiles()) {
+      continue;
+    }
+
     tabInfo.tab->setMod(m_mod, origin);
     tabInfo.tab->clear();
     tabInfo.tab->update();
   }
+
+  feedFiles(becauseOriginChanged);
+  setTabsColors();
 }
 
-void ModInfoDialog::feedFiles()
+void ModInfoDialog::feedFiles(bool becauseOriginChanged)
 {
   const auto rootPath = m_mod->absolutePath();
 
@@ -282,6 +300,14 @@ void ModInfoDialog::feedFiles()
       QString fileName = dirIterator.next();
 
       for (auto& tabInfo : m_tabs) {
+        if (!tabInfo.isVisible()) {
+          continue;
+        }
+
+        if (becauseOriginChanged && !tabInfo.tab->usesOriginFiles()) {
+          continue;
+        }
+
         if (tabInfo.tab->feedFile(rootPath, fileName)) {
           break;
         }
@@ -332,7 +358,7 @@ void ModInfoDialog::saveState(Settings& s) const
 {
   const auto tabState = saveTabState();
   if (!tabState.isEmpty()) {
-    s.directInterface().setValue("mod_info_tabs", tabState);
+    s.directInterface().setValue("mod_info_tab_order", tabState);
   }
 
   for (const auto& tabInfo : m_tabs) {
@@ -366,14 +392,13 @@ QString ModInfoDialog::saveTabState() const
 
 std::vector<QString> ModInfoDialog::getOrderedTabNames() const
 {
-  const auto value = Settings::instance()
-    .directInterface().value("mod_info_tabs");
+  const auto& settings = Settings::instance().directInterface();
 
   std::vector<QString> v;
 
-  if (value.type() == QVariant::ByteArray) {
+  if (settings.contains("mod_info_tabs")) {
     // old byte array
-    QDataStream stream(value.toByteArray());
+    QDataStream stream(settings.value("mod_info_tabs").toByteArray());
 
     int count = 0;
     stream >> count;
@@ -385,7 +410,7 @@ std::vector<QString> ModInfoDialog::getOrderedTabNames() const
     }
   } else {
     // string list
-    QString string = value.toString();
+    QString string = settings.value("mod_info_tab_order").toString();
     QTextStream stream(&string);
 
     while (!stream.atEnd()) {
@@ -458,14 +483,10 @@ void ModInfoDialog::reAddTabs(const std::vector<bool>& visibility, ETabs sel)
   }
 }
 
-int ModInfoDialog::tabIndex(const QString& tabId)
+void ModInfoDialog::onOriginModified(std::size_t tabIndex, int originID)
 {
-  for (int i = 0; i < ui->tabWidget->count(); ++i) {
-    if (ui->tabWidget->widget(i)->objectName() == tabId) {
-      return i;
-    }
-  }
-  return -1;
+  emit originModified(originID);
+  updateTabs(true);
 }
 
 void ModInfoDialog::onDeleteShortcut()
diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 54e056b8..31ea5536 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -116,6 +116,7 @@ private:
     QIcon icon;
 
     TabInfo(std::unique_ptr<ModInfoDialogTab> tab);
+    bool isVisible() const;
   };
 
   std::unique_ptr<Ui::ModInfoDialog> ui;
@@ -131,15 +132,15 @@ private:
   QString saveTabState() const;
   void update(bool firstTime=false);
   void onDeleteShortcut();
-  int tabIndex(const QString &tabId);
   MOShared::FilesOrigin* getOrigin();
   void setTabsVisibility(bool firstTime);
-  void updateTabs();
-  void feedFiles();
+  void updateTabs(bool becauseOriginChanged=false);
+  void feedFiles(bool becauseOriginChanged);
   void setTabsColors();
   void switchToTab(ETabs id);
   void reAddTabs(const std::vector<bool>& visibility, ETabs sel);
   std::vector<QString> getOrderedTabNames() const;
+  void onOriginModified(std::size_t tabIndex, int originID);
 
   template <class T>
   std::unique_ptr<ModInfoDialogTab> createTab(int index)
diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
index 4bd10028..0d739d1f 100644
--- a/src/modinfodialogcategories.cpp
+++ b/src/modinfodialogcategories.cpp
@@ -42,6 +42,11 @@ bool CategoriesTab::canHandleSeparators() const
   return true;
 }
 
+bool CategoriesTab::usesOriginFiles() const
+{
+  return false;
+}
+
 void CategoriesTab::add(
   const CategoryFactory &factory, const std::set<int>& enabledCategories,
   QTreeWidgetItem* root, int rootLevel)
diff --git a/src/modinfodialogcategories.h b/src/modinfodialogcategories.h
index 738b4e4d..392023e7 100644
--- a/src/modinfodialogcategories.h
+++ b/src/modinfodialogcategories.h
@@ -12,6 +12,7 @@ public:
   void clear() override;
   void update() override;
   bool canHandleSeparators() const override;
+  bool usesOriginFiles() const override;
 
 private:
   void add(
diff --git a/src/modinfodialognexus.cpp b/src/modinfodialognexus.cpp
index 172968ab..d296e000 100644
--- a/src/modinfodialognexus.cpp
+++ b/src/modinfodialognexus.cpp
@@ -102,6 +102,11 @@ void NexusTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
     mod.data(), &ModInfo::modDetailsUpdated, [&]{ onModChanged(); });
 }
 
+bool NexusTab::usesOriginFiles() const
+{
+  return false;
+}
+
 void NexusTab::updateVersionColor()
 {
   if (mod()->getVersion() != mod()->getNewestVersion()) {
diff --git a/src/modinfodialognexus.h b/src/modinfodialognexus.h
index ce1ef426..a09f4316 100644
--- a/src/modinfodialognexus.h
+++ b/src/modinfodialognexus.h
@@ -42,6 +42,7 @@ public:
   void clear() override;
   void update() override;
   void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin) override;
+  bool usesOriginFiles() const override;
 
 private:
   QMetaObject::Connection m_modConnection;
diff --git a/src/modinfodialogtab.cpp b/src/modinfodialogtab.cpp
index 2f5fbdb8..009fb804 100644
--- a/src/modinfodialogtab.cpp
+++ b/src/modinfodialogtab.cpp
@@ -53,6 +53,11 @@ bool ModInfoDialogTab::canHandleUnmanaged() const
   return false;
 }
 
+bool ModInfoDialogTab::usesOriginFiles() const
+{
+  return true;
+}
+
 void ModInfoDialogTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
 {
   m_mod = mod;
@@ -158,3 +163,8 @@ void NotesTab::onNotes()
     mod()->setNotes(ui->notesEdit->toHtml());
   }
 }
+
+bool NotesTab::usesOriginFiles() const
+{
+  return false;
+}
diff --git a/src/modinfodialogtab.h b/src/modinfodialogtab.h
index fae5bc41..c85d2ded 100644
--- a/src/modinfodialogtab.h
+++ b/src/modinfodialogtab.h
@@ -27,10 +27,12 @@ public:
   virtual bool canClose();
   virtual void saveState(Settings& s);
   virtual void restoreState(const Settings& s);
+
   virtual bool deleteRequested();
 
   virtual bool canHandleSeparators() const;
   virtual bool canHandleUnmanaged() const;
+  virtual bool usesOriginFiles() const;
 
   virtual void setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin);
 
@@ -81,6 +83,7 @@ public:
   void clear() override;
   void update() override;
   bool canHandleSeparators() const override;
+  bool usesOriginFiles() const override;
 
 private:
   void onComments();
-- 
cgit v1.3.1


From fa20f81b46c3f8c89fcbbdff6e5da0225c707358 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 25 Jun 2019 17:44:41 -0400
Subject: replaced reportError() calls by qCritical() because they can come
 from a thread, which hangs the ui categories and notes will update the tab
 color when changing fixed rare crash when reordering tabs while loading a mod

---
 src/modinfodialog.cpp           | 18 ++++++++++++++++--
 src/modinfodialog.h             |  1 +
 src/modinfodialog.ui            |  7 ++-----
 src/modinfodialogcategories.cpp |  3 ++-
 src/modinfodialogesps.cpp       |  3 ++-
 src/modinfodialogtab.cpp        | 36 ++++++++++++++++++++++++------------
 src/modinfodialogtab.h          |  2 ++
 src/modinfodialogtextfiles.cpp  |  2 +-
 src/modinforegular.cpp          |  8 ++++++--
 9 files changed, 56 insertions(+), 24 deletions(-)

(limited to 'src/modinfodialogcategories.cpp')

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index f11fa6f3..7696023f 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -124,7 +124,8 @@ 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(ETabs(-1))
+    m_core(core), m_plugin(plugin), m_initialTab(ETabs(-1)),
+    m_arrangingTabs(false)
 {
   ui->setupUi(this);
 
@@ -156,6 +157,10 @@ ModInfoDialog::ModInfoDialog(
         setMod(name);
         update();
       });
+
+    connect(
+      tabInfo.tab.get(), &ModInfoDialogTab::hasDataChanged,
+      [&]{ setTabsColors(); });
   }
 
   connect(ui->tabWidget, &QTabWidget::currentChanged, [&]{ onTabChanged(); });
@@ -269,6 +274,8 @@ void ModInfoDialog::update(bool firstTime)
 
 void ModInfoDialog::setTabsVisibility(bool firstTime)
 {
+  QScopedValueRollback arrangingTabs(m_arrangingTabs, true);
+
   std::vector<bool> visibility(m_tabs.size());
 
   bool changed = false;
@@ -374,7 +381,7 @@ void ModInfoDialog::setTabsColors()
   for (const auto& tabInfo : m_tabs) {
     const auto c = tabInfo.tab->hasData() ?
       QColor::Invalid :
-      ui->tabWidget->palette().color(QPalette::Disabled, QPalette::WindowText);
+      m_mainWindow->palette().color(QPalette::Disabled, QPalette::WindowText);
 
     ui->tabWidget->tabBar()->setTabTextColor(tabInfo.realPos, c);
   }
@@ -564,6 +571,13 @@ void ModInfoDialog::on_closeButton_clicked()
 
 void ModInfoDialog::onTabChanged()
 {
+  if (m_arrangingTabs) {
+    // this can be fired while re-arranging tabs, which happens before mods
+    // are given to tabs, and might trigger first activation, which breaks all
+    // sorts of things
+    return;
+  }
+
   if (auto* tabInfo=currentTab()) {
     tabInfo->tab->activated();
   }
diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 36363c34..6dc66003 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -141,6 +141,7 @@ private:
   PluginContainer* m_plugin;
   std::vector<TabInfo> m_tabs;
   ETabs m_initialTab;
+  bool m_arrangingTabs;
 
   std::vector<TabInfo> createTabs();
   TabInfo* currentTab();
diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index fd367e74..30ea9217 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -810,9 +810,6 @@ text-align: left;</string>
       <layout class="QVBoxLayout" name="verticalLayout_7">
        <item>
         <widget class="QTreeWidget" name="categories">
-         <property name="animated">
-          <bool>true</bool>
-         </property>
          <attribute name="headerVisible">
           <bool>false</bool>
          </attribute>
@@ -1038,7 +1035,7 @@ p, li { white-space: pre-wrap; }
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_10">
        <item>
-        <widget class="QLineEdit" name="commentsEdit">
+        <widget class="QLineEdit" name="comments">
          <property name="toolTip">
           <string>Enter comments about the mod here.  These are displayed in the notes column of the mod list.</string>
          </property>
@@ -1051,7 +1048,7 @@ p, li { white-space: pre-wrap; }
         </widget>
        </item>
        <item>
-        <widget class="HTMLEditor" name="notesEdit">
+        <widget class="HTMLEditor" name="notes">
          <property name="toolTip">
           <string>Enter notes about the mod here.  These can be viewed in the mod list by hovering over the notes column or the flags column.</string>
          </property>
diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
index 0d739d1f..8ffded59 100644
--- a/src/modinfodialogcategories.cpp
+++ b/src/modinfodialogcategories.cpp
@@ -34,7 +34,6 @@ void CategoriesTab::update()
     ui->categories->invisibleRootItem(), 0);
 
   updatePrimary();
-  setHasData(ui->primaryCategories->count() > 0);
 }
 
 bool CategoriesTab::canHandleSeparators() const
@@ -92,6 +91,8 @@ void CategoriesTab::updatePrimary()
       break;
     }
   }
+
+  setHasData(ui->primaryCategories->count() > 0);
 }
 
 void CategoriesTab::addChecked(QTreeWidgetItem* tree)
diff --git a/src/modinfodialogesps.cpp b/src/modinfodialogesps.cpp
index ecb341e8..7961096d 100644
--- a/src/modinfodialogesps.cpp
+++ b/src/modinfodialogesps.cpp
@@ -260,7 +260,6 @@ bool ESPsTab::feedFile(const QString& rootPath, const QString& fullPath)
         m_inactiveModel->add(std::move(esp));
       }
 
-      setHasData(true);
       return true;
     }
   }
@@ -272,6 +271,8 @@ void ESPsTab::update()
 {
   m_inactiveModel->finished();
   m_activeModel->finished();
+
+  setHasData(m_inactiveModel->rowCount() > 0 || m_activeModel->rowCount() > 0);
 }
 
 void ESPsTab::onActivate()
diff --git a/src/modinfodialogtab.cpp b/src/modinfodialogtab.cpp
index d99e8727..f5eeeed1 100644
--- a/src/modinfodialogtab.cpp
+++ b/src/modinfodialogtab.cpp
@@ -131,7 +131,10 @@ void ModInfoDialogTab::emitModOpen(QString name)
 
 void ModInfoDialogTab::setHasData(bool b)
 {
-  m_hasData = b;
+  if (m_hasData != b) {
+    m_hasData = b;
+    emit hasDataChanged();
+  }
 }
 
 
@@ -140,14 +143,14 @@ NotesTab::NotesTab(
   QWidget* parent, Ui::ModInfoDialog* ui, int index)
    : ModInfoDialogTab(oc, plugin, parent, ui, index)
 {
-  connect(ui->commentsEdit, &QLineEdit::editingFinished, [&]{ onComments(); });
-  connect(ui->notesEdit, &HTMLEditor::editingFinished, [&]{ onNotes(); });
+  connect(ui->comments, &QLineEdit::editingFinished, [&]{ onComments(); });
+  connect(ui->notes, &HTMLEditor::editingFinished, [&]{ onNotes(); });
 }
 
 void NotesTab::clear()
 {
-  ui->commentsEdit->clear();
-  ui->notesEdit->clear();
+  ui->comments->clear();
+  ui->notes->clear();
   setHasData(false);
 }
 
@@ -156,10 +159,9 @@ void NotesTab::update()
   const auto comments = mod()->comments();
   const auto notes = mod()->notes();
 
-  ui->commentsEdit->setText(comments);
-  ui->notesEdit->setText(notes);
-
-  setHasData(!comments.isEmpty() || !notes.isEmpty());
+  ui->comments->setText(comments);
+  ui->notes->setText(notes);
+  checkHasData();
 }
 
 bool NotesTab::canHandleSeparators() const
@@ -169,20 +171,30 @@ bool NotesTab::canHandleSeparators() const
 
 void NotesTab::onComments()
 {
-  mod()->setComments(ui->commentsEdit->text());
+  mod()->setComments(ui->comments->text());
+  checkHasData();
 }
 
 void NotesTab::onNotes()
 {
   // Avoid saving html stub if notes field is empty.
-  if (ui->notesEdit->toPlainText().isEmpty()) {
+  if (ui->notes->toPlainText().isEmpty()) {
     mod()->setNotes({});
   } else {
-    mod()->setNotes(ui->notesEdit->toHtml());
+    mod()->setNotes(ui->notes->toHtml());
   }
+
+  checkHasData();
 }
 
 bool NotesTab::usesOriginFiles() const
 {
   return false;
 }
+
+void NotesTab::checkHasData()
+{
+  setHasData(
+    !ui->comments->text().isEmpty() ||
+    !ui->notes->toPlainText().isEmpty());
+}
diff --git a/src/modinfodialogtab.h b/src/modinfodialogtab.h
index 41d913f8..058035ab 100644
--- a/src/modinfodialogtab.h
+++ b/src/modinfodialogtab.h
@@ -49,6 +49,7 @@ public:
 signals:
   void originModified(int originID);
   void modOpen(QString name);
+  void hasDataChanged();
 
 protected:
   Ui::ModInfoDialog* ui;
@@ -93,6 +94,7 @@ public:
 private:
   void onComments();
   void onNotes();
+  void checkHasData();
 };
 
 #endif // MODINFODIALOGTAB_H
diff --git a/src/modinfodialogtextfiles.cpp b/src/modinfodialogtextfiles.cpp
index 2b5ab489..e3d00049 100644
--- a/src/modinfodialogtextfiles.cpp
+++ b/src/modinfodialogtextfiles.cpp
@@ -158,7 +158,6 @@ bool GenericFilesTab::feedFile(const QString& rootPath, const QString& fullPath)
   for (const auto* e : extensions) {
     if (wantsFile(rootPath, fullPath)) {
       m_model->add(rootPath, fullPath);
-      setHasData(true);
       return true;
     }
   }
@@ -169,6 +168,7 @@ bool GenericFilesTab::feedFile(const QString& rootPath, const QString& fullPath)
 void GenericFilesTab::update()
 {
   m_model->finished();
+  setHasData(m_model->rowCount() > 0);
 }
 
 void GenericFilesTab::onSelection(
diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
index babbd665..4333e351 100644
--- a/src/modinforegular.cpp
+++ b/src/modinforegular.cpp
@@ -194,10 +194,14 @@ void ModInfoRegular::saveMeta()
       if (metaFile.status() == QSettings::NoError) {
         m_MetaInfoChanged = false;
       } else {
-        reportError(tr("failed to write %1/meta.ini: error %2").arg(absolutePath()).arg(metaFile.status()));
+        qCritical()
+          << QString("failed to write %1/meta.ini: error %2")
+            .arg(absolutePath()).arg(metaFile.status());
       }
     } else {
-      reportError(tr("failed to write %1/meta.ini: error %2").arg(absolutePath()).arg(metaFile.status()));
+      qCritical()
+        << QString("failed to write %1/meta.ini: error %2")
+          .arg(absolutePath()).arg(metaFile.status());
     }
   }
 }
-- 
cgit v1.3.1


From 82d985064e5105ded4b20d357eaf7cd1b97fe9da Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 2 Jul 2019 12:02:07 -0400
Subject: added a ModInfoDialogTabContext to avoid passing too many things to
 tab constructors mod is passed to ctors to make sure they can never be empty
 only call deleteRequest() to selected mod comments

---
 src/mainwindow.cpp              |  4 +-
 src/modinfodialog.cpp           | 40 +++++++++++-------
 src/modinfodialog.h             | 36 ++++------------
 src/modinfodialogcategories.cpp | 14 +++---
 src/modinfodialogcategories.h   |  4 +-
 src/modinfodialogconflicts.cpp  | 12 +++---
 src/modinfodialogconflicts.h    |  4 +-
 src/modinfodialogesps.cpp       |  8 ++--
 src/modinfodialogesps.h         |  4 +-
 src/modinfodialogfiletree.cpp   | 14 +++---
 src/modinfodialogfiletree.h     |  4 +-
 src/modinfodialogimages.cpp     |  9 ++--
 src/modinfodialogimages.h       |  4 +-
 src/modinfodialognexus.cpp      | 85 +++++++++++++++++++------------------
 src/modinfodialognexus.h        |  4 +-
 src/modinfodialogtab.cpp        | 33 ++++++++-------
 src/modinfodialogtab.h          | 94 +++++++++++++++++++++++++++++++++++++----
 src/modinfodialogtextfiles.cpp  | 30 ++++++-------
 src/modinfodialogtextfiles.h    | 14 +++---
 19 files changed, 226 insertions(+), 191 deletions(-)

(limited to 'src/modinfodialogcategories.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d48fae4f..7ab555fa 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3223,11 +3223,9 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
   } else {
     modInfo->saveMeta();
 
-    ModInfoDialog dialog(this, &m_OrganizerCore, &m_PluginContainer);
+    ModInfoDialog dialog(this, &m_OrganizerCore, &m_PluginContainer, modInfo);
     connect(&dialog, SIGNAL(originModified(int)), this, SLOT(originModified(int)));
 
-    dialog.setMod(modInfo);
-
 	  //Open the tab first if we want to use the standard indexes of the tabs.
 	  if (tab != -1) {
 		  dialog.setTab(ModInfoDialog::ETabs(tab));
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 4af479c4..4ef010e4 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -127,7 +127,8 @@ bool ModInfoDialog::TabInfo::isVisible() const
 
 
 ModInfoDialog::ModInfoDialog(
-  MainWindow* mw, OrganizerCore* core, PluginContainer* plugin) :
+  MainWindow* mw, OrganizerCore* core, PluginContainer* plugin,
+  ModInfo::Ptr mod) :
     TutorableDialog("ModInfoDialog", mw),
     ui(new Ui::ModInfoDialog), m_mainWindow(mw),
     m_core(core), m_plugin(plugin), m_initialTab(ETabs(-1)),
@@ -138,6 +139,7 @@ ModInfoDialog::ModInfoDialog(
   auto* sc = new QShortcut(QKeySequence::Delete, this);
   connect(sc, &QShortcut::activated, [&]{ onDeleteShortcut(); });
 
+  setMod(mod);
   m_tabs = createTabs();
 
   for (int i=0; i<ui->tabWidget->count(); ++i) {
@@ -184,19 +186,26 @@ ModInfoDialog::ModInfoDialog(
 
 ModInfoDialog::~ModInfoDialog() = default;
 
+template <class T>
+std::unique_ptr<ModInfoDialogTab> createTab(ModInfoDialog& d, int index)
+{
+  return std::make_unique<T>(ModInfoDialogTabContext(
+    *d.m_core, *d.m_plugin, &d, d.ui.get(), index, d.m_mod, d.getOrigin()));
+}
+
 std::vector<ModInfoDialog::TabInfo> ModInfoDialog::createTabs()
 {
   std::vector<TabInfo> v;
 
-  v.push_back(createTab<TextFilesTab>(TAB_TEXTFILES));
-  v.push_back(createTab<IniFilesTab>(TAB_INIFILES));
-  v.push_back(createTab<ImagesTab>(TAB_IMAGES));
-  v.push_back(createTab<ESPsTab>(TAB_ESPS));
-  v.push_back(createTab<ConflictsTab>(TAB_CONFLICTS));
-  v.push_back(createTab<CategoriesTab>(TAB_CATEGORIES));
-  v.push_back(createTab<NexusTab>(TAB_NEXUS));
-  v.push_back(createTab<NotesTab>(TAB_NOTES));
-  v.push_back(createTab<FileTreeTab>(TAB_FILETREE));
+  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));
 
   return v;
 }
@@ -218,6 +227,7 @@ int ModInfoDialog::exec()
 
 void ModInfoDialog::setMod(ModInfo::Ptr mod)
 {
+  Q_ASSERT(mod);
   m_mod = mod;
 
   for (auto& tabInfo : m_tabs) {
@@ -584,10 +594,8 @@ void ModInfoDialog::onOriginModified(int originID)
 
 void ModInfoDialog::onDeleteShortcut()
 {
-  for (auto& tabInfo : m_tabs) {
-    if (tabInfo.tab->deleteRequested()) {
-      break;
-    }
+  if (auto* tabInfo=currentTab()) {
+    tabInfo->tab->deleteRequested();
   }
 }
 
@@ -663,7 +671,7 @@ void ModInfoDialog::onTabMoved()
 void ModInfoDialog::on_nextButton_clicked()
 {
   auto mod = m_mainWindow->nextModInList();
-  if (mod == m_mod) {
+  if (!mod || mod == m_mod) {
     return;
   }
 
@@ -674,7 +682,7 @@ void ModInfoDialog::on_nextButton_clicked()
 void ModInfoDialog::on_prevButton_clicked()
 {
   auto mod = m_mainWindow->previousModInList();
-  if (mod == m_mod) {
+  if (!mod || mod == m_mod) {
     return;
   }
 
diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 899a3eab..9eb00a3b 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -66,7 +66,11 @@ protected:
  **/
 class ModInfoDialog : public MOBase::TutorableDialog
 {
-    Q_OBJECT
+  Q_OBJECT;
+
+  template <class T>
+  friend std::unique_ptr<ModInfoDialogTab> createTab(
+    ModInfoDialog& d, int index);
 
 public:
   enum ETabs {
@@ -81,30 +85,12 @@ public:
     TAB_FILETREE
   };
 
- /**
-  * @brief constructor
-  *
-  * @param modInfo info structure about the mod to display
-  * @param parent parend widget
-  **/
-  ModInfoDialog(MainWindow* mw, OrganizerCore* core, PluginContainer* plugin);
+  ModInfoDialog(
+    MainWindow* mw, OrganizerCore* core, PluginContainer* plugin,
+    ModInfo::Ptr mod);
 
   ~ModInfoDialog();
 
-  /**
-   * @brief retrieve the (user-modified) version of the mod
-   *
-   * @return the (user-modified) version of the mod
-   **/
-  QString getModVersion() const;
-
-  /**
-   * @brief retrieve the (user-modified) mod id
-   *
-   * @return the (user-modified) id of the mod
-   **/
-  const int getModID() const;
-
   void setMod(ModInfo::Ptr mod);
   void setMod(const QString& name);
   void setTab(ETabs id);
@@ -166,12 +152,6 @@ private:
   void onOriginModified(int originID);
   void onTabChanged();
   void onTabMoved();
-
-  template <class T>
-  std::unique_ptr<ModInfoDialogTab> createTab(int index)
-  {
-    return std::make_unique<T>(*m_core, *m_plugin, this, ui.get(), index);
-  }
 };
 
 #endif // MODINFODIALOG_H
diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
index 8ffded59..c61e248e 100644
--- a/src/modinfodialogcategories.cpp
+++ b/src/modinfodialogcategories.cpp
@@ -3,10 +3,8 @@
 #include "categories.h"
 #include "modinfo.h"
 
-CategoriesTab::CategoriesTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int id)
-    : ModInfoDialogTab(oc, plugin, parent, ui, id)
+CategoriesTab::CategoriesTab(ModInfoDialogTabContext cx)
+  : ModInfoDialogTab(std::move(cx))
 {
   connect(
     ui->categories, &QTreeWidget::itemChanged,
@@ -30,7 +28,7 @@ void CategoriesTab::update()
   clear();
 
   add(
-    CategoryFactory::instance(), mod()->getCategories(),
+    CategoryFactory::instance(), mod().getCategories(),
     ui->categories->invisibleRootItem(), 0);
 
   updatePrimary();
@@ -81,7 +79,7 @@ void CategoriesTab::updatePrimary()
 {
   ui->primaryCategories->clear();
 
-  int primaryCategory = mod()->getPrimaryCategory();
+  int primaryCategory = mod().getPrimaryCategory();
 
   addChecked(ui->categories->invisibleRootItem());
 
@@ -111,7 +109,7 @@ void CategoriesTab::save(QTreeWidgetItem* currentNode)
   for (int i = 0; i < currentNode->childCount(); ++i) {
     QTreeWidgetItem *childNode = currentNode->child(i);
 
-    mod()->setCategory(
+    mod().setCategory(
       childNode->data(0, Qt::UserRole).toInt(), childNode->checkState(0));
 
     save(childNode);
@@ -134,6 +132,6 @@ void CategoriesTab::onCategoryChanged(QTreeWidgetItem* item, int)
 void CategoriesTab::onPrimaryChanged(int index)
 {
   if (index != -1) {
-    mod()->setPrimaryCategory(ui->primaryCategories->itemData(index).toInt());
+    mod().setPrimaryCategory(ui->primaryCategories->itemData(index).toInt());
   }
 }
diff --git a/src/modinfodialogcategories.h b/src/modinfodialogcategories.h
index 392023e7..c8b52fec 100644
--- a/src/modinfodialogcategories.h
+++ b/src/modinfodialogcategories.h
@@ -5,9 +5,7 @@ class CategoryFactory;
 class CategoriesTab : public ModInfoDialogTab
 {
 public:
-  CategoriesTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int id);
+  CategoriesTab(ModInfoDialogTabContext cx);
 
   void clear() override;
   void update() override;
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index a3383a50..511d48ad 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -382,11 +382,9 @@ void for_each_in_selection(QTreeView* tree, F&& f)
 }
 
 
-ConflictsTab::ConflictsTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int id) :
-    ModInfoDialogTab(oc, plugin, parent, ui, id),
-    m_general(this, ui, oc), m_advanced(this, ui, oc)
+ConflictsTab::ConflictsTab(ModInfoDialogTabContext cx) :
+  ModInfoDialogTab(cx), // don't move, cx is used again
+  m_general(this, cx.ui, cx.core), m_advanced(this, cx.ui, cx.core)
 {
   connect(
     &m_general, &GeneralConflictsTab::modOpen,
@@ -872,7 +870,7 @@ bool GeneralConflictsTab::update()
   int numOverwritten = 0;
 
   if (m_tab->origin() != nullptr) {
-    const auto rootPath = m_tab->mod()->absolutePath();
+    const auto rootPath = m_tab->mod().absolutePath();
 
     for (const auto& file : m_tab->origin()->getFiles()) {
       // careful: these two strings are moved into createXItem() below
@@ -1085,7 +1083,7 @@ void AdvancedConflictsTab::update()
   clear();
 
   if (m_tab->origin() != nullptr) {
-    const auto rootPath = m_tab->mod()->absolutePath();
+    const auto rootPath = m_tab->mod().absolutePath();
 
     const auto& files = m_tab->origin()->getFiles();
     m_model->reserve(files.size());
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index 3fa12231..a77c2ac9 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -103,9 +103,7 @@ class ConflictsTab : public ModInfoDialogTab
   Q_OBJECT;
 
 public:
-  ConflictsTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int id);
+  ConflictsTab(ModInfoDialogTabContext cx);
 
   void update() override;
   void clear() override;
diff --git a/src/modinfodialogesps.cpp b/src/modinfodialogesps.cpp
index 8dceaa31..fba5d39a 100644
--- a/src/modinfodialogesps.cpp
+++ b/src/modinfodialogesps.cpp
@@ -224,11 +224,9 @@ private:
 
 
 
-ESPsTab::ESPsTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int id) :
-    ModInfoDialogTab(oc, plugin, parent, ui, id),
-    m_inactiveModel(new ESPListModel), m_activeModel(new ESPListModel)
+ESPsTab::ESPsTab(ModInfoDialogTabContext cx) :
+  ModInfoDialogTab(std::move(cx)),
+  m_inactiveModel(new ESPListModel), m_activeModel(new ESPListModel)
 {
   ui->inactiveESPList->setModel(m_inactiveModel);
   ui->activeESPList->setModel(m_activeModel);
diff --git a/src/modinfodialogesps.h b/src/modinfodialogesps.h
index 217863c6..b128f279 100644
--- a/src/modinfodialogesps.h
+++ b/src/modinfodialogesps.h
@@ -11,9 +11,7 @@ class ESPsTab : public ModInfoDialogTab
   Q_OBJECT;
 
 public:
-  ESPsTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int id);
+  ESPsTab(ModInfoDialogTabContext cx);
 
   void clear() override;
   bool feedFile(const QString& rootPath, const QString& fullPath) override;
diff --git a/src/modinfodialogfiletree.cpp b/src/modinfodialogfiletree.cpp
index 6690dd2f..35480e2c 100644
--- a/src/modinfodialogfiletree.cpp
+++ b/src/modinfodialogfiletree.cpp
@@ -13,10 +13,8 @@ namespace shell = MOBase::shell;
 // checking whether menu items apply to them, just show all of them
 const int max_scan_for_context_menu = 50;
 
-FileTreeTab::FileTreeTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int id)
-    : ModInfoDialogTab(oc, plugin, parent, ui, id), m_fs(nullptr)
+FileTreeTab::FileTreeTab(ModInfoDialogTabContext cx)
+  : ModInfoDialogTab(std::move(cx)), m_fs(nullptr)
 {
   m_fs = new QFileSystemModel(this);
   m_fs->setReadOnly(false);
@@ -58,7 +56,7 @@ void FileTreeTab::clear()
 
 void FileTreeTab::update()
 {
-  const auto rootPath = mod()->absolutePath();
+  const auto rootPath = mod().absolutePath();
 
   m_fs->setRootPath(rootPath);
   ui->filetree->setRootIndex(m_fs->index(rootPath));
@@ -139,7 +137,7 @@ void FileTreeTab::onPreview()
     return;
   }
 
-  core().previewFile(parentWidget(), mod()->name(), m_fs->filePath(selection));
+  core().previewFile(parentWidget(), mod().name(), m_fs->filePath(selection));
 }
 
 void FileTreeTab::onExplore()
@@ -149,7 +147,7 @@ void FileTreeTab::onExplore()
   if (selection.isValid()) {
     shell::ExploreFile(m_fs->filePath(selection));
   } else {
-    shell::ExploreFile(mod()->absolutePath());
+    shell::ExploreFile(mod().absolutePath());
   }
 }
 
@@ -205,7 +203,7 @@ void FileTreeTab::onUnhide()
 
 void FileTreeTab::onOpenInExplorer()
 {
-  shell::ExploreFile(mod()->absolutePath());
+  shell::ExploreFile(mod().absolutePath());
 }
 
 bool FileTreeTab::deleteFile(const QModelIndex& index)
diff --git a/src/modinfodialogfiletree.h b/src/modinfodialogfiletree.h
index 9f5206b9..f9fa62d4 100644
--- a/src/modinfodialogfiletree.h
+++ b/src/modinfodialogfiletree.h
@@ -6,9 +6,7 @@
 class FileTreeTab : public ModInfoDialogTab
 {
 public:
-  FileTreeTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int id);
+  FileTreeTab(ModInfoDialogTabContext cx);
 
   void clear() override;
   void update() override;
diff --git a/src/modinfodialogimages.cpp b/src/modinfodialogimages.cpp
index 307fa8e8..cf33f9f5 100644
--- a/src/modinfodialogimages.cpp
+++ b/src/modinfodialogimages.cpp
@@ -35,12 +35,9 @@ QString dimensionString(const QSize& s)
 }
 
 
-ImagesTab::ImagesTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int id) :
-    ModInfoDialogTab(oc, plugin, parent, ui, id),
-    m_image(new ScalableImage),
-    m_ddsAvailable(false), m_ddsEnabled(false)
+ImagesTab::ImagesTab(ModInfoDialogTabContext cx) :
+  ModInfoDialogTab(std::move(cx)), m_image(new ScalableImage),
+  m_ddsAvailable(false), m_ddsEnabled(false)
 {
   getSupportedFormats();
 
diff --git a/src/modinfodialogimages.h b/src/modinfodialogimages.h
index d22a6ab2..8d9b965b 100644
--- a/src/modinfodialogimages.h
+++ b/src/modinfodialogimages.h
@@ -314,9 +314,7 @@ class ImagesTab : public ModInfoDialogTab
   friend class ImagesTabHelpers::ThumbnailsWidget;
 
 public:
-  ImagesTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int id);
+  ImagesTab(ModInfoDialogTabContext cx);
 
   void clear() override;
   bool feedFile(const QString& rootPath, const QString& fullPath) override;
diff --git a/src/modinfodialognexus.cpp b/src/modinfodialognexus.cpp
index 8c8ce55a..81546f58 100644
--- a/src/modinfodialognexus.cpp
+++ b/src/modinfodialognexus.cpp
@@ -14,11 +14,8 @@ bool isValidModID(int id)
   return (id > 0);
 }
 
-NexusTab::NexusTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int id) :
-    ModInfoDialogTab(oc, plugin, parent, ui, id), m_requestStarted(false),
-    m_loading(false)
+NexusTab::NexusTab(ModInfoDialogTabContext cx) :
+  ModInfoDialogTab(std::move(cx)), m_requestStarted(false), m_loading(false)
 {
   ui->modID->setValidator(new QIntValidator(ui->modID));
   ui->endorse->setVisible(core().settings().endorsementIntegration());
@@ -70,9 +67,9 @@ void NexusTab::update()
 
   clear();
 
-  ui->modID->setText(QString("%1").arg(mod()->getNexusID()));
+  ui->modID->setText(QString("%1").arg(mod().getNexusID()));
 
-  QString gameName = mod()->getGameName();
+  QString gameName = mod().getGameName();
   ui->sourceGame->addItem(
     core().managedGame()->gameName(),
     core().managedGame()->gameShortName());
@@ -100,10 +97,10 @@ void NexusTab::update()
     [&](const QUrl& url){ shell::OpenLink(url); });
 
   ui->endorse->setEnabled(
-    (mod()->endorsedState() == ModInfo::ENDORSED_FALSE) ||
-    (mod()->endorsedState() == ModInfo::ENDORSED_NEVER));
+    (mod().endorsedState() == ModInfo::ENDORSED_FALSE) ||
+    (mod().endorsedState() == ModInfo::ENDORSED_NEVER));
 
-  setHasData(mod()->getNexusID() >= 0);
+  setHasData(mod().getNexusID() >= 0);
 }
 
 void NexusTab::firstActivation()
@@ -128,10 +125,10 @@ bool NexusTab::usesOriginFiles() const
 
 void NexusTab::updateVersionColor()
 {
-  if (mod()->getVersion() != mod()->getNewestVersion()) {
+  if (mod().getVersion() != mod().getNewestVersion()) {
     ui->version->setStyleSheet("color: red");
     ui->version->setToolTip(tr("Current Version: %1").arg(
-      mod()->getNewestVersion().canonicalString()));
+      mod().getNewestVersion().canonicalString()));
   } else {
     ui->version->setStyleSheet("color: green");
     ui->version->setToolTip(tr("No update available"));
@@ -140,11 +137,11 @@ void NexusTab::updateVersionColor()
 
 void NexusTab::updateWebpage()
 {
-  const int modID = mod()->getNexusID();
+  const int modID = mod().getNexusID();
 
   if (isValidModID(modID)) {
     const QString nexusLink = NexusInterface::instance(&plugin())
-      ->getModURL(modID, mod()->getGameName());
+      ->getModURL(modID, mod().getGameName());
 
     ui->visitNexus->setToolTip(nexusLink);
     refreshData(modID);
@@ -152,19 +149,19 @@ void NexusTab::updateWebpage()
     onModChanged();
   }
 
-  ui->version->setText(mod()->getVersion().displayString());
-  ui->hasCustomURL->setChecked(mod()->hasCustomURL());
-  ui->customURL->setText(mod()->getCustomURL());
-  ui->customURL->setEnabled(mod()->hasCustomURL());
-  ui->visitCustomURL->setEnabled(mod()->hasCustomURL());
-  ui->visitCustomURL->setToolTip(mod()->parseCustomURL().toString());
+  ui->version->setText(mod().getVersion().displayString());
+  ui->hasCustomURL->setChecked(mod().hasCustomURL());
+  ui->customURL->setText(mod().getCustomURL());
+  ui->customURL->setEnabled(mod().hasCustomURL());
+  ui->visitCustomURL->setEnabled(mod().hasCustomURL());
+  ui->visitCustomURL->setToolTip(mod().parseCustomURL().toString());
 
   updateTracking();
 }
 
 void NexusTab::updateTracking()
 {
-  if (mod()->trackedState() == ModInfo::TRACKED_TRUE) {
+  if (mod().trackedState() == ModInfo::TRACKED_TRUE) {
     ui->track->setChecked(true);
     ui->track->setText(tr("Tracked"));
   } else {
@@ -185,7 +182,7 @@ void NexusTab::refreshData(int modID)
 bool NexusTab::tryRefreshData(int modID)
 {
   if (isValidModID(modID) && !m_requestStarted) {
-    if (mod()->updateNXMInfo()) {
+    if (mod().updateNXMInfo()) {
       ui->browser->setHtml("");
       return true;
     }
@@ -198,7 +195,7 @@ void NexusTab::onModChanged()
 {
   m_requestStarted = false;
 
-  const QString nexusDescription = mod()->getNexusDescription();
+  const QString nexusDescription = mod().getNexusDescription();
 
   QString descriptionAsHTML = R"(
 <html>
@@ -247,12 +244,12 @@ void NexusTab::onModIDChanged()
     return;
   }
 
-  const int oldID = mod()->getNexusID();
+  const int oldID = mod().getNexusID();
   const int newID = ui->modID->text().toInt();
 
   if (oldID != newID){
-    mod()->setNexusID(newID);
-    mod()->setLastNexusQuery(QDateTime::fromSecsSinceEpoch(0));
+    mod().setNexusID(newID);
+    mod().setLastNexusQuery(QDateTime::fromSecsSinceEpoch(0));
 
     ui->browser->page()->setHtml("");
 
@@ -270,9 +267,9 @@ void NexusTab::onSourceGameChanged()
 
   for (auto game : plugin().plugins<MOBase::IPluginGame>()) {
     if (game->gameName() == ui->sourceGame->currentText()) {
-      mod()->setGameName(game->gameShortName());
-      mod()->setLastNexusQuery(QDateTime::fromSecsSinceEpoch(0));
-      refreshData(mod()->getNexusID());
+      mod().setGameName(game->gameShortName());
+      mod().setLastNexusQuery(QDateTime::fromSecsSinceEpoch(0));
+      refreshData(mod().getNexusID());
       return;
     }
   }
@@ -285,16 +282,16 @@ void NexusTab::onVersionChanged()
   }
 
   MOBase::VersionInfo version(ui->version->text());
-  mod()->setVersion(version);
+  mod().setVersion(version);
   updateVersionColor();
 }
 
 void NexusTab::onRefreshBrowser()
 {
-  const auto modID = mod()->getNexusID();
+  const auto modID = mod().getNexusID();
 
   if (isValidModID(modID)) {
-    mod()->setLastNexusQuery(QDateTime::fromSecsSinceEpoch(0));
+    mod().setLastNexusQuery(QDateTime::fromSecsSinceEpoch(0));
     updateWebpage();
   } else {
     qInfo("Mod has no valid Nexus ID, info can't be updated.");
@@ -303,11 +300,11 @@ void NexusTab::onRefreshBrowser()
 
 void NexusTab::onVisitNexus()
 {
-  const int modID = mod()->getNexusID();
+  const int modID = mod().getNexusID();
 
   if (isValidModID(modID)) {
     const QString nexusLink = NexusInterface::instance(&plugin())
-      ->getModURL(modID, mod()->getGameName());
+      ->getModURL(modID, mod().getGameName());
 
     shell::OpenLink(QUrl(nexusLink));
   }
@@ -315,12 +312,16 @@ void NexusTab::onVisitNexus()
 
 void NexusTab::onEndorse()
 {
-  core().loggedInAction(parentWidget(), [m=mod()]{ m->endorse(true); });
+  // use modPtr() instead of mod() or this because the callback may be
+  // executed after the dialog is closed
+  core().loggedInAction(parentWidget(), [m=modPtr()]{ m->endorse(true); });
 }
 
 void NexusTab::onTrack()
 {
-  core().loggedInAction(parentWidget(), [m=mod()] {
+  // use modPtr() instead of mod() or this because the callback may be
+  // executed after the dialog is closed
+  core().loggedInAction(parentWidget(), [m=modPtr()] {
     if (m->trackedState() == ModInfo::TRACKED_TRUE) {
       m->track(false);
     } else {
@@ -335,9 +336,9 @@ void NexusTab::onCustomURLToggled()
     return;
   }
 
-  mod()->setHasCustomURL(ui->hasCustomURL->isChecked());
-  ui->customURL->setEnabled(mod()->hasCustomURL());
-  ui->visitCustomURL->setEnabled(mod()->hasCustomURL());
+  mod().setHasCustomURL(ui->hasCustomURL->isChecked());
+  ui->customURL->setEnabled(mod().hasCustomURL());
+  ui->visitCustomURL->setEnabled(mod().hasCustomURL());
 }
 
 void NexusTab::onCustomURLChanged()
@@ -346,13 +347,13 @@ void NexusTab::onCustomURLChanged()
     return;
   }
 
-  mod()->setCustomURL(ui->customURL->text());
-  ui->visitCustomURL->setToolTip(mod()->parseCustomURL().toString());
+  mod().setCustomURL(ui->customURL->text());
+  ui->visitCustomURL->setToolTip(mod().parseCustomURL().toString());
 }
 
 void NexusTab::onVisitCustomURL()
 {
-  const auto url = mod()->parseCustomURL();
+  const auto url = mod().parseCustomURL();
   if (url.isValid()) {
     shell::OpenLink(url);
   }
diff --git a/src/modinfodialognexus.h b/src/modinfodialognexus.h
index 930c1ffc..6478375b 100644
--- a/src/modinfodialognexus.h
+++ b/src/modinfodialognexus.h
@@ -33,9 +33,7 @@ signals:
 class NexusTab : public ModInfoDialogTab
 {
 public:
-  NexusTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int id);
+  NexusTab(ModInfoDialogTabContext cx);
 
   ~NexusTab();
 
diff --git a/src/modinfodialogtab.cpp b/src/modinfodialogtab.cpp
index 0468b405..554df6df 100644
--- a/src/modinfodialogtab.cpp
+++ b/src/modinfodialogtab.cpp
@@ -3,11 +3,9 @@
 #include "texteditor.h"
 #include "directoryentry.h"
 
-ModInfoDialogTab::ModInfoDialogTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int id) :
-    ui(ui), m_core(oc), m_plugin(plugin), m_parent(parent),
-    m_origin(nullptr), m_tabID(id), m_hasData(false), m_firstActivation(true)
+ModInfoDialogTab::ModInfoDialogTab(ModInfoDialogTabContext cx) :
+  ui(cx.ui), m_core(cx.core), m_plugin(cx.plugin), m_parent(cx.parent),
+  m_origin(cx.origin), m_tabID(cx.id), m_hasData(false), m_firstActivation(true)
 {
 }
 
@@ -82,8 +80,15 @@ void ModInfoDialogTab::setMod(ModInfo::Ptr mod, MOShared::FilesOrigin* origin)
   m_origin = origin;
 }
 
-ModInfo::Ptr ModInfoDialogTab::mod() const
+ModInfo& ModInfoDialogTab::mod() const
 {
+  Q_ASSERT(m_mod);
+  return *m_mod;
+}
+
+ModInfo::Ptr ModInfoDialogTab::modPtr() const
+{
+  Q_ASSERT(m_mod);
   return m_mod;
 }
 
@@ -143,10 +148,8 @@ void ModInfoDialogTab::setFocus()
 }
 
 
-NotesTab::NotesTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int index)
-   : ModInfoDialogTab(oc, plugin, parent, ui, index)
+NotesTab::NotesTab(ModInfoDialogTabContext cx)
+   : ModInfoDialogTab(std::move(cx))
 {
   connect(ui->comments, &QLineEdit::editingFinished, [&]{ onComments(); });
   connect(ui->notes, &HTMLEditor::editingFinished, [&]{ onNotes(); });
@@ -161,8 +164,8 @@ void NotesTab::clear()
 
 void NotesTab::update()
 {
-  const auto comments = mod()->comments();
-  const auto notes = mod()->notes();
+  const auto comments = mod().comments();
+  const auto notes = mod().notes();
 
   ui->comments->setText(comments);
   ui->notes->setText(notes);
@@ -176,7 +179,7 @@ bool NotesTab::canHandleSeparators() const
 
 void NotesTab::onComments()
 {
-  mod()->setComments(ui->comments->text());
+  mod().setComments(ui->comments->text());
   checkHasData();
 }
 
@@ -184,9 +187,9 @@ void NotesTab::onNotes()
 {
   // Avoid saving html stub if notes field is empty.
   if (ui->notes->toPlainText().isEmpty()) {
-    mod()->setNotes({});
+    mod().setNotes({});
   } else {
-    mod()->setNotes(ui->notes->toHtml());
+    mod().setNotes(ui->notes->toHtml());
   }
 
   checkHasData();
diff --git a/src/modinfodialogtab.h b/src/modinfodialogtab.h
index 3f98314a..eb574de0 100644
--- a/src/modinfodialogtab.h
+++ b/src/modinfodialogtab.h
@@ -10,6 +10,33 @@ namespace Ui { class ModInfoDialog; }
 class Settings;
 class OrganizerCore;
 
+// helper struct to avoid passing too much stuff to tab constructors
+//
+struct ModInfoDialogTabContext
+{
+  OrganizerCore& core;
+  PluginContainer& plugin;
+  QWidget* parent;
+  Ui::ModInfoDialog* ui;
+  int id;
+  ModInfo::Ptr mod;
+  MOShared::FilesOrigin* origin;
+
+  ModInfoDialogTabContext(
+    OrganizerCore& core,
+    PluginContainer& plugin,
+    QWidget* parent,
+    Ui::ModInfoDialog* ui,
+    int id,
+    ModInfo::Ptr mod,
+    MOShared::FilesOrigin* origin) :
+      core(core), plugin(plugin), parent(parent), ui(ui), id(id),
+      mod(mod), origin(origin)
+  {
+  }
+};
+
+
 // base class for all tabs in the mod info dialog
 //
 // when the dialog is opened or when next/previous is clicked, the sequence is:
@@ -38,7 +65,7 @@ class OrganizerCore;
 // tabs can call emitModOpen() to request showing a different mod
 //
 // hasDataChanged() should be called when a tab goes from having data to being
-// empty or vice versa; this will update the tab text color
+// empty or vice versa; this will update the tab text colour
 //
 class ModInfoDialogTab : public QObject
 {
@@ -107,20 +134,75 @@ public:
   //
   virtual void firstActivation();
 
+  // called when closing the dialog, can return false to stop the dialog from
+  // closing
+  //
+  // this is typically used by tabs that require manual saving, like text files;
+  // tabs that refuse to close should focus themselves before showing whatever
+  // confirmation they have
   //
   virtual bool canClose();
+
+
+  // called after the dialog is closed, tabs should save whatever UI state they
+  // want
+  //
   virtual void saveState(Settings& s);
+
+  // called before the is shown, tabs should restore whatever UI state they
+  // saved in saveState()
+  //
   virtual void restoreState(const Settings& s);
 
+
+  // called on the selected tab when the Delete key is pressed on the keyboard;
+  // tabs _must_ check which widget currently has focus to decide whether this
+  // should be handled or not; do not blindly delete stuff when this is called
+  //
+  // if the delete request was handled, this should return true
+  //
   virtual bool deleteRequested();
 
+
+  // return true if this tab can handle a separator mod, defaults to false;
+  // when this returns false, the tab is removed from the widget entirely
+  //
+  // if a tab can show meaningful information about a separator (like
+  // categories or notes), it should return true
+  //
   virtual bool canHandleSeparators() const;
+
+  // return true if this tab can handle unmanaged mods, defaults to false;
+  // when this returns false, the tab is removed from the widget entirely
+  //
   virtual bool canHandleUnmanaged() const;
+
+  // return true if this tab uses the files from the mod's origin, defaults to
+  // false
+  //
+  // tabs that do not care about the files inside a mod should return false,
+  // such as the notes or categories tab
+  //
+  // mods that return true will be updated anytime a tab calls
+  // emitOriginModifed()
+  //
   virtual bool usesOriginFiles() const;
 
-  ModInfo::Ptr mod() const;
+
+  // returns the currently selected mod
+  //
+  ModInfo& mod() const;
+
+  // returns the currently selected mod, can never be empty
+  //
+  ModInfo::Ptr modPtr() const;
+
+  // returns the origin of the selected mod; this can be null for mods that
+  // don't have an origin, like deactivated mods
+  //
   MOShared::FilesOrigin* origin() const;
 
+
   int tabID() const;
   bool hasData() const;
 
@@ -133,9 +215,7 @@ signals:
 protected:
   Ui::ModInfoDialog* ui;
 
-  ModInfoDialogTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int id);
+  ModInfoDialogTab(ModInfoDialogTabContext cx);
 
   OrganizerCore& core();
   PluginContainer& plugin();
@@ -186,9 +266,7 @@ private:
 class NotesTab : public ModInfoDialogTab
 {
 public:
-  NotesTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int index);
+  NotesTab(ModInfoDialogTabContext cx);
 
   void clear() override;
   void update() override;
diff --git a/src/modinfodialogtextfiles.cpp b/src/modinfodialogtextfiles.cpp
index bc44ee3e..7a09fa4e 100644
--- a/src/modinfodialogtextfiles.cpp
+++ b/src/modinfodialogtextfiles.cpp
@@ -99,10 +99,10 @@ private:
 
 
 GenericFilesTab::GenericFilesTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int id,
-  QListView* list, QSplitter* sp, TextEditor* e, QLineEdit* filter) :
-    ModInfoDialogTab(oc, plugin, parent, ui, id),
+  ModInfoDialogTabContext cx,
+  QListView* list, QSplitter* sp,
+  TextEditor* e, QLineEdit* filter) :
+    ModInfoDialogTab(std::move(cx)),
     m_list(list), m_editor(e), m_splitter(sp), m_model(new FileListModel)
 {
   m_list->setModel(m_model);
@@ -208,13 +208,10 @@ void GenericFilesTab::select(const QModelIndex& index)
 }
 
 
-TextFilesTab::TextFilesTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int id)
-    : GenericFilesTab(
-        oc, plugin, parent, ui, id,
-        ui->textFileList, ui->tabTextSplitter,
-        ui->textFileEditor, ui->textFileFilter)
+TextFilesTab::TextFilesTab(ModInfoDialogTabContext cx)
+  : GenericFilesTab(cx,
+      cx.ui->textFileList, cx.ui->tabTextSplitter,
+      cx.ui->textFileEditor, cx.ui->textFileFilter)
 {
 }
 
@@ -231,13 +228,10 @@ bool TextFilesTab::wantsFile(const QString& rootPath, const QString& fullPath) c
   return false;
 }
 
-IniFilesTab::IniFilesTab(
-  OrganizerCore& oc, PluginContainer& plugin,
-  QWidget* parent, Ui::ModInfoDialog* ui, int id)
-    : GenericFilesTab(
-        oc, plugin, parent, ui, id,
-        ui->iniFileList, ui->tabIniSplitter,
-        ui->iniFileEditor, ui->iniFileFilter)
+IniFilesTab::IniFilesTab(ModInfoDialogTabContext cx)
+  : GenericFilesTab(cx,
+      cx.ui->iniFileList, cx.ui->tabIniSplitter,
+      cx.ui->iniFileEditor, cx.ui->iniFileFilter)
 {
 }
 
diff --git a/src/modinfodialogtextfiles.h b/src/modinfodialogtextfiles.h
index ffe49904..725ac999 100644
--- a/src/modinfodialogtextfiles.h
+++ b/src/modinfodialogtextfiles.h
@@ -30,9 +30,9 @@ protected:
   FilterWidget m_filter;
 
   GenericFilesTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int id,
-    QListView* list, QSplitter* splitter, TextEditor* editor, QLineEdit* filter);
+    ModInfoDialogTabContext cx,
+    QListView* list, QSplitter* splitter,
+    TextEditor* editor, QLineEdit* filter);
 
   virtual bool wantsFile(const QString& rootPath, const QString& fullPath) const = 0;
 
@@ -45,9 +45,7 @@ private:
 class TextFilesTab : public GenericFilesTab
 {
 public:
-  TextFilesTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int id);
+  TextFilesTab(ModInfoDialogTabContext cx);
 
 protected:
   bool wantsFile(const QString& rootPath, const QString& fullPath) const override;
@@ -57,9 +55,7 @@ protected:
 class IniFilesTab : public GenericFilesTab
 {
 public:
-  IniFilesTab(
-    OrganizerCore& oc, PluginContainer& plugin,
-    QWidget* parent, Ui::ModInfoDialog* ui, int id);
+  IniFilesTab(ModInfoDialogTabContext cx);
 
 protected:
   bool wantsFile(const QString& rootPath, const QString& fullPath) const override;
-- 
cgit v1.3.1