From a105e4c8c881ac720c41ef342769adee14caca47 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Thu, 31 Dec 2020 12:34:17 +0100
Subject: Move more stuff from MainWindow. Minor improvements for prev/next
 button in ModInfoDialog.

---
 src/modinfodialog.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/modinfodialog.h')

diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 48680ca4..a3b6ffdb 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -33,7 +33,7 @@ class PluginContainer;
 class OrganizerCore;
 class Settings;
 class ModInfoDialogTab;
-class MainWindow;
+class ModListView;
 
 /**
  * this is a larger dialog used to visualise information about the mod.
@@ -52,8 +52,8 @@ class ModInfoDialog : public MOBase::TutorableDialog
 
 public:
   ModInfoDialog(
-    MainWindow* mw, OrganizerCore* core, PluginContainer* plugin,
-    ModInfo::Ptr mod);
+    OrganizerCore& core, PluginContainer& plugin,
+    ModInfo::Ptr mod, ModListView* view);
 
   ~ModInfoDialog();
 
@@ -71,6 +71,10 @@ signals:
   //
   void originModified(int originID);
 
+  // emitted when the mod of the dialog is changed
+  //
+  void modChanged(unsigned int modIndex);
+
 protected:
   // forwards to tryClose()
   //
@@ -115,10 +119,10 @@ private:
   };
 
   std::unique_ptr<Ui::ModInfoDialog> ui;
-  MainWindow* m_mainWindow;
+  OrganizerCore& m_core;
+  PluginContainer& m_plugin;
+  ModListView* m_modListView;
   ModInfo::Ptr m_mod;
-  OrganizerCore* m_core;
-  PluginContainer* m_plugin;
   std::vector<TabInfo> m_tabs;
 
   // initial tab requested by the main window when the dialog is opened; whether
-- 
cgit v1.3.1


From f4fff85d6de679172b0fe69dc28f8314cfc634fb Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Thu, 31 Dec 2020 16:54:31 +0100
Subject: Fix parent of ModInfoDialog.

---
 src/modinfodialog.cpp      | 5 ++---
 src/modinfodialog.h        | 2 +-
 src/modlistviewactions.cpp | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/modinfodialog.h')

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 54c97406..e627c219 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -174,11 +174,10 @@ bool ModInfoDialog::TabInfo::isVisible() const
   return (realPos != -1);
 }
 
-
 ModInfoDialog::ModInfoDialog(
   OrganizerCore& core, PluginContainer& plugin,
-  ModInfo::Ptr mod, ModListView* modListView) :
-    TutorableDialog("ModInfoDialog", modListView),
+  ModInfo::Ptr mod, ModListView* modListView, QWidget *parent) :
+    TutorableDialog("ModInfoDialog", parent),
     ui(new Ui::ModInfoDialog),
     m_core(core),
     m_plugin(plugin),
diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index a3b6ffdb..6d408f05 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -53,7 +53,7 @@ class ModInfoDialog : public MOBase::TutorableDialog
 public:
   ModInfoDialog(
     OrganizerCore& core, PluginContainer& plugin,
-    ModInfo::Ptr mod, ModListView* view);
+    ModInfo::Ptr mod, ModListView* view, QWidget* parent = nullptr);
 
   ~ModInfoDialog();
 
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index 3cc2a841..2029ddd3 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -433,7 +433,7 @@ void ModListViewActions::displayModInformation(ModInfo::Ptr modInfo, unsigned in
   else {
     modInfo->saveMeta();
 
-    ModInfoDialog dialog(m_core, m_core.pluginContainer(), modInfo, m_view);
+    ModInfoDialog dialog(m_core, m_core.pluginContainer(), modInfo, m_view, m_main);
     connect(&dialog, &ModInfoDialog::originModified, this, &ModListViewActions::originModified);
     connect(&dialog, &ModInfoDialog::modChanged, [=](unsigned int index) {
       auto idx = m_view->indexModelToView(m_core.modList()->index(index, 0));
-- 
cgit v1.3.1