Merge pull request #454 from Modorganizer2/Develop

Release 2.1.4
Merge branch 'Develop' of https://github.com/Modorganizer2/modorganizer into Develop
2026-07-27 13:58:24 -07:00 · 2018-08-02 09:15:12 +02:00 · 2018-08-01 20:12:32 +02:00 · 2018-08-01 20:04:59 +02:00 · 2018-08-01 12:55:36 -05:00 · 2018-08-01 17:55:07 +02:00
115 changed files with 12707 additions and 1421 deletions
@@ -2,17 +2,14 @@
 Thumbs.db
 src/moc_*.cpp
 src/ui_*.h
-src/organizer_en.ts
 src/*.qrc.depends
 src/Modorganizer.*
 src/*.bak
 CMakeLists.txt.user
 edit
-stderr.log
-stdout.log
-vs_stderr.log
-vs_stdout.log
-build
-/vsbuild
 /CMakeFiles
 .idea
+/msbuild.log
+/*std*.log
+/*build
+
@@ -1,14 +1,15 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+
+ADD_COMPILE_OPTIONS($<$<CXX_COMPILER_ID:MSVC>:/MP>)

 PROJECT(organizer)

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

 SET(DEPENDENCIES_DIR CACHE PATH "")
 # hint to find qt in dependencies path
 LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/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)
+LIST(APPEND CMAKE_PREFIX_PATH ${LZ4_ROOT}/dll)

 ADD_SUBDIRECTORY(src)
@@ -1,42 +1,83 @@
 # 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.
+Mod Organizer 2 is a mod manager created by Tannin to support 64-bit games like Skyrim Special Edition and Fallout 4 in addition to all the 32-bit games MO1 already supported.
+
+Tannin discontinued the project when he was hired by the Nexus team to develop their new Vortex mod manager.
+MO2 was not completed and was left with many issues. LePresidente managed to fix it to a usable state by himself after SkyrimSE came out, adding support for it, and releasing v2.0.8.
+The project took up speed again after a few more coders showed up in late 2017, and a lot of progress has been made.
+
+## Help Wanted!
+Mod Organizer 2 is an open project in the hands of the community, there are problems that need to be solved and things that could be added. MO2 really needs developers and if you have the programming skills and some free time you can really improve the experience of the modding community.
+
+To have more information, please join the open MO2 Development discord server :* [ModOrganizerDevs](https://discord.gg/vD2ZbfX)
+If you want to help translate MO2 to your language you should join the discord server too and head to the #translation channel.
+To setup a development environment on your machine, there is the [umbrella project](https://github.com/Modorganizer2/modorganizer-umbrella) that handles that.
+If you want to submit your code changes, please use a good formating style like the default one in Visual Studio.
+
+Through the work of a few people of the community MO2 has come quite far, now it needs some more of those people to go further.
+
+## Reporting Issues:
+Issues should be reported to the GitHub page or on the open discord server: [ModOrganizerDevs](https://discord.gg/vD2ZbfX). Here is also where dev builds are tested, bugs are reported and investigated, suggestions are discussed and a lot more.
+
+Credits to Tannin, LePresidente, Silarn, erasmux, AL12 and many others for the development.
+
+## Download Location
+
+* on [GitHub.com](https://github.com/Modorganizer2/modorganizer/releases)
+* on [NexusMods.com](https://www.nexusmods.com/skyrimspecialedition/mods/6194)
+
+## Old Download Location
+
+* [TanninOne/modorganizer/releases](https://github.com/TanninOne/modorganizer/releases)

 ## Building

-Please refer to [TanninOne/modorganizer-umbrella](https://github.com/TanninOne/modorganizer-umbrella) for build instructions.
+Please refer to [Modorganizer2/modorganizer-umbrella](https://github.com/Modorganizer2/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.
+MO2 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/LePresidente/cpython-1
+* https://github.com/Modorganizer2/githubpp
+* https://github.com/Modorganizer2/modorganizer
+* https://github.com/Modorganizer2/modorganizer-archive
+* https://github.com/Modorganizer2/modorganizer-bsatk
+* https://github.com/Modorganizer2/modorganizer-bsa_extractor
+* https://github.com/Modorganizer2/modorganizer-check_fnis
+* https://github.com/Modorganizer2/modorganizer-diagnose_basic
+* https://github.com/Modorganizer2/modorganizer-esptk
+* https://github.com/Modorganizer2/modorganizer-helper
+* https://github.com/Modorganizer2/modorganizer-game_fallout3
+* https://github.com/Modorganizer2/modorganizer-game_fallout4
+* https://github.com/Modorganizer2/modorganizer-game_fallout4vr
+* https://github.com/Modorganizer2/modorganizer-game_falloutnv
+* https://github.com/Modorganizer2/modorganizer-game_features
+* https://github.com/Modorganizer2/modorganizer-game_gamebryo
+* https://github.com/Modorganizer2/modorganizer-game_morrowind
+* https://github.com/Modorganizer2/modorganizer-game_oblivion
+* https://github.com/Modorganizer2/modorganizer-game_skyrim
+* https://github.com/Modorganizer2/modorganizer-game_skyrimSE
+* https://github.com/Modorganizer2/modorganizer-game_ttw
+* https://github.com/Modorganizer2/modorganizer-installer_bain
+* https://github.com/Modorganizer2/modorganizer-installer_bundle
+* https://github.com/Modorganizer2/modorganizer-installer_fomod
+* https://github.com/Modorganizer2/modorganizer-installer_manual
+* https://github.com/Modorganizer2/modorganizer-installer_ncc
+* https://github.com/Modorganizer2/modorganizer-installer_quick
+* https://github.com/Modorganizer2/modorganizer-lootcli
+* https://github.com/Modorganizer2/modorganizer-NCC
+* https://github.com/Modorganizer2/modorganizer-nxmhandler
+* https://github.com/Modorganizer2/modorganizer-plugin_python
+* https://github.com/Modorganizer2/modorganizer-preview_base
+* https://github.com/Modorganizer2/modorganizer-tool_configurator
+* https://github.com/Modorganizer2/modorganizer-tool_inibakery
+* https://github.com/Modorganizer2/modorganizer-uibase
+* https://github.com/Modorganizer2/usvfs
+
+### Unused Repositories
+* https://github.com/Modorganizer2/modorganizer-hookdll
 * https://github.com/TanninOne/modorganizer-tool_nmmimport
-* https://github.com/TanninOne/modorganizer-tool_configurator
-* https://github.com/TanninOne/modorganizer-tool_inieditor
-* https://github.com/TanninOne/modorganizer-preview_base
-* https://github.com/TanninOne/modorganizer-diagnose_basic
-* https://github.com/TanninOne/modorganizer-installer_quick
-* https://github.com/TanninOne/modorganizer-installer_manual
-* https://github.com/TanninOne/modorganizer-installer_fomod
-* https://github.com/TanninOne/modorganizer-installer_bundle
-* https://github.com/TanninOne/modorganizer-installer_bain
-* https://github.com/TanninOne/modorganizer-game_skyrim
-* https://github.com/TanninOne/modorganizer-game_oblivion
-* https://github.com/TanninOne/modorganizer-game_fallout3
-* https://github.com/TanninOne/modorganizer-game_fallout4
-* https://github.com/TanninOne/modorganizer-game_falloutnv
-* https://github.com/TanninOne/modorganizer-game_gamebryo
-* https://github.com/TanninOne/modorganizer-game_features
-* https://github.com/TanninOne/modorganizer-check_fnis
-* https://github.com/TanninOne/modorganizer-plugin_python
-* https://github.com/TanninOne/modorganizer-bsa_extractor
-* https://github.com/TanninOne/usvfs
+
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.11)

 CMAKE_POLICY(SET CMP0020 NEW)
 #CMAKE_POLICY(SET CMP0043 NEW)
@@ -30,6 +30,7 @@ SET(organizer_SRCS
    motddialog.cpp
    modlistsortproxy.cpp
    modlist.cpp
+    modidlineedit.cpp
    modinfodialog.cpp
    modinfo.cpp
    modinfobackup.cpp
@@ -120,6 +121,7 @@ SET(organizer_HDRS
    motddialog.h
    modlistsortproxy.h
    modlist.h
+    modidlineedit.h
    modinfodialog.h
    modinfo.h
    modinfobackup.h
@@ -238,6 +240,13 @@ SOURCE_GROUP(Source FILES ${organizer_SRCS})
 SOURCE_GROUP(Headers FILES ${organizer_HDRS})
 SOURCE_GROUP(UI FILES ${organizer_UIS})

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

 # Qt5
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -249,10 +258,13 @@ FIND_PACKAGE(Qt5Quick REQUIRED)
 FIND_PACKAGE(Qt5Network REQUIRED)
 FIND_PACKAGE(Qt5WinExtras REQUIRED)
 FIND_PACKAGE(Qt5WebEngineWidgets REQUIRED)
+FIND_PACKAGE(Qt5Qml REQUIRED)
 FIND_PACKAGE(Qt5LinguistTools)
 QT5_WRAP_UI(organizer_UIHDRS ${organizer_UIS})
 QT5_ADD_RESOURCES(organizer_RCCPPS ${organizer_QRCS})
-QT5_CREATE_TRANSLATION(organizer_translations_qm ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/organizer_en.ts)
+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)
+ADD_CUSTOM_TARGET(translations DEPENDS ${organizer_translations_qm})

 INCLUDE_DIRECTORIES(${Qt5Declarative_INCLUDES})

@@ -271,15 +283,6 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 FIND_PACKAGE(zlib REQUIRED)
 # TODO FindZlib doesn't find the static zlib library

-
-# MO projects
-SET(default_project_path "${CMAKE_SOURCE_DIR}/..")
-GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
-
-SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")
-SET(lib_path "${project_path}/../../install/libs")
-
-
 INCLUDE_DIRECTORIES(${project_path}/uibase/src
                    ${project_path}/bsatk/src
                    ${project_path}/esptk/src
@@ -287,13 +290,13 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src
                    ${project_path}/../usvfs/include
                    ${project_path}/game_gamebryo/src
                    ${project_path}/game_features/src
-                    ${project_path}/githubpp/src)
-
+                    ${project_path}/githubpp/src
+                    ${LZ4_ROOT}/include)

 INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS})
 LINK_DIRECTORIES(${lib_path}
-                 ${project_path}/../zlib/lib)
-
+                 ${ZLIB_ROOT}/lib
+                 ${LZ4_ROOT}/dll)
 EXECUTE_PROCESS(
  COMMAND git log -1 --format=%h
  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -312,20 +315,27 @@ 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
                      ${Boost_LIBRARIES}
                      zlibstatic
                      uibase esptk bsatk githubpp
                      ${usvfs_name}
-                      Dbghelp advapi32 Version Shlwapi)
-IF (NOT "${OPTIMIZE_COMPILE_FLAGS}" STREQUAL "")
-  SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS_RELWITHDEBINFO
-                        ${OPTIMIZE_COMPILE_FLAGS})
+                      Dbghelp advapi32 Version Shlwapi liblz4)
+
+IF (MSVC)
+  SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS "/std:c++latest")
+ENDIF()
+IF (MSVC AND "${CMAKE_SIZEOF_VOID_P}" EQUAL 4)
+  # 32 bits
+  SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE")
 ENDIF()
-SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO
-                      "/LARGEADDRESSAWARE ${OPTIMIZE_LINK_FLAGS}")

-
-QT5_USE_MODULES(ModOrganizer Widgets Script Qml QuickWidgets Quick Network WebEngineWidgets)
+IF (NOT "${OPTIMIZE_COMPILE_FLAGS}" STREQUAL "")
+  SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS_RELWITHDEBINFO ${OPTIMIZE_COMPILE_FLAGS})
+ENDIF()
+IF (NOT "${OPTIMIZE_LINK_FLAGS}" STREQUAL "")
+  SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO ${OPTIMIZE_LINK_FLAGS})
+ENDIF()


 ###############
@@ -347,10 +357,16 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5
 SET(windeploy_parameters "--no-translations --plugindir qtplugins --libdir dlls --release-with-debug-info --no-compiler-runtime")
 INSTALL(
    CODE
-    "EXECUTE_PROCESS(
-        COMMAND
+    "EXECUTE_PROCESS(COMMAND
        ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets ${windeploy_parameters}
-        COMMAND
+        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}
+        WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
+    )
+    EXECUTE_PROCESS(COMMAND
        ${qt5bin}/windeployqt.exe uibase.dll ${windeploy_parameters}
        WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
    )
@@ -363,6 +379,11 @@ INSTALL(
    file(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/bin/qtplugins)"
 )

+# 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)
@@ -29,7 +29,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTextBrowser>
 #include <QVariant>
 #include <Qt>
-
+#include <QFontDatabase>

 AboutDialog::AboutDialog(const QString &version, QWidget *parent)
  : QDialog(parent)
@@ -37,24 +37,44 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
 {
  ui->setupUi(this);

-  m_LicenseFiles[LICENSE_LGPL3] = "lgpl-3.0.txt";
-  m_LicenseFiles[LICENSE_GPL3] = "gpl-3.0.txt";
-  m_LicenseFiles[LICENSE_BSD3] = "bsd3.txt";
+  m_LicenseFiles[LICENSE_LGPL3] = "LGPL-v3.0.txt";
+  m_LicenseFiles[LICENSE_LGPL21] = "GNU-LGPL-v2.1.txt";
+  m_LicenseFiles[LICENSE_GPL3] = "GPL-v3.0.txt";
+  m_LicenseFiles[LICENSE_GPL2] = "GPL-v2.0.txt";
  m_LicenseFiles[LICENSE_BOOST] = "boost.txt";
-  m_LicenseFiles[LICENSE_CCBY3] = "by-sa3.txt";
+  m_LicenseFiles[LICENSE_7ZIP] = "7zip.txt";
+  m_LicenseFiles[LICENSE_CCBY3] = "BY-SA-v3.0.txt";
  m_LicenseFiles[LICENSE_ZLIB] = "zlib.txt";
-  m_LicenseFiles[LICENSE_APACHE2] = "apache-license-2.0.txt";
+  m_LicenseFiles[LICENSE_PYTHON] = "python.txt";
+  m_LicenseFiles[LICENSE_SSL] = "openssl.txt";
+  m_LicenseFiles[LICENSE_CPPTOML] = "cpptoml.txt";
+  m_LicenseFiles[LICENSE_UDIS] = "udis86.txt";
+  m_LicenseFiles[LICENSE_SPDLOG] = "spdlog.txt";
+  m_LicenseFiles[LICENSE_FMT] = "fmt.txt";
+  m_LicenseFiles[LICENSE_SIP] = "sip.txt";
+  m_LicenseFiles[LICENSE_CASTLE] = "Castle.txt";
+  m_LicenseFiles[LICENSE_ANTLR] = "AntlrBuildTask.txt";
+  m_LicenseFiles[LICENSE_DXTEX] = "DXTex.txt";

  addLicense("Qt", LICENSE_LGPL3);
  addLicense("Qt Json", LICENSE_GPL3);
  addLicense("Boost Library", LICENSE_BOOST);
-  addLicense("7-zip", LICENSE_LGPL3);
-  addLicense("ZLib", LICENSE_ZLIB);
+  addLicense("7-zip", LICENSE_7ZIP);
+  addLicense("ZLib", LICENSE_NONE);
  addLicense("Tango Icon Theme", LICENSE_NONE);
  addLicense("RRZE Icon Set", LICENSE_CCBY3);
  addLicense("Icons by Lorc, Delapouite and sbed available on http://game-icons.net", LICENSE_CCBY3);
-  addLicense("Castle Core", LICENSE_APACHE2);
+  addLicense("Castle Core", LICENSE_CASTLE);
+  addLicense("ANTLR", LICENSE_ANTLR);
  addLicense("LOOT", LICENSE_GPL3);
+  addLicense("Python", LICENSE_PYTHON);
+  addLicense("OpenSSL", LICENSE_SSL);
+  addLicense("cpptoml", LICENSE_CPPTOML);
+  addLicense("Udis86", LICENSE_UDIS);
+  addLicense("spdlog", LICENSE_SPDLOG);
+  addLicense("{fmt}", LICENSE_FMT);
+  addLicense("SIP", LICENSE_SIP);
+  addLicense("DXTex Headers", LICENSE_DXTEX);

  ui->nameLabel->setText(QString("<span style=\"font-size:12pt; font-weight:600;\">%1 %2</span>").arg(ui->nameLabel->text()).arg(version));
 #if defined(HGID)
@@ -64,6 +84,8 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
 #else
  ui->revisionLabel->setText(ui->revisionLabel->text() + " unknown");
 #endif
+
+  ui->licenseText->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
 }


@@ -85,10 +107,15 @@ void AboutDialog::on_creditsList_currentItemChanged(QListWidgetItem *current, QL
 {
  auto iter = m_LicenseFiles.find(current->data(Qt::UserRole).toInt());
  if (iter != m_LicenseFiles.end()) {
-    QString filePath = qApp->applicationDirPath() + "/license/" + iter->second;
+    QString filePath = qApp->applicationDirPath() + "/licenses/" + iter->second;
    QString text = MOBase::readFileText(filePath);
    ui->licenseText->setText(text);
  } else {
    ui->licenseText->setText(tr("No license"));
  }
 }
+
+void AboutDialog::on_copyrightText_linkActivated(const QString &link)
+{
+  emit linkClicked(link);
+}
@@ -40,17 +40,32 @@ public:
  explicit AboutDialog(const QString &version, QWidget *parent = 0);
  ~AboutDialog();

+signals:
+
+  void linkClicked(QString link);
+
 private:

  enum Licenses {
    LICENSE_NONE,
    LICENSE_LGPL3,
+    LICENSE_LGPL21,
    LICENSE_GPL3,
-    LICENSE_BSD3,
+    LICENSE_GPL2,
    LICENSE_BOOST,
    LICENSE_CCBY3,
+    LICENSE_PYTHON,
+    LICENSE_SSL,
+    LICENSE_CPPTOML,
+    LICENSE_7ZIP,
    LICENSE_ZLIB,
-    LICENSE_APACHE2
+    LICENSE_UDIS,
+    LICENSE_SPDLOG,
+    LICENSE_FMT,
+    LICENSE_SIP,
+    LICENSE_CASTLE,
+    LICENSE_ANTLR,
+    LICENSE_DXTEX
  };

 private:
@@ -59,6 +74,7 @@ private:

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

 private:

@@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>604</width>
-    <height>369</height>
+    <width>1010</width>
+    <height>477</height>
   </rect>
  </property>
  <property name="windowTitle">
@@ -120,14 +120,14 @@
         <item>
          <widget class="QLabel" name="label_3">
           <property name="text">
-            <string notr="true">Copyright 2011-2016 Sebastian Herbord</string>
+            <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>
           </property>
          </widget>
         </item>
         <item>
-          <widget class="QLabel" name="label_2">
+          <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/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>
+            <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>
           </property>
           <property name="wordWrap">
            <bool>true</bool>
@@ -153,8 +153,8 @@
        <attribute name="title">
         <string>Thanks</string>
        </attribute>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-		<item>
+        <layout class="QGridLayout" name="gridLayout_0">
+         <item row="0" column="0">
          <widget class="QGroupBox" name="groupBox">
           <property name="title">
            <string>Current Maintainers</string>
@@ -167,12 +167,17 @@
              </property>
              <item>
               <property name="text">
-                <string notr="true">LePresidente</string>
+                <string>LePresidente (Project Lead)</string>
               </property>
              </item>
              <item>
               <property name="text">
-                <string notr="true">Silarn</string>
+                <string notr="true">AL12</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Diana</string>
               </property>
              </item>
              <item>
@@ -182,7 +187,7 @@
              </item>
              <item>
               <property name="text">
-                <string notr="true">Diana</string>
+                <string notr="true">Silarn</string>
               </property>
              </item>
             </widget>
@@ -190,8 +195,29 @@
           </layout>
          </widget>
         </item>
-         <item>
+         <item row="1" column="0">
          <widget class="QGroupBox" name="groupBox_2">
+           <property name="title">
+            <string>Major Contributors</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0">
+            <item>
+             <widget class="QListWidget" name="listWidget_2">
+              <property name="selectionMode">
+               <enum>QAbstractItemView::NoSelection</enum>
+              </property>
+              <item>
+               <property name="text">
+                <string notr="true">AnyOldName3 (Python Plugins)</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="0" column="1" rowspan="2">
+          <widget class="QGroupBox" name="groupBox_3">
           <property name="title">
            <string>Translators</string>
           </property>
@@ -201,36 +227,6 @@
              <property name="selectionMode">
               <enum>QAbstractItemView::NoSelection</enum>
              </property>
-              <item>
-               <property name="text">
-                <string notr="true">pndrev (German)</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">DaWul (Spanish)</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">Fiama (Spanish)</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">Alyndiar (French)</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">Jlkawaii (French)</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">Rigoletto (French)</string>
-               </property>
-              </item>
              <item>
               <property name="text">
                <string notr="true">Scythe1912 (Chinese)</string>
@@ -248,7 +244,47 @@
              </item>
              <item>
               <property name="text">
-                <string notr="true">tokcdk  (Russian)</string>
+                <string>Cyb3r (Dutch)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Alyndiar (French)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>fruttyx (French)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Jlkawaii (French)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Rigoletto (French)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Yoplala (French)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Faron (German)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">pndrev (German)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Mordan (Greek)</string>
               </property>
              </item>
              <item>
@@ -261,7 +297,37 @@
              </item>
              <item>
               <property name="text">
-                <string>... more (Can't track)</string>
+                <string>Yoosk (Polish)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Brgodfx (Portuguese)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">tokcdk  (Russian)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">DaWul (Spanish)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Fiama (Spanish)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Jax (Swedish)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>...and all other Transifex contributors!</string>
               </property>
               <property name="toolTip">
                <string/>
@@ -272,10 +338,10 @@
           </layout>
          </widget>
         </item>
-         <item>
-          <widget class="QGroupBox" name="groupBox_3">
+         <item row="0" column="2" rowspan="2">
+          <widget class="QGroupBox" name="groupBox_4">
           <property name="title">
-            <string>Other Supporter</string>
+            <string>Other Supporters &amp;&amp; Contributors</string>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_7">
            <item>
@@ -283,11 +349,6 @@
              <property name="selectionMode">
               <enum>QAbstractItemView::NoSelection</enum>
              </property>
-			   <item>
-               <property name="text">
-                <string notr="true">Al12 (Discord) </string>
-               </property>
-              </item>
              <item>
               <property name="text">
                <string notr="true">blacksol</string>
@@ -308,6 +369,11 @@
                <string notr="true">Bridger</string>
               </property>
              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Brixified</string>
+               </property>
+              </item>
              <item>
               <property name="text">
                <string notr="true">GamerPoet</string>
@@ -318,11 +384,36 @@
                <string notr="true">Gopher</string>
               </property>
              </item>
+              <item>
+               <property name="text">
+                <string notr="true">GrantSP</string>
+               </property>
+              </item>
              <item>
               <property name="text">
                <string notr="true">GSDFan</string>
               </property>
              </item>
+              <item>
+               <property name="text">
+                <string notr="true">ogrotten</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">outdatedtv</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Schilduin</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">SuperSandro2000</string>
+               </property>
+              </item>
              <item>
               <property name="text">
                <string notr="true">Uhuru</string>
@@ -343,11 +434,6 @@
                <string notr="true">thosrtanner</string>
               </property>
              </item>
-              <item>
-               <property name="text">
-                <string>ogrotten</string>
-               </property>
-              </item>
             </widget>
            </item>
           </layout>
@@ -173,13 +173,13 @@ void BrowserDialog::titleChanged(const QString &title)

 QString BrowserDialog::guessFileName(const QString &url)
 {
-  QRegExp uploadsExp(QString("http://.+/uploads/([^/]+)$"));
+  QRegExp uploadsExp(QString("https://.+/uploads/([^/]+)$"));
  if (uploadsExp.indexIn(url) != -1) {
    // these seem to be premium downloads
    return uploadsExp.cap(1);
  }

-  QRegExp filesExp(QString("http://.+\\?file=([^&]+)"));
+  QRegExp filesExp(QString("https://.+\\?file=([^&]+)"));
  if (filesExp.indexIn(url) != -1) {
    // a regular manual download?
    return filesExp.cap(1);
@@ -167,7 +167,7 @@ void CategoryFactory::saveCategories()
 }


-unsigned int CategoryFactory::countCategories(std::tr1::function<bool (const Category &category)> filter)
+unsigned int CategoryFactory::countCategories(std::function<bool (const Category &category)> filter)
 {
  unsigned int result = 0;
  for (const Category &cat : m_Categories) {
@@ -99,7 +99,7 @@ public:
   * @param filter the filter to test
   * @return number of matching categories
   */
-  unsigned int countCategories(std::tr1::function<bool (const Category &category)> filter);
+  unsigned int countCategories(std::function<bool (const Category &category)> filter);

  /**
   * @brief get the id of the parent category
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86"/>
-	<file name="7z.dll"/>
-	<file name="archive.dll"/>
-    <file name="d3dcompiler_47.dll"/>
-    <file name="libeay32.dll"/>
-	<file name="libEGL.dll"/>
-	<file name="libGLESV2.dll"/>
-	<file name="liblz4.dll"/>
-	<file name="opengl32sw.dll"/>
-    <file name="Qt5Core.dll"/>
-    <file name="Qt5Gui.dll"/>
-    <file name="Qt5Network.dll"/>
-    <file name="Qt5Positioning.dll"/>
-    <file name="Qt5PrintSupport.dll"/>
-    <file name="Qt5Qml.dll"/>
-    <file name="Qt5Quick.dll"/>
-	<file name="Qt5QuickWidgets.dll"/>
-	<file name="Qt5WebChannel.dll"/>
-	<file name="Qt5SerialPort.dll"/>
-    <file name="Qt5Svg.dll"/>
-	<file name="Qt5WebEngineCore.dll"/>
-    <file name="Qt5WebEngineWidgets.dll"/>
-    <file name="Qt5Widgets.dll"/>
-	<file name="Qt5WinExtras.dll"/>
-	<file name="ssleay32.dll"/>
+  <assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86"/>
+  <file name="7z.dll"/>
+  <file name="archive.dll"/>
+  <file name="d3dcompiler_47.dll"/>
+  <file name="libEGL.dll"/>
+  <file name="libGLESV2.dll"/>
+  <file name="liblz4.dll"/>
+  <file name="opengl32sw.dll"/>
+  <file name="Qt5Core.dll"/>
+  <file name="Qt5Gui.dll"/>
+  <file name="Qt5Network.dll"/>
+  <file name="Qt5Positioning.dll"/>
+  <file name="Qt5PrintSupport.dll"/>
+  <file name="Qt5Qml.dll"/>
+  <file name="Qt5Quick.dll"/>
+  <file name="Qt5QuickWidgets.dll"/>
+  <file name="Qt5WebChannel.dll"/>
+  <file name="Qt5SerialPort.dll"/>
+  <file name="Qt5Svg.dll"/>
+  <file name="Qt5WebEngineCore.dll"/>
+  <file name="Qt5WebEngineWidgets.dll"/>
+  <file name="Qt5Widgets.dll"/>
+  <file name="Qt5WinExtras.dll"/>
 </assembly>
@@ -40,7 +40,7 @@ int DownloadList::rowCount(const QModelIndex&) const

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


@@ -63,6 +63,7 @@ QVariant DownloadList::headerData(int section, Qt::Orientation orientation, int
    switch (section) {
      case COL_NAME: return tr("Name");
      case COL_FILETIME: return tr("Filetime");
+      case COL_SIZE: return tr("Size");
      default: return tr("Done");
    }
  } else {
@@ -39,7 +39,8 @@ public:
  enum EColumn {
    COL_NAME = 0,
    COL_FILETIME,
-    COL_STATUS
+    COL_STATUS,
+    COL_SIZE
  };

 public:
@@ -47,6 +47,8 @@ bool DownloadListSortProxy::lessThan(const QModelIndex &left,
      return m_Manager->getFileTime(leftIndex) < m_Manager->getFileTime(rightIndex);
    } else if (left.column() == DownloadList::COL_STATUS) {
      return m_Manager->getState(leftIndex) < m_Manager->getState(rightIndex);
+    } else if(left.column() == DownloadList::COL_SIZE){
+      return m_Manager->getFileSize(leftIndex) < m_Manager->getFileSize(rightIndex);
    } else {
      return leftIndex < rightIndex;
    }
@@ -53,6 +53,7 @@ DownloadListWidgetDelegate::DownloadListWidgetDelegate(DownloadManager *manager,
  m_InstallLabel = m_ItemWidget->findChild<QLabel*>("installLabel");

  m_InstallLabel->setVisible(false);
+  m_Progress->setTextVisible(true);

  connect(manager, SIGNAL(stateChanged(int,DownloadManager::DownloadState)), this, SLOT(stateChanged(int,DownloadManager::DownloadState)));
  connect(manager, SIGNAL(downloadRemoved(int)), this, SLOT(resetCache(int)));
@@ -81,15 +82,34 @@ void DownloadListWidgetDelegate::drawCache(QPainter *painter, const QStyleOption
 {
  QRect rect = option.rect;
  rect.setLeft(0);
-  rect.setWidth(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2));
+  rect.setWidth(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2) + m_View->columnWidth(3));
  painter->drawPixmap(rect, cache);
 }


+QString DownloadListWidgetDelegate::sizeFormat(quint64 size) const
+{
+	qreal calc = size;
+	QStringList list;
+	list << "KB" << "MB" << "GB" << "TB";
+
+	QStringListIterator i(list);
+	QString unit("byte(s)");
+
+	while (calc >= 1024.0 && i.hasNext())
+	{
+		unit = i.next();
+		calc /= 1024.0;
+	}
+
+	return QString().setNum(calc, 'f', 2) + " " + unit;
+}
+
+
 void DownloadListWidgetDelegate::paintPendingDownload(int downloadIndex) const
 {
-  std::pair<int, int> nexusids = m_Manager->getPendingDownload(downloadIndex);
-  m_NameLabel->setText(tr("< mod %1 file %2 >").arg(nexusids.first).arg(nexusids.second));
+  std::tuple<QString, int, int> nexusids = m_Manager->getPendingDownload(downloadIndex);
+  m_NameLabel->setText(tr("< game %1 mod %2 file %3 >").arg(std::get<0>(nexusids)).arg(std::get<1>(nexusids)).arg(std::get<2>(nexusids)));
  m_SizeLabel->setText("???");
  m_InstallLabel->setVisible(true);
  m_InstallLabel->setText(tr("Pending"));
@@ -105,9 +125,9 @@ void DownloadListWidgetDelegate::paintRegularDownload(int downloadIndex) const
    name.append("...");
  }
  m_NameLabel->setText(name);
-  m_SizeLabel->setText(QString::number(m_Manager->getFileSize(downloadIndex) / 1024));
+  m_SizeLabel->setText(sizeFormat(m_Manager->getFileSize(downloadIndex) ));
  DownloadManager::DownloadState state = m_Manager->getState(downloadIndex);
-  if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)) {
+  if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) || (state == DownloadManager::STATE_PAUSING)) {
    QPalette labelPalette;
    m_InstallLabel->setVisible(true);
    m_Progress->setVisible(false);
@@ -159,7 +179,8 @@ void DownloadListWidgetDelegate::paintRegularDownload(int downloadIndex) const
  } else {
    m_InstallLabel->setVisible(false);
    m_Progress->setVisible(true);
-    m_Progress->setValue(m_Manager->getProgress(downloadIndex));
+    m_Progress->setValue(m_Manager->getProgress(downloadIndex).first);
+    m_Progress->setFormat(m_Manager->getProgress(downloadIndex).second);
  }
 }

@@ -172,7 +193,7 @@ void DownloadListWidgetDelegate::paint(QPainter *painter, const QStyleOptionView
      return;
    }

-    m_ItemWidget->resize(QSize(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2), option.rect.height()));
+    m_ItemWidget->resize(QSize(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2) + m_View->columnWidth(3), option.rect.height()));

    int downloadIndex = index.data().toInt();

@@ -224,7 +245,11 @@ void DownloadListWidgetDelegate::issueQueryInfo()

 void DownloadListWidgetDelegate::issueDelete()
 {
-  emit removeDownload(m_ContextRow, true);
+	if (QMessageBox::question(nullptr, tr("Delete Files?"),
+		tr("This will permanently delete the selected download."),
+		QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+		emit removeDownload(m_ContextRow, true);
+	}
 }

 void DownloadListWidgetDelegate::issueRemoveFromView()
@@ -234,7 +259,22 @@ void DownloadListWidgetDelegate::issueRemoveFromView()

 void DownloadListWidgetDelegate::issueRestoreToView()
 {
-  emit restoreDownload(m_ContextRow);
+		emit restoreDownload(m_ContextRow);
+}
+
+void DownloadListWidgetDelegate::issueRestoreToViewAll()
+{
+	emit restoreDownload(-1);
+}
+
+void DownloadListWidgetDelegate::issueVisitOnNexus()
+{
+	emit visitOnNexus(m_ContextRow);
+}
+
+void DownloadListWidgetDelegate::issueOpenInDownloadsFolder()
+{
+  emit openInDownloadsFolder(m_ContextRow);
 }

 void DownloadListWidgetDelegate::issueCancel()
@@ -254,7 +294,7 @@ void DownloadListWidgetDelegate::issueResume()

 void DownloadListWidgetDelegate::issueDeleteAll()
 {
-  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+  if (QMessageBox::question(nullptr, tr("Delete Files?"),
                            tr("This will remove all finished downloads from this list and from disk."),
                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
    emit removeDownload(-1, true);
@@ -263,13 +303,22 @@ void DownloadListWidgetDelegate::issueDeleteAll()

 void DownloadListWidgetDelegate::issueDeleteCompleted()
 {
-  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+  if (QMessageBox::question(nullptr, tr("Delete Files?"),
                            tr("This will remove all installed downloads from this list and from disk."),
                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
    emit removeDownload(-2, true);
  }
 }

+void DownloadListWidgetDelegate::issueDeleteUninstalled()
+{
+  if (QMessageBox::question(nullptr, tr("Delete Files?"),
+    tr("This will remove all uninstalled downloads from this list and from disk."),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    emit removeDownload(-3, true);
+  }
+}
+
 void DownloadListWidgetDelegate::issueRemoveFromViewAll()
 {
  if (QMessageBox::question(nullptr, tr("Are you sure?"),
@@ -288,6 +337,15 @@ void DownloadListWidgetDelegate::issueRemoveFromViewCompleted()
  }
 }

+void DownloadListWidgetDelegate::issueRemoveFromViewUninstalled()
+{
+  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+    tr("This will remove all uninstalled downloads from this list (but NOT from disk)."),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    emit removeDownload(-3, false);
+  }
+}
+
 bool DownloadListWidgetDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
                                   const QStyleOptionViewItem &option, const QModelIndex &index)
 {
@@ -296,7 +354,7 @@ bool DownloadListWidgetDelegate::editorEvent(QEvent *event, QAbstractItemModel *
      QModelIndex sourceIndex = qobject_cast<QSortFilterProxyModel*>(model)->mapToSource(index);
      if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_READY) {
        emit installDownload(sourceIndex.row());
-      } else if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) {
+      } else if ((m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) || (m_Manager->getState(sourceIndex.row()) == DownloadManager::STATE_PAUSING)) {
        emit resumeDownload(sourceIndex.row());
      }
      return true;
@@ -313,30 +371,47 @@ bool DownloadListWidgetDelegate::editorEvent(QEvent *event, QAbstractItemModel *
            menu.addAction(tr("Install"), this, SLOT(issueInstall()));
            if (m_Manager->isInfoIncomplete(m_ContextRow)) {
              menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfo()));
+            }else {
+              menu.addAction(tr("Visit on Nexus"), this,SLOT(issueVisitOnNexus()));
            }
+
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+            
+            menu.addSeparator();
+
            menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
            if (hidden) {
              menu.addAction(tr("Un-Hide"), this, SLOT(issueRestoreToView()));
            } else {
-              menu.addAction(tr("Remove from View"), this, SLOT(issueRemoveFromView()));
+              menu.addAction(tr("Hide"), this, SLOT(issueRemoveFromView()));
            }
          } else if (state == DownloadManager::STATE_DOWNLOADING){
            menu.addAction(tr("Cancel"), this, SLOT(issueCancel()));
            menu.addAction(tr("Pause"), this, SLOT(issuePause()));
-          } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)) {
-            menu.addAction(tr("Remove"), this, SLOT(issueDelete()));
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+          } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) || (state == DownloadManager::STATE_PAUSING)) {
+            menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
            menu.addAction(tr("Resume"), this, SLOT(issueResume()));
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
          }

          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()));
-        if (!hidden) {
-          menu.addSeparator();
-          menu.addAction(tr("Remove Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
-          menu.addAction(tr("Remove All..."), this, SLOT(issueRemoveFromViewAll()));
-        }
+
+				if (!hidden) {
+					menu.addSeparator();
+					menu.addAction(tr("Hide Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
+          menu.addAction(tr("Hide Uninstalled..."), this, SLOT(issueRemoveFromViewUninstalled()));
+					menu.addAction(tr("Hide All..."), this, SLOT(issueRemoveFromViewAll()));
+				}
+				if (hidden) {
+					menu.addSeparator();
+					menu.addAction(tr("Un-Hide All..."), this, SLOT(issueRestoreToViewAll()));
+				}
+
        menu.exec(mouseEvent->globalPos());

        event->accept();
@@ -71,14 +71,18 @@ signals:
  void cancelDownload(int index);
  void pauseDownload(int index);
  void resumeDownload(int index);
+  void visitOnNexus(int index);
+  void openInDownloadsFolder(int index);

 protected:

+	QString sizeFormat(quint64 size) const;
  bool editorEvent(QEvent *event, QAbstractItemModel *model,
                   const QStyleOptionViewItem &option, const QModelIndex &index);

 private:

+
  void drawCache(QPainter *painter, const QStyleOptionViewItem &option, const QPixmap &cache) const;

 private slots:
@@ -87,13 +91,18 @@ private slots:
  void issueDelete();
  void issueRemoveFromView();
  void issueRestoreToView();
+  void issueRestoreToViewAll();
+  void issueVisitOnNexus();
+  void issueOpenInDownloadsFolder();
  void issueCancel();
  void issuePause();
  void issueResume();
  void issueDeleteAll();
  void issueDeleteCompleted();
+  void issueDeleteUninstalled();
  void issueRemoveFromViewAll();
  void issueRemoveFromViewCompleted();
+  void issueRemoveFromViewUninstalled();
  void issueQueryInfo();

  void stateChanged(int row, DownloadManager::DownloadState);
@@ -86,6 +86,9 @@
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string notr="true">KB</string>
+          </property>
+		  <property name="visible">
+           <bool>false</bool>
          </property>
         </widget>
        </item>
@@ -81,18 +81,35 @@ void DownloadListWidgetCompactDelegate::drawCache(QPainter *painter, const QStyl
 {
  QRect rect = option.rect;
  rect.setLeft(0);
-  rect.setWidth(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2));
+  rect.setWidth(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2) + m_View->columnWidth(3));
  painter->drawPixmap(rect, cache);
 }

+QString DownloadListWidgetCompactDelegate::sizeFormat(quint64 size) const
+{
+  qreal calc = size;
+  QStringList list;
+  list << "KB" << "MB" << "GB" << "TB";
+
+  QStringListIterator i(list);
+  QString unit("byte(s)");
+
+  while (calc >= 1024.0 && i.hasNext())
+  {
+    unit = i.next();
+    calc /= 1024.0;
+  }
+
+  return QString().setNum(calc, 'f', 2) + " " + unit;
+}

 void DownloadListWidgetCompactDelegate::paintPendingDownload(int downloadIndex) const
 {
-  std::pair<int, int> nexusids = m_Manager->getPendingDownload(downloadIndex);
-  m_NameLabel->setText(tr("< mod %1 file %2 >").arg(nexusids.first).arg(nexusids.second));
-  if (m_SizeLabel != nullptr) {
-    m_SizeLabel->setText("???");
-  }
+  std::tuple<QString, int, int> nexusids = m_Manager->getPendingDownload(downloadIndex);
+  m_NameLabel->setText(tr("< game %1 mod %2 file %3 >").arg(std::get<0>(nexusids)).arg(std::get<1>(nexusids)).arg(std::get<2>(nexusids)));
+  //if (m_SizeLabel != nullptr) {
+  //  m_SizeLabel->setText("???");
+  //}
  m_DoneLabel->setVisible(true);
  m_DoneLabel->setText(tr("Pending"));
  m_Progress->setVisible(false);
@@ -110,11 +127,15 @@ void DownloadListWidgetCompactDelegate::paintRegularDownload(int downloadIndex)

  DownloadManager::DownloadState state = m_Manager->getState(downloadIndex);

-  if ((m_SizeLabel != nullptr) && (state >= DownloadManager::STATE_READY)) {
-    m_SizeLabel->setText(QString::number(m_Manager->getFileSize(downloadIndex) / 1048576));
+  if (m_SizeLabel != nullptr) {
+    m_SizeLabel->setText(sizeFormat(m_Manager->getFileSize(downloadIndex)) + "  ");
+    m_SizeLabel->setVisible(true);
  }
+  //else {
+  //  m_SizeLabel->setVisible(false);
+  //}

-  if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)) {
+  if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) || (state == DownloadManager::STATE_PAUSING)) {
    m_DoneLabel->setVisible(true);
    m_Progress->setVisible(false);
    m_DoneLabel->setText(QString("%1<img src=\":/MO/gui/inactive\">").arg(tr("Paused")));
@@ -138,7 +159,8 @@ void DownloadListWidgetCompactDelegate::paintRegularDownload(int downloadIndex)
  } else {
    m_DoneLabel->setVisible(false);
    m_Progress->setVisible(true);
-    m_Progress->setValue(m_Manager->getProgress(downloadIndex));
+    m_Progress->setValue(m_Manager->getProgress(downloadIndex).first);
+    m_Progress->setFormat(m_Manager->getProgress(downloadIndex).second);
  }
 }

@@ -152,7 +174,7 @@ void DownloadListWidgetCompactDelegate::paint(QPainter *painter, const QStyleOpt
      return;
    }

-    m_ItemWidget->resize(QSize(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2), option.rect.height()));
+    m_ItemWidget->resize(QSize(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2) + m_View->columnWidth(3), option.rect.height()));
    if (index.row() % 2 == 1) {
      m_ItemWidget->setBackgroundRole(QPalette::AlternateBase);
    } else {
@@ -208,7 +230,11 @@ void DownloadListWidgetCompactDelegate::issueQueryInfo()

 void DownloadListWidgetCompactDelegate::issueDelete()
 {
-  emit removeDownload(m_ContextIndex.row(), true);
+	if (QMessageBox::question(nullptr, tr("Are you sure?"),
+		tr("This will permanently delete the selected download."),
+		QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+		emit removeDownload(m_ContextIndex.row(), true);
+	}
 }

 void DownloadListWidgetCompactDelegate::issueRemoveFromView()
@@ -216,11 +242,27 @@ void DownloadListWidgetCompactDelegate::issueRemoveFromView()
  emit removeDownload(m_ContextIndex.row(), false);
 }

+void DownloadListWidgetCompactDelegate::issueVisitOnNexus()
+{
+	emit visitOnNexus(m_ContextIndex.row());
+}
+
+void DownloadListWidgetCompactDelegate::issueOpenInDownloadsFolder()
+{
+  emit openInDownloadsFolder(m_ContextIndex.row());
+}
+
 void DownloadListWidgetCompactDelegate::issueRestoreToView()
 {
-  emit restoreDownload(m_ContextIndex.row());
+		emit restoreDownload(m_ContextIndex.row());
 }

+void DownloadListWidgetCompactDelegate::issueRestoreToViewAll()
+{
+	emit restoreDownload(-1);
+}
+
+
 void DownloadListWidgetCompactDelegate::issueCancel()
 {
  emit cancelDownload(m_ContextIndex.row());
@@ -254,6 +296,15 @@ void DownloadListWidgetCompactDelegate::issueDeleteCompleted()
  }
 }

+void DownloadListWidgetCompactDelegate::issueDeleteUninstalled()
+{
+  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+    tr("This will remove all uninstalled downloads from this list and from disk."),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    emit removeDownload(-3, true);
+  }
+}
+
 void DownloadListWidgetCompactDelegate::issueRemoveFromViewAll()
 {
  if (QMessageBox::question(nullptr, tr("Are you sure?"),
@@ -272,6 +323,15 @@ void DownloadListWidgetCompactDelegate::issueRemoveFromViewCompleted()
  }
 }

+void DownloadListWidgetCompactDelegate::issueRemoveFromViewUninstalled()
+{
+  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+    tr("This will permanently remove all uninstalled downloads from this list (but NOT from disk)."),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    emit removeDownload(-3, false);
+  }
+}
+

 bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
                                   const QStyleOptionViewItem &option, const QModelIndex &index)
@@ -281,7 +341,7 @@ bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItem
      QModelIndex sourceIndex = qobject_cast<QSortFilterProxyModel*>(model)->mapToSource(index);
      if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_READY) {
        emit installDownload(sourceIndex.row());
-      } else if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) {
+      } else if ((m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) || (m_Manager->getState(sourceIndex.row()) == DownloadManager::STATE_PAUSING)) {
        emit resumeDownload(sourceIndex.row());
      }
      return true;
@@ -298,29 +358,40 @@ bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItem
            menu.addAction(tr("Install"), this, SLOT(issueInstall()));
            if (m_Manager->isInfoIncomplete(m_ContextIndex.row())) {
              menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfo()));
+            }else {
+              menu.addAction(tr("Visit on Nexus"), this, SLOT(issueVisitOnNexus()));
            }
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+            menu.addSeparator();
            menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
            if (hidden) {
              menu.addAction(tr("Un-Hide"), this, SLOT(issueRestoreToView()));
            } else {
-              menu.addAction(tr("Remove from View"), this, SLOT(issueRemoveFromView()));
+              menu.addAction(tr("Hide"), this, SLOT(issueRemoveFromView()));
            }
          } else if (state == DownloadManager::STATE_DOWNLOADING){
            menu.addAction(tr("Cancel"), this, SLOT(issueCancel()));
            menu.addAction(tr("Pause"), this, SLOT(issuePause()));
-          } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)) {
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+          } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) || (state == DownloadManager::STATE_PAUSING)) {
            menu.addAction(tr("Remove"), this, SLOT(issueDelete()));
            menu.addAction(tr("Resume"), this, SLOT(issueResume()));
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
          }
-
          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()));
        if (!hidden) {
          menu.addSeparator();
-          menu.addAction(tr("Remove Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
-          menu.addAction(tr("Remove All..."), this, SLOT(issueRemoveFromViewAll()));
+          menu.addAction(tr("Hide Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
+          menu.addAction(tr("Hide Uninstalled..."), this, SLOT(issueRemoveFromViewUninstalled()));
+          menu.addAction(tr("Hide All..."), this, SLOT(issueRemoveFromViewAll()));
+        }
+        if (hidden) {
+          menu.addSeparator();
+          menu.addAction(tr("Un-Hide All..."), this, SLOT(issueRestoreToViewAll()));
        }
        menu.exec(mouseEvent->globalPos());

@@ -334,4 +405,3 @@ bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItem

  return QItemDelegate::editorEvent(event, model, option, index);
 }
-
--- a/Show More
+++ b/Show More