Merge pull request #793 from ModOrganizer2/Develop

Stage for release 2.2.1
Merge branch 'Develop'
2026-07-27 13:58:24 -07:00 · 2019-07-22 01:01:40 -05:00 · 2019-07-22 01:00:42 -05:00 · 2019-07-22 00:57:17 -05:00 · 2019-07-14 17:15:43 +02:00 · 2019-07-14 02:46:57 +02:00
161 changed files with 41655 additions and 26799 deletions
@@ -1,15 +1,33 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

-ADD_COMPILE_OPTIONS($<$<CXX_COMPILER_ID:MSVC>:/MP>)
+ADD_COMPILE_OPTIONS($<$<CXX_COMPILER_ID:MSVC>:/MP> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELEASE>:/O2>> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELWITHDEBINFO>:/O2>>)

 PROJECT(organizer)

 # sets ModOrganizer as StartUp Project in Visual Studio
 set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY VS_STARTUP_PROJECT "ModOrganizer")

+set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
+set(CMAKE_INSTALL_MESSAGE NEVER)
+
 SET(DEPENDENCIES_DIR CACHE PATH "")
 # hint to find qt in dependencies path
 LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
 LIST(APPEND CMAKE_PREFIX_PATH ${LZ4_ROOT}/dll)

 ADD_SUBDIRECTORY(src)
+
+set(vcxproj_user_file "${CMAKE_CURRENT_BINARY_DIR}/INSTALL.vcxproj.user")
+if(NOT EXISTS ${vcxproj_user_file})
+	FILE(WRITE ${vcxproj_user_file}
+		"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+			"<Project ToolsVersion=\"Current\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
+			  "<PropertyGroup>\n"
+				"<LocalDebuggerWorkingDirectory>${CMAKE_INSTALL_PREFIX}/bin</LocalDebuggerWorkingDirectory>\n"
+				"<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>"
+				"<LocalDebuggerCommand>${CMAKE_INSTALL_PREFIX}/bin/ModOrganizer.exe</LocalDebuggerCommand>\n"
+			  "</PropertyGroup>\n"
+			"</Project>\n")
+endif()
+
+INSTALL(FILES dump_running_process.bat DESTINATION bin)
@@ -0,0 +1,32 @@
+version: 1.0.{build}
+skip_branch_with_pr: true
+image: Visual Studio 2019
+environment:
+  WEBHOOK_URL:
+    secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1VYoNNsKROB4s6VsQiL6qbLNLc4XQhc8Y9DhdU9Hfh49vhypcjUEQmMsENxnp+1hYMJctTqIYDunVSd767eez5wz6rKHqk+XOHmg5gyVNCV9u4DVcCZJSVe4UTKn1lc47H0=
+build:
+  parallel: true
+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: build\src\ModOrganizer.exe
+  name: modorganizer_exe
+- path: build\src\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: Push-AppveyorArtifact ${env:APPVEYOR_BUILD_FOLDER}\stdout.log
+  - ps: Push-AppveyorArtifact ${env:APPVEYOR_BUILD_FOLDER}\stderr.log
+  - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 failure $env:WEBHOOK_URL
@@ -0,0 +1,2 @@
+pushd "%~dp0"
+start ModOrganizer.exe --crashdump
@@ -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
-
@@ -9,6 +9,28 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
  SET(PROJ_ARCH x64)
 ENDIF()

+macro(add_msvc_precompiled_header PrecompiledHeader PrecompiledSource SourcesVar HeadersVar)
+  if(MSVC)
+    get_filename_component(PrecompiledBasename ${PrecompiledHeader} NAME_WE)
+    set(PrecompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${PrecompiledBasename}.pch")
+    set(Sources ${${SourcesVar}})
+
+    set_source_files_properties(
+		${PrecompiledSource} PROPERTIES
+		COMPILE_FLAGS "/Yc\"${PrecompiledHeader}\" /Fp\"${PrecompiledBinary}\""
+		OBJECT_OUTPUTS "${PrecompiledBinary}")
+
+    set_source_files_properties(
+		${Sources} PROPERTIES
+		COMPILE_FLAGS "/Yu\"${PrecompiledHeader}\" /FI\"${PrecompiledHeader}\" /Fp\"${PrecompiledBinary}\""
+		OBJECT_DEPENDS "${PrecompiledBinary}")
+
+    list(APPEND ${SourcesVar} ${PrecompiledSource})
+	list(APPEND ${HeadersVar} ${PrecompiledHeader})
+  endif(MSVC)
+endmacro(add_msvc_precompiled_header)
+
+
 SET(organizer_SRCS
    transfersavesdialog.cpp
    syncoverwritedialog.cpp
@@ -32,6 +54,14 @@ SET(organizer_SRCS
    modlist.cpp
    modidlineedit.cpp
    modinfodialog.cpp
+	modinfodialogcategories.cpp
+	modinfodialogconflicts.cpp
+	modinfodialogesps.cpp
+	modinfodialogfiletree.cpp
+	modinfodialogimages.cpp
+	modinfodialognexus.cpp
+	modinfodialogtab.cpp
+	modinfodialogtextfiles.cpp
    modinfo.cpp
    modinfobackup.cpp
    modinfoforeign.cpp
@@ -79,7 +109,6 @@ SET(organizer_SRCS
    previewgenerator.cpp
    previewdialog.cpp
    aboutdialog.cpp
-    json.cpp
    modflagicondelegate.cpp
    genericicondelegate.cpp
    organizerproxy.cpp
@@ -94,6 +123,12 @@ SET(organizer_SRCS
    lcdnumber.cpp
    forcedloaddialog.cpp
    forcedloaddialogwidget.cpp
+	filterwidget.cpp
+	statusbar.cpp
+	apiuseraccount.cpp
+	filerenamer.cpp
+	texteditor.cpp
+	expanderwidget.cpp

    shared/windows_error.cpp
    shared/error_report.cpp
@@ -127,6 +162,15 @@ SET(organizer_HDRS
    modlist.h
    modidlineedit.h
    modinfodialog.h
+	modinfodialogcategories.h
+	modinfodialogconflicts.h
+	modinfodialogesps.h
+	modinfodialogfiletree.h
+	modinfodialogfwd.h
+	modinfodialogimages.h
+	modinfodialognexus.h
+	modinfodialogtab.h
+	modinfodialogtextfiles.h
    modinfo.h
    modinfobackup.h
    modinfoforeign.h
@@ -173,7 +217,6 @@ SET(organizer_HDRS
    previewgenerator.h
    previewdialog.h
    aboutdialog.h
-    json.h
    modflagicondelegate.h
    genericicondelegate.h
    organizerproxy.h
@@ -185,12 +228,17 @@ SET(organizer_HDRS
    instancemanager.h
    usvfsconnector.h
    eventfilter.h
-    descriptionpage.h
    moshortcut.h
    listdialog.h
    lcdnumber.h
    forcedloaddialog.h
    forcedloaddialogwidget.h
+	filterwidget.h
+	statusbar.h
+	apiuseraccount.h
+	filerenamer.h
+	texteditor.h
+	expanderwidget.h

    shared/windows_error.h
    shared/error_report.h
@@ -205,7 +253,6 @@ SET(organizer_HDRS
 SET(organizer_UIS
    transfersavesdialog.ui
    syncoverwritedialog.ui
-    simpleinstalldialog.ui
    settingsdialog.ui
    selectiondialog.ui
    queryoverwritedialog.ui
@@ -217,8 +264,6 @@ SET(organizer_UIS
    mainwindow.ui
    lockeddialog.ui
    waitingonclosedialog.ui
-    installdialog.ui
-    finddialog.ui
    editexecutablesdialog.ui
    credentialsdialog.ui
    categoriesdialog.ui
@@ -245,15 +290,191 @@ SET(organizer_RCS
 	)


-SOURCE_GROUP(Source FILES ${organizer_SRCS})
-SOURCE_GROUP(Headers FILES ${organizer_HDRS})
-SOURCE_GROUP(UI FILES ${organizer_UIS})
+source_group(src REGULAR_EXPRESSION ".*\\.(h|cpp|ui)")
+
+set(application
+	iuserinterface
+	main
+	mainwindow
+	moapplication
+	moshortcut
+	selfupdater
+	singleinstance
+	statusbar
+)
+
+set(browser
+	browserdialog
+	browserview
+)
+
+set(core
+	categories
+	shared/directoryentry
+	directoryrefresher
+	installationmanager
+	instancemanager
+	loadmechanism
+	nexusinterface
+	nxmaccessmanager
+	organizercore
+	organizerproxy
+	apiuseraccount
+)
+
+set(dialogs
+	aboutdialog
+	activatemodsdialog
+	categoriesdialog
+	credentialsdialog
+	filedialogmemory
+	forcedloaddialog
+	forcedloaddialogwidget
+	listdialog
+	messagedialog
+	motddialog
+	overwriteinfodialog
+	queryoverwritedialog
+	problemsdialog
+	savetextasdialog
+	selectiondialog
+	syncoverwritedialog
+	transfersavesdialog
+	waitingonclosedialog
+)
+
+set(downloads
+	downloadlist
+	downloadlistsortproxy
+	downloadlistwidget
+	downloadmanager
+)
+
+set(executables
+	executableslist
+	editexecutablesdialog
+)
+
+set(locking
+	ilockedwaitingforprocess
+	lockeddialog
+	lockeddialogbase
+)
+
+set(modinfo
+	modinfo
+	modinfobackup
+	modinfoforeign
+	modinfooverwrite
+	modinforegular
+	modinfoseparator
+	modinfowithconflictinfo
+)
+
+set(modinfo\\dialog
+	modinfodialog
+	modinfodialogcategories
+	modinfodialogconflicts
+	modinfodialogesps
+	modinfodialogfiletree
+	modinfodialogfwd
+	modinfodialogimages
+	modinfodialognexus
+	modinfodialogtab
+	modinfodialogtextfiles
+)
+set(modlist
+	modlist
+	modlistsortproxy
+	modlistview
+)
+
+set(plugins
+	plugincontainer
+	pluginlist
+	pluginlistsortproxy
+	pluginlistview
+)
+
+set(previews
+	previewdialog
+	previewgenerator
+)
+
+set(profiles
+	profile
+	profileinputdialog
+	profilesdialog
+)
+
+set(settings
+	settings
+	settingsdialog
+)
+
+set(utilities
+	shared/appconfig
+	bbcode
+	csvbuilder
+	shared/error_report
+	eventfilter
+	helper
+	shared/leaktrace
+	persistentcookiejar
+	serverinfo
+	spawn
+	shared/stackdata
+	shared/util
+	usvfsconnector
+	shared/windows_error
+)
+
+set(widgets
+	expanderwidget
+	genericicondelegate
+	filerenamer
+	filterwidget
+	icondelegate
+	lcdnumber
+	logbuffer
+	loghighlighter
+	modflagicondelegate
+	modidlineedit
+	noeditdelegate
+	qtgroupingproxy
+	texteditor
+	viewmarkingscrollbar
+)
+
+set(src_filters
+	application core browser dialogs downloads executables locking modinfo modinfo\\dialog
+	modlist plugins previews profiles settings utilities widgets
+)
+
+foreach(filter in list ${src_filters})
+	set(files)
+	foreach(d in lists ${${filter}})
+		set(files ${files} ${d}.cpp ${d}.h ${d}.inc ${d}.ui)
+	endforeach()
+
+	source_group(src\\${filter} FILES ${files})
+endforeach()
+
+file(GLOB_RECURSE rule_files ../vsbuild/CMakeFiles/*.rule)
+file(GLOB qm_files ../vsbuild/src/*.qm)
+
+source_group(cmake FILES CMakeLists.txt)
+source_group(autogen FILES ${rule_files} ${qm_files})
+source_group(resources FILES ${organizer_RCS} ${organizer_QRCS})

 # 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")
+
+add_msvc_precompiled_header("pch.h" "pch.cpp" organizer_SRCS organizer_HDRS)
+
 #TODO this should not be a hardcoded path
 SET(lib_path "${project_path}/../../install/libs")

@@ -261,18 +482,25 @@ SET(lib_path "${project_path}/../../install/libs")
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 SET(CMAKE_AUTOMOC ON)
 SET(CMAKE_AUTOUIC ON)
+SET(CMAKE_AUTORCC ON)
+
 FIND_PACKAGE(Qt5Widgets REQUIRED)
 FIND_PACKAGE(Qt5QuickWidgets REQUIRED)
 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})
-QT5_ADD_RESOURCES(organizer_RCCPPS ${organizer_QRCS})
+
 SET(mo_translation_sources ${CMAKE_SOURCE_DIR}/src ${project_path}/uibase/src)
-QT5_CREATE_TRANSLATION(organizer_translations_qm ${mo_translation_sources} ${CMAKE_SOURCE_DIR}/src/organizer_en.ts)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set_property(GLOBAL PROPERTY AUTOGEN_SOURCE_GROUP autogen)
+set_property(GLOBAL PROPERTY AUTOMOC_SOURCE_GROUP autogen)
+set_property(GLOBAL PROPERTY AUTORCC_SOURCE_GROUP autogen)
+
+QT5_CREATE_TRANSLATION(organizer_translations_qm ${mo_translation_sources} ${CMAKE_SOURCE_DIR}/src/organizer_en.ts OPTIONS -silent)
 ADD_CUSTOM_TARGET(translations DEPENDS ${organizer_translations_qm})

 INCLUDE_DIRECTORIES(${Qt5Declarative_INCLUDES})
@@ -296,17 +524,17 @@ 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
                    ${project_path}/githubpp/src
-                    ${LZ4_ROOT}/include)
+                    ${LZ4_ROOT}/lib)

 INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS})
 LINK_DIRECTORIES(${lib_path}
                 ${ZLIB_ROOT}/lib
-                 ${LZ4_ROOT}/dll)
+                 ${LZ4_ROOT}/bin)
 EXECUTE_PROCESS(
  COMMAND git log -1 --format=%h
  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -322,18 +550,18 @@ ELSE()
  SET(usvfs_name usvfs_x86)
 ENDIF()

-ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIHDRS} ${organizer_RCS} ${organizer_RCCPPS} ${organizer_translations_qm})
+ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIS} ${organizer_RCS} ${organizer_QRCS} ${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")
+  SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS "/std:c++latest /permissive-")
 ENDIF()
 IF (MSVC AND "${CMAKE_SIZEOF_VOID_P}" EQUAL 4)
  # 32 bits
@@ -363,21 +591,23 @@ 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 --verbose 0 ModOrganizer.exe --webenginewidgets --websockets ${windeploy_parameters}
        WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
    )
    EXECUTE_PROCESS(COMMAND
-        ${qt5bin}/windeployqt.exe uibase.dll ${windeploy_parameters}
+        ${qt5bin}/windeployqt.exe --verbose 0 uibase.dll ${windeploy_parameters}
        WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
    )
    file(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/bin/platforms)
@@ -390,10 +620,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)
@@ -115,7 +115,7 @@ void AboutDialog::on_creditsList_currentItemChanged(QListWidgetItem *current, QL
  }
 }

-void AboutDialog::on_copyrightText_linkActivated(const QString &link)
+void AboutDialog::on_sourceText_linkActivated(const QString &link)
 {
  emit linkClicked(link);
-}
+}
@@ -74,7 +74,7 @@ private:

 private slots:
  void on_creditsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
-  void on_copyrightText_linkActivated(const QString &link);
+  void on_sourceText_linkActivated(const QString &link);

 private:

@@ -120,20 +120,43 @@
         <item>
          <widget class="QLabel" name="label_3">
           <property name="text">
-            <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright 2011-2016 Sebastian Herbord&lt;/p&gt;&lt;p&gt;Copyright 2016-2018 Mod Organizer 2 contributors&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;Copyright © 2011-2016 Sebastian Herbord&lt;br/&gt;Copyright © 2016-2019 Mod Organizer 2 Contributors&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="copyrightText">
           <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/Modorganizer2/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>
+            <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>
           </property>
           <property name="wordWrap">
            <bool>true</bool>
           </property>
          </widget>
         </item>
+         <item>
+          <spacer name="verticalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Minimum</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="sourceText">
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Source code can be found at &lt;a href=&quot;https://github.com/ModOrganizer2/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>
+          </widget>
+         </item>
        </layout>
       </widget>
       <widget class="QWidget" name="software">
@@ -157,7 +180,7 @@
         <item row="0" column="0">
          <widget class="QGroupBox" name="groupBox">
           <property name="title">
-            <string>Lead Developers/ Maintainers</string>
+            <string>Lead Developers &amp;&amp; Maintainers</string>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_6">
            <item>
@@ -175,11 +198,6 @@
                <string notr="true">AL12</string>
               </property>
              </item>
-              <item>
-               <property name="text">
-                <string notr="true">erasmux</string>
-               </property>
-              </item>
              <item>
               <property name="text">
                <string notr="true">Silarn</string>
@@ -198,7 +216,7 @@
         <item row="1" column="0">
          <widget class="QGroupBox" name="groupBox_2">
           <property name="title">
-            <string>Mo2 devs and Contributors</string>
+            <string>MO2 Developers &amp;&amp; Contributors</string>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0">
            <item>
@@ -213,12 +231,22 @@
              </item>
              <item>
               <property name="text">
-                <string>Project579</string>
+                <string notr="true">erasmux</string>
               </property>
              </item>
              <item>
               <property name="text">
-                <string>przester</string>
+                <string notr="true">isanae</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Project579</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">przester</string>
               </property>
              </item>
             </widget>
@@ -292,6 +320,11 @@
                <string notr="true">pndrev (German)</string>
               </property>
              </item>
+              <item>
+               <property name="text">
+                <string>yohru (Japanese)</string>
+               </property>
+              </item>
              <item>
               <property name="text">
                <string>Mordan (Greek)</string>
@@ -342,12 +375,12 @@
              </item>
              <item>
               <property name="text">
-                <string>yohru (Japanese)</string>
+                <string>Nubbie (Swedish)</string>
               </property>
              </item>
              <item>
               <property name="text">
-                <string>...and all other Transifex contributors!</string>
+                <string>...and all other contributors!</string>
               </property>
               <property name="toolTip">
                <string/>
@@ -0,0 +1,67 @@
+#include "apiuseraccount.h"
+
+APIUserAccount::APIUserAccount()
+  : m_type(APIUserAccountTypes::None)
+{
+}
+
+const QString& APIUserAccount::id() const
+{
+  return m_id;
+}
+
+const QString& APIUserAccount::name() const
+{
+  return m_name;
+}
+
+APIUserAccountTypes APIUserAccount::type() const
+{
+  return m_type;
+}
+
+const APILimits& APIUserAccount::limits() const
+{
+  return m_limits;
+}
+
+APIUserAccount& APIUserAccount::id(const QString& id)
+{
+  m_id = id;
+  return *this;
+}
+
+APIUserAccount& APIUserAccount::name(const QString& name)
+{
+  m_name = name;
+  return *this;
+}
+
+APIUserAccount& APIUserAccount::type(APIUserAccountTypes type)
+{
+  m_type = type;
+  return *this;
+}
+
+APIUserAccount& APIUserAccount::limits(const APILimits& limits)
+{
+  m_limits = limits;
+  return *this;
+}
+
+int APIUserAccount::remainingRequests() const
+{
+  return std::max(
+    m_limits.remainingDailyRequests,
+    m_limits.remainingHourlyRequests);
+}
+
+bool APIUserAccount::shouldThrottle() const
+{
+  return (remainingRequests() < ThrottleThreshold);
+}
+
+bool APIUserAccount::exhausted() const
+{
+  return (remainingRequests() <= 0);
+}
@@ -0,0 +1,129 @@
+#ifndef APIUSERACCOUNT_H
+#define APIUSERACCOUNT_H
+
+#include <QString>
+
+/**
+* represents user account types on a mod provider website such as nexus
+*/
+enum class APIUserAccountTypes
+{
+  // not logged in
+  None = 0,
+
+  // regular account
+  Regular,
+
+  // premium account
+  Premium
+};
+
+
+/**
+* current limits imposed on the user account
+**/
+struct APILimits
+{
+  // maximum number of requests per day
+  int maxDailyRequests = 0;
+
+  // remaining number of requests today
+  int remainingDailyRequests = 0;
+
+  // maximum number of requests per hour
+  int maxHourlyRequests = 0;
+
+  // remaining number of requests this hour
+  int remainingHourlyRequests = 0;
+};
+
+
+/**
+* API statistics
+*/
+struct APIStats
+{
+  // number of API requests currently queued
+  int requestsQueued = 0;
+};
+
+
+/**
+* represents a user account on the mod provier website
+*/
+class APIUserAccount
+{
+public:
+  // when the number of remanining requests is under this number, further
+  // requests will be throttled by avoiding non-critical ones
+  static const int ThrottleThreshold = 200;
+
+  APIUserAccount();
+
+  /**
+  * user id
+  */
+  const QString& id() const;
+
+  /**
+  * user name
+  */
+  const QString& name() const;
+
+  /**
+  * account type
+  */
+  APIUserAccountTypes type() const;
+
+  /**
+  * current API limits
+  */
+  const APILimits& limits() const;
+
+
+  /**
+  * sets the user id
+  */
+  APIUserAccount& id(const QString& id);
+
+  /**
+  * sets the user name
+  **/
+  APIUserAccount& name(const QString& name);
+
+  /**
+  * sets the acount type
+  */
+  APIUserAccount& type(APIUserAccountTypes type);
+
+  /**
+  * sets the current limits
+  */
+  APIUserAccount& limits(const APILimits& limits);
+
+
+  /**
+  * returns the number of remaining requests
+  */
+  int remainingRequests() const;
+
+  /**
+  * whether the number of remaining requests is low enough that further
+  * requests should be throttled
+  */
+  bool shouldThrottle() const;
+
+  /**
+  * true if all the remaining requests have been used and the API will refuse
+  * further requests
+  */
+  bool exhausted() const;
+
+private:
+  QString m_id, m_name;
+  APIUserAccountTypes m_type;
+  APILimits m_limits;
+  APIStats m_stats;
+};
+
+#endif // APIUSERACCOUNT_H
@@ -137,11 +137,13 @@ private:
    m_TagMap["center"] = std::make_pair(QRegExp("\\[center\\](.*)\\[/center\\]"),
                                        "<div align=\"center\">\\1</div>");
    m_TagMap["quote"]  = std::make_pair(QRegExp("\\[quote\\](.*)\\[/quote\\]"),
-                                        "<blockquote>\"\\1\"</blockquote>");
+                                        "<figure class=\"quote\"><blockquote>\\1</blockquote></figure>");
    m_TagMap["quote="] = std::make_pair(QRegExp("\\[quote=([^\\]]*)\\](.*)\\[/quote\\]"),
-                                        "<blockquote>\"\\2\"<br/><span>--\\1</span></blockquote></p>");
+                                        "<figure class=\"quote\"><blockquote>\\2</blockquote></figure>");
+    m_TagMap["spoiler"] = std::make_pair(QRegExp("\\[spoiler\\](.*)\\[/spoiler\\]"),
+      "<details><summary>Spoiler:  <div class=\"bbc_spoiler_show\">Show</div></summary><div class=\"spoiler_content\">\\1</div></details>");
    m_TagMap["code"]   = std::make_pair(QRegExp("\\[code\\](.*)\\[/code\\]"),
-                                        "<pre>\\1</pre>");
+                                        "<code>\\1</code>");
    m_TagMap["heading"]= std::make_pair(QRegExp("\\[heading\\](.*)\\[/heading\\]"),
                                        "<h2><strong>\\1</strong></h2>");
    m_TagMap["line"]   = std::make_pair(QRegExp("\\[line\\]"),
@@ -174,14 +176,14 @@ private:
                                         "<a href=\"\\1\">\\1</a>");
    m_TagMap["url="]    = std::make_pair(QRegExp("\\[url=([^\\]]*)\\](.*)\\[/url\\]"),
                                         "<a href=\"\\1\">\\2</a>");
-    m_TagMap["img"] = std::make_pair(QRegExp("\\[img\\](.*)\\[/img\\]"),
+    m_TagMap["img"] = std::make_pair(QRegExp("\\[img(?:\\s*width=\\d+\\s*,?\\s*height=\\d+)?\\](.*)\\[/img\\]"),
                                     "<img src=\"\\1\">");
    m_TagMap["img="] = std::make_pair(QRegExp("\\[img=([^\\]]*)\\](.*)\\[/img\\]"),
                                      "<img src=\"\\2\" alt=\"\\1\">");
    m_TagMap["email="]  = std::make_pair(QRegExp("\\[email=\"?([^\\]]*)\"?\\](.*)\\[/email\\]"),
                                         "<a href=\"mailto:\\1\">\\2</a>");
    m_TagMap["youtube"] = std::make_pair(QRegExp("\\[youtube\\](.*)\\[/youtube\\]"),
-                                         "<a href=\"http://www.youtube.com/v/\\1\">http://www.youtube.com/v/\\1</a>");
+                                         "<a href=\"https://www.youtube.com/watch?v=\\1\">https://www.youtube.com/watch?v=\\1</a>");


    // make all patterns non-greedy and case-insensitive
@@ -32,16 +32,6 @@ CredentialsDialog::~CredentialsDialog()
  delete ui;
 }

-QString CredentialsDialog::username() const
-{
-  return ui->usernameEdit->text();
-}
-
-QString CredentialsDialog::password() const
-{
-  return ui->passwordEdit->text();
-}
-
 bool CredentialsDialog::store() const
 {
  return ui->rememberCheck->isChecked();
@@ -34,9 +34,6 @@ public:
  explicit CredentialsDialog(QWidget *parent = 0);
  ~CredentialsDialog();

-  QString username() const;
-  QString password() const;
-
  bool store() const;
  bool neverAsk() const;

@@ -1,28 +0,0 @@
-#include <QWebEnginePage>
-
-#ifndef DESCRIPTIONPAGE_H
-#define DESCRIPTIONPAGE_H
-
-class DescriptionPage : public QWebEnginePage
-{
-    Q_OBJECT
-
-public:
-    DescriptionPage(QObject* parent = 0) : QWebEnginePage(parent){}
-
-    bool acceptNavigationRequest(const QUrl & url, QWebEnginePage::NavigationType type, bool isMainFrame)
-    {
-        if (type == QWebEnginePage::NavigationTypeLinkClicked)
-        {
-            emit linkClicked(url);
-            return false;
-        }
-        return true;
-    }
-
-signals:
-    void linkClicked(const QUrl&);
-
-};
-
-#endif //DESCRIPTIONPAGE_H
@@ -178,10 +178,9 @@ void DirectoryRefresher::refresh()
  std::wstring dataDirectory = QDir::toNativeSeparators(game->dataDirectory().absolutePath()).toStdWString();
  m_DirectoryStructure->addFromOrigin(L"data", dataDirectory, 0);

-  // TODO what was the point of having the priority in this tuple? the list is already sorted by priority
+  std::sort(m_Mods.begin(), m_Mods.end(), [](auto lhs, auto rhs){return lhs.priority < rhs.priority;});
  auto iter = m_Mods.begin();

-  //TODO i is the priority here, where higher = more important. the input vector is also sorted by priority but inverted!
  for (int i = 1; iter != m_Mods.end(); ++iter, ++i) {
    try {
      addModToStructure(m_DirectoryStructure, iter->modName, i, iter->absolutePath, iter->stealFiles, iter->archives);
@@ -21,6 +21,7 @@
  <file name="Qt5Svg.dll"/>
  <file name="Qt5WebEngineCore.dll"/>
  <file name="Qt5WebEngineWidgets.dll"/>
+  <file name="Qt5WebSockets.dll"/>
  <file name="Qt5Widgets.dll"/>
  <file name="Qt5WinExtras.dll"/>
-</assembly>
+</assembly>
@@ -47,7 +47,7 @@ int DownloadList::rowCount(const QModelIndex&) const

 int DownloadList::columnCount(const QModelIndex&) const
 {
-  return 4;
+  return COL_COUNT;
 }


@@ -69,6 +69,9 @@ QVariant DownloadList::headerData(int section, Qt::Orientation orientation, int
      (orientation == Qt::Horizontal)) {
    switch (section) {
      case COL_NAME: return tr("Name");
+      case COL_MODNAME: return tr("Mod name");
+      case COL_VERSION: return tr("Version");
+      case COL_ID: return tr("Nexus ID");
      case COL_SIZE: return tr("Size");
      case COL_STATUS: return tr("Status");
      case COL_FILETIME: return tr("Filetime");
@@ -93,6 +96,30 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
    } else {
      switch (index.column()) {
        case COL_NAME: return m_MetaDisplay ? m_Manager->getDisplayName(index.row()) : m_Manager->getFileName(index.row());
+        case COL_MODNAME: {
+          if (m_Manager->isInfoIncomplete(index.row())) {
+            return {};
+          } else {
+            const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(index.row());
+            return info->modName;
+          }
+        }
+        case COL_VERSION: {
+          if (m_Manager->isInfoIncomplete(index.row())) {
+            return {};
+          } else {
+            const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(index.row());
+            return info->version.canonicalString();
+          }
+        }
+        case COL_ID: {
+          if (m_Manager->isInfoIncomplete(index.row())) {
+            return {};
+          } else {
+            const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(index.row());
+            return QString("%1").arg(m_Manager->getModID(index.row()));
+          }
+        }
        case COL_SIZE: return sizeFormat(m_Manager->getFileSize(index.row()));
        case COL_FILETIME: return m_Manager->getFileTime(index.row());
        case COL_STATUS:
@@ -104,8 +131,9 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
            case DownloadManager::STATE_CANCELED: return tr("Canceled");
            case DownloadManager::STATE_PAUSED: return tr("Paused");
            case DownloadManager::STATE_ERROR: return tr("Error");
-            case DownloadManager::STATE_FETCHINGMODINFO: return tr("Fetching Info 1");
-            case DownloadManager::STATE_FETCHINGFILEINFO: return tr("Fetching Info 2");
+            case DownloadManager::STATE_FETCHINGMODINFO: return tr("Fetching Info");
+            case DownloadManager::STATE_FETCHINGFILEINFO: return tr("Fetching Info");
+            case DownloadManager::STATE_FETCHINGMODINFO_MD5: return tr("Fetching Info");
            case DownloadManager::STATE_READY: return tr("Downloaded");
            case DownloadManager::STATE_INSTALLED: return tr("Installed");
            case DownloadManager::STATE_UNINSTALLED: return tr("Uninstalled");
@@ -133,7 +161,7 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
        text += tr("Information missing, please select \"Query Info\" from the context menu to re-retrieve.");
      } else {
        const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(index.row());
-        return QString("%1 (ID %2) %3<br><span>%4</span>").arg(info->modName).arg(m_Manager->getModID(index.row())).arg(info->version.canonicalString()).arg(info->description);
+        return QString("%1 (ID %2) %3<br><span>%4</span>").arg(info->modName).arg(m_Manager->getModID(index.row())).arg(info->version.canonicalString()).arg(info->description.chopped(4096));
      }
      return text;
    }
@@ -142,10 +170,10 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
        && m_Manager->isInfoIncomplete(index.row()))
      return QIcon(":/MO/gui/warning_16");
  } else if (role == Qt::TextAlignmentRole) {
-    if (index.column() == COL_NAME)
-      return QVariant(Qt::AlignVCenter | Qt::AlignLeft);
-    else
+    if (index.column() == COL_SIZE)
      return QVariant(Qt::AlignVCenter | Qt::AlignRight);
+    else
+      return QVariant(Qt::AlignVCenter | Qt::AlignLeft);
  }
  return QVariant();
 }
@@ -39,7 +39,13 @@ public:
    COL_NAME = 0,
    COL_STATUS,
    COL_SIZE,
-    COL_FILETIME
+    COL_FILETIME,
+    COL_MODNAME,
+    COL_VERSION,
+    COL_ID,
+
+    // number of columns
+    COL_COUNT
  };

 public:
@@ -43,6 +43,48 @@ bool DownloadListSortProxy::lessThan(const QModelIndex &left,
      && (rightIndex < m_Manager->numTotalDownloads())) {
    if (left.column() == DownloadList::COL_NAME) {
      return m_Manager->getFileName(left.row()).compare(m_Manager->getFileName(right.row()), Qt::CaseInsensitive) < 0;
+    } else if (left.column() == DownloadList::COL_MODNAME) {
+      QString leftName, rightName;
+
+      if (!m_Manager->isInfoIncomplete(left.row())) {
+        const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(left.row());
+        leftName = info->modName;
+      }
+
+      if (!m_Manager->isInfoIncomplete(right.row())) {
+        const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(right.row());
+        rightName = info->modName;
+      }
+
+      return leftName.compare(rightName, Qt::CaseInsensitive) < 0;
+    } else if (left.column() == DownloadList::COL_VERSION) {
+        MOBase::VersionInfo versionLeft, versionRight;
+
+        if (!m_Manager->isInfoIncomplete(left.row())) {
+          const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(left.row());
+          versionLeft = info->version;
+        }
+
+        if (!m_Manager->isInfoIncomplete(right.row())) {
+          const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(right.row());
+          versionRight = info->version;
+        }
+
+        return versionLeft < versionRight;
+    } else if (left.column() == DownloadList::COL_ID) {
+      int leftID=0, rightID=0;
+
+      if (!m_Manager->isInfoIncomplete(left.row())) {
+        const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(left.row());
+        leftID = info->modID;
+      }
+
+      if (!m_Manager->isInfoIncomplete(right.row())) {
+        const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(right.row());
+        rightID = info->modID;
+      }
+
+      return leftID < rightID;
    } else if (left.column() == DownloadList::COL_STATUS) {
      DownloadManager::DownloadState leftState = m_Manager->getState(left.row());
      DownloadManager::DownloadState rightState = m_Manager->getState(right.row());
@@ -123,6 +123,15 @@ DownloadListWidget::~DownloadListWidget()
 void DownloadListWidget::setManager(DownloadManager *manager)
 {
  m_Manager = manager;
+
+  // hide these columns by default
+  //
+  // note that this is overridden by the ini if MO has been started at least
+  // once before, which is handled in MainWindow::processUpdates() for older
+  // versions
+  header()->hideSection(DownloadList::COL_MODNAME);
+  header()->hideSection(DownloadList::COL_VERSION);
+  header()->hideSection(DownloadList::COL_ID);
 }

 void DownloadListWidget::setSourceModel(DownloadList *sourceModel)
@@ -200,7 +209,7 @@ void DownloadListWidget::onCustomContextMenu(const QPoint &point)
    if (state >= DownloadManager::STATE_READY) {
      menu.addAction(tr("Install"), this, SLOT(issueInstall()));
      if (m_Manager->isInfoIncomplete(m_ContextRow))
-        menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfo()));
+        menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfoMd5()));
      else
        menu.addAction(tr("Visit on Nexus"), this, SLOT(issueVisitOnNexus()));
      menu.addAction(tr("Open File"), this, SLOT(issueOpenFile()));
@@ -226,9 +235,9 @@ void DownloadListWidget::onCustomContextMenu(const QPoint &point)

    menu.addSeparator();
  }
-  menu.addAction(tr("Delete Installed..."), this, SLOT(issueDeleteCompleted()));
-  menu.addAction(tr("Delete Uninstalled..."), this, SLOT(issueDeleteUninstalled()));
-  menu.addAction(tr("Delete All..."), this, SLOT(issueDeleteAll()));
+  menu.addAction(tr("Delete Installed Downloads..."), this, SLOT(issueDeleteCompleted()));
+  menu.addAction(tr("Delete Uninstalled Downloads..."), this, SLOT(issueDeleteUninstalled()));
+  menu.addAction(tr("Delete All Downloads..."), this, SLOT(issueDeleteAll()));

  menu.addSeparator();
  if (!hidden) {
@@ -252,10 +261,15 @@ void DownloadListWidget::issueQueryInfo()
  emit queryInfo(m_ContextRow);
 }

+void DownloadListWidget::issueQueryInfoMd5()
+{
+  emit queryInfoMd5(m_ContextRow);
+}
+
 void DownloadListWidget::issueDelete()
 {
-  if (QMessageBox::question(nullptr, tr("Delete Files?"),
-                            tr("This will permanently delete the selected download."),
+  if (QMessageBox::warning(nullptr, tr("Delete Files?"),
+                            tr("This will permanently delete the selected download.\n\nAre you absolutely sure you want to proceed?"),
                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
    emit removeDownload(m_ContextRow, true);
  }
@@ -309,8 +323,8 @@ void DownloadListWidget::issueResume()

 void DownloadListWidget::issueDeleteAll()
 {
-  if (QMessageBox::question(nullptr, tr("Delete Files?"),
-                            tr("This will remove all finished downloads from this list and from disk."),
+  if (QMessageBox::warning(nullptr, tr("Delete Files?"),
+                            tr("This will remove all finished downloads from this list and from disk.\n\nAre you absolutely sure you want to proceed?"),
                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
    emit removeDownload(-1, true);
  }
@@ -318,8 +332,8 @@ void DownloadListWidget::issueDeleteAll()

 void DownloadListWidget::issueDeleteCompleted()
 {
-  if (QMessageBox::question(nullptr, tr("Delete Files?"),
-                            tr("This will remove all installed downloads from this list and from disk."),
+  if (QMessageBox::warning(nullptr, tr("Delete Files?"),
+                            tr("This will remove all installed downloads from this list and from disk.\n\nAre you absolutely sure you want to proceed?"),
                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
    emit removeDownload(-2, true);
  }
@@ -327,8 +341,8 @@ void DownloadListWidget::issueDeleteCompleted()

 void DownloadListWidget::issueDeleteUninstalled()
 {
-  if (QMessageBox::question(nullptr, tr("Delete Files?"),
-                            tr("This will remove all uninstalled downloads from this list and from disk."),
+  if (QMessageBox::warning(nullptr, tr("Delete Files?"),
+                            tr("This will remove all uninstalled downloads from this list and from disk.\n\nAre you absolutely sure you want to proceed?"),
                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
    emit removeDownload(-3, true);
  }
@@ -336,7 +350,7 @@ void DownloadListWidget::issueDeleteUninstalled()

 void DownloadListWidget::issueRemoveFromViewAll()
 {
-  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+  if (QMessageBox::question(nullptr, tr("Hide Files?"),
                            tr("This will remove all finished downloads from this list (but NOT from disk)."),
                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
    emit removeDownload(-1, false);
@@ -345,7 +359,7 @@ void DownloadListWidget::issueRemoveFromViewAll()

 void DownloadListWidget::issueRemoveFromViewCompleted()
 {
-  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+  if (QMessageBox::question(nullptr, tr("Hide Files?"),
                            tr("This will remove all installed downloads from this list (but NOT from disk)."),
                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
    emit removeDownload(-2, false);
@@ -354,7 +368,7 @@ void DownloadListWidget::issueRemoveFromViewCompleted()

 void DownloadListWidget::issueRemoveFromViewUninstalled()
 {
-  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+  if (QMessageBox::question(nullptr, tr("Hide Files?"),
                            tr("This will remove all uninstalled downloads from this list (but NOT from disk)."),
                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
    emit removeDownload(-3, false);
--- a/Show More
+++ b/Show More