Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 9 insertions, 5 deletions

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 35da228b..feaac2d4 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -20,6 +20,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "modinfodialog.h"

 #include "ui_modinfodialog.h"

 

+#include "iplugingame.h"

+#include "nexusinterface.h"

 #include "report.h"

 #include "utility.h"

 #include "messagedialog.h"

@@ -27,7 +29,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "questionboxmemory.h"

 #include "settings.h"

 #include "categories.h"

-#include <gameinfo.h>

 

 #include <QDir>

 #include <QDirIterator>

@@ -36,9 +37,11 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QMessageBox>

 #include <QMenu>

 #include <QFileSystemModel>

+#include <QInputDialog>

+

 #include <Shlwapi.h>

+

 #include <sstream>

-#include <QInputDialog>

 

 

 using namespace MOBase;

@@ -688,7 +691,9 @@ void ModInfoDialog::on_visitNexusLabel_linkActivated(const QString &link)
 

 void ModInfoDialog::linkClicked(const QUrl &url)

 {

-  if (url.toString().startsWith(ToQString(GameInfo::instance().getNexusPage(false)))) {

+  //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()->isURLGameRelated(url)) {

     this->close();

     emit nexusLinkActivated(url.toString());

   } else {

@@ -832,12 +837,11 @@ void ModInfoDialog::activateNexusTab()
   QLineEdit *modIDEdit = findChild<QLineEdit*>("modIDEdit");

   int modID = modIDEdit->text().toInt();

   if (modID != 0) {

-    QString nexusLink = QString("%1/downloads/file.php?id=%2").arg(ToQString(GameInfo::instance().getNexusPage(false))).arg(modID);

+    QString nexusLink = NexusInterface::instance()->getModURL(modID);

     QLabel *visitNexusLabel = findChild<QLabel*>("visitNexusLabel");

     visitNexusLabel->setText(tr("<a href=\"%1\">Visit on Nexus</a>").arg(nexusLink));

     visitNexusLabel->setToolTip(nexusLink);

 

-

     if (m_ModInfo->getNexusDescription().isEmpty() ||

         QDateTime::currentDateTime() > m_ModInfo->getLastNexusQuery().addDays(1)) {

       refreshNexusData(modID);