Changed mod Information dialog "Next" and "Previous" buttons to remember the currently viewed tab.

4 files changed, 22 insertions, 16 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2d6ccc94..00c7895e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2464,8 +2464,8 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
     connect(&dialog, SIGNAL(nexusLinkActivated(QString)), this, SLOT(nexusLinkActivated(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()), this, SLOT(modOpenNext()), Qt::QueuedConnection);

-    connect(&dialog, SIGNAL(modOpenPrev()), this, SLOT(modOpenPrev()), 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)));

 	

@@ -2526,7 +2526,7 @@ void MainWindow::setWindowEnabled(bool enabled)
 }

 

 

-void MainWindow::modOpenNext()

+void MainWindow::modOpenNext(int tab)

 {

   QModelIndex index = m_ModListSortProxy->mapFromSource(m_OrganizerCore.modList()->index(m_ContextRow, 0));

   index = m_ModListSortProxy->index((index.row() + 1) % m_ModListSortProxy->rowCount(), 0);

@@ -2537,13 +2537,13 @@ void MainWindow::modOpenNext()
   if ((std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end()) ||

       (std::find(flags.begin(), flags.end(), ModInfo::FLAG_BACKUP) != flags.end())) {

     // skip overwrite and backups

-    modOpenNext();

+    modOpenNext(tab);

   } else {

-    displayModInformation(m_ContextRow);

+    displayModInformation(m_ContextRow,tab);

   }

 }

 

-void MainWindow::modOpenPrev()

+void MainWindow::modOpenPrev(int tab)

 {

   QModelIndex index = m_ModListSortProxy->mapFromSource(m_OrganizerCore.modList()->index(m_ContextRow, 0));

   int row = index.row() - 1;

@@ -2557,9 +2557,9 @@ void MainWindow::modOpenPrev()
   if ((std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end()) ||

       (std::find(flags.begin(), flags.end(), ModInfo::FLAG_BACKUP) != flags.end())) {

     // skip overwrite and backups

-    modOpenPrev();

+    modOpenPrev(tab);

   } else {

-    displayModInformation(m_ContextRow);

+    displayModInformation(m_ContextRow,tab);

   }

 }

 

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 3d093131..b06da353 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -474,8 +474,8 @@ private slots:
   void deselectFilters();

 

   void displayModInformation(const QString &modName, int tab);

-  void modOpenNext();

-  void modOpenPrev();

+  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 705f0019..c25041f2 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -1448,14 +1448,20 @@ void ModInfoDialog::on_endorseBtn_clicked()
 

 void ModInfoDialog::on_nextButton_clicked()

 {

-  emit modOpenNext();

-  this->accept();

+	int currentTab = ui->tabWidget->currentIndex();

+	int tab = m_RealTabPos[currentTab];

+

+    emit modOpenNext(tab);

+    this->accept();

 }

 

 void ModInfoDialog::on_prevButton_clicked()

 {

-  emit modOpenPrev();

-  this->accept();

+	int currentTab = ui->tabWidget->currentIndex();

+	int tab = m_RealTabPos[currentTab];

+

+    emit modOpenPrev(tab);

+    this->accept();

 }

 

 

diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index b5cc12a8..ddd72f4d 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -112,8 +112,8 @@ signals:
   void nexusLinkActivated(const QString &link);

   void downloadRequest(const QString &link);

   void modOpen(const QString &modName, int tab);

-  void modOpenNext();

-  void modOpenPrev();

+  void modOpenNext(int tab=-1);

+  void modOpenPrev(int tab=-1);

   void originModified(int originID);

   void endorseMod(ModInfo::Ptr nexusID);