Merge pull request #695 from ModOrganizer2/Develop

Stage for Release 2.2.0

.github/ISSUE_TEMPLATE/dev-ticket.md

@@ -0,0 +1,10 @@
+---
+name: Dev Ticket
+about: Reserved for development tasks and management.
+title: ''
+labels: Dev Ticket
+assignees: ''
+
+---
+
+Task:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: Feature Request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/issue-report.md

@@ -0,0 +1,41 @@
+---
+name: Issue Report
+about: Create an issue report.
+title: ''
+labels: issue report
+assignees: ''
+
+---
+
+## The problem:
+Briefly describe the issue you are experiencing. Tell us what you were trying to do and what happened instead. Remember, this is _not_ a place to ask questions. For that, go to our [discord channel](https://discord.gg/5tCqt6V)
+
+
+## To Reproduce:
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+
+## Environment:
+
+* Mod Organizer Version that exhibits the issue:
+* Last Mod Organizer Verison that did not exhibit the issue (if applicable):
+* Desktop OS/version used to run Mod Organizer:
+
+## Details:
+If necessary, describe the problem you have been experiencing with more details and pictures.
+
+
+## Link to Mod Organizer logs:
+To access the log files you can press the Open folder icon over the modlist and select "Open MO2 Logs folder". You should close MO2 before sending or examining the logs as they are finished writing only after the program is closed.
+
+### USVFS:
+Create a [GIST](https://gist.github.com) which is a paste of your USVFS logs, and link them here.
+Do _NOT_ paste your full USVFS logs here, as it will make this issue very long and hard to read!
+If you are reporting a bug, _always_ include the USVFS logs!
+
+### MO Interface:
+Create a [GIST](https://gist.github.com) which is a paste of your mo_interface logs, and link them here.
+Do _NOT_ paste your full mo_interface logs here, as it will make this issue very long and hard to read!
+If you are reporting a bug, _always_ include the mo_interface logs!

appveyor.yml

@@ -0,0 +1,28 @@
+version: 1.0.{build}
+skip_branch_with_pr: true
+image: Visual Studio 2017
+environment:
+  WEBHOOK_URL:
+    secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1VYoNNsKROB4s6VsQiL6qbLNLc4XQhc8Y9DhdU9Hfh49vhypcjUEQmMsENxnp+1hYMJctTqIYDunVSd767eez5wz6rKHqk+XOHmg5gyVNCV9u4DVcCZJSVe4UTKn1lc47H0=
+build_script:
+- cmd: >-
+    git clone --depth=1 --branch=%APPVEYOR_REPO_BRANCH% https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null
+
+    mkdir c:\projects\modorganizer-build -type directory
+
+    cd c:\projects\modorganizer-umbrella
+
+    C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True %APPVEYOR_PROJECT_NAME%
+artifacts:
+- path: vsbuild\src\RelWithDebInfo\ModOrganizer.exe
+  name: modorganizer_exe
+- path: vsbuild\src\RelWithDebInfo\ModOrganizer.pdb
+  name: modorganizer_pdb
+on_success:
+  - ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+  - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 success $env:WEBHOOK_URL
+on_failure:
+  - ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+  - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 failure $env:WEBHOOK_URL

readme.md

@@ -1,3 +1,5 @@
+[![Build status](https://ci.appveyor.com/api/projects/status/23qmd9rufv9vpmg7?svg=true)](https://ci.appveyor.com/project/Modorganizer2/modorganizer)
+
 # 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.
@@ -82,4 +84,3 @@ Here is a complete list:
 ### Unused Repositories
 * https://github.com/Modorganizer2/modorganizer-hookdll
 * https://github.com/TanninOne/modorganizer-tool_nmmimport
-

src/CMakeLists.txt

@@ -54,7 +54,6 @@ SET(organizer_SRCS
     executableslist.cpp
     editexecutablesdialog.cpp
     downloadmanager.cpp
-    downloadlistwidgetcompact.cpp
     downloadlistwidget.cpp
     downloadlistsortproxy.cpp
     downloadlist.cpp
@@ -80,7 +79,6 @@ SET(organizer_SRCS
     previewgenerator.cpp
     previewdialog.cpp
     aboutdialog.cpp
-    json.cpp
     modflagicondelegate.cpp
     genericicondelegate.cpp
     organizerproxy.cpp
@@ -92,6 +90,9 @@ SET(organizer_SRCS
     eventfilter.cpp
     moshortcut.cpp
     listdialog.cpp
+    lcdnumber.cpp
+    forcedloaddialog.cpp
+    forcedloaddialogwidget.cpp
 
     shared/windows_error.cpp
     shared/error_report.cpp
@@ -146,7 +147,6 @@ SET(organizer_HDRS
     executableslist.h
     editexecutablesdialog.h
     downloadmanager.h
-    downloadlistwidgetcompact.h
     downloadlistwidget.h
     downloadlistsortproxy.h
     downloadlist.h
@@ -172,7 +172,6 @@ SET(organizer_HDRS
     previewgenerator.h
     previewdialog.h
     aboutdialog.h
-    json.h
     modflagicondelegate.h
     genericicondelegate.h
     organizerproxy.h
@@ -187,6 +186,9 @@ SET(organizer_HDRS
     descriptionpage.h
     moshortcut.h
     listdialog.h
+    lcdnumber.h
+    forcedloaddialog.h
+    forcedloaddialogwidget.h
 
     shared/windows_error.h
     shared/error_report.h
@@ -216,8 +218,6 @@ SET(organizer_UIS
     installdialog.ui
     finddialog.ui
     editexecutablesdialog.ui
-    downloadlistwidgetcompact.ui
-    downloadlistwidget.ui
     credentialsdialog.ui
     categoriesdialog.ui
     activatemodsdialog.ui
@@ -228,6 +228,8 @@ SET(organizer_UIS
     browserdialog.ui
     aboutdialog.ui
     listdialog.ui
+    forcedloaddialog.ui
+    forcedloaddialogwidget.ui
   )
 
 SET(organizer_QRCS
@@ -246,7 +248,8 @@ SOURCE_GROUP(Headers FILES ${organizer_HDRS})
 SOURCE_GROUP(UI FILES ${organizer_UIS})
 
 # MO projects
-SET(default_project_path "${CMAKE_SOURCE_DIR}/..")
+SET(dependency_project_path "${DEPENDENCIES_DIR}")
+SET(default_project_path "${DEPENDENCIES_DIR}/modorganizer_super")
 GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
 
 SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")
@@ -263,6 +266,7 @@ FIND_PACKAGE(Qt5Quick REQUIRED)
 FIND_PACKAGE(Qt5Network REQUIRED)
 FIND_PACKAGE(Qt5WinExtras REQUIRED)
 FIND_PACKAGE(Qt5WebEngineWidgets REQUIRED)
+FIND_PACKAGE(Qt5WebSockets REQUIRED)
 FIND_PACKAGE(Qt5Qml REQUIRED)
 FIND_PACKAGE(Qt5LinguistTools)
 QT5_WRAP_UI(organizer_UIHDRS ${organizer_UIS})
@@ -292,7 +296,7 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src
                     ${project_path}/bsatk/src
                     ${project_path}/esptk/src
                     ${project_path}/archive/src
-                    ${project_path}/../usvfs/include
+                    ${dependency_project_path}/usvfs/include
                     ${project_path}/game_gamebryo/src/gamebryo
                     ${project_path}/game_gamebryo/src/creation
                     ${project_path}/game_features/src
@@ -321,12 +325,12 @@ ENDIF()
 ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIHDRS} ${organizer_RCS} ${organizer_RCCPPS} ${organizer_translations_qm})
 TARGET_LINK_LIBRARIES(ModOrganizer
                       Qt5::Widgets Qt5::WinExtras Qt5::WebEngineWidgets Qt5::Quick
-                      Qt5::Qml Qt5::QuickWidgets Qt5::Network
+                      Qt5::Qml Qt5::QuickWidgets Qt5::Network Qt5::WebSockets
                       ${Boost_LIBRARIES}
                       zlibstatic
                       uibase esptk bsatk githubpp
                       ${usvfs_name}
-                      Dbghelp advapi32 Version Shlwapi liblz4)
+                      Dbghelp advapi32 Version Shlwapi liblz4 Crypt32)
 
 IF (MSVC)
   SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS "/std:c++latest")
@@ -359,17 +363,19 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5
         DESTINATION bin/dlls
         RENAME dlls.manifest)
 
+INSTALL(FILES ${organizer_translations_qm} DESTINATION bin/translations)
+
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stylesheets
+                  ${CMAKE_CURRENT_SOURCE_DIR}/tutorials
+        DESTINATION bin)
+
+#We should do this last, since windeployqt.exe scans the folders in bin for required modules e.g QtQuick.2 required by tutorials.
 # use windeployqt.exe to install all required libraries
 SET(windeploy_parameters "--no-translations --plugindir qtplugins --libdir dlls --release-with-debug-info --no-compiler-runtime")
 INSTALL(
     CODE
     "EXECUTE_PROCESS(COMMAND
-        ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets ${windeploy_parameters}
-        WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
-    )
-    # run it a second time because on the first run it misses some files
-    EXECUTE_PROCESS(COMMAND
-        ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets ${windeploy_parameters}
+        ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets --websockets ${windeploy_parameters}
         WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
     )
     EXECUTE_PROCESS(COMMAND
@@ -386,10 +392,4 @@ INSTALL(
 )
 
 # qdds.dll needs installing manually as Qt no longer ships with it by default.
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll DESTINATION bin/dlls/imageformats)
-
-install(FILES ${organizer_translations_qm} DESTINATION bin/translations)
-
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stylesheets
-                  ${CMAKE_CURRENT_SOURCE_DIR}/tutorials
-        DESTINATION bin)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll DESTINATION bin/dlls/imageformats)