updated build scripts

Update to scons build

.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

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,273 +0,0 @@
-HOW TO BUILD
-============
-
-Intro:
-------
-
-Building Mod Organizer can be a rather daunting task especially if you're not very comfortable with C++ development under windows.
-Please note that if you only want to work on and build a plugin you can save yourself a lot of trouble
-
-Overview:
----------
-
-As of July 2014 MO consists of the following subprojects:
-- organizer: The main userinterface. heavy usage of various libraries
-- hookdll: core library of the virtual file system
-- uibase: interop between plugins and the main application as well as some reusable functionality
-- shared: functionality shared between organizer and hookdll. I'm attempting to get rid of this library over time
-- nxmhandler: tool to pass handling of nxm links to MO or other applications
-- helper: tool for doing operations requiring elevated priviledges if MO doesn't have them
-- proxydll: dll used in the "proxy dll" load mechanism
-- esptk: small library containing functionality to work with esps/esms
-- bsatk: small library containing functionality to work with bsas. Requires zlib to extract files. Requires boost_thread to provide multi-threaded extraction
-- archive: small wrapper library around 7zip for dealing with mod archives. Requires 7zip
-- NCC: extension to NMM to provide a binary with command line interface for fomod installation. This is c# code and does not build with the rest of the project. Requires the rest of NMM
-- bossdummy: dummy dll that looks like the boss.dll. This is used instead of the real boss dlls in NCC to save some disk space
-- pythonrunner: library for embedding python code. Requires boost_python, python 2.7 and pyqt5
-- loot_cli: this is a command line client of loot. This can be better integrated with MO than the official loot client.
-
-And various plugins:
-- bsaExtractor: offers to extract bsas after a mod has been installed
-- checkFNIS: Activates each time an application is started from MO and runs fnis if necessary
-- diagnoseBasic: Various diagnostic checks on the game
-- inieditor: minimalistic file editor for ini files
-- installerBain: handles non-scripted bain installers
-- installerBundle: handles installation of archives wrapped in archives
-- installerFomod: handles installation of xml fomods
-- installerManual: handles installations of archives that aren't supported by any other plugin (or if the user chooses to do the installation manually)
-- installerNCC: handles installation of any fomod (requires NCC)
-- installerQuick: handles very simple one-click installations
-- NMMImport: importer from existing nmm installation
-- proxyPython: integrates pythonrunner as a plugin into MO
-- pyniEdit: more user-friendly ini editor. python code
-- previewBase: used for file previews. this plugin covers image formats supported by the qt installation (usually at least jpg, gif, png) and text files
-- previewDDS: used to preview dds textures. uses code from the nif file format library
-
-There are a few more plugins that are either broken or samples
-- installerBCF: this was intended to use .bcf (bain conversion file) files as installation instructions but currently it is completely function-less
-- helloWorldCpp: sample for cpp plugins. This should compile even without fulfilling most dependencies below
-- pageTESAlliance: integrates the tes alliance page into MO. This integration is not nearly as tight as that of nexus.
-
-Requirements:
--------------
-
-Visual C++ compiler 2013 (VC 12.0) or up
-- Included in visual c++ express 2013
-- Do install windows sdk too if only for the cdb debugger which is included in that package
-Note: If you're having trouble installing the windows sdk, you may be affected by this bug: http://support.microsoft.com/kb/2717426
-
-Qt Libraries 5.4.x (http://www.qt.io/download-open-source/#section-2)
-- i.e. "Qt libraries 5.4.0 for Windows (VS 2013, 722 MB)"
-- tested: 5.4.0 for Windows 32-bit (VS 2013, OpenGL, 695 MB)
-- Install according to instruction
-
-boost libraries (http://www.boost.org/)
-- tested: 1.56
-- Build according to their instructions (using vc++): http://www.boost.org/doc/libs/1_57_0/more/getting_started/windows.html
-- A few of the boost libraries need to be built (the rest is header-only). The only compiled libs MO needs (at the time of writing) are
-  boost_thread (for everything that links agains bsatk) and boost_python (for pythonrunner). You can disable the others to save 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
-- 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 sourcecode (http://www.7-zip.org/download.html)
-- only for "archive" subproject
-- no need to compile, will be linked into project
-
-Python 2.7 (32-bit)
-- only for pythonrunner
-
-PyQt5 for Python 2.7 (http://www.riverbankcomputing.co.uk/software/pyqt/download)
-- tested: PyQt-gpl-5.4.zip
-- only for pythonrunner
-
-SIP (http://www.riverbankcomputing.com/software/sip/download)
-- presumably only for pythonrunner as it's needed for PyQT5
-
-Recommended:
-------------
-
-Qt Creator
-- included in Qt SDK
-- With Qt Creator usually the rule is "the newer the better"
-- Start Qt Creator and check if things are set up correctly:
-  1) Go to Tools > Options > Build & Run > Qt Versions
-	2.1) If the QtSDK 5.4.x you installed earlier is not auto-detected, click "Add" to add it manually
-	2.2) Navigate to your <your qt5 installation>\bin\qmake.exe
-	2.3) Restart qt creator
-	3) Go to Tools > Options > Build & Run > Kits
-	3.1) If no Kit is auto-detected (or the auto-detected ones have picked up the wrong qt or vc++ installation) click "Add"
-	3.2) Enter a Name (i.e. "Qt 5.4 MSVC2013 32bit")
-	3.3) In Compiler select the visual studio compiler installed earlier (may show up as "Microsoft Windows SDK for Windows x). Make sure you select the x86 variant
-	3.4) CDB should be auto-detected
-	3.5) Select the qt version set up earlier
-	4) Apply and close the options
-
-Set up (using Qt Creator):
---------------------------
-
-1. Create a file called "LocalPaths.pri" in your ModOrganizer\source directory
-2. Open that file with any text editor and enter (one entry per line)
-2a. BOOSTPATH=<path to your boost installation> (i.e. C:\code\boost_1_56_0)
-2b. LOOTPATH=C:/Users/Tannin/Documents/Projects/loot_api
-2c. PYTHONPATH=D:/Python278
-2d. SEVENZIPPATH=D:/Documents/Projects/7zip
-2e. ZLIBPATH=D:/Documents/Projects/zlib-1.2.7
-3. Using Qt Creator open source/ModOrganizer.pro from your working copy
-4. Compile the configuration(s) you want to use (debug and/or release) (Build All). This should compile correctly (though right now it produces a lot of warnings in boost headers).
-5. <reserved for future use. Maybe grab a coffee?>
-6. return to the "projects" tab and switch to "Run Settings"
-7. Determine the folder of the qt binaries in the package you downloaded. This could be "QtSDK\Desktop\Qt\5.4.0\msvc2013\bin" or "Qt5.4.0\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 the qt binaries directory, copy the following files to <your working copy>\output\dlls: Qt5Core.dll, Qt5Declarative.dll, Qt5Gui.dll, Qt5Network.dll, Qt5Script.dll, Qt5Sql.dll, Qt5Webkit.dll, Qt5Xml.dll, Qt5XmlPatterns.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 the qt binaries copy the following files to <your working copy>\outputd\dlls: Qt5Cored.dll, Qt5Declaratived.dll, Qt5Guid.dll, Qt5Networkd.dll, Qt5Scriptd.dll, Qt5Sqld.dll, Qt5Webkitd.dll, Qt5Xmld.dll, Qt5XmlPatternsd.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.
-
-
-
------------------
-Troubleshooting (thanks to Ross):
------------------
-
-1) When I try to build, I am seeing the error "error: LNK1104: cannot open file 'zlibstatic.lib'"
-
-	a) Make sure you have the following files
-		{ZLIBPATH}\build\zconf.h
-  		{ZLIBPATH}\build\zlib.h
-  		{ZLIBPATH}\build\zlibstatic.lib
-
-	b) make sure "zlibstat.lib" was renamed to "zlibstatic.lib"
-	c) currently, there are references to zlibstatic in the following 2 project files:
-		./bsatk/bsatk.pro
-		./hookdll/hookdll.pro
-
-	Please note if building this, you need to switch OFF -DZLIB_WINAPI ...
-
-2) After building, I try to open {MOPROJECTPATH}\outputd\ModOragnizer.exe and get this error
-	"The program can't start because QtDeclaratived4.dll is missing from your computer. Try reinstalling the program to fix this problem."
-
-		-> When setting up Qt4.8.x, make sure you copied the "d" (debug) versions of the dll files to {MOPROJECTPATH}\outputd\dlls
-		   If you copied the release version or did not copy the dlls at all, you may see this error.
-		   The *.dll files can be found in {QT48xPATH}\bin
-
-		Similiar:
-		http://stackoverflow.com/questions/11196416/cant-start-qt-exe-file-on-windows-7
-
-3) I am getting one or more of the the following compiler warnings...
-
-	"{MOPROJECTPATH}\source\bsatk\bsaexception.cpp:32: warning: C4996: 'vsnprintf': This function or variable may be unsafe.
-	Consider using vsnprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details."
-		-> Ignore/suppress warning like this and make be ultra-careful using printf-style functions. vsnprintf_s is a visual-c++ only function so using those would make porting (i.e. to mingw) harder
-	
-	"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\stdio.h:354: see declaration of 'vsnprintf'"
-		-> see previous
-	
-	"debug\bsaarchive.obj:-1: warning: LNK4042: object specified more than once; extras ignored"
-
-		-> This appears to be an issue when using VC++ 2010 as the compiler. There are some posts on StackOverflow
-			which suggest fixes when using VC++ as the IDE, but not sure how to apply them to Qt Creator.
-				http://stackoverflow.com/questions/3729515
-				http://stackoverflow.com/questions/3695174
-			
-		-> Also, not sure if this affects VC++ 2012 / VC++ 2013 / GCC via cygwin/mingw.
-			Not even sure if the project would successfully compile on these.
-	
-	"{MOPROJECTPATH}\source\organizer\mainwindow.cpp:3995: warning: C4428: universal-character-name encountered in source"
-	
-		-> very pointless warning.
-			http://stackoverflow.com/questions/11589571
-			http://stackoverflow.com/questions/7078013
-			
-			the best solution I saw was to just disable the warning altogether...
-			#pragma warning( disable : 4428 )
-
-	"warning: LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library"
-	
-	-> You can always add a #pragma to ignore them :P
-		http://msdn.microsoft.com/en-us/library/2c8f766e%28v=vs.80%29.aspx
-	
-4) I got the following error while building...
-	"error: LNK1201: error writing to program database
-	'{MOPROJECTPATH}\{whatever-your-build-directory-name-is}\organizer\debug\ModOrganizer.pdb';
-	check for insufficient disk space, invalid path, or insufficient privilege"
-	
-	-> I had this happen after trying to look at something in memory via Process Explorer.
-	   To resolve, I killed and restarted PE. Alternatively, you could probably use the
-	   Unlocker utility. After unlocking, I manually deleted everything in the directory.
-
-	   Unlocker: http://www.filehippo.com/download_unlocker/ or http://www.emptyloop.com/unlocker/
-	   Warning: With Unlocker v1.9.2, you must select "Advanced" then uncheck everything to
-	   avoid having some Delta toolbar garbage installed...
-
-5) Problem TT has seen:
-    Complains about 'qtwebkit4' missing. For some reason this seems to insist on
-    living with modorganiser.exe
-
-6) Debugging the python proxy: I (TT) don't think this is possible unless you have a debug
-   build of PyQt. However, a debug build of PyQt requires a debug build of python. There doesn't
-   appear to be a half way house which is build wiht normal python but debug versions of QT libraries.
-   You can confuse pyqt by copying the debug QT DLLs to appropriate named files in the DLLs
-   directory, and removing QT from your project run path, which results in the python proxy
-   initialising succesfully, but causes mod organiser to crash in strange places.
-
--------------------
-Building with scons
--------------------
-
-1) Download scons from www.scons.org and install
-2) Download QT4 (and/or QT5) from https://bitbucket.org/dirkbaechle/scons_qt4 and 
-    https://bitbucket.org/dirkbaechle/scons_qt5. Install as per instructions
-3) Copy scons_configure_template.py to scons_configure.py. Edit to point to your
-   boost/python/zlib/7zip/loot directories as appropriate.
-4) Create build kits as follows:
-       Custom Process step:
-          Command: <python path>\Scripts\scons.bat
-          Arguments: -u .
-          Working directory: %{sourcedir}
-
-       Clean Custom Process step:
-          Command: <python path>\Scripts\scons.bat
-          Arguments: -c -u .
-          Working directory: %{sourcedir}
-
-    For the release build, add 'CONFIG=release' to the arguments.
-    
-    If you want to do parallel builds, add -j and a number to the arguments.
-    However you may need to install pywin32 (but it seems to work OK for me).
-    -j 4 did the entire build in 2m 15s. scons uses -Z7 to store debugging
-    information in the .obj files which removes the issues with multiple
-    processes attempting to access one datafile.
-
-    Note. If you want to build a sub project separately, it seems to be better
-    to open the subproject, set that up with the scons kit and build that as a
-    project.
-    
-    Please note: the generated (runnable) output files end up in the build directory,
-    in the '_ModOrganizer' subdirectory (not at the top level). Named like that
-    so you can see it! The scons build will also populate the directory with
-    all the necessary DLLs (but see note 6 above about your build tool path if
-    trying to debug).

readme.md

@@ -0,0 +1,40 @@
+# 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_pyniedit
+* 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_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

scons_configure_template.py

@@ -4,7 +4,7 @@
 # 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 = 'C:\\Apps\\boost_1_55_0'
+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
@@ -14,15 +14,20 @@ BOOSTPATH = 'C:\\Apps\\boost_1_55_0'
 # 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=C:\Apps\Python
+#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 = 'C:\\Apps\\Qt\\4.8.6'
+#QTDIR = r"C:\Apps\Qt\4.8.6"
 
 # Path to 7-zip sources
-SEVENZIPPATH = 'C:\\Apps\\7-Zip\\7z920'
+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 = 'C:\\Apps\\zlib-1.2.8'
+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,338 @@
+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
+    savegameinfowidgetgamebryo.cpp
+    savegameinfowidget.cpp
+    savegamegamebryo.cpp
+    savegame.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
+    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
+    gameinfoimpl.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
+    safewritefile.cpp
+    modflagicondelegate.cpp
+    genericicondelegate.cpp
+    organizerproxy.cpp
+    viewmarkingscrollbar.cpp
+    plugincontainer.cpp
+    organizercore.cpp
+
+    shared/inject.cpp
+    shared/windows_error.cpp
+    shared/error_report.cpp
+    shared/directoryentry.cpp
+    shared/gameinfo.cpp
+    shared/oblivioninfo.cpp
+    shared/fallout3info.cpp
+    shared/falloutnvinfo.cpp
+    shared/util.cpp
+    shared/skyriminfo.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
+    savegameinfowidgetgamebryo.h
+    savegameinfowidget.h
+    savegamegamebyro.h
+    savegame.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
+    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
+    gameinfoimpl.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
+    safewritefile.h
+    modflagicondelegate.h
+    genericicondelegate.h
+    organizerproxy.h
+    viewmarkingscrollbar.h
+    plugincontainer.h
+    organizercore.h
+    iuserinterface.h
+
+    shared/inject.h
+    shared/windows_error.h
+    shared/error_report.h
+    shared/directoryentry.h
+    shared/gameinfo.h
+    shared/oblivioninfo.h
+    shared/fallout3info.h
+    shared/falloutnvinfo.h
+    shared/util.h
+    shared/skyriminfo.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
+    savegameinfowidget.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        ON)
+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")
+
+
+MESSAGE(STATUS ${lib_path})
+MESSAGE(STATUS ${project_path})
+
+INCLUDE_DIRECTORIES(${project_path}/uibase/src
+                    ${project_path}/bsatk/src
+                    ${project_path}/esptk/src
+                    ${project_path}/archive/src
+                    ${project_path}/game_features/src)
+INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS})
+LINK_DIRECTORIES(${lib_path}
+                 ${project_path}/../zlib/lib)
+
+ADD_DEFINITIONS(-D_UNICODE -DUNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
+
+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
+                      Dbghelp advapi32 Version Shlwapi)
+
+SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS /GL)
+SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO
+                      "/LTCG /INCREMENTAL:NO /LARGEADDRESSAWARE /OPT:REF /OPT:ICF")
+
+
+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

@@ -3,6 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS = bsatk \
           shared \
           uibase \
+          esptk \
           organizer \
           hookdll \
           archive \
@@ -11,8 +12,7 @@ SUBDIRS = bsatk \
           nxmhandler \
           BossDummy \
           pythonRunner \
-          loot_cli \
-          esptk
+          loot_cli
 
 pythonRunner.depends = uibase
 plugins.depends = pythonRunner uibase

src/SConscript

@@ -1,6 +1,43 @@
+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()
@@ -47,16 +84,12 @@ env.AppendUnique(LIBS = [
 other_sources = env.AddExtraMoc(env.Glob('*.h'))
 
 for file in env.Glob('*.rc'):
-    # version.rc is included in app_icon.rc. Not sure why it's a separate file.
-    if file.name == 'version.rc':
-        continue
     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',
-#    '../boss_modified/boss-api',
     '../plugins/gamefeatures',
     '.',            # Why is this necessary?
     '${LOOTPATH}',
@@ -86,10 +119,19 @@ cpp_files = [
 ]
 
 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:
-    hgid = subprocess.check_output(['hg', 'id', '-i']).rstrip()
+    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 = 'Unknown version'
+    hgid = "Problem determining version"
 
 # FIXME: It'd be much easier to stringify this in the source code
 about_env.AppendUnique(CPPDEFINES = [ 'HGID=\\"%s\\"' % hgid ])

src/aboutdialog.cpp

@@ -37,7 +37,7 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
   m_LicenseFiles[LICENSE_ZLIB] = "zlib.txt";
   m_LicenseFiles[LICENSE_APACHE2] = "apache-license-2.0.txt";
 
-  addLicense("Qt 5.4", LICENSE_LGPL3);
+  addLicense("Qt", LICENSE_LGPL3);
   addLicense("Qt Json", LICENSE_GPL3);
   addLicense("Boost Library", LICENSE_BOOST);
   addLicense("7-zip", LICENSE_LGPL3);

src/aboutdialog.ui

@@ -90,7 +90,7 @@
          <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;/body&gt;&lt;/html&gt;</string>
+            <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>

src/app_icon.rc

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

src/baincomplexinstallerdialog.ui

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>BainComplexInstallerDialog</class>
- <widget class="QDialog" name="BainComplexInstallerDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>398</width>
-    <height>365</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>BAIN Package Installer</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Name</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="nameEdit"/>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>This looks like a Package prepared for Installation through BAIN. You can select options from the list below. If there is a package.txt file, it should contain detailed information about the options.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QListWidget" name="optionsList">
-     <property name="toolTip">
-      <string>Components of this package.</string>
-     </property>
-     <property name="whatsThis">
-      <string>Components of this package.
-If there is a component called &quot;00 Core&quot; it is usually required. Options are ordered by priority as set up by the author.</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="packageBtn">
-       <property name="toolTip">
-        <string>The package.txt is often part of BAIN packages and contains details about the options available.</string>
-       </property>
-       <property name="whatsThis">
-        <string>The package.txt is often part of BAIN packages and contains details about the options available.</string>
-       </property>
-       <property name="text">
-        <string>Package.txt</string>
-       </property>
-      </widget>
-     </item>
-     <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="manualBtn">
-       <property name="toolTip">
-        <string>Opens a Dialog that allows custom modifications.</string>
-       </property>
-       <property name="whatsThis">
-        <string>Opens a Dialog that allows custom modifications.</string>
-       </property>
-       <property name="text">
-        <string>Manual</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okBtn">
-       <property name="text">
-        <string>Ok</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cancelBtn">
-       <property name="text">
-        <string>Cancel</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/categories.h

@@ -87,7 +87,7 @@ public:
    *
    * @return unsigned int number of categories
    **/
-  unsigned numCategories() const { return m_Categories.size(); }
+   size_t numCategories() const { return m_Categories.size(); }
 
   /**
    * @brief count all categories that match a specified filter

src/editexecutablesdialog.cpp

@@ -111,10 +111,10 @@ void EditExecutablesDialog::saveExecutable()
 
 void EditExecutablesDialog::delayedRefresh()
 {
-  int index = ui->executablesListBox->currentIndex().row();
+  QModelIndex index = ui->executablesListBox->currentIndex();
   resetInput();
   refreshExecutablesWidget();
-  ui->executablesListBox->setCurrentRow(index);
+  on_executablesListBox_clicked(index);
 }
 
 
@@ -214,7 +214,6 @@ bool EditExecutablesDialog::executableChanged()
 {
   if (m_CurrentItem != nullptr) {
     Executable const &selectedExecutable(m_ExecutablesList.find(m_CurrentItem->text()));
-
     return selectedExecutable.m_Arguments != ui->argumentsEdit->text()
         || selectedExecutable.m_SteamAppID != ui->appIDOverwriteEdit->text()
         || selectedExecutable.m_WorkingDirectory != QDir::fromNativeSeparators(ui->workingDirEdit->text())
@@ -222,7 +221,11 @@ bool EditExecutablesDialog::executableChanged()
         || (selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE) != ui->closeCheckBox->isChecked()
         || selectedExecutable.usesOwnIcon() != ui->useAppIconCheckBox->isChecked();
   } else {
-    return false;
+    QFileInfo fileInfo(ui->binaryEdit->text());
+    return !ui->binaryEdit->text().isEmpty()
+        && !ui->titleEdit->text().isEmpty()
+        && fileInfo.exists()
+        && fileInfo.isFile();
   }
 }
 
@@ -260,24 +263,26 @@ void EditExecutablesDialog::on_closeButton_clicked()
 void EditExecutablesDialog::on_executablesListBox_clicked(const QModelIndex &current)
 {
   if (current.isValid()) {
-    ui->executablesListBox->selectionModel()->clearSelection();
-    ui->executablesListBox->selectionModel()->select(current, QItemSelectionModel::SelectCurrent);
 
     if (executableChanged()) {
       QMessageBox::StandardButton res = QMessageBox::question(this, tr("Save Changes?"),
                                                               tr("You made changes to the current executable, do you want to save them?"),
-                                                              QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-      if (res == QMessageBox::Cancel) {
-        return;
-      } else if (res == QMessageBox::Yes) {
-        // this invalidates the item passed as a a parameter
+                                                              QMessageBox::Yes | QMessageBox::No);
+      if (res == QMessageBox::Yes) {
         saveExecutable();
 
+        //This is necessary if we're adding a new item, but it doesn't look very nice.
+        //Ideally we'd end up with the correct row displayed
+        ui->executablesListBox->selectionModel()->clearSelection();
+        ui->executablesListBox->selectionModel()->select(current, QItemSelectionModel::SelectCurrent);
         QTimer::singleShot(50, this, SLOT(delayedRefresh()));
         return;
       }
     }
 
+    ui->executablesListBox->selectionModel()->clearSelection();
+    ui->executablesListBox->selectionModel()->select(current, QItemSelectionModel::SelectCurrent);
+
     m_CurrentItem = ui->executablesListBox->item(current.row());
 
     Executable const &selectedExecutable(m_ExecutablesList.find(m_CurrentItem->text()));

src/fomodinstallerdialog.ui

@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FomodInstallerDialog</class>
- <widget class="QDialog" name="FomodInstallerDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>662</width>
-    <height>501</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>FOMOD Installation Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Name</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="nameEdit"/>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1">
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <layout class="QFormLayout" name="formLayout">
-         <property name="fieldGrowthPolicy">
-          <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-         </property>
-         <property name="horizontalSpacing">
-          <number>15</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_3">
-           <property name="text">
-            <string>Author</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QLabel" name="authorLabel">
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_4">
-           <property name="text">
-            <string>Version</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QLabel" name="versionLabel">
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>Website</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QLabel" name="websiteLabel">
-           <property name="text">
-            <string>&lt;a href=&quot;#&quot;&gt;Link&lt;/a&gt;</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QTextEdit" name="descriptionText">
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="screenshotLabel">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QStackedWidget" name="stepsStack">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="currentIndex">
-        <number>-1</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <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="manualBtn">
-       <property name="text">
-        <string>Manual</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="prevBtn">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Back</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="nextBtn">
-       <property name="text">
-        <string>Next</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cancelBtn">
-       <property name="text">
-        <string>Cancel</string>
-       </property>
-       <property name="default">
-        <bool>false</bool>
-       </property>
-       <property name="flat">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/installationmanager.cpp

@@ -34,6 +34,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <installationtester.h>
 #include <gameinfo.h>
 #include <utility.h>
+#include <scopeguard.h>
 #include <QFileInfo>
 #include <QLibrary>
 #include <QInputDialog>
@@ -71,7 +72,6 @@ static T resolveFunction(QLibrary &lib, const char *name)
 
 InstallationManager::InstallationManager()
   : m_ParentWidget(nullptr)
-  , m_InstallationProgress(nullptr)
   , m_SupportedExtensions({ "zip", "rar", "7z", "fomod", "001" })
 {
   QLibrary archiveLib("dlls\\archive.dll");
@@ -85,8 +85,6 @@ InstallationManager::InstallationManager()
   if (!m_CurrentArchive->isValid()) {
     throw MyException(getErrorString(m_CurrentArchive->getLastError()));
   }
-
-  m_InstallationProgress.setWindowFlags(m_InstallationProgress.windowFlags() & (~Qt::WindowContextHelpButtonHint));
 }
 
 
@@ -97,7 +95,6 @@ InstallationManager::~InstallationManager()
 
 void InstallationManager::setParentWidget(QWidget *widget)
 {
-  m_InstallationProgress.setParent(widget, Qt::Dialog);
   for (IPluginInstaller *installer : m_Installers) {
     installer->setParentWidget(widget);
   }
@@ -171,19 +168,24 @@ bool InstallationManager::unpackSingleFile(const QString &fileName)
     return false;
   }
 
-  m_InstallationProgress.setWindowTitle(tr("Extracting files"));
-  m_InstallationProgress.setLabelText(QString());
-  m_InstallationProgress.setValue(0);
-  m_InstallationProgress.setWindowModality(Qt::WindowModal);
-  m_InstallationProgress.show();
+  m_InstallationProgress = new QProgressDialog(m_ParentWidget);
+  ON_BLOCK_EXIT([this] () {
+    m_InstallationProgress->hide();
+    m_InstallationProgress->deleteLater();
+    m_InstallationProgress = nullptr;
+  });
+  m_InstallationProgress->setWindowFlags(
+        m_InstallationProgress->windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+  m_InstallationProgress->setWindowTitle(tr("Extracting files"));
+  m_InstallationProgress->setWindowModality(Qt::WindowModal);
+  m_InstallationProgress->show();
 
   bool res = m_CurrentArchive->extract(ToWString(QDir::toNativeSeparators(QDir::tempPath())).c_str(),
                                 new MethodCallback<InstallationManager, void, float>(this, &InstallationManager::updateProgress),
                                 new MethodCallback<InstallationManager, void, LPCWSTR>(this, &InstallationManager::dummyProgressFile),
                                 new MethodCallback<InstallationManager, void, LPCWSTR>(this, &InstallationManager::report7ZipError));
 
-  m_InstallationProgress.hide();
-
   return res;
 }
 
@@ -191,7 +193,7 @@ bool InstallationManager::unpackSingleFile(const QString &fileName)
 QString InstallationManager::extractFile(const QString &fileName)
 {
   if (unpackSingleFile(fileName)) {
-    return QDir::tempPath().append("/").append(QFileInfo(fileName).fileName());
+    return QDir::tempPath() + "/" + QFileInfo(fileName).fileName();
   } else {
     return QString();
   }
@@ -215,7 +217,7 @@ QStringList InstallationManager::extractFiles(const QStringList &filesOrig, bool
 {
   QStringList files;
 
-  foreach (const QString &file, filesOrig) {
+  for (const QString &file : filesOrig) {
     files.append(canonicalize(file));
   }
 
@@ -249,22 +251,26 @@ QStringList InstallationManager::extractFiles(const QStringList &filesOrig, bool
     }
   }
 
-  m_InstallationProgress.setWindowTitle(tr("Extracting files"));
-  m_InstallationProgress.setLabelText(QString());
-  m_InstallationProgress.setValue(0);
-  m_InstallationProgress.setWindowModality(Qt::WindowModal);
-  m_InstallationProgress.show();
+  m_InstallationProgress = new QProgressDialog(m_ParentWidget);
+  ON_BLOCK_EXIT([this] () {
+    m_InstallationProgress->hide();
+    m_InstallationProgress->deleteLater();
+    m_InstallationProgress = nullptr;
+  });
+  m_InstallationProgress->setWindowFlags(
+        m_InstallationProgress->windowFlags() & (~Qt::WindowContextHelpButtonHint));
+  m_InstallationProgress->setWindowTitle(tr("Extracting files"));
+  m_InstallationProgress->setWindowModality(Qt::WindowModal);
+  m_InstallationProgress->show();
 
   // unpack only the files we need for the installer
   if (!m_CurrentArchive->extract(ToWString(QDir::toNativeSeparators(QDir::tempPath())).c_str(),
          new MethodCallback<InstallationManager, void, float>(this, &InstallationManager::updateProgress),
          new MethodCallback<InstallationManager, void, LPCWSTR>(this, &InstallationManager::dummyProgressFile),
          new MethodCallback<InstallationManager, void, LPCWSTR>(this, &InstallationManager::report7ZipError))) {
-    m_InstallationProgress.hide();
     throw MyException(QString("extracting failed (%1)").arg(m_CurrentArchive->getLastError()));
   }
 
-  m_InstallationProgress.hide();
   return result;
 }
 
@@ -387,21 +393,21 @@ DirectoryTree::Node *InstallationManager::getSimpleArchiveBase(DirectoryTree *da
 
 void InstallationManager::updateProgress(float percentage)
 {
-  m_InstallationProgress.setValue(static_cast<int>(percentage * 100.0));
-  if (m_InstallationProgress.wasCanceled()) {
-    m_CurrentArchive->cancel();
-    m_InstallationProgress.reset();
+  if (m_InstallationProgress != nullptr) {
+    m_InstallationProgress->setValue(static_cast<int>(percentage * 100.0));
+    if (m_InstallationProgress->wasCanceled()) {
+      m_CurrentArchive->cancel();
+      m_InstallationProgress->reset();
+    }
   }
 }
 
 
 void InstallationManager::updateProgressFile(LPCWSTR fileName)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-  m_InstallationProgress.setLabelText(QString::fromWCharArray(fileName));
-#else
-  m_InstallationProgress.setLabelText(QString::fromUtf16(fileName));
-#endif
+  if (m_InstallationProgress != nullptr) {
+    m_InstallationProgress->setLabelText(QString::fromWCharArray(fileName));
+  }
 }
 
 
@@ -533,16 +539,21 @@ bool InstallationManager::doInstall(GuessedValue<QString> &modName, int modID,
 
   qDebug("installing to \"%s\"", targetDirectoryNative.toUtf8().constData());
 
-  m_InstallationProgress.setWindowTitle(tr("Extracting files"));
-  m_InstallationProgress.setLabelText(QString());
-  m_InstallationProgress.setValue(0);
-  m_InstallationProgress.setWindowModality(Qt::WindowModal);
-  m_InstallationProgress.show();
+  m_InstallationProgress = new QProgressDialog(m_ParentWidget);
+  ON_BLOCK_EXIT([this] () {
+    m_InstallationProgress->hide();
+    m_InstallationProgress->deleteLater();
+    m_InstallationProgress = nullptr;
+  });
+
+  m_InstallationProgress->setWindowFlags(
+        m_InstallationProgress->windowFlags() & (~Qt::WindowContextHelpButtonHint));
+  m_InstallationProgress->setWindowModality(Qt::WindowModal);
+  m_InstallationProgress->show();
   if (!m_CurrentArchive->extract(ToWString("\\\\?\\" + targetDirectoryNative).c_str(),
          new MethodCallback<InstallationManager, void, float>(this, &InstallationManager::updateProgress),
          new MethodCallback<InstallationManager, void, LPCWSTR>(this, &InstallationManager::updateProgressFile),
          new MethodCallback<InstallationManager, void, LPCWSTR>(this, &InstallationManager::report7ZipError))) {
-    m_InstallationProgress.hide();
     if (m_CurrentArchive->getLastError() == Archive::ERROR_EXTRACT_CANCELLED) {
       return false;
     } else {
@@ -550,8 +561,6 @@ bool InstallationManager::doInstall(GuessedValue<QString> &modName, int modID,
     }
   }
 
-  m_InstallationProgress.hide();
-
   QSettings settingsFile(targetDirectory + "/meta.ini", QSettings::IniFormat);
 
   // overwrite settings only if they are actually are available or haven't been set before
@@ -676,6 +685,11 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
   }
   qDebug("using mod name \"%s\" (id %d) -> %s", modName->toUtf8().constData(), modID, qPrintable(m_CurrentFile));
 
+  //If there's an archive already open, close it. This happens with the bundle
+  //installer when it uncompresses a split archive, then finds it has a real archive
+  //to deal with.
+  m_CurrentArchive->close();
+
   // open the archive and construct the directory tree the installers work on
   bool archiveOpen = m_CurrentArchive->open(ToWString(QDir::toNativeSeparators(fileName)).c_str(),
                                             new MethodCallback<InstallationManager, void, LPSTR>(this, &InstallationManager::queryPassword));

src/installationmanager.h

@@ -208,7 +208,7 @@ private:
   Archive *m_CurrentArchive;
   QString m_CurrentFile;
 
-  QProgressDialog m_InstallationProgress;
+  QProgressDialog *m_InstallationProgress { nullptr };
 
   std::set<QString> m_TempFilesToDelete;
 

src/logbuffer.h

@@ -91,7 +91,7 @@ private:
   QString m_OutFileName;
   bool m_ShutDown;
   QtMsgType m_MinMsgType;
-  unsigned int m_NumMessages;
+  size_t m_NumMessages;
   std::vector<Message> m_Messages;
   
 };

src/main.cpp

@@ -23,18 +23,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <vld.h>
 #endif // LEAK_CHECK_WITH_VLD
 
-#include <QApplication>
-#include <QPushButton>
-#include <QListWidget>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QDir>
-#include <QFileInfo>
-#include <QSettings>
-#include <QWhatsThis>
-#include <QToolBar>
-#include <QFileDialog>
-#include <QDesktopServices>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <DbgHelp.h>
@@ -64,6 +52,22 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "tutorialmanager.h"
 #include "nxmaccessmanager.h"
 #include <iostream>
+#include <ShellAPI.h>
+#include <eh.h>
+#include <windows_error.h>
+#include <boost/scoped_array.hpp>
+#include <QApplication>
+#include <QPushButton>
+#include <QListWidget>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QDir>
+#include <QFileInfo>
+#include <QSettings>
+#include <QWhatsThis>
+#include <QToolBar>
+#include <QFileDialog>
+#include <QDesktopServices>
 #include <QMessageBox>
 #include <QSharedMemory>
 #include <QBuffer>
@@ -71,10 +75,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDirIterator>
 #include <QDesktopServices>
 #include <QLibraryInfo>
-#include <ShellAPI.h>
-#include <eh.h>
-#include <windows_error.h>
-#include <boost/scoped_array.hpp>
+#include <QSslSocket>
 
 
 #pragma comment(linker, "/manifestDependency:\"name='dlls' processorArchitecture='x86' version='1.0.0.0' type='win32' \"")
@@ -236,10 +237,10 @@ static LONG WINAPI MyUnhandledExceptionFilter(struct _EXCEPTION_POINTERS *except
             return EXCEPTION_EXECUTE_HANDLER;
           }
           _snprintf(errorBuffer, errorLen, "failed to save minidump to %ls (error %lu)",
-                     dumpName.c_str(), ::GetLastError());
+                    dumpName.c_str(), ::GetLastError());
         } else {
           _snprintf(errorBuffer, errorLen, "failed to create %ls (error %lu)",
-                     dumpName.c_str(), ::GetLastError());
+                    dumpName.c_str(), ::GetLastError());
         }
       } else {
         return result;
@@ -378,7 +379,7 @@ int main(int argc, char *argv[])
 
     LogBuffer::init(100, QtDebugMsg, qApp->property("dataPath").toString() + "/logs/mo_interface.log");
 
-#if QT_VERSION >= 0x050000
+#if QT_VERSION >= 0x050000 && !defined(QT_NO_SSL)
     qDebug("ssl support: %d", QSslSocket::supportsSsl());
 #endif