- bugfix: extracting bsas did not work with non-ascii characters in the mod name

- another attempt to switch branches...

README.txt

@@ -6,29 +6,31 @@ Requirements:
 
 Visual C++ compiler 2010 (VC 10.0) or up
 - Included in visual c++ express 2010 or windows sdk 7.0
+Note: If you're having trouble installing the windows sdk, you may be affected by this bug: http://support.microsoft.com/kb/2717426
 
 QtSDK 4.8.x (http://qt-project.org/downloads)
 - Qt5 is not yet supported but WIP
 - Install according to instruction
 
 boost libraries (http://www.boost.org/)
-- Compile according to their instructions (using vc++)
-- As of time of writing boost_thread is the only compiled boost library used, you can
-  disable the others to safe yourself the compile time
+- Compile according to their instructions (using vc++): http://www.boost.org/doc/libs/1_54_0/more/getting_started/windows.html
+- A few of the boost libraries need to be built (the rest is header-only). The only compiled lib MO needs (at the time of writing) is
+  boost_thread. You can disable the others to safe yourself compile time (even on a modern system compiling boost can easily take an hour)
 
 zlib (http://www.zlib.net/)
 - Compile static library according to their instructions
-- You should have a "zlibstatic.lib" under "build" afterwards
+- Depending on the version of zlib and how you built you should have a file called zlibstatic.lib or zlibstat.lib in "build" or "x86\ZLibStatRelease".
+- Please copy that lib file to "build\zlibstatic.lib" (if it doesn't exist) so MO finds it.
 
 7z.dll (http://www.7-zip.org/download.html)
 - Part of the 7-zip program
 - Has to be the 32-bit dll! (approx. 893kb)
+- If you don't want to install 7-zip (32-bit) you can open the 7z installer (i.e. 7z920.exe) in an archiving tool and unpack only the 7z.dll
 
 Recommended:
 ------------
 
 Qt Creator
-- Included in QtSDK but there might be a newer version as a separate download
 
 Set up (using Qt Creator):
 --------------------------
@@ -40,14 +42,15 @@ Set up (using Qt Creator):
 5. Switch the build configuration at the very top of the same page from "debug" to "release" (or vice versa) and repeat steps 3 and 4
 6. Compile the configuration(s) you want to use (debug and/or release) (Build All). This should compile correctly.
 7. return to the "projects" tab and switch to "Run Settings"
+8. Determine the folder of the qt binaries in the package you downloaded. This could be "QtSDK\Desktop\Qt\4.8.5\msvc2010\bin" or "Qt4.8.5\bin"
 For Release build:
-8r. Add a "Run configuration" that points to <your working copy>\output\ModOrganizer.exe
-9r. Copy "7z.dll" to <your working copy>\output\dlls
-10r. From QtSDK\Desktop\Qt\4.8.0\msvc2010\bin copy the following files to <your working copy>\output\dlls: QtCore4.dll, QtDeclarative4.dll, QtGui4.dll, QtNetwork4.dll, QtScript4.dll, QtSql4.dll, QtWebkit4.dll, QtXml4.dll, QtXmlPatterns4.dll
+9r. Add a "Run configuration" that points to <your working copy>\output\ModOrganizer.exe
+10r. Copy "7z.dll" to <your working copy>\output\dlls
+11r. From the qt binaries directory, copy the following files to <your working copy>\output\dlls: QtCore4.dll, QtDeclarative4.dll, QtGui4.dll, QtNetwork4.dll, QtScript4.dll, QtSql4.dll, QtWebkit4.dll, QtXml4.dll, QtXmlPatterns4.dll
 For Debug build:
-8d. Add a "Run configuration" that points to <your working copy>\outputd\ModOrganizer.exe
-9d. Copy "7z.dll" to <your working copy>\outputd\dlls
-10d. From QtSDK\Desktop\Qt\4.8.0\msvc2010\bin copy the following files to <your working copy>\outputd\dlls: QtCored4.dll, QtDeclaratived4.dll, QtGuid4.dll, QtNetworkd4.dll, QtScriptd4.dll, QtSqld4.dll, QtWebkitd4.dll, QtXmld4.dll, QtXmlPatternsd4.dll
+9d. Add a "Run configuration" that points to <your working copy>\outputd\ModOrganizer.exe
+10d. Copy "7z.dll" to <your working copy>\outputd\dlls
+11d. From the qt binaries copy the following files to <your working copy>\outputd\dlls: QtCored4.dll, QtDeclaratived4.dll, QtGuid4.dll, QtNetworkd4.dll, QtScriptd4.dll, QtSqld4.dll, QtWebkitd4.dll, QtXmld4.dll, QtXmlPatternsd4.dll
 
 Now you should be able to compile and run Mod Organizer.
 Please note that when you change anything apart from the "organizer" subproject, qt creator may not pick up on the changes

src/ModOrganizer.pro

@@ -1,23 +1,23 @@
 TEMPLATE = subdirs
-CONFIG += ordered
 
 
 SUBDIRS = bsatk \
-					shared \
-					uibase \
-					organizer \
-					hookdll \
-					archive \
-					helper \
+          shared \
+          uibase \
+          organizer \
+          hookdll \
+          archive \
+          helper \
           plugins \
           proxydll \
           nxmhandler \
-    BossDummy \
-    pythonRunner \
-    esptk
+          BossDummy \
+          pythonRunner \
+          esptk
 
+plugins.depends = pythonRunner
 hookdll.depends = shared
-organizer.depends = shared, uibase, plugins
+organizer.depends = shared uibase plugins
 
 CONFIG(debug, debug|release) {
     DESTDIR = outputd

src/categories.cpp

@@ -43,6 +43,7 @@ QString CategoryFactory::categoriesFilePath()
 
 CategoryFactory::CategoryFactory()
 {
+  atexit(&cleanup);
   reset();
 
   QFile categoryFile(categoriesFilePath());
@@ -124,6 +125,12 @@ void CategoryFactory::setParents()
   }
 }
 
+void CategoryFactory::cleanup()
+{
+  delete s_Instance;
+  s_Instance = NULL;
+}
+
 
 void CategoryFactory::saveCategories()
 {

src/categories.h

@@ -180,6 +180,8 @@ private:
 
   void setParents();
 
+  static void cleanup();
+
 private:
 
   static CategoryFactory *s_Instance;
@@ -188,6 +190,8 @@ private:
   std::map<int, unsigned int> m_IDMap;
   std::map<int, unsigned int> m_NexusMap;
 
+private:
+
 };
 
 

src/downloadlist.cpp

@@ -75,12 +75,14 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
   if (role == Qt::DisplayRole) {
     return index.row();
   } else if (role == Qt::ToolTipRole) {
+    QString text = m_Manager->getFileName(index.row()) + "\n";
     if (m_Manager->isInfoIncomplete(index.row())) {
-      return tr("Information missing, please select \"Query Info\" from the context menu to re-retrieve.");
+      text += tr("Information missing, please select \"Query Info\" from the context menu to re-retrieve.");
     } else {
       NexusInfo info = m_Manager->getNexusInfo(index.row());
-      return QString("%1 (ID %2) %3").arg(info.m_ModName).arg(m_Manager->getModID(index.row())).arg(info.m_Version);
+      text += QString("%1 (ID %2) %3").arg(info.m_ModName).arg(m_Manager->getModID(index.row())).arg(info.m_Version);
     }
+    return text;
   } else {
     return QVariant();
   }

src/downloadlistwidget.cpp

@@ -208,6 +208,11 @@ void DownloadListWidgetDelegate::issueRemoveFromView()
   emit removeDownload(m_ContextRow, false);
 }
 
+void DownloadListWidgetDelegate::issueRestoreToView()
+{
+  emit restoreDownload(m_ContextRow);
+}
+
 void DownloadListWidgetDelegate::issueCancel()
 {
   emit cancelDownload(m_ContextRow);
@@ -277,13 +282,18 @@ bool DownloadListWidgetDelegate::editorEvent(QEvent *event, QAbstractItemModel *
         QMenu menu(m_View);
         m_ContextRow = qobject_cast<QSortFilterProxyModel*>(model)->mapToSource(index).row();
         DownloadManager::DownloadState state = m_Manager->getState(m_ContextRow);
+        bool hidden = m_Manager->isHidden(m_ContextRow);
         if (state >= DownloadManager::STATE_READY) {
           menu.addAction(tr("Install"), this, SLOT(issueInstall()));
           if (m_Manager->isInfoIncomplete(m_ContextRow)) {
             menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfo()));
           }
           menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
-          menu.addAction(tr("Remove from View"), this, SLOT(issueRemoveFromView()));
+          if (hidden) {
+            menu.addAction(tr("Un-Hide"), this, SLOT(issueRestoreToView()));
+          } else {
+            menu.addAction(tr("Remove from View"), this, SLOT(issueRemoveFromView()));
+          }
         } else if (state == DownloadManager::STATE_DOWNLOADING){
           menu.addAction(tr("Cancel"), this, SLOT(issueCancel()));
           menu.addAction(tr("Pause"), this, SLOT(issuePause()));
@@ -295,9 +305,11 @@ bool DownloadListWidgetDelegate::editorEvent(QEvent *event, QAbstractItemModel *
         menu.addSeparator();
         menu.addAction(tr("Delete Installed..."), this, SLOT(issueDeleteCompleted()));
         menu.addAction(tr("Delete All..."), this, SLOT(issueDeleteAll()));
-        menu.addSeparator();
-        menu.addAction(tr("Remove Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
-        menu.addAction(tr("Remove All..."), this, SLOT(issueRemoveFromViewAll()));
+        if (!hidden) {
+          menu.addSeparator();
+          menu.addAction(tr("Remove Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
+          menu.addAction(tr("Remove All..."), this, SLOT(issueRemoveFromViewAll()));
+        }
         menu.exec(mouseEvent->globalPos());
 
         event->accept();

src/downloadlistwidget.h

@@ -65,6 +65,7 @@ signals:
   void installDownload(int index);
   void queryInfo(int index);
   void removeDownload(int index, bool deleteFile);
+  void restoreDownload(int index);
   void cancelDownload(int index);
   void pauseDownload(int index);
   void resumeDownload(int index);
@@ -83,6 +84,7 @@ private slots:
   void issueInstall();
   void issueDelete();
   void issueRemoveFromView();
+  void issueRestoreToView();
   void issueCancel();
   void issuePause();
   void issueResume();

src/downloadlistwidget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>315</width>
-    <height>75</height>
+    <height>81</height>
    </rect>
   </property>
   <property name="contextMenuPolicy">
@@ -78,14 +78,14 @@
         <item>
          <widget class="QLabel" name="sizeLabel">
           <property name="text">
-           <string>0</string>
+           <string notr="true">0</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>KB</string>
+           <string notr="true">KB</string>
           </property>
          </widget>
         </item>

src/downloadlistwidgetcompact.cpp

@@ -195,6 +195,11 @@ void DownloadListWidgetCompactDelegate::issueRemoveFromView()
   emit removeDownload(m_ContextIndex.row(), false);
 }
 
+void DownloadListWidgetCompactDelegate::issueRestoreToView()
+{
+  emit restoreDownload(m_ContextIndex.row());
+}
+
 void DownloadListWidgetCompactDelegate::issueCancel()
 {
   emit cancelDownload(m_ContextIndex.row());
@@ -265,13 +270,18 @@ bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItem
         QMenu menu;
         m_ContextIndex = qobject_cast<QSortFilterProxyModel*>(model)->mapToSource(index);
         DownloadManager::DownloadState state = m_Manager->getState(m_ContextIndex.row());
+        bool hidden = m_Manager->isHidden(m_ContextIndex.row());
         if (state >= DownloadManager::STATE_READY) {
           menu.addAction(tr("Install"), this, SLOT(issueInstall()));
           if (m_Manager->isInfoIncomplete(m_ContextIndex.row())) {
             menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfo()));
           }
           menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
-          menu.addAction(tr("Remove from View"), this, SLOT(issueRemoveFromView()));
+          if (hidden) {
+            menu.addAction(tr("Un-Hide"), this, SLOT(issueRestoreToView()));
+          } else {
+            menu.addAction(tr("Remove from View"), this, SLOT(issueRemoveFromView()));
+          }
         } else if (state == DownloadManager::STATE_DOWNLOADING){
           menu.addAction(tr("Cancel"), this, SLOT(issueCancel()));
           menu.addAction(tr("Pause"), this, SLOT(issuePause()));
@@ -283,9 +293,11 @@ bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItem
         menu.addSeparator();
         menu.addAction(tr("Delete Installed..."), this, SLOT(issueDeleteCompleted()));
         menu.addAction(tr("Delete All..."), this, SLOT(issueDeleteAll()));
-        menu.addSeparator();
-        menu.addAction(tr("Remove Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
-        menu.addAction(tr("Remove All..."), this, SLOT(issueRemoveFromViewAll()));
+        if (!hidden) {
+          menu.addSeparator();
+          menu.addAction(tr("Remove Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
+          menu.addAction(tr("Remove All..."), this, SLOT(issueRemoveFromViewAll()));
+        }
         menu.exec(mouseEvent->globalPos());
 
         event->accept();

src/downloadlistwidgetcompact.h

@@ -65,6 +65,7 @@ signals:
   void installDownload(int index);
   void queryInfo(int index);
   void removeDownload(int index, bool deleteFile);
+  void restoreDownload(int index);
   void cancelDownload(int index);
   void pauseDownload(int index);
   void resumeDownload(int index);
@@ -83,6 +84,7 @@ private slots:
   void issueInstall();
   void issueDelete();
   void issueRemoveFromView();
+  void issueRestoreToView();
   void issueCancel();
   void issuePause();
   void issueResume();

src/downloadmanager.cpp

@@ -22,6 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "nxmurl.h"
 #include <gameinfo.h>
 #include <nxmurl.h>
+#include <taskprogressmanager.h>
 #include "utility.h"
 #include "json.h"
 #include "selectiondialog.h"
@@ -63,18 +64,21 @@ DownloadManager::DownloadInfo *DownloadManager::DownloadInfo::createNew(const Ne
   info->m_CurrentUrl = 0;
   info->m_Tries = AUTOMATIC_RETRIES;
   info->m_State = STATE_STARTED;
+  info->m_TaskProgressId = TaskProgressManager::instance().getId();
 
   return info;
 }
 
-DownloadManager::DownloadInfo *DownloadManager::DownloadInfo::createFromMeta(const QString &filePath)
+DownloadManager::DownloadInfo *DownloadManager::DownloadInfo::createFromMeta(const QString &filePath, bool showHidden)
 {
   DownloadInfo *info = new DownloadInfo;
 
   QString metaFileName = filePath + ".meta";
   QSettings metaFile(metaFileName, QSettings::IniFormat);
-  if (metaFile.value("removed", false).toBool()) {
+  if (!showHidden && metaFile.value("removed", false).toBool()) {
     return NULL;
+  } else {
+    info->m_Hidden = metaFile.value("removed", false).toBool();
   }
 
   QString fileName = QFileInfo(filePath).fileName();
@@ -105,6 +109,7 @@ DownloadManager::DownloadInfo *DownloadManager::DownloadInfo::createFromMeta(con
   info->m_CurrentUrl = 0;
   info->m_Urls = metaFile.value("url", "").toString().split(";");
   info->m_Tries = 0;
+  info->m_TaskProgressId = TaskProgressManager::instance().getId();
   info->m_NexusInfo.m_Name     = metaFile.value("name", 0).toString();
   info->m_NexusInfo.m_ModName  = metaFile.value("modName", "").toString();
   info->m_NexusInfo.m_Version  = metaFile.value("version", 0).toString();
@@ -148,7 +153,8 @@ QString DownloadManager::DownloadInfo::currentURL()
 
 
 DownloadManager::DownloadManager(NexusInterface *nexusInterface, QObject *parent)
-  : IDownloadManager(parent), m_NexusInterface(nexusInterface), m_DirWatcher()
+  : IDownloadManager(parent), m_NexusInterface(nexusInterface), m_DirWatcher(), m_ShowHidden(false),
+    m_DateExpression("/Date\\((\\d+)\\)/")
 {
   connect(&m_DirWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(directoryChanged(QString)));
 }
@@ -159,6 +165,7 @@ DownloadManager::~DownloadManager()
   for (QVector<DownloadInfo*>::iterator iter = m_ActiveDownloads.begin(); iter != m_ActiveDownloads.end(); ++iter) {
     delete *iter;
   }
+  m_ActiveDownloads.clear();
 }
 
 
@@ -184,13 +191,15 @@ void DownloadManager::pauseAll()
   ::Sleep(100);
 
   bool done = false;
+  QTime startTime = QTime::currentTime();
   // further loops: busy waiting for all downloads to complete. This could be neater...
-  while (!done) {
+  while (!done && (startTime.secsTo(QTime::currentTime()) < 5)) {
     QCoreApplication::processEvents();
     done = true;
     foreach (DownloadInfo *info, m_ActiveDownloads) {
       if ((info->m_State < STATE_CANCELED) ||
-          (info->m_State != STATE_FETCHINGFILEINFO) || (info->m_State != STATE_FETCHINGMODINFO)) {
+          (info->m_State == STATE_FETCHINGFILEINFO) ||
+          (info->m_State == STATE_FETCHINGMODINFO)) {
         done = false;
         break;
       }
@@ -226,6 +235,12 @@ void DownloadManager::setSupportedExtensions(const QStringList &extensions)
   refreshList();
 }
 
+void DownloadManager::setShowHidden(bool showHidden)
+{
+  m_ShowHidden = showHidden;
+  refreshList();
+}
+
 void DownloadManager::refreshList()
 {
   // remove finished downloads
@@ -263,7 +278,7 @@ void DownloadManager::refreshList()
 
     QString fileName = QDir::fromNativeSeparators(m_OutputDirectory) + "/" + file;
 
-    DownloadInfo *info = DownloadInfo::createFromMeta(fileName);
+    DownloadInfo *info = DownloadInfo::createFromMeta(fileName, m_ShowHidden);
     if (info != NULL) {
       m_ActiveDownloads.push_front(info);
     }
@@ -362,6 +377,15 @@ void DownloadManager::startDownload(QNetworkReply *reply, DownloadInfo *newDownl
 void DownloadManager::addNXMDownload(const QString &url)
 {
   NXMUrl nxmInfo(url);
+
+  QString managedGame = ToQString(MOShared::GameInfo::instance().getGameShortName());
+
+  if (nxmInfo.game().compare(managedGame, Qt::CaseInsensitive) != 0) {
+    QMessageBox::information(NULL, tr("Wrong Game"), tr("The download link is for a mod for \"%1\" but this instance of MO "
+    "has been set up for \"%2\".").arg(nxmInfo.game()).arg(managedGame), QMessageBox::Ok);
+    return;
+  }
+
   m_RequestIDs.insert(m_NexusInterface->requestFileInfo(nxmInfo.getModId(), nxmInfo.getFileId(), this, QVariant()));
 }
 
@@ -433,6 +457,22 @@ void DownloadManager::refreshAlphabeticalTranslation()
 }
 
 
+void DownloadManager::restoreDownload(int index)
+{
+  if ((index < 0) || (index >= m_ActiveDownloads.size())) {
+    throw MyException(tr("invalid index"));
+  }
+
+  DownloadInfo *download = m_ActiveDownloads.at(index);
+  download->m_Hidden = false;
+
+  QString filePath = m_OutputDirectory + "/" + download->m_FileName;
+
+  QSettings metaSettings(filePath.append(".meta"), QSettings::IniFormat);
+  metaSettings.setValue("removed", false);
+}
+
+
 void DownloadManager::removeDownload(int index, bool deleteFile)
 {
   try {
@@ -488,9 +528,13 @@ void DownloadManager::pauseDownload(int index)
     return;
   }
 
-  if (m_ActiveDownloads.at(index)->m_State == STATE_DOWNLOADING) {
-    setState(m_ActiveDownloads.at(index), STATE_PAUSING);
-    qDebug("pausing %d - %s", index, m_ActiveDownloads[index]->m_FileName.toUtf8().constData());
+  DownloadInfo *info = m_ActiveDownloads.at(index);
+
+  if (info->m_State == STATE_DOWNLOADING) {
+    setState(info, STATE_PAUSING);
+    qDebug("pausing %d - %s", index, info->m_FileName.toUtf8().constData());
+  } else if ((info->m_State == STATE_FETCHINGMODINFO) || (info->m_State == STATE_FETCHINGFILEINFO)) {
+    setState(info, STATE_READY);
   }
 }
 
@@ -667,6 +711,14 @@ int DownloadManager::getModID(int index) const
   return m_ActiveDownloads.at(index)->m_ModID;
 }
 
+bool DownloadManager::isHidden(int index) const
+{
+  if ((index < 0) || (index >= m_ActiveDownloads.size())) {
+    throw MyException(tr("invalid index"));
+  }
+  return m_ActiveDownloads.at(index)->m_Hidden;
+}
+
 
 NexusInfo DownloadManager::getNexusInfo(int index) const
 {
@@ -800,11 +852,11 @@ void DownloadManager::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
       setState(info, STATE_PAUSED);
     } else {
       if (bytesTotal > info->m_TotalSize) {
-        qDebug("file size %s: %lld", qPrintable(info->m_FileName), bytesTotal);
         info->m_TotalSize = bytesTotal;
       }
       int oldProgress = info->m_Progress;
       info->m_Progress = ((info->m_ResumePos + bytesReceived) * 100) / (info->m_ResumePos + bytesTotal);
+      TaskProgressManager::instance().updateProgress(info->m_TaskProgressId, bytesReceived, bytesTotal);
       if (oldProgress != info->m_Progress) {
         emit update(index);
       }
@@ -831,6 +883,7 @@ void DownloadManager::createMetaFile(DownloadInfo *info)
   metaFile.setValue("name", info->m_NexusInfo.m_Name);
   metaFile.setValue("modName", info->m_NexusInfo.m_ModName);
   metaFile.setValue("version", info->m_NexusInfo.m_Version);
+  metaFile.setValue("fileTime", info->m_NexusInfo.m_FileTime);
   metaFile.setValue("fileCategory", info->m_NexusInfo.m_FileCategory);
   metaFile.setValue("newestVersion", info->m_NexusInfo.m_NewestVersion);
   metaFile.setValue("category", info->m_NexusInfo.m_Category);
@@ -838,6 +891,7 @@ void DownloadManager::createMetaFile(DownloadInfo *info)
   metaFile.setValue("uninstalled", info->m_State == DownloadManager::STATE_UNINSTALLED);
   metaFile.setValue("paused", (info->m_State == DownloadManager::STATE_PAUSED) ||
                               (info->m_State == DownloadManager::STATE_ERROR));
+  metaFile.setValue("removed", info->m_Hidden);
 
   // slightly hackish...
   for (int i = 0; i < m_ActiveDownloads.size(); ++i) {
@@ -861,11 +915,9 @@ void DownloadManager::nxmDescriptionAvailable(int, QVariant userData, QVariant r
 
   DownloadInfo *info = downloadInfoByID(userData.toInt());
   if (info == NULL) return;
-
   info->m_NexusInfo.m_Category = result["category_id"].toInt();
   info->m_NexusInfo.m_ModName = result["name"].toString().trimmed();
   info->m_NexusInfo.m_NewestVersion = result["version"].toString();
-
   if (info->m_FileID != 0) {
     setState(info, STATE_READY);
   } else {
@@ -874,6 +926,17 @@ void DownloadManager::nxmDescriptionAvailable(int, QVariant userData, QVariant r
 }
 
 
+QDateTime DownloadManager::matchDate(const QString &timeString)
+{
+  if (m_DateExpression.exactMatch(timeString)) {
+    return QDateTime::fromMSecsSinceEpoch(m_DateExpression.cap(1).toLongLong());
+  } else {
+    qWarning("date not matched: %s", qPrintable(timeString));
+    return QDateTime::currentDateTime();
+  }
+}
+
+
 void DownloadManager::nxmFilesAvailable(int, QVariant userData, QVariant resultData, int requestID)
 {
   std::set<int>::iterator idIter = m_RequestIDs.find(requestID);
@@ -907,7 +970,11 @@ void DownloadManager::nxmFilesAvailable(int, QVariant userData, QVariant resultD
         (fileNameVariant == info->m_FileName) || (fileNameVariant == alternativeLocalName)) {
       info->m_NexusInfo.m_Name = fileInfo["name"].toString();
       info->m_NexusInfo.m_Version = fileInfo["version"].toString();
+      if (info->m_NexusInfo.m_Version.isEmpty()) {
+        info->m_NexusInfo.m_Version = info->m_NexusInfo.m_NewestVersion;
+      }
       info->m_NexusInfo.m_FileCategory = fileInfo["category_id"].toInt();
+      info->m_NexusInfo.m_FileTime = matchDate(fileInfo["date"].toString());
       info->m_FileID = fileInfo["id"].toInt();
       found = true;
       break;
@@ -946,7 +1013,7 @@ void DownloadManager::nxmFilesAvailable(int, QVariant userData, QVariant resultD
 }
 
 
-void DownloadManager::nxmFileInfoAvailable(int modID, int fileID, QVariant, QVariant resultData, int requestID)
+void DownloadManager::nxmFileInfoAvailable(int modID, int fileID, QVariant userData, QVariant resultData, int requestID)
 {
   std::set<int>::iterator idIter = m_RequestIDs.find(requestID);
   if (idIter == m_RequestIDs.end()) {
@@ -961,9 +1028,17 @@ void DownloadManager::nxmFileInfoAvailable(int modID, int fileID, QVariant, QVar
 
   info.m_Name = result["name"].toString();
   info.m_Version = result["version"].toString();
+  if (info.m_Version.isEmpty()) {
+    info.m_Version = info.m_NewestVersion;
+  }
   info.m_FileName = result["uri"].toString();
+  info.m_FileTime = matchDate(result["date"].toString());
 
-  m_RequestIDs.insert(m_NexusInterface->requestDownloadURL(modID, fileID, this, qVariantFromValue(info)));
+  if (userData.isValid()) {
+    m_RequestIDs.insert(m_NexusInterface->requestDownloadURL(modID, fileID, this, qVariantFromValue(info), userData.toString()));
+  } else {
+    m_RequestIDs.insert(m_NexusInterface->requestDownloadURL(modID, fileID, this, qVariantFromValue(info)));
+  }
 }
 
 
@@ -1105,6 +1180,7 @@ void DownloadManager::downloadFinished()
     QByteArray data = info->m_Reply->readAll();
     info->m_Output.write(data);
     info->m_Output.close();
+    TaskProgressManager::instance().forgetMe(info->m_TaskProgressId);
 
     bool error = false;
 

src/downloadmanager.h

@@ -46,6 +46,7 @@ struct NexusInfo {
   QString m_NewestVersion;
   QString m_FileName;
   QVariantList m_DownloadMap;
+  QDateTime m_FileTime;
   bool m_Set;
 };
 Q_DECLARE_METATYPE(NexusInfo)
@@ -98,10 +99,14 @@ private:
     int m_Tries;
     bool m_ReQueried;
 
+    quint32 m_TaskProgressId;
+
     NexusInfo m_NexusInfo;
 
+    bool m_Hidden;
+
     static DownloadInfo *createNew(const NexusInfo &nexusInfo, int modID, int fileID, const QStringList &URLs);
-    static DownloadInfo *createFromMeta(const QString &filePath);
+    static DownloadInfo *createFromMeta(const QString &filePath, bool showHidden);
 
     /**
      * @brief rename the file
@@ -121,7 +126,7 @@ private:
   private:
     static unsigned int s_NextDownloadID;
   private:
-    DownloadInfo() : m_TotalSize(0), m_ReQueried(false) {}
+    DownloadInfo() : m_TotalSize(0), m_ReQueried(false), m_Hidden(false) {}
   };
 
 public:
@@ -166,6 +171,11 @@ public:
    */
   void setSupportedExtensions(const QStringList &extensions);
 
+  /**
+   * @brief sets whether hidden files are to be shown after all
+   */
+  void setShowHidden(bool showHidden);
+
   /**
    * @brief download from an already open network connection
    *
@@ -261,6 +271,13 @@ public:
    **/
   int getModID(int index) const;
 
+  /**
+   * @brief determine if the specified file is supposed to be hidden
+   * @param index index of the file to look up
+   * @return true if the specified file is supposed to be hidden
+   */
+  bool isHidden(int index) const;
+
   /**
    * @brief retrieve all nexus info of the download specified by index
    *
@@ -350,6 +367,12 @@ public slots:
    **/
   void removeDownload(int index, bool deleteFile);
 
+  /**
+   * @brief restores the specified download to view (which was previously hidden
+   * @param index index of the download to restore
+   */
+  void restoreDownload(int index);
+
   /**
    * @brief cancel the specified download. This will lead to the corresponding file to be deleted
    *
@@ -415,6 +438,8 @@ private:
 
   DownloadInfo *downloadInfoByID(unsigned int id);
 
+  QDateTime matchDate(const QString &timeString);
+
 private:
 
   static const int AUTOMATIC_RETRIES = 3;
@@ -434,6 +459,10 @@ private:
 
   std::map<QString, int> m_DownloadFails;
 
+  bool m_ShowHidden;
+
+  QRegExp m_DateExpression;
+
 };
 
 #endif // DOWNLOADMANAGER_H

src/installationmanager.cpp

@@ -46,6 +46,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDateTime>
 #include <QDirIterator>
 #include <boost/assign.hpp>
+#include <boost/scoped_ptr.hpp>
 
 
 using namespace MOBase;
@@ -183,11 +184,7 @@ bool InstallationManager::unpackSingleFile(const QString &fileName)
 QString InstallationManager::extractFile(const QString &fileName)
 {
   if (unpackSingleFile(fileName)) {
-    QString tempFileName = QDir::tempPath().append("/").append(QFileInfo(fileName).fileName());
-
-    m_FilesToDelete.insert(tempFileName);
-
-    return tempFileName;
+    return QDir::tempPath().append("/").append(QFileInfo(fileName).fileName());
   } else {
     return QString();
   }
@@ -509,7 +506,6 @@ bool InstallationManager::ensureValidModName(GuessedValue<QString> &name) const
   return true;
 }
 
-
 bool InstallationManager::doInstall(GuessedValue<QString> &modName, int modID,
                                     const QString &version, const QString &newestVersion, int categoryID)
 {
@@ -531,7 +527,6 @@ bool InstallationManager::doInstall(GuessedValue<QString> &modName, int modID,
   m_InstallationProgress.setValue(0);
   m_InstallationProgress.setWindowModality(Qt::WindowModal);
   m_InstallationProgress.show();
-
   if (!m_CurrentArchive->extract(ToWString(QDir::toNativeSeparators(targetDirectory)).c_str(),
          new MethodCallback<InstallationManager, void, float>(this, &InstallationManager::updateProgress),
          new MethodCallback<InstallationManager, void, LPCWSTR>(this, &InstallationManager::updateProgressFile),
@@ -570,52 +565,39 @@ bool InstallationManager::doInstall(GuessedValue<QString> &modName, int modID,
 }
 
 
-void InstallationManager::openFile(const QString &fileName)
-{
-  unpackSingleFile(fileName);
-
-  QString tempFileName = QDir::tempPath().append("/").append(QFileInfo(fileName).fileName());
-
-  SHELLEXECUTEINFOW execInfo;
-  memset(&execInfo, 0, sizeof(SHELLEXECUTEINFOW));
-  execInfo.cbSize = sizeof(SHELLEXECUTEINFOW);
-  execInfo.fMask = SEE_MASK_NOCLOSEPROCESS;
-  execInfo.lpVerb = L"open";
-  std::wstring fileNameW = ToWString(tempFileName);
-  execInfo.lpFile = fileNameW.c_str();
-  execInfo.nShow = SW_SHOWNORMAL;
-  if (!::ShellExecuteExW(&execInfo)) {
-    qCritical("failed to spawn %s: %d", tempFileName.toUtf8().constData(), ::GetLastError());
-  }
-
-  m_FilesToDelete.insert(tempFileName);
-}
-
-
-// copy and pasted from mo_dll
-bool EndsWith(LPCWSTR string, LPCWSTR subString)
-{
-  size_t slen = wcslen(string);
-  size_t len = wcslen(subString);
-  if (slen < len) {
-    return false;
-  }
-
-  for (size_t i = 0; i < len; ++i) {
-    if (towlower(string[slen - len + i]) != towlower(subString[i])) {
-      return false;
-    }
-  }
-  return true;
-}
-
-
 bool InstallationManager::wasCancelled()
 {
   return m_CurrentArchive->getLastError() == Archive::ERROR_EXTRACT_CANCELLED;
 }
 
 
+void InstallationManager::postInstallCleanup() const
+{
+  m_CurrentArchive->close();
+
+  // directories we may want to remove. sorted from longest to shortest to ensure we remove subdirectories first.
+  auto longestFirst = [](const QString &LHS, const QString &RHS) -> bool {
+                          if (LHS.size() != RHS.size()) return LHS.size() > RHS.size();
+                          else return LHS < RHS;
+                        };
+
+  std::set<QString, std::function<bool(const QString&, const QString&)>> directoriesToRemove(longestFirst);
+
+  // clean up temp files
+  // TODO: this doesn't yet remove directories. Also, the files may be left there if this point isn't reached
+  foreach (const QString &tempFile, m_TempFilesToDelete) {
+    QFileInfo fileInfo(QDir::tempPath() + "/" + tempFile);
+    QFile::remove(fileInfo.absoluteFilePath());
+    directoriesToRemove.insert(fileInfo.absolutePath());
+  }
+
+  // try to delete each directory we had temporary files in. the call fails for non-empty directories which is ok
+  foreach (const QString &dir, directoriesToRemove) {
+    QDir().rmdir(dir);
+  }
+}
+
+
 bool InstallationManager::install(const QString &fileName, GuessedValue<QString> &modName, bool &hasIniTweaks)
 {
   QFileInfo fileInfo(fileName);
@@ -665,7 +647,7 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
   }
 
   m_CurrentFile = fileInfo.absoluteFilePath();
-  if (fileInfo.dir() == QDir(ToQString(GameInfo::instance().getDownloadDir()))) {
+  if (fileInfo.dir() == QDir(m_DownloadsDirectory)) {
     m_CurrentFile = fileInfo.fileName();
   }
   qDebug("using mod name \"%s\" (id %d) -> %s", modName->toUtf8().constData(), modID, qPrintable(m_CurrentFile));
@@ -674,12 +656,9 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
   bool archiveOpen = m_CurrentArchive->open(ToWString(QDir::toNativeSeparators(fileName)).c_str(),
                                             new MethodCallback<InstallationManager, void, LPSTR>(this, &InstallationManager::queryPassword));
 
-  ON_BLOCK_EXIT([this] {
-    this->m_CurrentArchive->close();
-  });
-
-  DirectoryTree *filesTree = archiveOpen ? createFilesTree() : NULL;
+  ON_BLOCK_EXIT(std::bind(&InstallationManager::postInstallCleanup, this));
 
+  QScopedPointer<DirectoryTree> filesTree(archiveOpen ? createFilesTree() : NULL);
   IPluginInstaller::EInstallResult installResult = IPluginInstaller::RESULT_NOTATTEMPTED;
 
   std::sort(m_Installers.begin(), m_Installers.end(), [] (IPluginInstaller *LHS, IPluginInstaller *RHS) {
@@ -704,7 +683,7 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
             (filesTree != NULL) && (installer->isArchiveSupported(*filesTree))) {
           installResult = installerSimple->install(modName, *filesTree, version, modID);
           if (installResult == IPluginInstaller::RESULT_SUCCESS) {
-            mapToArchive(filesTree);
+            mapToArchive(filesTree.data());
             // the simple installer only prepares the installation, the rest works the same for all installers
             if (!doInstall(modName, modID, version, newestVersion, categoryID)) {
               installResult = IPluginInstaller::RESULT_FAILED;
@@ -729,13 +708,6 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
                 qPrintable(installer->name()), e.what());
     }
 
-    // clean up temp files
-    // TODO: this doesn't yet remove directories. Also, the files may be left there if this point isn't reached
-    foreach (const QString &tempFile, m_TempFilesToDelete) {
-      QFile::remove(QDir::tempPath() + "/" + tempFile);
-    }
-
-
     // act upon the installation result. at this point the files have already been
     // extracted to the correct location
     switch (installResult) {

src/installationmanager.h

@@ -64,6 +64,12 @@ public:
    */
   void setModsDirectory(const QString &modsDirectory) { m_ModsDirectory = modsDirectory; }
 
+  /**
+   * @brief update the directory where downloads are stored
+   * @param downloadDirectory the download directory
+   */
+  void setDownloadDirectory(const QString &downloadDirectory) { m_DownloadsDirectory = downloadDirectory; }
+
   /**
    * @brief install a mod from an archive
    *
@@ -168,9 +174,7 @@ private:
 
   bool ensureValidModName(MOBase::GuessedValue<QString> &name) const;
 
-private slots:
-
-  void openFile(const QString &fileName);
+  void postInstallCleanup() const;
 
 private:
 
@@ -193,6 +197,7 @@ private:
   QWidget *m_ParentWidget;
 
   QString m_ModsDirectory;
+  QString m_DownloadsDirectory;
 
   std::vector<MOBase::IPluginInstaller*> m_Installers;
   std::set<QString, CaseInsensitive> m_SupportedExtensions;
@@ -202,7 +207,6 @@ private:
 
   QProgressDialog m_InstallationProgress;
 
-  std::set<QString> m_FilesToDelete;
   std::set<QString> m_TempFilesToDelete;
 
 };

src/main.cpp

@@ -18,6 +18,11 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
+#ifdef LEAK_CHECK_WITH_VLD
+#include <wchar.h>
+#include <vld.h>
+#endif // LEAK_CHECK_WITH_VLD
+
 #include <QApplication>
 #include <QPushButton>
 #include <QListWidget>
@@ -55,7 +60,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "selectiondialog.h"
 #include "moapplication.h"
 #include "tutorialmanager.h"
-#include <QLibrary>
 #include <iostream>
 #include <QMessageBox>
 #include <QSharedMemory>
@@ -135,7 +139,7 @@ bool bootstrap()
           QObject::tr("The current user account doesn't have the required access rights to run "
              "Mod Organizer. The neccessary changes can be made automatically (the MO directory "
              "will be made writable for the current user account). You will be asked to run "
-             "\"helper.exe\" with administrative rights)."),
+             "\"helper.exe\" with administrative rights."),
              QMessageBox::Yes | QMessageBox::Cancel) == QMessageBox::Yes) {
         if (!Helper::init(GameInfo::instance().getOrganizerDirectory())) {
           return false;
@@ -151,6 +155,7 @@ bool bootstrap()
 
   // verify the hook-dll exists
   QString dllName = qApp->applicationDirPath() + "/" + ToQString(AppConfig::hookDLLName());
+
   HMODULE dllMod = ::LoadLibraryW(ToWString(dllName).c_str());
   if (dllMod == NULL) {
     throw windows_error("hook.dll is missing or invalid");
@@ -395,6 +400,27 @@ int main(int argc, char *argv[])
       settings.setValue("gamePath", gamePath.toUtf8().constData());
     }
 
+    int edition = 0;
+    if (settings.contains("game_edition")) {
+      edition = settings.value("game_edition").toInt();
+    } else {
+      std::vector<std::wstring> editions = GameInfo::instance().getSteamVariants();
+      if (editions.size() < 2) {
+        edition = 0;
+      } else {
+        SelectionDialog selection(QObject::tr("Please select the game edition you have (MO can't start the game correctly if this is set incorrectly!)"), NULL);
+        int index = 0;
+        for (auto iter = editions.begin(); iter != editions.end(); ++iter) {
+          selection.addChoice(ToQString(*iter), "", index++);
+        }
+        if (selection.exec() == QDialog::Rejected) {
+          return -1;
+        } else {
+          settings.setValue("game_edition", selection.getChoiceData().toInt());
+        }
+      }
+    }
+
     qDebug("managing game at %s", qPrintable(QDir::toNativeSeparators(gamePath)));
 
     ExecutablesList executablesList;
@@ -428,63 +454,70 @@ int main(int argc, char *argv[])
     qDebug("initializing tutorials");
     TutorialManager::init(QDir::fromNativeSeparators(ToQString(GameInfo::instance().getTutorialDir())).append("/"));
 
-    application.setStyleFile(settings.value("Settings/style", "").toString());
+    if (!application.setStyleFile(settings.value("Settings/style", "").toString())) {
+      // disable invalid stylesheet
+      settings.setValue("Settings/style", "");
+    }
 
-    // set up main window and its data structures
-    MainWindow mainWindow(argv[0], settings);
-    QObject::connect(&mainWindow, SIGNAL(styleChanged(QString)), &application, SLOT(setStyleFile(QString)));
-    QObject::connect(&instance, SIGNAL(messageSent(QString)), &mainWindow, SLOT(externalMessage(QString)));
+    int res = 1;
+    { // scope to control lifetime of mainwindow
+      // set up main window and its data structures
+      MainWindow mainWindow(argv[0], settings);
+      QObject::connect(&mainWindow, SIGNAL(styleChanged(QString)), &application, SLOT(setStyleFile(QString)));
+      QObject::connect(&instance, SIGNAL(messageSent(QString)), &mainWindow, SLOT(externalMessage(QString)));
 
-    mainWindow.setExecutablesList(executablesList);
-    mainWindow.readSettings();
+      mainWindow.setExecutablesList(executablesList);
+      mainWindow.readSettings();
 
-    QString selectedProfileName = QString::fromUtf8(settings.value("selected_profile", "").toByteArray());
+      QString selectedProfileName = QString::fromUtf8(settings.value("selected_profile", "").toByteArray());
 
-    { // see if there is a profile on the command line
-      int profileIndex = arguments.indexOf("-p", 1);
-      if ((profileIndex != -1) && (profileIndex < arguments.size() - 1)) {
-        qDebug("profile overwritten on command line");
-        selectedProfileName = arguments.at(profileIndex + 1);
+      { // see if there is a profile on the command line
+        int profileIndex = arguments.indexOf("-p", 1);
+        if ((profileIndex != -1) && (profileIndex < arguments.size() - 1)) {
+          qDebug("profile overwritten on command line");
+          selectedProfileName = arguments.at(profileIndex + 1);
+        }
+        arguments.removeAt(profileIndex);
+        arguments.removeAt(profileIndex);
       }
-      arguments.removeAt(profileIndex);
-      arguments.removeAt(profileIndex);
-    }
-    qDebug("configured profile: %s", qPrintable(selectedProfileName));
+      qDebug("configured profile: %s", qPrintable(selectedProfileName));
 
-    // if we have a command line parameter, it is either a nxm link or
-    // a binary to start
-    if ((arguments.size() > 1) && (!isNxmLink(arguments.at(1)))) {
-      QString exeName = arguments.at(1);
-      qDebug("starting %s from command line", qPrintable(exeName));
-      arguments.removeFirst(); // remove application name (ModOrganizer.exe)
-      arguments.removeFirst(); // remove binary name
-      // pass the remaining parameters to the binary
-      mainWindow.spawnProgram(exeName, arguments.join(" "), selectedProfileName, QDir());
-      return 0;
-    }
+      // if we have a command line parameter, it is either a nxm link or
+      // a binary to start
+      if ((arguments.size() > 1) && (!isNxmLink(arguments.at(1)))) {
+        QString exeName = arguments.at(1);
+        qDebug("starting %s from command line", qPrintable(exeName));
+        arguments.removeFirst(); // remove application name (ModOrganizer.exe)
+        arguments.removeFirst(); // remove binary name
+        // pass the remaining parameters to the binary
+        mainWindow.startApplication(exeName, arguments, QString(), selectedProfileName);
+        return 0;
+      }
 
-    mainWindow.createFirstProfile();
+      mainWindow.createFirstProfile();
 
-    if (selectedProfileName.length() != 0) {
-      if (!mainWindow.setCurrentProfile(selectedProfileName)) {
+      if (selectedProfileName.length() != 0) {
+        if (!mainWindow.setCurrentProfile(selectedProfileName)) {
+          mainWindow.setCurrentProfile(1);
+          qWarning("failed to set profile: %s",
+                   selectedProfileName.toUtf8().constData());
+        }
+      } else {
         mainWindow.setCurrentProfile(1);
-        qWarning("failed to set profile: %s",
-                 selectedProfileName.toUtf8().constData());
       }
-    } else {
-      mainWindow.setCurrentProfile(1);
-    }
 
-    qDebug("displaying main window");
-    mainWindow.show();
+      qDebug("displaying main window");
+      mainWindow.show();
 
-    if ((arguments.size() > 1) &&
-        (isNxmLink(arguments.at(1)))) {
-      qDebug("starting download from command line: %s", qPrintable(arguments.at(1)));
-      mainWindow.externalMessage(arguments.at(1));
+      if ((arguments.size() > 1) &&
+          (isNxmLink(arguments.at(1)))) {
+        qDebug("starting download from command line: %s", qPrintable(arguments.at(1)));
+        mainWindow.externalMessage(arguments.at(1));
+      }
+      splash.finish(&mainWindow);
+      res = application.exec();
     }
-    splash.finish(&mainWindow);
-    return application.exec();
+    return res;
   } catch (const std::exception &e) {
     reportError(e.what());
     return 1;

src/mainwindow.h

@@ -50,6 +50,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "savegameinfowidgetgamebryo.h"
 #include <guessedvalue.h>
 #include <directoryentry.h>
+#include <boost/signals2.hpp>
 
 namespace Ui {
     class MainWindow;
@@ -59,11 +60,32 @@ class QToolButton;
 class ModListSortProxy;
 class ModListGroupCategoriesProxy;
 
+
 class MainWindow : public QMainWindow, public MOBase::IOrganizer, public MOBase::IPluginDiagnose
 {
   Q_OBJECT
   Q_INTERFACES(MOBase::IPluginDiagnose)
 
+private:
+
+  struct SignalCombinerAnd
+  {
+    typedef bool result_type;
+    template<typename InputIterator>
+    bool operator()(InputIterator first, InputIterator last) const
+    {
+      while (first != last) {
+        if (!(*first)) {
+          return false;
+        }
+        ++first;
+      }
+      return true;
+    }
+  };
+
+  typedef boost::signals2::signal<bool (const QString&), SignalCombinerAnd> SignalAboutToRunApplication;
+
 public:
   explicit MainWindow(const QString &exeName, QSettings &initSettings, QWidget *parent = 0);
   ~MainWindow();
@@ -76,7 +98,6 @@ public:
   void refreshBSAList();
   void refreshDataTree();
   void refreshSaveList();
-  void refreshModList();
 
   void setExecutablesList(const ExecutablesList &executablesList);
 
@@ -89,8 +110,8 @@ public:
 
   void createFirstProfile();
 
-  void spawnProgram(const QString &fileName, const QString &argumentsArg,
-                    const QString &profileName, const QDir &currentDirectory);
+/*  void spawnProgram(const QString &fileName, const QString &argumentsArg,
+                    const QString &profileName, const QDir &currentDirectory);*/
 
   void loadPlugins();
 
@@ -111,7 +132,16 @@ public:
   virtual QString pluginDataPath() const;
   virtual void installMod(const QString &fileName);
   virtual QString resolvePath(const QString &fileName) const;
+  virtual QStringList listDirectories(const QString &directoryName) const;
+  virtual QStringList findFiles(const QString &path, const std::function<bool(const QString &)> &filter) const;
+  virtual QList<FileInfo> findFileInfos(const QString &path, const std::function<bool(const FileInfo&)> &filter) const;
+
   virtual MOBase::IDownloadManager *downloadManager();
+  virtual MOBase::IPluginList *pluginList();
+  virtual MOBase::IModList *modList();
+  virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = "");
+  virtual bool onAboutToRun(const std::function<bool(const QString&)> &func);
+  virtual void refreshModList(bool saveChanges = true);
 
   virtual std::vector<unsigned int> activeProblems() const;
   virtual QString shortDescription(unsigned int key) const;
@@ -153,7 +183,6 @@ signals:
   void styleChanged(const QString &styleFile);
 
 
-
   void modListDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
 
 protected:
@@ -168,7 +197,7 @@ private:
   void actionToToolButton(QAction *&sourceAction);
   bool verifyPlugin(MOBase::IPlugin *plugin);
   void registerPluginTool(MOBase::IPluginTool *tool);
-  bool registerPlugin(QObject *pluginObj);
+  bool registerPlugin(QObject *pluginObj, const QString &fileName);
 
   void updateToolBar();
   void activateSelectedProfile();
@@ -201,9 +230,23 @@ private:
 
   void refreshFilters();
 
-  void saveCategoriesFromMenu(QMenu *menu, int modRow);
+  /**
+   * Sets category selections from menu; for multiple mods, this will only apply
+   * the changes made in the menu (which is the delta between the current menu selection and the reference mod)
+   * @param menu the menu after editing by the user
+   * @param modRow index of the mod to edit
+   */
+  void addRemoveCategoriesFromMenu(QMenu *menu, int modRow);
 
-  bool addCategories(QMenu *menu, int targetID);
+  /**
+   * Sets category selections from menu; for multiple mods, this will completely
+   * replace the current set of categories on each selected with those selected in the menu
+   * @param menu the menu after editing by the user
+   * @param modRow index of the mod to edit
+   */
+  void replaceCategoriesFromMenu(QMenu *menu, int modRow);
+
+  bool populateMenuCategories(QMenu *menu, int targetID);
 
   void updateDownloadListDelegate();
 
@@ -243,10 +286,12 @@ private:
 
   static void setupNetworkProxy(bool activate);
   void activateProxy(bool activate);
+  void installTranslator(const QString &name);
 
 private:
 
   static const unsigned int PROBLEM_PLUGINSNOTLOADED = 1;
+  static const unsigned int PROBLEM_TOOMANYPLUGINS = 2;
 
 private:
 
@@ -288,9 +333,6 @@ private:
   DownloadManager m_DownloadManager;
   InstallationManager m_InstallationManager;
 
-  QTranslator *m_Translator;
-  QTranslator *m_TranslatorQt;
-
   SelfUpdater m_Updater;
 
   CategoryFactory &m_CategoryFactory;
@@ -320,6 +362,11 @@ private:
 
   QFile m_PluginsCheck;
 
+  SignalAboutToRunApplication m_AboutToRun;
+
+  QString m_CurrentLanguage;
+  std::vector<QTranslator*> m_Translators;
+
 private slots:
 
   void showMessage(const QString &message);
@@ -399,7 +446,9 @@ private slots:
 
   void originModified(int originID);
 
-  void saveCategories();
+  void addRemoveCategories_MenuHandler();
+  void replaceCategories_MenuHandler();
+
   void savePrimaryCategory();
   void addPrimaryCategoryCandidates();
 
@@ -466,6 +515,10 @@ private slots:
   void removeFromToolbar();
   void overwriteClosed(int);
 
+  void changeVersioningScheme();
+  void ignoreUpdate();
+  void unignoreUpdate();
+
 private slots: // ui slots
   // actions
   void on_actionAdd_Profile_triggered();
@@ -478,7 +531,7 @@ private slots: // ui slots
   void on_actionEndorseMO_triggered();
 
   void on_bsaList_customContextMenuRequested(const QPoint &pos);
-  void on_bsaList_itemChanged(QTreeWidgetItem *item, int column);
+  void bsaList_itemMoved();
   void on_btnRefreshData_clicked();
   void on_categoriesList_customContextMenuRequested(const QPoint &pos);
   void on_compactBox_toggled(bool checked);
@@ -498,6 +551,8 @@ private slots: // ui slots
   void on_groupCombo_currentIndexChanged(int index);
   void on_categoriesList_itemSelectionChanged();
   void on_linkButton_pressed();
+  void on_showHiddenBox_toggled(bool checked);
+  void on_bsaList_itemChanged(QTreeWidgetItem *item, int column);
 };
 
 #endif // MAINWINDOW_H

src/mainwindow.ui

@@ -725,7 +725,7 @@ p, li { white-space: pre-wrap; }
              <number>6</number>
             </property>
             <item>
-             <widget class="QTreeWidget" name="bsaList">
+             <widget class="MOBase::SortableTreeWidget" name="bsaList">
               <property name="contextMenuPolicy">
                <enum>Qt::CustomContextMenu</enum>
               </property>
@@ -742,7 +742,7 @@ BSAs checked here are loaded in such a way that your installation order is obeye
                <set>QAbstractItemView::NoEditTriggers</set>
               </property>
               <property name="showDropIndicator" stdset="0">
-               <bool>false</bool>
+               <bool>true</bool>
               </property>
               <property name="dragEnabled">
                <bool>false</bool>
@@ -751,10 +751,10 @@ BSAs checked here are loaded in such a way that your installation order is obeye
                <bool>false</bool>
               </property>
               <property name="dragDropMode">
-               <enum>QAbstractItemView::NoDragDrop</enum>
+               <enum>QAbstractItemView::DragDrop</enum>
               </property>
               <property name="defaultDropAction">
-               <enum>Qt::IgnoreAction</enum>
+               <enum>Qt::MoveAction</enum>
               </property>
               <property name="selectionMode">
                <enum>QAbstractItemView::SingleSelection</enum>
@@ -768,6 +768,12 @@ BSAs checked here are loaded in such a way that your installation order is obeye
               <property name="itemsExpandable">
                <bool>true</bool>
               </property>
+              <property name="columnCount">
+               <number>1</number>
+              </property>
+              <attribute name="headerVisible">
+               <bool>false</bool>
+              </attribute>
               <attribute name="headerDefaultSectionSize">
                <number>200</number>
               </attribute>
@@ -776,11 +782,6 @@ BSAs checked here are loaded in such a way that your installation order is obeye
                 <string>File</string>
                </property>
               </column>
-              <column>
-               <property name="text">
-                <string>Mod</string>
-               </property>
-              </column>
              </widget>
             </item>
             <item>
@@ -968,7 +969,7 @@ p, li { white-space: pre-wrap; }
              </layout>
             </item>
             <item>
-             <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2">
+             <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,2">
               <item>
                <widget class="QCheckBox" name="compactBox">
                 <property name="text">
@@ -976,6 +977,13 @@ p, li { white-space: pre-wrap; }
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QCheckBox" name="showHiddenBox">
+                <property name="text">
+                 <string>Show Hidden</string>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="MOBase::LineEditClear" name="downloadFilterEdit">
                 <property name="placeholderText">
@@ -1217,6 +1225,11 @@ Right now this has very limited functionality</string>
    <extends>QTreeView</extends>
    <header>modlistview.h</header>
   </customwidget>
+  <customwidget>
+   <class>MOBase::SortableTreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>sortabletreewidget.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="resources.qrc"/>

src/moapplication.cpp

@@ -19,20 +19,23 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "moapplication.h"
 #include "report.h"
-#include "utility.h"
+#include <utility.h>
 #include <appconfig.h>
 #include <QFile>
 #include <QStringList>
+#include <QPlastiqueStyle>
+#include <QCleanlooksStyle>
 
 
 MOApplication::MOApplication(int argc, char **argv)
   : QApplication(argc, argv)
 {
   connect(&m_StyleWatcher, SIGNAL(fileChanged(QString)), SLOT(updateStyle(QString)));
+  m_DefaultStyle = style()->objectName();
 }
 
 
-void MOApplication::setStyleFile(const QString &styleName)
+bool MOApplication::setStyleFile(const QString &styleName)
 {
   // remove all files from watch
   QStringList currentWatch = m_StyleWatcher.files();
@@ -42,11 +45,16 @@ void MOApplication::setStyleFile(const QString &styleName)
   // set new stylesheet or clear it
   if (styleName.length() != 0) {
     QString styleSheetName = applicationDirPath() + "/" + MOBase::ToQString(AppConfig::stylesheetsPath()) + "/" + styleName;
-    m_StyleWatcher.addPath(styleSheetName);
-    updateStyle(styleSheetName);
+    if (QFile::exists(styleSheetName)) {
+      m_StyleWatcher.addPath(styleSheetName);
+      updateStyle(styleSheetName);
+    } else {
+      updateStyle(styleName);
+    }
   } else {
     setStyleSheet("");
   }
+  return true;
 }
 
 
@@ -70,11 +78,18 @@ bool MOApplication::notify(QObject *receiver, QEvent *event)
 
 void MOApplication::updateStyle(const QString &fileName)
 {
-  QFile file(fileName);
-  if (file.open(QFile::ReadOnly)) {
-    setStyleSheet(file.readAll());
+  if (fileName == "Plastique") {
+    setStyle(new QPlastiqueStyle);
+    setStyleSheet("");
+  } else if (fileName == "Cleanlooks") {
+    setStyle(new QCleanlooksStyle);
+    setStyleSheet("");
   } else {
-    qDebug("no stylesheet");
+    setStyle(m_DefaultStyle);
+    if (QFile::exists(fileName)) {
+      setStyleSheet(QString("file:///%1").arg(fileName));
+    } else {
+      qWarning("invalid stylesheet: %s", qPrintable(fileName));
+    }
   }
-  file.close();
 }

src/moapplication.h

@@ -17,33 +17,35 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MOAPPLICATION_H
-#define MOAPPLICATION_H
-
-#include <QApplication>
-#include <QFileSystemWatcher>
-
-
-class MOApplication : public QApplication {
-Q_OBJECT
-public:
-
-  MOApplication(int argc, char **argv);
-
-  virtual bool notify (QObject *receiver, QEvent *event);
-
-public slots:
-
-  void setStyleFile(const QString &style);
-
-private slots:
-
-  void updateStyle(const QString &fileName);
-
-private:
-
-  QFileSystemWatcher m_StyleWatcher;
-};
-
-
-#endif // MOAPPLICATION_H
+#ifndef MOAPPLICATION_H
+#define MOAPPLICATION_H
+
+#include <QApplication>
+#include <QFileSystemWatcher>
+
+
+class MOApplication : public QApplication {
+Q_OBJECT
+public:
+
+  MOApplication(int argc, char **argv);
+
+  virtual bool notify (QObject *receiver, QEvent *event);
+
+public slots:
+
+  bool setStyleFile(const QString &style);
+
+private slots:
+
+  void updateStyle(const QString &fileName);
+
+private:
+
+  QFileSystemWatcher m_StyleWatcher;
+  QString m_DefaultStyle;
+
+};
+
+
+#endif // MOAPPLICATION_H