fixed priority ordering after enabling/disabling mod

- overwrite path configurable
- one can now set a base directory for all configurable paths
- user can now opt in/out of receiving pre-release updates (not functional yet)

.gitignore

@@ -0,0 +1,12 @@
+*.user
+Thumbs.db
+src/moc_*.cpp
+src/ui_*.h
+src/*.qrc.depends
+src/Modorganizer.*
+CMakeLists.txt.user
+edit
+stderr.log
+stdout.log
+build
+.idea

.hgignore

@@ -1,4 +1,6 @@
 syntax: glob
+scons_configure.py
+scons-ModOrganizer-*
 ModOrganizer-build-desktop*
 outputd/*
 output/*
@@ -13,3 +15,32 @@ source - Copy/*
 ModOrganizer-build-*
 pdbs/*
 source/NCC/BossDummy.x/*
+*.ts
+staging_prepare/*
+staging_trans/*
+tools/python_zip/*
+Makefile
+html
+*.vcxproj
+*.pdb
+*.dll
+*.exp
+*.tlog
+*.user
+*.obj
+*.suo
+*.sln
+*.log
+*.filters
+*.lib
+source/organizer/resources/contents/icons
+source/plugins/build-*
+*/GeneratedFiles/*
+translations/*
+source/LocalPaths.pri
+source/*/Win32/Debug/*
+source/plugins/*/Win32/Debug/*
+*~
+syntax: regexp
+Makefile\.(Debug|Release)
+source/.*/debug/.*

CMakeLists.txt

@@ -0,0 +1,14 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+PROJECT(organizer)
+
+
+SET(DEPENDENCIES_DIR CACHE PATH "")
+# hint to find qt in dependencies path
+LIST(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/qt5/lib/cmake)
+FILE(GLOB_RECURSE BOOST_ROOT ${DEPENDENCIES_DIR}/boost*/project-config.jam)
+GET_FILENAME_COMPONENT(BOOST_ROOT ${BOOST_ROOT} DIRECTORY)
+
+SET(ZLIB_ROOT ${DEPENDENCIES_DIR}/zlib)
+
+ADD_SUBDIRECTORY(src)

README.txt

@@ -1,68 +0,0 @@
-HOW TO BUILD
-============
-
-Requirements:
--------------
-
-Visual C++ compiler 2010 (VC 10.0) or up
-- Included in visual c++ express 2010 or windows sdk 7.0
-
-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
-
-zlib (http://www.zlib.net/)
-- Compile static library according to their instructions
-- You should have a "zlibstatic.lib" under "build" afterwards
-
-7z.dll (http://www.7-zip.org/download.html)
-- Part of the 7-zip program
-- Has to be the 32-bit dll! (approx. 893kb)
-
-Recommended:
-------------
-
-Qt Creator
-- Included in QtSDK but there might be a newer version as a separate download
-
-Set up (using Qt Creator):
---------------------------
-
-1. Using Qt Creator open source/ModOrganizer.pro from your working copy
-2. Open the "Projects" tab, open the "Details" for "Build Environment"
-3. Click "Add" to add a variable called "BOOSTPATH" with the path of your boost installation as the value (i.e. C:\code\boost_1_52_0)
-4. Click "Add" to add a variable called "ZLIBPATH" with the path of your zlib installation as the value (i.e. C:\code\zlib-1.2.7)
-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"
-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
-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
-
-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
-and not recompile the modified subproject. the "organizer" project on the other hand is always re-linked. If anyone knowledgeable enough with qmake
-can fix that that would be awesome.
-
-Set up (without Qt Creator):
-----------------------------
-
-1. open a command line shell and navigate to <your working copy>\source
-2. run "qmake -tp vc" to create a visual c++ solution
-3. Open that solution
-4. - 98. A miracle happens
-99. You can now compile MO using VC
-
-I'm not using this workflow so I can't give more detailed instructions.
-Please note that the primary project format of MO remains qmake, if you work with visual studio and make changes to the project (like adding
-source files) you have to manually transfer those changes to the .pro file.

mappings.imp

@@ -0,0 +1,30 @@
+[
+
+# for boost???
+# These are probably correct but might need a revisit as if you look at the boost documentation pages, it
+# can give you huge lists of alternate includes...
+    { symbol: [ "BOOST_FOREACH",                            "private", "<boost/foreach.hpp>", "public" ] },
+
+    { include: [ "@\"boost/bind/.*\"",                      "private", "<boost/bind.hpp>", "public" ] },
+    { include: [ "@\"boost/algorithm/string/.*\"",          "private", "<boost/algorithm/string.hpp>", "public" ] },
+    { include: [ "@\"boost/assign/.*\"",                    "private", "<boost/assign.hpp>", "public" ] },
+    { include: [ "@\"boost/filesystem/.*\"",                "private", "<boost/filesystem.hpp>", "public" ] },
+    { include: [ "@\"boost/format/.*\"",                    "private", "<boost/format.hpp>", "public" ] },
+    { include: [ "@\"boost/function/.*\"",                  "private", "<boost/function.hpp>", "public" ] },
+    { include: [ "@\"boost/local/.*\"",                     "private", "<boost/locale.hpp>", "public" ] },
+    { include: [ "@\"boost/python/.*\"",                    "private", "<boost/python.hpp>", "public" ] },
+    { include: [ "@\"boost/signals2/.*\"",                  "private", "<boost/signals2.hpp>", "public" ] },
+    { include: [ "\"boost/smart_ptr/scoped_array.hpp\"",    "private", "<boost/scoped_array.hpp>", "public" ] },
+    { include: [ "\"boost/smart_ptr/shared_ptr.hpp\"",      "private", "<boost/shared_ptr.hpp>", "public" ] },
+    # this appears to be excessive
+    #{ include: [ "@\"boost/thread/.*\"",                    "private", "<boost/thread.hpp>", "public" ] },
+
+# And this is specific to us
+    { include: [ "\"appconfig.inc\"", "private", "\"appconfig.h\"", "public" ] },
+
+]
+
+# Ones I don't yet know how to deal with
+#include "boost/fusion/container/vector/vector10_fwd.hpp"  // for fusion
+#include "boost/iterator/iterator_facade.hpp"  // for operator!=
+#include "boost/iterator/iterator_facade.hpp"

massage_messages.py

@@ -0,0 +1,157 @@
+from collections import defaultdict
+
+import fileinput
+import re
+import subprocess
+import sys
+
+
+"""
+
+source/organizer/aboutdialog.h should add these lines:
+#include <QObject>  // for Q_OBJECT, slots
+#include <QString>  // for QString
+class QListWidgetItem;
+class QWidget;
+
+source/organizer/aboutdialog.h should remove these lines:
+- #include <QListWidgetItem>  // lines 25-25
+- #include <utility>  // lines 28-28
+- #include <vector>  // lines 27-27
+- class DownloadManager;  // lines 47-47
+
+The full include-list for source/organizer/aboutdialog.h:
+#include <QDialog>  // for QDialog
+#include <QObject>  // for Q_OBJECT, slots
+#include <QString>  // for QString
+#include <map>      // for map
+class QListWidgetItem;
+class QWidget;
+namespace Ui { class AboutDialog; }  // lines 31-31
+---
+"""
+
+removing = None
+includes = dict()
+
+adding = None
+added = dict()
+lcadded = dict()
+
+foundline = None
+
+errors = False
+
+messages = defaultdict(list)
+
+def process_next_line(line, outfile):
+    """ Read a line of output/error from include-what-you use
+        Turn clang errors into a form QT creator recognises
+        Raise warnings for unneeded includes
+    """
+    global removing
+    global includes
+    global foundline
+    global errors
+    global added
+    global adding
+    line = line.rstrip()
+    print >> outfile, line
+
+    if line.endswith(' should remove these lines:'):
+        adding = None
+        removing = (line.split(' '))[0]
+    elif line.endswith(' should add these lines:'):
+        removing = None
+        adding = (line.split(' '))[0]
+    elif line == '' or line.startswith(' the full include-list'):
+        adding = None
+        removing = None
+    elif adding:
+        m = re.match(r'.*class (.*);', line)
+        if m:
+            added[m.group(1)] = (adding, line)
+            lcadded[m.group(1).lower() + '.h'] = m.group(1)
+        else:
+            added[line] = (adding, line)
+    elif removing:
+        # Really we should stash these so that if we get a 'class xxx' in
+        # the add lines we can print it here. also we could do the case
+        # fixing.
+        m = re.match(r'- #include [<"](.*)[">] +// lines (.*)-', line)
+        if m:
+            foundline = m.group(2)
+            # Note: In this project at least we have a naming convention of
+            # lower case filename and upper case classname.
+            clname = m.group(1)
+            if clname not in added:
+                if clname in lcadded:
+                    clname = lcadded[clname]
+            if clname in added:
+                messages[removing].append(
+                    '%s(%s) : warning I0004: Replace include of %s with '
+                        'forward reference %s' % (
+                        removing, m.group(2), m.group(1), added[clname][1]))
+                del added[clname]
+            else:
+                messages[removing].append(
+                    '%s(%s) : warning I0001: Unnecessary include of %s' % (
+                                              removing, m.group(2), m.group(1)))
+
+        else:
+            m = re.match(r'- (.*) +// lines (.*)-', line)
+            if m:
+                messages[removing].append(
+                    '%s(%s) : warning I0002: Unnecessary forward ref of %s' % (
+                                              removing, m.group(2), m.group(1)))
+            else:
+                print '********* I got confused **********'
+    elif line.startswith('In file included from'):
+        line = re.sub(r'^(In file included from)(.*):(\d+):',
+                      r'        \2(\3) : \1 here',
+                      line)
+        # Note; QT Creator seems to be unwilling to let you double click the
+        # line to select the code in question if you get a string of these, not
+        # sure why.
+    elif ': note:' in line:
+        line = '        ' + re.sub(r':(\d+):\d+: note:', r'(\1) : note:', line)
+    else:
+        # Replace clang :line:column: type: with ms (line) : type nnnn:
+        line = re.sub(r':(\d+):\d+: ([^:]*):', r'(\1) : \2 I1234:', line)
+        if ' : error I1234:' in line:
+            errors = True
+
+    print line
+
+outfile = open(sys.argv[1], 'w')
+process = subprocess.Popen(sys.argv[2:],
+                           stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
+while True:
+    output = process.stdout.readline()
+    if output == '' and process.poll() is not None:
+        break
+    if output:
+        process_next_line(output, outfile)
+
+# A note: We should probably do some work as we use the source code line for
+# messages in include files...
+
+if foundline is None:
+    foundline = '1'
+
+for add in added:
+    messages[added[add][0]].append(
+        '%s(%s) : warning I0003: Need to include %s' % (
+                                       added[add][0], foundline, added[add][1]))
+
+for file in sorted(messages.keys(), reverse = True):
+    for line in messages[file]:
+        print line
+
+rc = process.poll()
+# The return code you get appears to be more to do with the amount of output
+# generated than any real error, so instead we should error if any ': error:'
+# lines are detected
+
+if errors:
+    sys.exit(1)

readme.md

@@ -0,0 +1,42 @@
+# Mod Organizer
+
+Mod Organizer (MO) is a tool for managing mod collections of arbitrary size. It is specifically designed for people who like to experiment with mods and thus need an easy and reliable way to install and uninstall them.
+
+## Building
+
+Please refer to [TanninOne/modorganizer-umbrella](https://github.com/TanninOne/modorganizer-umbrella) for build instructions.
+
+## Other Repositories
+
+MO consists of multiple repositories on github. The Umbrella project will download them automatically as required. They should however also be buildable individually.
+Here is a complete list:
+* https://github.com/TanninOne/modorganizer
+* https://github.com/TanninOne/modorganizer-uibase
+* https://github.com/TanninOne/modorganizer-hookdll
+* https://github.com/TanninOne/modorganizer-bsatk
+* https://github.com/TanninOne/modorganizer-esptk
+* https://github.com/TanninOne/modorganizer-archive
+* https://github.com/TanninOne/modorganizer-nxmhandler
+* https://github.com/TanninOne/modorganizer-lootcli
+* https://github.com/TanninOne/modorganizer-helper
+* https://github.com/TanninOne/modorganizer-tool_nmmimport
+* https://github.com/TanninOne/modorganizer-tool_configurator
+* https://github.com/TanninOne/modorganizer-tool_inieditor
+* https://github.com/TanninOne/modorganizer-preview_base
+* https://github.com/TanninOne/modorganizer-diagnose_basic
+* https://github.com/TanninOne/modorganizer-installer_quick
+* https://github.com/TanninOne/modorganizer-installer_manual
+* https://github.com/TanninOne/modorganizer-installer_fomod
+* https://github.com/TanninOne/modorganizer-installer_bundle
+* https://github.com/TanninOne/modorganizer-installer_bain
+* https://github.com/TanninOne/modorganizer-game_skyrim
+* https://github.com/TanninOne/modorganizer-game_oblivion
+* https://github.com/TanninOne/modorganizer-game_fallout3
+* https://github.com/TanninOne/modorganizer-game_fallout4
+* https://github.com/TanninOne/modorganizer-game_falloutnv
+* https://github.com/TanninOne/modorganizer-game_gamebryo
+* https://github.com/TanninOne/modorganizer-game_features
+* https://github.com/TanninOne/modorganizer-check_fnis
+* https://github.com/TanninOne/modorganizer-plugin_python
+* https://github.com/TanninOne/modorganizer-bsa_extractor
+* https://github.com/TanninOne/usvfs

scons_configure_template.py

@@ -0,0 +1,33 @@
+# This python script contains the configuration for scons
+# Copy this to scons_configure.py and adjust to taste.
+
+# Path to your boost install - it should have a boost/ subdirectory and a stage/
+# subdirectory. The scons script will use stage/lib if there, or the appropriate
+# version for your compiler, if you installed the multiple-build version
+BOOSTPATH = r"C:\Apps\boost_1_55_0"
+
+# Version of Visual Studio to use, if you wish to use a specific version. If you
+# don't specify a version, the latest will be picked.. See the scons manual for
+# supported values.
+#MSVC_VERSION = '10.0Exp'
+
+# Path to your python install
+# You don't really need to set this up but you might if (say) you have a 32- and
+# 64-bit python install and scons has been installed for the 64 bit version
+#PYTHONPATH=r"C:\Apps\Python"
+
+# Path to your QT install. This might constrain the version of MSVC you can use.
+# This seems to be set by QTCreator
+#QTDIR = r"C:\Apps\Qt\4.8.6"
+
+# Path to 7-zip sources
+SEVENZIPPATH = r"C:\Apps\7-Zip\7z920"
+
+# Path to zlib. Please read the README file for more information about how this
+# needs to be set up
+ZLIBPATH = r"C:\Apps\zlib-1.2.8"
+
+# Source control programs. Sadly I can't get this information from qt, even
+# though you have to set it up in the configuration
+GIT = r"C:\Program Files\git\bin\git.exe"
+MERCURIAL = r"C:\Program Files\TortoiseHg\hg.exe"

src/CMakeLists.txt

@@ -0,0 +1,349 @@
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
+
+CMAKE_POLICY(SET CMP0020 NEW)
+#CMAKE_POLICY(SET CMP0043 NEW)
+
+SET(PROJ_AUTHOR Tannin)
+SET(PROJ_ARCH x86)
+IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  SET(PROJ_ARCH x64)
+ENDIF()
+
+SET(organizer_SRCS
+    transfersavesdialog.cpp
+    syncoverwritedialog.cpp
+    spawn.cpp
+    singleinstance.cpp
+    settingsdialog.cpp
+    settings.cpp
+    selfupdater.cpp
+    selectiondialog.cpp
+    queryoverwritedialog.cpp
+    profilesdialog.cpp
+    profile.cpp
+    pluginlistsortproxy.cpp
+    pluginlist.cpp
+    overwriteinfodialog.cpp
+    nxmaccessmanager.cpp
+    nexusinterface.cpp
+    motddialog.cpp
+    modlistsortproxy.cpp
+    modlist.cpp
+    modinfodialog.cpp
+    modinfo.cpp
+    modinfobackup.cpp
+    modinfoforeign.cpp
+    modinfooverwrite.cpp
+    modinforegular.cpp
+    modinfowithconflictinfo.cpp
+    messagedialog.cpp
+    mainwindow.cpp
+    main.cpp
+    loghighlighter.cpp
+    logbuffer.cpp
+    lockeddialog.cpp
+    loadmechanism.cpp
+    installationmanager.cpp
+    helper.cpp
+    filedialogmemory.cpp
+    executableslist.cpp
+    editexecutablesdialog.cpp
+    downloadmanager.cpp
+    downloadlistwidgetcompact.cpp
+    downloadlistwidget.cpp
+    downloadlistsortproxy.cpp
+    downloadlist.cpp
+    directoryrefresher.cpp
+    credentialsdialog.cpp
+    categoriesdialog.cpp
+    categories.cpp
+    bbcode.cpp
+    activatemodsdialog.cpp
+    moapplication.cpp
+    profileinputdialog.cpp
+    icondelegate.cpp
+    csvbuilder.cpp
+    savetextasdialog.cpp
+    qtgroupingproxy.cpp
+    modlistview.cpp
+    problemsdialog.cpp
+    serverinfo.cpp
+    browserview.cpp
+    browserdialog.cpp
+    persistentcookiejar.cpp
+    noeditdelegate.cpp
+    previewgenerator.cpp
+    previewdialog.cpp
+    aboutdialog.cpp
+    json.cpp
+    modflagicondelegate.cpp
+    genericicondelegate.cpp
+    organizerproxy.cpp
+    viewmarkingscrollbar.cpp
+    plugincontainer.cpp
+    organizercore.cpp
+    instancemanager.cpp
+    usvfsconnector.cpp
+    eventfilter.cpp
+
+    shared/inject.cpp
+    shared/windows_error.cpp
+    shared/error_report.cpp
+    shared/directoryentry.cpp
+    shared/util.cpp
+    shared/appconfig.cpp
+    shared/leaktrace.cpp
+    shared/stackdata.cpp
+  )
+
+SET(organizer_HDRS
+    transfersavesdialog.h
+    syncoverwritedialog.h
+    spawn.h
+    singleinstance.h
+    settingsdialog.h
+    settings.h
+    selfupdater.h
+    selectiondialog.h
+    queryoverwritedialog.h
+    profilesdialog.h
+    profile.h
+    pluginlistsortproxy.h
+    pluginlist.h
+    overwriteinfodialog.h
+    nxmaccessmanager.h
+    nexusinterface.h
+    motddialog.h
+    modlistsortproxy.h
+    modlist.h
+    modinfodialog.h
+    modinfo.h
+    modinfobackup.h
+    modinfoforeign.h
+    modinfooverwrite.h
+    modinforegular.h
+    modinfowithconflictinfo.h
+    messagedialog.h
+    mainwindow.h
+    loghighlighter.h
+    logbuffer.h
+    lockeddialog.h
+    loadmechanism.h
+    installationmanager.h
+    helper.h
+    filedialogmemory.h
+    executableslist.h
+    editexecutablesdialog.h
+    downloadmanager.h
+    downloadlistwidgetcompact.h
+    downloadlistwidget.h
+    downloadlistsortproxy.h
+    downloadlist.h
+    directoryrefresher.h
+    credentialsdialog.h
+    categoriesdialog.h
+    categories.h
+    bbcode.h
+    activatemodsdialog.h
+    moapplication.h
+    profileinputdialog.h
+    icondelegate.h
+    csvbuilder.h
+    savetextasdialog.h
+    qtgroupingproxy.h
+    modlistview.h
+    problemsdialog.h
+    serverinfo.h
+    browserview.h
+    browserdialog.h
+    persistentcookiejar.h
+    noeditdelegate.h
+    previewgenerator.h
+    previewdialog.h
+    aboutdialog.h
+    json.h
+    modflagicondelegate.h
+    genericicondelegate.h
+    organizerproxy.h
+    viewmarkingscrollbar.h
+    plugincontainer.h
+    organizercore.h
+    iuserinterface.h
+    instancemanager.h
+    usvfsconnector.h
+    eventfilter.h
+
+    shared/inject.h
+    shared/windows_error.h
+    shared/error_report.h
+    shared/directoryentry.h
+    shared/util.h
+    shared/appconfig.h
+    shared/appconfig.inc
+    shared/leaktrace.h
+    shared/stackdata.h
+  )
+
+SET(organizer_UIS
+    transfersavesdialog.ui
+    syncoverwritedialog.ui
+    simpleinstalldialog.ui
+    settingsdialog.ui
+    selectiondialog.ui
+    queryoverwritedialog.ui
+    profilesdialog.ui
+    overwriteinfodialog.ui
+    motddialog.ui
+    modinfodialog.ui
+    messagedialog.ui
+    mainwindow.ui
+    lockeddialog.ui
+    installdialog.ui
+    finddialog.ui
+    editexecutablesdialog.ui
+    downloadlistwidgetcompact.ui
+    downloadlistwidget.ui
+    credentialsdialog.ui
+    categoriesdialog.ui
+    activatemodsdialog.ui
+    profileinputdialog.ui
+    savetextasdialog.ui
+    problemsdialog.ui
+    previewdialog.ui
+    browserdialog.ui
+    aboutdialog.ui
+  )
+
+SET(organizer_QRCS
+    resources.qrc
+    stylesheet_resource.qrc
+    )
+
+SET(organizer_RCS
+    app_icon.rc
+    version.rc
+	)
+
+
+SOURCE_GROUP(Source FILES ${organizer_SRCS})
+SOURCE_GROUP(Headers FILES ${organizer_HDRS})
+SOURCE_GROUP(UI FILES ${organizer_UIS})
+
+
+# Qt5
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+SET(CMAKE_AUTOMOC ON)
+SET(CMAKE_AUTOUIC ON)
+FIND_PACKAGE(Qt5Widgets REQUIRED)
+FIND_PACKAGE(Qt5Declarative REQUIRED)
+FIND_PACKAGE(Qt5Network REQUIRED)
+FIND_PACKAGE(Qt5WinExtras REQUIRED)
+FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
+QT5_WRAP_UI(organizer_UIHDRS ${organizer_UIS})
+QT5_ADD_RESOURCES(organizer_RCCPPS ${organizer_QRCS})
+
+INCLUDE_DIRECTORIES(${Qt5Declarative_INCLUDES})
+
+ADD_DEFINITIONS(-DQT_MESSAGELOGCONTEXT)
+
+# Boost
+SET(Boost_USE_STATIC_LIBS       OFF)
+SET(Boost_USE_MULTITHREADED      ON)
+SET(Boost_USE_STATIC_RUNTIME    OFF)
+FIND_PACKAGE(Boost REQUIRED)
+
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+
+
+FIND_PACKAGE(zlib REQUIRED)
+# TODO FindZlib doesn't find the static zlib library
+
+
+# MO projects
+SET(default_project_path "${CMAKE_SOURCE_DIR}/..")
+GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
+
+SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")
+SET(lib_path "${project_path}/../../install/libs")
+
+
+INCLUDE_DIRECTORIES(${project_path}/uibase/src
+                    ${project_path}/bsatk/src
+                    ${project_path}/esptk/src
+                    ${project_path}/archive/src
+                    ${project_path}/../usvfs/usvfs
+                    ${project_path}/game_gamebryo/src
+                    ${project_path}/game_features/src
+                    ${project_path}/githubpp/src)
+
+
+INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS})
+LINK_DIRECTORIES(${lib_path}
+                 ${project_path}/../zlib/lib)
+
+EXECUTE_PROCESS(
+  COMMAND git log -1 --format=%h
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  OUTPUT_VARIABLE GIT_COMMIT_HASH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+ADD_DEFINITIONS(-D_UNICODE -DUNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -DGITID="${GIT_COMMIT_HASH}")
+
+IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+  SET(usvfs_name usvfs_x64)
+ELSE()
+  SET(usvfs_name usvfs_x86)
+ENDIF()
+
+ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIHDRS} ${organizer_RCS} ${organizer_RCCPPS})
+TARGET_LINK_LIBRARIES(ModOrganizer
+                      Qt5::Widgets Qt5::WinExtras Qt5::WebKitWidgets
+                      ${Boost_LIBRARIES}
+                      zlibstatic
+                      uibase esptk bsatk githubpp
+                      ${usvfs_name}
+                      Dbghelp advapi32 Version Shlwapi)
+IF (NOT "${OPTIMIZE_COMPILE_FLAGS}" STREQUAL "")
+  SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS_RELWITHDEBINFO
+                        ${OPTIMIZE_COMPILE_FLAGS})
+ENDIF()
+SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO
+                      "/LARGEADDRESSAWARE ${OPTIMIZE_LINK_FLAGS}")
+
+
+QT5_USE_MODULES(ModOrganizer Widgets Declarative Network WebKitWidgets)
+
+
+###############
+## Installation
+
+SET(qt5bin ${Qt5Core_DIR}/../../../bin)
+
+FIND_PROGRAM(WINDEPLOYQT_COMMAND windeployqt PATHS ${qt5bin} NO_DEFAULT_PATH)
+
+INSTALL(TARGETS ModOrganizer
+        RUNTIME DESTINATION bin)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ModOrganizer.pdb
+        DESTINATION pdb)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5
+        DESTINATION bin/dlls
+        RENAME dlls.manifest)
+
+# use windeployqt.exe to install all required libraries
+SET(windeploy_parameters --no-translations --no-plugins --libdir dlls --release-with-debug-info --no-compiler-runtime)
+INSTALL(
+    CODE
+    "EXECUTE_PROCESS(
+        COMMAND
+        ${qt5bin}/windeployqt.exe ModOrganizer.exe ${windeploy_parameters}
+        COMMAND
+        ${qt5bin}/windeployqt.exe uibase.dll ${windeploy_parameters}
+        WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
+    )"
+)
+
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stylesheets
+                  ${CMAKE_CURRENT_SOURCE_DIR}/tutorials
+        DESTINATION bin)

src/ModOrganizer.pro

@@ -1,26 +1,56 @@
 TEMPLATE = subdirs
-CONFIG += ordered
-
 
 SUBDIRS = bsatk \
-					shared \
-					uibase \
-					organizer \
-					hookdll \
-					archive \
-					helper \
+          shared \
+          uibase \
+          esptk \
+          organizer \
+          hookdll \
+          archive \
+          helper \
           plugins \
-          proxydll \
           nxmhandler \
-    BossDummy \
-    pythonRunner \
-    esptk
+          BossDummy \
+          pythonRunner \
+          loot_cli
 
+pythonRunner.depends = uibase
+plugins.depends = pythonRunner uibase
 hookdll.depends = shared
-organizer.depends = shared, uibase, plugins
+organizer.depends = shared uibase plugins
 
 CONFIG(debug, debug|release) {
-    DESTDIR = outputd
+  DESTDIR = $$PWD/../outputd
 } else {
-    DESTDIR = output
+  DESTDIR = $$PWD/../output
 }
+
+STATICDATAPATH = $${DESTDIR}\\..\\tools\\static_data\\dlls
+DLLSPATH = $${DESTDIR}\\dlls
+
+otherlibs.path = $$DLLSPATH
+otherlibs.files += $${STATICDATAPATH}\\7z.dll \
+    $${BOOSTPATH}\\stage\\lib\\boost_python-vc*-mt-1*.dll
+
+qtlibs.path = $$DLLSPATH
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+  QTLIBNAMES += Core Gui Network OpenGL Script Sql Svg Qml Quick Webkit Widgets Xml XmlPatterns
+} else {
+  QTLIBNAMES += Core Declarative Gui Network OpenGL Script Sql Svg Webkit Xml XmlPatterns
+}
+
+QTLIBSUFFIX = $${QT_MAJOR_VERSION}.dll
+CONFIG(debug, debug|release): QTLIBSUFFIX = "d$${QTLIBSUFFIX}" # Can't use Debug: .. here, it ignores the line - no idea why, as it works in BossDummy.pro
+
+for(QTNAME, QTLIBNAMES) {
+  QTFILE = Qt$${QTNAME}
+  qtlibs.files += $$[QT_INSTALL_BINS]\\$${QTFILE}$${QTLIBSUFFIX}
+}
+
+INSTALLS += qtlibs otherlibs
+
+OTHER_FILES +=\
+    ../SConstruct\
+    ../scons_configure.py\
+    SConscript

src/SConscript

@@ -0,0 +1,179 @@
+import ctypes
+import os
+import subprocess
+
+def resolve_name(source):
+    # Get the actual name of the file, after reparse points and symlinks are
+    # taken into account.
+    GENERIC_READ = 0x80000000
+    FILE_SHARE_READ = 0x1
+    OPEN_EXISTING = 0x3
+    FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
+    handle = ctypes.windll.kernel32.CreateFileA(source,
+                                                GENERIC_READ,
+                                                FILE_SHARE_READ,
+                                                None,
+                                                OPEN_EXISTING,
+                                                FILE_FLAG_BACKUP_SEMANTICS,
+                                                None)
+    # get the target
+    FILE_NAME_NORMALIZED = 0x0
+    FILE_NAME_OPENED = 0x8
+    buff = ctypes.create_string_buffer(1024)
+    res = ctypes.windll.kernel32.GetFinalPathNameByHandleA(handle,
+                                                           buff,
+                                                           ctypes.sizeof(buff),
+                                                           FILE_NAME_NORMALIZED)
+    target = buff.value
+    ctypes.windll.kernel32.CloseHandle(handle)
+    return target
+
+def search_up(path, target):
+    while True:
+        if os.path.exists(os.path.join(path, target)):
+            return True
+        npath = os.path.dirname(path)
+        if npath == path:
+            break
+        path = npath
+    return False
+
+Import('qt_env')
+
+env = qt_env.Clone()
+
+modules = [ 
+    'Core', 
+    'Gui', 
+    'Network', 
+    'Script', 
+    'Sql', 
+    'WebKit', 
+    'Xml', 
+    'XmlPatterns',
+    'Declarative'
+]
+
+if env['QT_MAJOR_VERSION'] > 4:
+    modules += [ 
+        'Widgets',
+        'Qml',
+        'WebKitWidgets'
+    ]
+
+env.EnableQtModules(*modules)
+
+env.Uic(env.Glob('*.ui'))
+
+env.RequireLibraries('uibase', 'shared', 'bsatk', 'esptk')
+
+env.AppendUnique(LIBS = [
+    'shell32',
+    'user32',
+    'ole32',
+    'advapi32',
+    'gdi32',
+    'shlwapi',
+    'Psapi',
+    'Version'
+])
+
+# We have to 'persuade' moc to generate certain other targets and inject them
+# into the list of cpps
+other_sources = env.AddExtraMoc(env.Glob('*.h'))
+
+for file in env.Glob('*.rc'):
+    other_sources.append(env.RES(file))
+
+# Note the order of this is important, or you can pick up the wrong report.h...
+# Doing appendunique seems to throw the moc code into a tizzy
+env['CPPPATH'] += [
+    '../archive',
+    '../plugins/gamefeatures',
+    '.',            # Why is this necessary?
+    '${LOOTPATH}',
+    '${BOOSTPATH}',
+]
+
+#########################FUDGE###############################
+env['CPPPATH'] += [
+    '../plugins/gameGamebryo',
+    ]
+#############################################################
+
+env.AppendUnique(CPPDEFINES = [
+    '_UNICODE',
+    '_CRT_SECURE_NO_WARNINGS',
+    '_SCL_SECURE_NO_WARNINGS',
+    'BOOST_DISABLE_ASSERTS',
+    'NDEBUG',
+    'QT_MESSAGELOGCONTEXT'
+])
+
+# Boost produces very long names with msvc truncates. Doesn't seem to cause
+# problems.
+# Also note to remove the -wd4100 I hacked the boost headers (tagged_argument.hpp)
+# appropriately.
+env.AppendUnique(CPPFLAGS = [ '-wd4503' ])
+
+env.AppendUnique(LINKFLAGS = [
+    '/SUBSYSTEM:WINDOWS',
+    '${EXE_MANIFEST_DEPENDENCY}'
+])
+
+#  modeltest is optional and it doesn't compile anyway...
+cpp_files = [
+    x for x in env.Glob('*.cpp', source = True)
+        if x.name != 'modeltest.cpp' and x.name != 'aboutdialog.cpp' and \
+           not x.name.startswith('moc_') # I think this is a strange bug
+]
+
+about_env = env.Clone()
+# This is somewhat of a hack until I can work out a way of setting up a build
+# with all the repos without using millions of junction points
+try:
+    target = resolve_name(Dir('.').srcnode().abspath)
+    if search_up(target, '.hg'):
+        hgid = subprocess.check_output([env['MERCURIAL'], 'id', '-i']).rstrip()
+    elif search_up(target, '.git'):
+        hgid = subprocess.check_output([env['GIT'], '-C', target, 'describe',
+                                                              '--tag']).rstrip()
+    else:
+        hgid = "Unknown"
+except:
+    hgid = "Problem determining version"
+
+# FIXME: It'd be much easier to stringify this in the source code
+about_env.AppendUnique(CPPDEFINES = [ 'HGID=\\"%s\\"' % hgid ])
+other_sources.append(about_env.StaticObject('aboutdialog.cpp'))
+
+env.AppendUnique(LIBPATH = "${ZLIBPATH}/build")
+env.AppendUnique(LIBS = 'zlibstatic')
+
+prog = env.Program('ModOrganizer',
+                   cpp_files + env.Glob('*.qrc') + other_sources)
+
+env.InstallModule(prog)
+
+for subdir in ('tutorials', 'stylesheets'):
+    env.Install(os.path.join(env['INSTALL_PATH'], subdir),
+                env.Glob(os.path.join(subdir, '*')))
+
+# FIXME Sort the translations. Except they don't exist on the 1.2 branch
+
+res = env['QT_USED_MODULES']
+Return('res')
+
+"""
+CONFIG(debug, debug|release) {
+} else {
+  QMAKE_CXXFLAGS += /Zi /GL
+  QMAKE_LFLAGS += /DEBUG /LTCG /OPT:REF /OPT:ICF
+}
+
+TRANSLATIONS = organizer_en.ts
+
+
+QMAKE_POST_LINK += xcopy /y /s /I $$quote($$BASEDIR\\*.qm) $$quote($$DSTDIR)\\translations $$escape_expand(\\n)
+
+"""

src/aboutdialog.cpp

@@ -0,0 +1,94 @@
+/*
+Copyright (C) 2014 Sebastian Herbord. All rights reserved.
+
+This file is part of Mod Organizer.
+
+Mod Organizer is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Mod Organizer is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "aboutdialog.h"
+#include "ui_aboutdialog.h"
+#include <utility.h>
+
+#include <QApplication>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QTextBrowser>
+#include <QVariant>
+#include <Qt>
+
+
+AboutDialog::AboutDialog(const QString &version, QWidget *parent)
+  : QDialog(parent)
+  , ui(new Ui::AboutDialog)
+{
+  ui->setupUi(this);
+
+  m_LicenseFiles[LICENSE_LGPL3] = "lgpl-3.0.txt";
+  m_LicenseFiles[LICENSE_GPL3] = "gpl-3.0.txt";
+  m_LicenseFiles[LICENSE_BSD3] = "bsd3.txt";
+  m_LicenseFiles[LICENSE_BOOST] = "boost.txt";
+  m_LicenseFiles[LICENSE_CCBY3] = "by-sa3.txt";
+  m_LicenseFiles[LICENSE_ZLIB] = "zlib.txt";
+  m_LicenseFiles[LICENSE_APACHE2] = "apache-license-2.0.txt";
+
+  addLicense("Qt", LICENSE_LGPL3);
+  addLicense("Qt Json", LICENSE_GPL3);
+  addLicense("Boost Library", LICENSE_BOOST);
+  addLicense("7-zip", LICENSE_LGPL3);
+  addLicense("ZLib", LICENSE_ZLIB);
+  addLicense("Tango Icon Theme", LICENSE_NONE);
+  addLicense("RRZE Icon Set", LICENSE_CCBY3);
+  addLicense("Icons by Lorc, Delapouite and sbed available on http://game-icons.net", LICENSE_CCBY3);
+  addLicense("Castle Core", LICENSE_APACHE2);
+  addLicense("LOOT", LICENSE_GPL3);
+
+  ui->nameLabel->setText(QString("<span style=\"font-size:12pt; font-weight:600;\">%1 %2</span>").arg(ui->nameLabel->text()).arg(version));
+#if defined(HGID)
+  ui->revisionLabel->setText(ui->revisionLabel->text() + " " + HGID);
+#elif defined(GITID)
+  ui->revisionLabel->setText(ui->revisionLabel->text() + " " + GITID);
+#else
+  ui->revisionLabel->setText(ui->revisionLabel->text() + " unknown");
+#endif
+}
+
+
+AboutDialog::~AboutDialog()
+{
+  delete ui;
+}
+
+
+void AboutDialog::addLicense(const QString &name, Licenses license)
+{
+  QListWidgetItem *item = new QListWidgetItem(name);
+  item->setData(Qt::UserRole, license);
+  ui->creditsList->addItem(item);
+}
+
+
+void AboutDialog::on_creditsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem*)
+{
+  auto iter = m_LicenseFiles.find(current->data(Qt::UserRole).toInt());
+  if (iter != m_LicenseFiles.end()) {
+    QString filePath = qApp->applicationDirPath() + "/license/" + iter->second;
+    QString text = MOBase::readFileText(filePath);
+    ui->licenseText->setText(text);
+  } else {
+    ui->licenseText->setText(tr("No license"));
+  }
+}

src/aboutdialog.h

@@ -0,0 +1,71 @@
+#ifndef ABOUTDIALOG_H
+/*
+Copyright (C) 2014 Sebastian Herbord. All rights reserved.
+
+This file is part of Mod Organizer.
+
+Mod Organizer is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Mod Organizer is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#define ABOUTDIALOG_H
+
+#include <QDialog>
+class QListWidgetItem;
+#include <QObject>
+#include <QString>
+
+#include <map>
+
+namespace Ui {
+  class AboutDialog;
+}
+
+class AboutDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit AboutDialog(const QString &version, QWidget *parent = 0);
+  ~AboutDialog();
+
+private:
+
+  enum Licenses {
+    LICENSE_NONE,
+    LICENSE_LGPL3,
+    LICENSE_GPL3,
+    LICENSE_BSD3,
+    LICENSE_BOOST,
+    LICENSE_CCBY3,
+    LICENSE_ZLIB,
+    LICENSE_APACHE2
+  };
+
+private:
+
+  void addLicense(const QString &name, Licenses license);
+
+private slots:
+  void on_creditsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
+
+private:
+
+  Ui::AboutDialog *ui;
+
+  std::map<int, QString> m_LicenseFiles;
+
+};
+
+#endif // ABOUTDIALOG_H

src/aboutdialog.ui

@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AboutDialog</class>
+ <widget class="QDialog" name="AboutDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>746</width>
+    <height>369</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>About</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="iconLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>250</width>
+           <height>250</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>250</width>
+           <height>250</height>
+          </size>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="pixmap">
+          <pixmap resource="resources.qrc">:/MO/gui/splash</pixmap>
+         </property>
+         <property name="scaledContents">
+          <bool>true</bool>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QTabWidget" name="tabWidget">
+       <property name="currentIndex">
+        <number>0</number>
+       </property>
+       <widget class="QWidget" name="about">
+        <attribute name="title">
+         <string>About</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QLabel" name="nameLabel">
+           <property name="text">
+            <string notr="true">Mod Organizer</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="revisionLabel">
+           <property name="text">
+            <string>Revision:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string notr="true">Copyright 2011-2016 Sebastian Herbord</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;&lt;p&gt;See the GNU General Public License for more details.&lt;/p&gt;&lt;p&gt;Source code can be found at &lt;a href=&quot;https://github.com/TanninOne/modorganizer&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;GitHub&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="software">
+        <attribute name="title">
+         <string>Used Software</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <item>
+          <widget class="QListWidget" name="creditsList"/>
+         </item>
+         <item>
+          <widget class="QTextBrowser" name="licenseText"/>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="credits">
+        <attribute name="title">
+         <string>Credits</string>
+        </attribute>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QGroupBox" name="groupBox">
+           <property name="title">
+            <string>Translators</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_6">
+            <item>
+             <widget class="QListWidget" name="listWidget_2">
+              <property name="selectionMode">
+               <enum>QAbstractItemView::NoSelection</enum>
+              </property>
+              <item>
+               <property name="text">
+                <string notr="true">pndrev (German)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">DaWul (Spanish)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Fiama (Spanish)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Alyndiar (French)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Jlkawaii (French)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Rigoletto (French)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Scythe1912 (Chinese)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">yc0620shen (Chinese)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">miraclefreak (Czech)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">tokcdk  (Russian)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Ren (Korean)</string>
+               </property>
+               <property name="toolTip">
+                <string/>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>... more (Can't track)</string>
+               </property>
+               <property name="toolTip">
+                <string/>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox_2">
+           <property name="title">
+            <string>Others</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_7">
+            <item>
+             <widget class="QListWidget" name="listWidget">
+              <property name="selectionMode">
+               <enum>QAbstractItemView::NoSelection</enum>
+              </property>
+              <item>
+               <property name="text">
+                <string notr="true">blacksol</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">DoubleYou</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">deathneko11</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Bridger</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">GamerPoet</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Gopher</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">GSDFan</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Uhuru</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Wolverine2710</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">z929669</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">thosrtanner</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>ogrotten</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <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="QPushButton" name="closeButton">
+       <property name="text">
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>closeButton</sender>
+   <signal>clicked()</signal>
+   <receiver>AboutDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>460</x>
+     <y>313</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>253</x>
+     <y>167</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

src/activatemodsdialog.cpp

@@ -1,97 +1,101 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "activatemodsdialog.h"
-#include "ui_activatemodsdialog.h"
-
-#include <QComboBox>
-#include <QLabel>
-
-ActivateModsDialog::ActivateModsDialog(const std::map<QString, std::vector<QString> > &missingPlugins, QWidget *parent)
-  : TutorableDialog("ActivateMods", parent), ui(new Ui::ActivateModsDialog)
-{
-  ui->setupUi(this);
-
-  QTableWidget *modsTable = findChild<QTableWidget*>("modsTable");
-  QHeaderView *headerView = modsTable->horizontalHeader();
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-  headerView->setSectionResizeMode(0, QHeaderView::Stretch);
-  headerView->setSectionResizeMode(1, QHeaderView::Interactive);
-#else
-  headerView->setResizeMode(0, QHeaderView::Stretch);
-  headerView->setResizeMode(1, QHeaderView::Interactive);
-#endif
-
-  int row = 0;
-
-  modsTable->setRowCount(missingPlugins.size());
-
-  for (std::map<QString, std::vector<QString> >::const_iterator espIter = missingPlugins.begin();
-       espIter != missingPlugins.end(); ++espIter, ++row) {
-    modsTable->setCellWidget(row, 0, new QLabel(espIter->first));
-    if (espIter->second.size() == 0) {
-      modsTable->setCellWidget(row, 1, new QLabel(tr("not found")));
-    } else {
-      QComboBox* combo = new QComboBox();
-      for (std::vector<QString>::const_iterator modIter = espIter->second.begin();
-           modIter != espIter->second.end(); ++modIter) {
-        combo->addItem(*modIter);
-      }
-      modsTable->setCellWidget(row, 1, combo);
-    }
-  }
-}
-
-
-ActivateModsDialog::~ActivateModsDialog()
-{
-  delete ui;
-}
-
-
-std::set<QString> ActivateModsDialog::getModsToActivate()
-{
-  std::set<QString> result;
-  QTableWidget *modsTable = findChild<QTableWidget*>("modsTable");
-
-  for (int row = 0; row < modsTable->rowCount(); ++row) {
-    QComboBox *comboBox = dynamic_cast<QComboBox*>(modsTable->cellWidget(row, 1));
-    if (comboBox != NULL) {
-      result.insert(comboBox->currentText());
-    }
-  }
-  return result;
-}
-
-
-std::set<QString> ActivateModsDialog::getESPsToActivate()
-{
-  std::set<QString> result;
-  QTableWidget *modsTable = findChild<QTableWidget*>("modsTable");
-
-  for (int row = 0; row < modsTable->rowCount(); ++row) {
-    QComboBox *comboBox = dynamic_cast<QComboBox*>(modsTable->cellWidget(row, 1));
-    if (comboBox != NULL) {
-      QLabel *espName = dynamic_cast<QLabel*>(modsTable->cellWidget(row, 0));
-
-      result.insert(espName->text());
-    }
-  }
-  return result;
-}
+/*
+Copyright (C) 2012 Sebastian Herbord. All rights reserved.
+
+This file is part of Mod Organizer.
+
+Mod Organizer is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Mod Organizer is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "activatemodsdialog.h"
+#include "ui_activatemodsdialog.h"
+
+#include <QComboBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QString>
+#include <QTableWidget>
+
+#include <QtGlobal>
+
+ActivateModsDialog::ActivateModsDialog(SaveGameInfo::MissingAssets const &missingAssets, QWidget *parent)
+  : TutorableDialog("ActivateMods", parent), ui(new Ui::ActivateModsDialog)
+{
+  ui->setupUi(this);
+
+  QTableWidget *modsTable = findChild<QTableWidget*>("modsTable");
+  QHeaderView *headerView = modsTable->horizontalHeader();
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+  headerView->setSectionResizeMode(0, QHeaderView::Stretch);
+  headerView->setSectionResizeMode(1, QHeaderView::Interactive);
+#else
+  headerView->setResizeMode(0, QHeaderView::Stretch);
+  headerView->setResizeMode(1, QHeaderView::Interactive);
+#endif
+
+  int row = 0;
+
+  modsTable->setRowCount(missingAssets.size());
+
+  for (SaveGameInfo::MissingAssets::const_iterator espIter = missingAssets.begin();
+       espIter != missingAssets.end(); ++espIter, ++row) {
+    modsTable->setCellWidget(row, 0, new QLabel(espIter.key()));
+    if (espIter->size() == 0) {
+      modsTable->setCellWidget(row, 1, new QLabel(tr("not found")));
+    } else {
+      QComboBox* combo = new QComboBox();
+      for (QString const &mod : espIter.value()) {
+        combo->addItem(mod);
+      }
+      modsTable->setCellWidget(row, 1, combo);
+    }
+  }
+}
+
+
+ActivateModsDialog::~ActivateModsDialog()
+{
+  delete ui;
+}
+
+
+std::set<QString> ActivateModsDialog::getModsToActivate()
+{
+  std::set<QString> result;
+  QTableWidget *modsTable = findChild<QTableWidget*>("modsTable");
+
+  for (int row = 0; row < modsTable->rowCount(); ++row) {
+    QComboBox *comboBox = dynamic_cast<QComboBox*>(modsTable->cellWidget(row, 1));
+    if (comboBox != nullptr) {
+      result.insert(comboBox->currentText());
+    }
+  }
+  return result;
+}
+
+
+std::set<QString> ActivateModsDialog::getESPsToActivate()
+{
+  std::set<QString> result;
+  QTableWidget *modsTable = findChild<QTableWidget*>("modsTable");
+
+  for (int row = 0; row < modsTable->rowCount(); ++row) {
+    QComboBox *comboBox = dynamic_cast<QComboBox*>(modsTable->cellWidget(row, 1));
+    if (comboBox != nullptr) {
+      QLabel *espName = dynamic_cast<QLabel*>(modsTable->cellWidget(row, 0));
+
+      result.insert(espName->text());
+    }
+  }
+  return result;
+}

src/activatemodsdialog.h

@@ -1,70 +1,76 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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 ACTIVATEMODSDIALOG_H
-#define ACTIVATEMODSDIALOG_H
-
-#include "tutorabledialog.h"
-#include <map>
-#include <set>
-
-namespace Ui {
-    class ActivateModsDialog;
-}
-
-/**
- * @brief Dialog that is used to batch activate/deactivate mods and plugins
- **/
-class ActivateModsDialog : public MOBase::TutorableDialog
-{
-  Q_OBJECT
-
-public:
- /**
-  * @brief constructor
-  *
-  * @param missingPlugins a map containing missing plugins that need to be activated
-  * @param parent ... Defaults to 0.
-  **/
- explicit ActivateModsDialog(const std::map<QString, std::vector<QString> > &missingPlugins, QWidget *parent = 0);
-  ~ActivateModsDialog();
-
-  /**
-   * @brief get a list of mods that the user chose to activate
-   * 
-   * @note This can of ocurse only be called after the dialog has been displayed
-   *
-   * @return set< QString > the mods to activate
-   **/
-  std::set<QString> getModsToActivate();
-
-  /**
-   * @brief get a list of plugins that should be activated
-   *
-   * @return set< QString > the plugins to activate. This contains only plugins that become available after enabling the mods retrieved with getModsToActivate
-   **/
-  std::set<QString> getESPsToActivate();
-
-private slots:
-
-private:
-  Ui::ActivateModsDialog *ui;
-};
-
-#endif // ACTIVATEMODSDIALOG_H
+/*
+Copyright (C) 2012 Sebastian Herbord. All rights reserved.
+
+This file is part of Mod Organizer.
+
+Mod Organizer is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Mod Organizer is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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 ACTIVATEMODSDIALOG_H
+#define ACTIVATEMODSDIALOG_H
+
+#include "savegameinfo.h"
+#include "tutorabledialog.h"
+
+#include <QObject>
+
+class QString;
+class QWidget;
+
+#include <set>
+
+namespace Ui {
+    class ActivateModsDialog;
+}
+
+/**
+ * @brief Dialog that is used to batch activate/deactivate mods and plugins
+ **/
+class ActivateModsDialog : public MOBase::TutorableDialog
+{
+  Q_OBJECT
+
+public:
+ /**
+  * @brief constructor
+  *
+  * @param missingPlugins a map containing missing plugins that need to be activated
+  * @param parent ... Defaults to 0.
+  **/
+ explicit ActivateModsDialog(SaveGameInfo::MissingAssets const &missingAssets, QWidget *parent = 0);
+  ~ActivateModsDialog();
+
+  /**
+   * @brief get a list of mods that the user chose to activate
+   * 
+   * @note This can of ocurse only be called after the dialog has been displayed
+   *
+   * @return set< QString > the mods to activate
+   **/
+  std::set<QString> getModsToActivate();
+
+  /**
+   * @brief get a list of plugins that should be activated
+   *
+   * @return set< QString > the plugins to activate. This contains only plugins that become available after enabling the mods retrieved with getModsToActivate
+   **/
+  std::set<QString> getESPsToActivate();
+
+private slots:
+
+private:
+  Ui::ActivateModsDialog *ui;
+};
+
+#endif // ACTIVATEMODSDIALOG_H

src/app_icon.rc

@@ -1,3 +1 @@
-#include "version.rc"
-
- IDI_ICON1               ICON    DISCARDABLE     "mo_icon.ico"
+IDI_ICON1               ICON    DISCARDABLE     "mo_icon.ico"