Update LLVM 5.0

add stretchToDisplayArea to settingsdialog

fix color picker and toolbar background

settingsdialog adjustments

fix tooltips + .pup

fix adapter box

.gitignore

@@ -56,6 +56,7 @@ rpcs3/git-version.h
 
 # Visual Studio Files
 .vs/*
+*.ipch
 *.vspx
 *.psess
 *.VC.*

.gitmodules

@@ -8,7 +8,6 @@
 [submodule "llvm"]
 	path = llvm
 	url = https://github.com/llvm-mirror/llvm
-	branch = release_40
 [submodule "rsx_program_decompiler"]
 	path = rsx_program_decompiler
 	url = https://github.com/RPCS3/rsx_program_decompiler
@@ -17,7 +16,7 @@
 	url = https://github.com/Microsoft/GSL.git
 [submodule "libpng"]
 	path = 3rdparty/libpng
-	url = https://github.com/RPCS3/libpng
+	url = https://github.com/Zangetsu38/libpng
 	ignore = dirty
 [submodule "Vulkan/glslang"]
 	path = Vulkan/glslang
@@ -42,5 +41,5 @@
 	url = https://github.com/madler/zlib
 [submodule "3rdparty/hidapi"]
 	path = 3rdparty/hidapi
-	url = https://github.com/RPCS3/hidapi
+	url = https://github.com/Zangetsu38/hidapi
 	branch = master

README.md

@@ -21,15 +21,15 @@ If you want to contribute please take a look at the [Coding Style](https://githu
 ## Dependencies
 
 ### Windows
-* [Visual Studio 2015](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx)
-* [Visual C++ Redistributable Packages for Visual Studio 2015](http://www.microsoft.com/en-us/download/details.aspx?id=48145)
+* [Visual Studio 2017](https://www.visualstudio.com/downloads/)
+* [Visual C++ Redistributable Packages for Visual Studio 2017](https://go.microsoft.com/fwlink/?LinkId=746572)
 * [Cmake 3.1.0+](https://www.cmake.org/download/) (required; add to PATH)
 * [Python 3.3+](https://www.python.org/downloads/) (required; add to PATH)
-* [Qt 5.7+](https://www.qt.io/download-open-source/) (required; add QTDIR `<QtInstallFolder>\5.7\msvc2015_64\` environment variable if you do not want to use the Visual Studio Qt Plugin)
+* [Qt 5.9+](https://www.qt.io/download-open-source/) (required; add QTDIR `<QtInstallFolder>\5.9\msvc2015_64\` environment variable if you do not want to use the Visual Studio Qt Plugin)
 * [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2015) (optional; see above)
 
 ### Linux
-* [Qt 5.7+](https://www.qt.io/download-open-source/)
+* [Qt 5.9+](https://www.qt.io/download-open-source/)
 * GCC 5.1+ or Clang 3.5.0+ ([not GCC 6.1](https://github.com/RPCS3/rpcs3/issues/1691))
 * Debian & Ubuntu: `sudo apt-get install cmake build-essential libasound2-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git qt5-default`
 * Arch: `sudo pacman -S glew openal cmake llvm qt5-base`
@@ -47,10 +47,10 @@ To initialize the repository don't forget to execute `git submodule update --ini
 ### Configuring Qt
 
 *If you're using Visual Studio 2017 without Qt plugin support (or simply dont want to use it):* 
-1) Add `QTDIR` environment variable and set it to `<QtInstallFolder>\5.7\msvc2015_64\` </br>
+1) Add `QTDIR` environment variable and set it to `<QtInstallFolder>\5.9\msvc2017_64\` </br>
 
 *If you wish to use the Visual Studio plugin for Qt:* </br>
-1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.7\msvc2015_64`. </br>
+1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.8\msvc2015_64`. </br>
 2) While selecting the rpcs3qt project, go to Qt5->Project Setting and select the version you added. 
 
 ### Building the projects

Utilities/JIT.cpp

@@ -257,11 +257,11 @@ struct MemoryManager : llvm::RTDyldMemoryManager
 		return RTDyldMemoryManager::registerEHFrames(addr, load_addr, size);
 	}
 
-	virtual void deregisterEHFrames(u8* addr, u64 load_addr, std::size_t size) override
+	virtual void deregisterEHFrames() override
 	{
 		LOG_ERROR(GENERAL, "deregisterEHFrames() called"); // Not expected
 
-		return RTDyldMemoryManager::deregisterEHFrames(addr, load_addr, size);
+		return RTDyldMemoryManager::deregisterEHFrames();
 	}
 };
 

Utilities/yaml-cpp.vcxproj

@@ -19,7 +19,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Vulkan/Vulkan-build/Vulkan-build.vcxproj

@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -39,20 +39,20 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m</NMakeBuildCommandLine>
-    <NMakeCleanCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeCleanCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeReBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m
     </NMakeReBuildCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeReBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeCleanCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m</NMakeCleanCommandLine>
   </PropertyGroup>
   <ItemDefinitionGroup>

Vulkan/glslang-build/glslang-build.vcxproj

@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -39,24 +39,24 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+    <NMakeBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
 msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+    <NMakeReBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
 msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+    <NMakeCleanCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
 msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m</NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <NMakeBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
       msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m
     </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
       msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m
     </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
       msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m
     </NMakeCleanCommandLine>
   </PropertyGroup>

appveyor.yml

@@ -1,6 +1,6 @@
 version: '0.0.2-{build}'
 
-os: Visual Studio 2015
+os: Visual Studio 2017
 platform: x64
 clone_folder: C:\rpcs3
 clone_depth: 3
@@ -15,8 +15,8 @@ before_build:
  - git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp 3rdparty/cereal 3rdparty/zlib 3rdparty/hidapi
  - 7z x zlib.7z -aos -oC:\rpcs3\ > null
  - 7z x vulkan.7z -aos -oC:\rpcs3\Vulkan > null
- - if %configuration%==Release (cmake -G "Visual Studio 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
-   else (7z x llvmlibs.7z -aos -oC:\rpcs3 > null && cmake -G "Visual Studio 14 Win64" -DLLVM_DIR=C:/rpcs3/llvm_build/lib/cmake/llvm -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
+ - if %configuration%==Release (cmake -G "Visual Studio 15 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
+   else (7z x llvmlibs.7z -aos -oC:\rpcs3 > null && cmake -G "Visual Studio 15 Win64" -DLLVM_DIR=C:/rpcs3/llvm_build/lib/cmake/llvm -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
 
 build_script:
  - cmake --build . --config Release -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -25,9 +25,9 @@ install:
  - if not exist llvmlibs.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRY2k3Q2Yya05lcm8" -FileName llvmlibs.7z
  - if not exist vulkan.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRaHYxV3VOS2d0a0U" -FileName vulkan.7z
  - if not exist zlib.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B-HVE3xvheVFX05lRFdnZlh5aUU" -FileName zlib.7z
- - set QTDIR=C:\Qt\5.8\msvc2015_64
+ - set QTDIR=C:\Qt\5.9\msvc2017_64
  - set OPENALDIR=C:\rpcs3\3rdparty\OpenAL
- - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%QTDIR%;%PATH%
+ - set PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%QTDIR%;%PATH%
  - set COMMIT_SHA=%APPVEYOR_REPO_COMMIT:~0,8%
 
 artifacts:

asmjitsrc/asmjit.vcxproj

@@ -93,7 +93,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

llvm_build/llvm_build.vcxproj

@@ -18,12 +18,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -39,30 +39,30 @@
     <NMakePreprocessorDefinitions>
     </NMakePreprocessorDefinitions>
     <NMakeBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
       msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m
     </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
       msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m
     </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
       msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m
     </NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <NMakePreprocessorDefinitions />
     <NMakeBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
       msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m
     </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
       msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m
     </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
       msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m
     </NMakeCleanCommandLine>
   </PropertyGroup>

rpcs3-tests/rpcs3-tests.vcxproj

@@ -20,14 +20,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>

rpcs3.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}"
 EndProject

rpcs3/CMakeLists.txt

@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0.2)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules")
 set(RES_FILES "")
 set(CMAKE_CXX_STANDARD 14)
 
 # Qt section
-find_package(Qt5 5.7 COMPONENTS Widgets)
+find_package(Qt5 5.9 COMPONENTS Widgets)
 if (WIN32)
     find_package(Qt5WinExtras REQUIRED)
     set(RPCS3_QT_LIBS Qt5::Widgets Qt5::WinExtras)
@@ -17,8 +17,8 @@ endif()
 
 # Let's make sure we have Qt before we continue
 if (NOT Qt5Widgets_FOUND)
-	if (Qt5Widgets_VERSION VERSION_LESS 5.7.0)
-		message("Minimum supported Qt5 version is 5.7! You have version ${Qt5Widgets_VERSION} installed, please upgrade!")
+	if (Qt5Widgets_VERSION VERSION_LESS 5.9.0)
+		message("Minimum supported Qt5 version is 5.9! You have version ${Qt5Widgets_VERSION} installed, please upgrade!")
 		if ("${CMAKE_SYSTEM}" MATCHES "Linux")
 			message(FATAL_ERROR "Most distros do not provide an up-to-date version of Qt.
 If you're on Ubuntu or Linux Mint, there are PPAs you can use to install an up-to-date qt5 version.
@@ -37,7 +37,7 @@ before re-running cmake")
     
     message("CMake was unable to find Qt5!")
     if (WIN32)
-		message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.8\\msvc2017_64\\)")
+		message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.9\\msvc2017_64\\)")
 	elseif("${CMAKE_SYSTEM}" MATCHES "Linux")
 		message(FATAL_ERROR "Make sure to install your distro's qt5 package!")
 	else()
@@ -47,6 +47,11 @@ endif()
 
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+
+# To make UI files on cmake 3.7 or less work
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 if (Qt5_POSITION_INDEPENDENT_CODE)
     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
     if(UNIX)

rpcs3/D3D12GSRender.vcxproj

@@ -31,7 +31,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

rpcs3/Emu/Cell/Modules/sceNp.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
@@ -911,6 +911,10 @@ s32 sceNpManagerRegisterCallback(vm::ptr<SceNpManagerCallback> callback, vm::ptr
 	{
 		return SCE_NP_ERROR_INVALID_ARGUMENT;
 	}
+	else
+	{
+		return SCE_NP_ERROR_NOT_INITIALIZED;
+	}
 
 	return CELL_OK;
 }

rpcs3/Emu/Cell/PPUTranslator.cpp

@@ -1,4 +1,4 @@
-#ifdef LLVM_AVAILABLE
+#ifdef LLVM_AVAILABLE
 
 #include "PPUTranslator.h"
 #include "PPUThread.h"
@@ -16,7 +16,7 @@ PPUTranslator::PPUTranslator(LLVMContext& context, Module* module, const ppu_mod
 	, m_module(module)
 	, m_is_be(false)
 	, m_info(info)
-	, m_pure_attr(AttributeSet::get(m_context, AttributeSet::FunctionIndex, {Attribute::NoUnwind, Attribute::ReadNone}))
+	, m_pure_attr(AttributeList::get(m_context,AttributeList::FunctionIndex, AttrBuilder().addAttribute(Attribute::NoUnwind).addAttribute(Attribute::ReadNone)))
 {
 	// There is no weak linkage on JIT, so let's create variables with different names for each module part
 	const u32 gsuffix = m_info.name.empty() ? info.funcs[0].addr : info.funcs[0].addr - m_info.segs[0].addr;
@@ -133,7 +133,7 @@ Function* PPUTranslator::Translate(const ppu_function& info)
 	const u64 base = m_reloc ? m_reloc->addr : 0;
 	m_addr = info.addr - base;
 
-	m_thread = &*m_function->getArgumentList().begin();
+	m_thread = &*m_function->arg_begin();
 	m_base_loaded = m_ir->CreateLoad(m_base);
 
 	m_body = BasicBlock::Create(m_context, "__body", m_function);
@@ -3115,7 +3115,7 @@ void PPUTranslator::STSWI(ppu_opcode_t op)
 	{
 		if (index > 3)
 		{
-			WriteMemory(GetGpr(reg, 32), addr);
+			WriteMemory(addr, GetGpr(reg, 32));
 			index -= 4;
 
 			if (index)
@@ -3129,7 +3129,7 @@ void PPUTranslator::STSWI(ppu_opcode_t op)
 
 			while (index)
 			{
-				WriteMemory(m_ir->CreateLShr(buf, 24), addr);
+				WriteMemory(addr, m_ir->CreateLShr(buf, 24));
 
 				if (--index)
 				{

rpcs3/Emu/Cell/PPUTranslator.h

@@ -120,7 +120,7 @@ class PPUTranslator final //: public CPUTranslator
 	std::map<u64, const ppu_reloc*> m_relocs;
 
 	// Attributes for function calls which are "pure" and may be optimized away if their results are unused
-	const llvm::AttributeSet m_pure_attr;
+	const llvm::AttributeList m_pure_attr;
 
 	// IR builder
 	llvm::IRBuilder<>* m_ir;
@@ -404,7 +404,7 @@ public:
 
 	// Call a function with attribute list
 	template<typename... Args>
-	llvm::CallInst* Call(llvm::Type* ret, llvm::AttributeSet attr, llvm::StringRef name, Args... args)
+	llvm::CallInst* Call(llvm::Type* ret, llvm::AttributeList attr, llvm::StringRef name, Args... args)
 	{
 		// Call the function
 		return m_ir->CreateCall(m_module->getOrInsertFunction(name, llvm::FunctionType::get(ret, {args->getType()...}, false), attr), {args...});
@@ -414,7 +414,7 @@ public:
 	template<typename... Args>
 	llvm::CallInst* Call(llvm::Type* ret, llvm::StringRef name, Args... args)
 	{
-		return Call(ret, llvm::AttributeSet{}, name, args...);
+		return Call(ret, llvm::AttributeList{}, name, args...);
 	}
 
 	// Handle compilation errors

rpcs3/Emu/Cell/lv2/sys_rsx.cpp

@@ -54,7 +54,7 @@ struct RsxDriverInfo {
     be_t<u32> unk14;         // 0x12E0
     be_t<u32> unk15;         // 0x12E4
     be_t<u32> unk16;         // 0x12E8
-    be_t<u32> unk17;         // 0x12F0 
+    be_t<u32> unk17;         // 0x12F0
     be_t<u32> lastError;     // 0x12F4 error param for cellGcmSetGraphicsHandler
     // todo: theres more to this 
 };
@@ -299,7 +299,7 @@ s32 sys_rsx_context_iounmap(u32 context_id, u32 io_addr, u32 a3, u32 size)
  */
 s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6)
 {
-    if (package_id != 0x101)
+    if (package_id != 0xFED)
 	sys_rsx.todo("sys_rsx_context_attribute(context_id=0x%x, package_id=0x%x, a3=0x%llx, a4=0x%llx, a5=0x%llx, a6=0x%llx)", context_id, package_id, a3, a4, a5, a6);
 
     // hle/lle protection
@@ -318,14 +318,8 @@ s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u6
 	
 	case 0x100: // Display mode set
         break;
-    case 0x101: // Display sync
-        // todo: this is wrong and should be 'second' vblank handler and freq
-        // although gcmSys seems just hardcoded at 1, so w/e
-        driverInfo.head[1].vBlankCount++;
-        driverInfo.head[1].lastSecondVTime = rsxTimeStamp();
-        sys_event_port_send(g_rsx_event_port, 0, (1 << 1), 0);
-        sys_event_port_send(g_rsx_event_port, 0, (1 << 11), 0); // second vhandler
-		break;
+    case 0x101: // Display sync set, cellGcmSetFlipMode
+        break;
 
 	case 0x102: // Display flip
         driverInfo.head[a3].flipFlags |= 0x80000000;
@@ -424,6 +418,14 @@ s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u6
     case 0x603: // Framebuffer close
         break;
 
+    case 0xFED: // hack: vblank command
+        // todo: this is wrong and should be 'second' vblank handler and freq
+        // although gcmSys seems just hardcoded at 1, so w/e
+        driverInfo.head[a3].vBlankCount++;
+        driverInfo.head[a3].lastSecondVTime = rsxTimeStamp();
+        sys_event_port_send(g_rsx_event_port, 0, (1 << 1), 0);
+        sys_event_port_send(g_rsx_event_port, 0, (1 << 11), 0); // second vhandler
+        break;
     case 0xFEF: // hack: user command
         // 'custom' invalid package id for now 
         // as i think we need custom lv1 interrupts to handle this accurately
@@ -472,6 +474,9 @@ s32 sys_rsx_device_unmap(u32 dev_id)
 	return CELL_OK;
 }
 
+/*
+* lv2 SysCall 677 (0x2A5): sys_rsx_attribute
+*/
 s32 sys_rsx_attribute(u32 packageId, u32 a2, u32 a3, u32 a4, u32 a5)
 {
 	sys_rsx.todo("sys_rsx_attribute(packageId=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x)", packageId, a2, a3, a4, a5);

rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp

@@ -175,9 +175,16 @@ void D3D12GSRender::prepare_render_targets(ID3D12GraphicsCommandList *copycmdlis
 		rsx::method_registers.clear_color_b() / 255.f,
 		rsx::method_registers.clear_color_a() / 255.f,
 	};
+
+    u32 clip_width = rsx::method_registers.surface_clip_width();
+    u32 clip_height = rsx::method_registers.surface_clip_height();
+
+    if (clip_height == 0 || clip_width == 0)
+        return;
+
 	m_rtts.prepare_render_target(copycmdlist,
 		rsx::method_registers.surface_color(), rsx::method_registers.surface_depth_fmt(),
-		rsx::method_registers.surface_clip_width(), rsx::method_registers.surface_clip_height(),
+        clip_width, clip_height,
 		rsx::method_registers.surface_color_target(),
 		get_color_surface_addresses(), get_zeta_surface_address(),
 		m_device.Get(), clear_color, 1.f, 0);

rpcs3/Emu/RSX/RSXThread.cpp

@@ -403,7 +403,7 @@ namespace rsx
 				if (get_system_time() - start_time > vblank_count * 1000000 / 60)
 				{
 					vblank_count++;
-                    sys_rsx_context_attribute(0x55555555, 0x101, 0, 0, 0, 0);
+                    sys_rsx_context_attribute(0x55555555, 0xFED, 1, 0, 0, 0);
 					if (vblank_handler)
 					{
 						intr_thread->cmd_list

rpcs3/Emu/RSX/rsx_methods.cpp

@@ -909,22 +909,6 @@ namespace rsx
 			}
 			Emu.Pause();
 		}
-
-		double limit = 0.;
-		switch (g_cfg.video.frame_limit)
-		{
-		case frame_limit_type::none: limit = 0.; break;
-		case frame_limit_type::_59_94: limit = 59.94; break;
-		case frame_limit_type::_50: limit = 50.; break;
-		case frame_limit_type::_60: limit = 60.; break;
-		case frame_limit_type::_30: limit = 30.; break;
-		case frame_limit_type::_auto: limit = rsx->fps_limit; break; // TODO
-		}
-		if (limit)
-		{
-			std::this_thread::sleep_for(std::chrono::milliseconds((s64)(1000.0 / limit - rsx->timer_sync.GetElapsedTimeInMilliSec())));
-			rsx->timer_sync.Start();
-		}
 		
 		rsx->gcm_current_buffer = arg;
 		rsx->flip(arg);
@@ -933,7 +917,6 @@ namespace rsx
 		//rsx->reset(); // moved to 'actual' rsx flip command
 
 		rsx->last_flip_time = get_system_time() - 1000000;
-		rsx->gcm_current_buffer = arg;
 		rsx->flip_status = CELL_GCM_DISPLAY_FLIP_STATUS_DONE;
 
 		if (rsx->flip_handler)
@@ -974,6 +957,22 @@ namespace rsx
         {
             static void impl(thread* rsx, u32 _reg, u32 arg)
             {
+                double limit = 0.;
+                switch (g_cfg.video.frame_limit)
+                {
+                case frame_limit_type::none: limit = 0.; break;
+                case frame_limit_type::_59_94: limit = 59.94; break;
+                case frame_limit_type::_50: limit = 50.; break;
+                case frame_limit_type::_60: limit = 60.; break;
+                case frame_limit_type::_30: limit = 30.; break;
+                case frame_limit_type::_auto: limit = rsx->fps_limit; break; // TODO
+                }
+                if (limit)
+                {
+                    std::this_thread::sleep_for(std::chrono::milliseconds((s64)(1000.0 / limit - rsx->timer_sync.GetElapsedTimeInMilliSec())));
+                    rsx->timer_sync.Start();
+                }
+
                 rsx->reset(); // fixes kh, so lets leave it here and see what happens
                 sys_rsx_context_attribute(0x55555555, 0x102, index, arg, 0, 0);
             }

rpcs3/GLGSRender.vcxproj

@@ -31,7 +31,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -95,4 +95,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

rpcs3/Json/tooltips.json

@@ -0,0 +1,86 @@
+{
+	"audio": {
+		"audioOutBox": "Windows: Always use XAudio, no exceptions.\n\nLinux: ALSA uses the native Linux sound system to output sound.\nThis option has good compatibility and sound quality.\nOpenAL uses a cross-platform approach but will have poor audio quality and stuttering sound in most games.\nIf unsure, use ALSA.",
+		"audioDump": "Saves all audio as a raw wave file. If unsure, leave this unchecked.",
+		"convert": "Use with buggy audio drivers if you have no sound or completely broken sound.",
+		"downmix": "Windows: Use with buggy audio drivers if you are only hearing parts of the game sound, for example music but not voices.\n\nLinux: Usually required with the ALSA audio backend unless you are actually using surround speakers.\nIf you are only hearing parts of the game sound, for example music but not voices, use this."
+	},
+	"cpu": {
+		"PPU": {
+			"precise": "This is the most accurate Interpreter, but very slow to play games with.\nYou may try this as a last resort if you encounter odd bugs or crashes.\nIf unsure, use PPU Interpreter Fast or PPU recompiler (LLVM).",
+			"fast": "This is the fastest interpreter.\nTrades accuracy for speed, and it very rarely breaks games even in comparison to the Precise option.\nTry this if PPU Recompiler (LLVM) fails.",
+			"LLVM": "Recompiles the game's executable once before running it for the first time.\nThis is by far the fastest option and should always be used.\nShould you face compatibility issues, fall back to one of the Interpreters and retry.\nIf unsure, use this option."
+		},
+		"SPU": {
+			"precise": "This is extremely slow but may fix broken graphics in some games.",
+			"fast": "This is slower than the SPU recompiler but significantly faster than the precise interpreter.\nGames rarely need this however.",
+			"ASMJIT": "This is the fastest option with very good compatibility.\nIf unsure, use this option.",
+			"LLVM": "This doesn't exist (yet)"
+		},
+		"libraries": {
+			"auto": "Automatically selects the LLE libraries to load.\nIf unsure, leave this option checked.",
+			"manual": "Allows the user to manually choose the LLE libraries to load.\nIf unsure, don't use this option. Nothing will work if you use this.",
+			"both": "Automatically selects the LLE libraries to load and allows the user to choose additional libraries manually.\nIf unsure, don't use this option.",
+			"liblv2": "This closely emulates how games can load and unload system module files on a real PlayStation 3.\nSome games require this. Usually safe to use, but if unsure, don't use this option and try auto first."
+		},
+		"checkboxes": {
+			"hookStFunc": "Placebo setting, this does nothing at all.",
+			"bindSPUThreads": "If your CPU has SMT (Hyper-Threading) SPU threads will run on these logical cores instead.\nUsually faster on an i3, possibly slower or no difference on an i7 or Ryzen.",
+			"lowerSPUThrPrio": "Runs SPU threads with lower priority than PPU threads.\nUsually faster on an i3 or i5, possibly slower or no difference on an i7 or Ryzen."
+		}
+	},
+	"emulator": {
+		"gui": {
+			"configs": "Only useful to developers.\nIf unsure, don't use this option.",
+			"stylesheets": "Only useful to developers.\nIf unsure, don't use this option.",
+			"show_welcome": "Shows the initial welcome screen upon starting RPCS3."
+		},
+		"misc": {
+			"exitOnStop": "Automatically close RPCS3 when closing a game, or when a game closes itself.",
+			"alwaysStart": "Leave this enabled unless you are a developer.",
+			"startGameFullscreen": "Automatically puts the game window in fullscreen.\nDouble click on the game window or press alt+enter to toggle fullscreen and windowed mode.",
+			"showFPSInTitle": "It can be useful to disable it with buggy screen recording software that fail to select a window with ever changing title."
+		}
+	},
+	"gpu": {
+		"comboboxes": {
+			"renderBox": "Vulkan is the fastest renderer. OpenGL is the most accurate renderer.\nIf unsure, use Vulkan. Should you have any compatibility issues, fall back to OpenGL.\nDirectX 12 is deprecated and should never be used.",
+			"resBox": "Leave this on 1280x720, every PS3 game is compatible with this resolution.\nSet it to 1920x1080 only if supported by the game. Lower resolutions may work but are not practical.\nHowever rarely due to emulation bugs some games will only render at low resolutions like 480p.",
+			"graphicsAdapterBox": "On multi GPU systems select which GPU to use in RPCS3 when using Vulkan or DirectX 12.\nThis is not needed whe using OpenGL.",
+			"aspectBox": "Leave this on 16:9 unless you have a 4:3 monitor.\nAuto also works well especially if you use a resolution that is not 720p.",
+			"frameLimitBox": "Auto is the most compatible option.\nSome games can work with frame limit off, but it may cause bugs and crashes.\nSet to off if you get severe hitching and stuttering."
+		},
+		"main": {
+			"dumpColor": "Enable this option if you get missing graphics or broken lighting ingame.\nMight degrade performance and introduce stuttering in some cases.\nRequired for Demon's Souls.",
+			"readColor": "Never use this.",
+			"dumpDepth": "Never use this.",
+			"readDepth": "Never use this.",
+			"vsync": "By having this off you might obtain a higher frame rate at the cost of tearing artifacts in the game.",
+			"autoInvalidateCache": "Enable this option if the game has broken shadows. May slightly degrade performance.",
+			"gpuTextureScaling": "Small to significant performance boost in most games and rarely with side effects.\nMay cause texture corruption in rare cases.\nOnly works with OpenGL for now.",
+			"stretchToDisplayArea": "Overrides the aspect ratio and stretches the image to the full display area."
+		},
+		"debug": {
+			"glLegacyBuffers": "Enables use of classic openGL buffers which allows capturing tools to work with rpcs3 e.g RenderDoc.\nIf unsure, don't use this option.",
+			"scrictModeRendering": "Enforces strict compliance to the API specification.\nMight result in degraded performance in some games.\nCan resolve rare cases of missing graphics and flickering.\nIf unsure, don't use this option.",
+			"forceHighpZ": "Only useful when debugging differences in GPU hardware.\nNot necessary for average users.\nIf unsure, don't use this option.",
+			"debugOutput": "Enables the selected API's inbuilt debugging functionality.\nWill cause severe performance degradation especially with vulkan.\nOnly useful for developers.\nIf unsure, don't use this option.",
+			"debugOverlay": "Provides a graphical overlay of various debugging information.\nIf unsure, don't use this option.",
+			"logProg": "Dump game shaders to file. Only useful to developers.\nIf unsure, don't use this option."
+		}
+	},
+	"input": {
+		"padHandlerBox": "If you want to use the keyboard to control, select the Keyboard option.\nYou can change the button mappings in Configuration --> Controls.\nIf you have a DualShock 4, select DualShock 4.\nWindows: If you have an Xbox controller, or another compatible device, use XInput.\nOlder controllers such as PS2 controllers with an adapter usually work fine with mmjoystick.\nCheck button mappings in the Windows control panel.\n\nLinux: evdev input is WIP.",
+		"keyboardHandlerBox": "Some games support native keyboard input.\nBasic will work in these cases.",
+		"mouseHandlerBox": "Some games support native mouse input.\nBasic will work in these cases.",
+		"useFakeCamera": "Camera support is not implemented, leave this on null.",
+		"cameraTypeBox": "Camera support is not implemented, leave this on unknown."
+	},
+	"network": {
+		"netStatusBox": "Leave as disconnected unless you're debugging.\nRPCS3 has no online support."
+	},
+	"system": {
+		"sysLangBox": "Some games may fail to boot if the system language is not available in the game itself.\nOther games will switch language automatically to what is selected here.\nIt is recommended leaving this on a language supported by the game.",
+		"enableHostRoot": "Required for some Homebrew.\nIf unsure, don't use this option."
+	}
+}

rpcs3/OpenAL.vcxproj

@@ -31,7 +31,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

rpcs3/VKGSRender.vcxproj

@@ -61,7 +61,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

rpcs3/XAudio.vcxproj

@@ -31,7 +31,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

rpcs3/emucore.vcxproj

@@ -30,7 +30,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

rpcs3/resources.qrc

@@ -21,7 +21,27 @@
         <file>Icons/media_gray.png</file>
         <file>Icons/unknown_blue.png</file>
         <file>Icons/unknown_gray.png</file>
+        <file>Icons/controller.png</file>
+        <file>Icons/insignia.png</file>
+        <file>Icons/configure.png</file>
+        <file>Icons/context.png</file>
+        <file>Icons/controllers.png</file>
+        <file>Icons/controls.png</file>
+        <file>Icons/disc.png</file>
+        <file>Icons/fullscreen.png</file>
+        <file>Icons/grid.png</file>
+        <file>Icons/list.png</file>
+        <file>Icons/refresh.png</file>
+        <file>Icons/screenshot.png</file>
+        <file>Icons/separator.png</file>
+        <file>Icons/sort.png</file>
+        <file>Icons/fullscreen_invert.png</file>
+        <file>Json/tooltips.json</file>
         <file>Icons/other_blue.png</file>
         <file>Icons/other_gray.png</file>
+        <file>Icons/pause_blue.png</file>
+        <file>Icons/play_blue.png</file>
+        <file>Icons/restart_blue.png</file>
+        <file>Icons/stop_blue.png</file>
     </qresource>
 </RCC>

rpcs3/rpcs3.vcxproj

@@ -26,7 +26,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
     <OutputDirectory>release\</OutputDirectory>
     <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
     <CharacterSet>Unicode</CharacterSet>
@@ -35,7 +35,7 @@
     <PrimaryOutput>rpcs3</PrimaryOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
     <OutputDirectory>release\</OutputDirectory>
     <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
     <CharacterSet>Unicode</CharacterSet>
@@ -44,7 +44,7 @@
     <PrimaryOutput>rpcs3</PrimaryOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
     <OutputDirectory>debug\</OutputDirectory>
     <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
     <CharacterSet>Unicode</CharacterSet>
@@ -53,7 +53,7 @@
     <PrimaryOutput>rpcs3</PrimaryOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
     <OutputDirectory>debug\</OutputDirectory>
     <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
     <CharacterSet>Unicode</CharacterSet>
@@ -347,7 +347,7 @@
     <ClCompile Include="keyboard_pad_handler.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="mm_joystick_handler.cpp" />
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_audio_tab.cpp">
+    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_about_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -372,11 +372,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_core_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_debugger_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -397,11 +392,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_graphics_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_gs_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -412,16 +402,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_gui_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_input_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_kernel_explorer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -442,21 +422,11 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_misc_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_msg_dialog_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_networking_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_pad_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -482,11 +452,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_system_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_vfs_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -502,7 +467,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_audio_tab.cpp">
+    <ClCompile Include="QTGeneratedFiles\Debug\moc_about_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
@@ -527,11 +492,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_core_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_debugger_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -552,11 +512,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_graphics_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_gs_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -567,16 +522,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_gui_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_input_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_kernel_explorer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -597,21 +542,11 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_misc_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_msg_dialog_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_networking_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_pad_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -637,11 +572,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_system_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -667,7 +597,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_audio_tab.cpp">
+    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_about_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
@@ -692,11 +622,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_core_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_debugger_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -717,11 +642,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_graphics_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_gs_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -732,16 +652,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_gui_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_input_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_kernel_explorer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -762,21 +672,11 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_misc_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_msg_dialog_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_networking_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_pad_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -802,11 +702,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_system_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_vfs_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -822,7 +717,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_audio_tab.cpp">
+    <ClCompile Include="QTGeneratedFiles\Release\moc_about_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
@@ -847,11 +742,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_core_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_debugger_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -872,11 +762,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_graphics_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_gs_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -887,16 +772,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_gui_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_input_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_kernel_explorer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -917,21 +792,11 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_misc_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_msg_dialog_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_networking_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_pad_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -957,11 +822,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_system_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -977,41 +837,34 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="rpcs3qt\about_dialog.cpp" />
     <ClCompile Include="rpcs3qt\game_list_grid.cpp" />
     <ClCompile Include="rpcs3qt\game_list_grid_delegate.cpp" />
     <ClCompile Include="rpcs3qt\vfs_dialog.cpp" />
     <ClCompile Include="rpcs3qt\vfs_dialog_tab.cpp" />
     <ClCompile Include="rpcs3qt\welcome_dialog.cpp" />
     <ClCompile Include="rpcs3_app.cpp" />
-    <ClCompile Include="rpcs3qt\audio_tab.cpp" />
     <ClCompile Include="rpcs3qt\auto_pause_settings_dialog.cpp" />
     <ClCompile Include="rpcs3qt\cg_disasm_window.cpp" />
-    <ClCompile Include="rpcs3qt\core_tab.cpp" />
     <ClCompile Include="rpcs3qt\debugger_frame.cpp" />
     <ClCompile Include="rpcs3qt\emu_settings.cpp" />
     <ClCompile Include="rpcs3qt\game_list_frame.cpp" />
     <ClCompile Include="rpcs3qt\gl_gs_frame.cpp" />
-    <ClCompile Include="rpcs3qt\graphics_tab.cpp" />
     <ClCompile Include="rpcs3qt\gs_frame.cpp" />
     <ClCompile Include="rpcs3qt\gui_settings.cpp" />
-    <ClCompile Include="rpcs3qt\gui_tab.cpp" />
-    <ClCompile Include="rpcs3qt\input_tab.cpp" />
     <ClCompile Include="rpcs3qt\instruction_editor_dialog.cpp" />
     <ClCompile Include="rpcs3qt\kernel_explorer.cpp" />
     <ClCompile Include="rpcs3qt\log_frame.cpp" />
     <ClCompile Include="rpcs3qt\main_window.cpp" />
     <ClCompile Include="rpcs3qt\memory_string_searcher.cpp" />
     <ClCompile Include="rpcs3qt\memory_viewer_panel.cpp" />
-    <ClCompile Include="rpcs3qt\misc_tab.cpp" />
     <ClCompile Include="rpcs3qt\msg_dialog_frame.cpp" />
-    <ClCompile Include="rpcs3qt\networking_tab.cpp" />
     <ClCompile Include="rpcs3qt\pad_settings_dialog.cpp" />
     <ClCompile Include="rpcs3qt\register_editor_dialog.cpp" />
     <ClCompile Include="rpcs3qt\rsx_debugger.cpp" />
     <ClCompile Include="rpcs3qt\save_data_dialog.cpp" />
     <ClCompile Include="rpcs3qt\save_data_utility.cpp" />
     <ClCompile Include="rpcs3qt\settings_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\system_tab.cpp" />
     <ClCompile Include="xinput_pad_handler.cpp" />
     <ClCompile Include="\rpcs3qt\*.cpp" />
   </ItemGroup>
@@ -1072,24 +925,6 @@
     </CustomBuild>
     <ClInclude Include="ds4_pad_handler.h" />
     <ClInclude Include="keyboard_pad_handler.h" />
-    <CustomBuild Include="rpcs3qt\graphics_tab.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing graphics_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing graphics_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing graphics_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Moc%27ing graphics_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\gs_frame.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing gs_frame.h...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing gs_frame.h...</Message>
@@ -1108,24 +943,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\input_tab.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing input_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing input_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing input_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Moc%27ing input_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\log_frame.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing log_frame.h...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing log_frame.h...</Message>
@@ -1162,42 +979,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\misc_tab.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing misc_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing misc_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing misc_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Moc%27ing misc_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\networking_tab.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing networking_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing networking_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing networking_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Moc%27ing networking_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\pad_settings_dialog.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing pad_settings_dialog.h...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing pad_settings_dialog.h...</Message>
@@ -1234,42 +1015,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\system_tab.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing system_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing system_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing system_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Moc%27ing system_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\audio_tab.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing audio_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing audio_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing audio_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Moc%27ing audio_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\auto_pause_settings_dialog.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing auto_pause_settings_dialog.h...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing auto_pause_settings_dialog.h...</Message>
@@ -1288,24 +1033,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\core_tab.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing core_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing core_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing core_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Moc%27ing core_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\debugger_frame.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing debugger_frame.h...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing debugger_frame.h...</Message>
@@ -1397,24 +1124,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\gui_tab.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing gui_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing gui_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing gui_tab.h...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Moc%27ing gui_tab.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\kernel_explorer.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing kernel_explorer.h...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing kernel_explorer.h...</Message>
@@ -1469,6 +1178,29 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
     </CustomBuild>
+    <ClInclude Include="QTGeneratedFiles\ui_about_dialog.h" />
+    <ClInclude Include="QTGeneratedFiles\ui_main_window.h" />
+    <ClInclude Include="QTGeneratedFiles\ui_pad_settings_dialog.h" />
+    <ClInclude Include="QTGeneratedFiles\ui_settings_dialog.h" />
+    <ClInclude Include="QTGeneratedFiles\ui_welcome_dialog.h" />
+    <CustomBuild Include="rpcs3qt\about_dialog.h">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Moc%27ing about_dialog.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing about_dialog.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing about_dialog.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing about_dialog.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras"</Command>
+    </CustomBuild>
     <ClInclude Include="rpcs3qt\game_list_grid_delegate.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="rpcs3qt\gl_gs_frame.h" />
@@ -1642,6 +1374,106 @@
   <ItemGroup>
     <ResourceCompile Include="rpcs3.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="rpcs3qt\about_dialog.ui">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="rpcs3qt\main_window.ui">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="rpcs3qt\pad_settings_dialog.ui">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="rpcs3qt\settings_dialog.ui">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="rpcs3qt\welcome_dialog.ui">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Uic%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
+    </CustomBuild>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
   <ProjectExtensions>

rpcs3/rpcs3.vcxproj.filters

@@ -55,6 +55,11 @@
       <Extensions>qrc;*</Extensions>
       <ParseFiles>false</ParseFiles>
     </Filter>
+    <Filter Include="Form Files">
+      <UniqueIdentifier>{99349809-55BA-4b9d-BF79-8FDBB0286EB3}</UniqueIdentifier>
+      <Extensions>ui</Extensions>
+      <ParseFiles>true</ParseFiles>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="\rpcs3qt\*.cpp">
@@ -63,21 +68,6 @@
     <ClCompile Include="main.cpp">
       <Filter>rpcs3</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_audio_tab.cpp">
-      <Filter>Generated Files\Release - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_audio_tab.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_audio_tab.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_audio_tab.cpp">
-      <Filter>Generated Files\Debug - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\audio_tab.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
     <ClCompile Include="rpcs3qt\auto_pause_settings_dialog.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
@@ -108,21 +98,6 @@
     <ClCompile Include="rpcs3qt\cg_disasm_window.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_core_tab.cpp">
-      <Filter>Generated Files\Release - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_core_tab.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_core_tab.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_core_tab.cpp">
-      <Filter>Generated Files\Debug - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\core_tab.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_debugger_frame.cpp">
       <Filter>Generated Files\Release - LLVM</Filter>
     </ClCompile>
@@ -171,21 +146,6 @@
     <ClCompile Include="rpcs3qt\gl_gs_frame.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_graphics_tab.cpp">
-      <Filter>Generated Files\Release - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_graphics_tab.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_graphics_tab.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_graphics_tab.cpp">
-      <Filter>Generated Files\Debug - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\graphics_tab.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_gs_frame.cpp">
       <Filter>Generated Files\Release - LLVM</Filter>
     </ClCompile>
@@ -216,36 +176,6 @@
     <ClCompile Include="rpcs3qt\gui_settings.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_gui_tab.cpp">
-      <Filter>Generated Files\Release - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_gui_tab.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_gui_tab.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_gui_tab.cpp">
-      <Filter>Generated Files\Debug - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\gui_tab.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_input_tab.cpp">
-      <Filter>Generated Files\Release - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_input_tab.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_input_tab.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_input_tab.cpp">
-      <Filter>Generated Files\Debug - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\input_tab.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_kernel_explorer.cpp">
       <Filter>Generated Files\Release - LLVM</Filter>
     </ClCompile>
@@ -306,36 +236,6 @@
     <ClCompile Include="rpcs3qt\memory_string_searcher.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_misc_tab.cpp">
-      <Filter>Generated Files\Release - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_misc_tab.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_misc_tab.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_misc_tab.cpp">
-      <Filter>Generated Files\Debug - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\misc_tab.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_networking_tab.cpp">
-      <Filter>Generated Files\Release - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_networking_tab.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_networking_tab.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_networking_tab.cpp">
-      <Filter>Generated Files\Debug - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\networking_tab.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_pad_settings_dialog.cpp">
       <Filter>Generated Files\Release - LLVM</Filter>
     </ClCompile>
@@ -399,21 +299,6 @@
     <ClCompile Include="rpcs3qt\settings_dialog.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
-    <ClCompile Include="rpcs3qt\system_tab.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_system_tab.cpp">
-      <Filter>Generated Files\Release - LLVM</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_system_tab.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_system_tab.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_system_tab.cpp">
-      <Filter>Generated Files\Debug - LLVM</Filter>
-    </ClCompile>
     <ClCompile Include="basic_keyboard_handler.cpp">
       <Filter>Io\Basic</Filter>
     </ClCompile>
@@ -561,6 +446,21 @@
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_vfs_dialog_tab.cpp">
       <Filter>Generated Files\Debug - LLVM</Filter>
     </ClCompile>
+    <ClCompile Include="rpcs3qt\about_dialog.cpp">
+      <Filter>Gui</Filter>
+    </ClCompile>
+    <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_about_dialog.cpp">
+      <Filter>Generated Files\Release - LLVM</Filter>
+    </ClCompile>
+    <ClCompile Include="QTGeneratedFiles\Debug\moc_about_dialog.cpp">
+      <Filter>Generated Files\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="QTGeneratedFiles\Release\moc_about_dialog.cpp">
+      <Filter>Generated Files\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_about_dialog.cpp">
+      <Filter>Generated Files\Debug - LLVM</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="\rpcs3qt\*.h">
@@ -599,6 +499,21 @@
     <ClInclude Include="rpcs3qt\game_list_grid_delegate.h">
       <Filter>Gui</Filter>
     </ClInclude>
+    <ClInclude Include="QTGeneratedFiles\ui_about_dialog.h">
+      <Filter>Generated Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QTGeneratedFiles\ui_main_window.h">
+      <Filter>Generated Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QTGeneratedFiles\ui_pad_settings_dialog.h">
+      <Filter>Generated Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QTGeneratedFiles\ui_settings_dialog.h">
+      <Filter>Generated Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QTGeneratedFiles\ui_welcome_dialog.h">
+      <Filter>Generated Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">
@@ -607,18 +522,12 @@
     <CustomBuild Include="release\moc_predefs.h.cbt">
       <Filter>Generated Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\audio_tab.h">
-      <Filter>Gui</Filter>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\auto_pause_settings_dialog.h">
       <Filter>Gui</Filter>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\cg_disasm_window.h">
       <Filter>Gui</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\core_tab.h">
-      <Filter>Gui</Filter>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\debugger_frame.h">
       <Filter>Gui</Filter>
     </CustomBuild>
@@ -628,21 +537,12 @@
     <CustomBuild Include="rpcs3qt\game_list_frame.h">
       <Filter>Gui</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\graphics_tab.h">
-      <Filter>Gui</Filter>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\gs_frame.h">
       <Filter>Gui</Filter>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\gui_settings.h">
       <Filter>Gui</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\gui_tab.h">
-      <Filter>Gui</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\input_tab.h">
-      <Filter>Gui</Filter>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\kernel_explorer.h">
       <Filter>Gui</Filter>
     </CustomBuild>
@@ -655,12 +555,6 @@
     <CustomBuild Include="rpcs3qt\memory_string_searcher.h">
       <Filter>Gui</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\misc_tab.h">
-      <Filter>Gui</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\networking_tab.h">
-      <Filter>Gui</Filter>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\pad_settings_dialog.h">
       <Filter>Gui</Filter>
     </CustomBuild>
@@ -673,9 +567,6 @@
     <CustomBuild Include="rpcs3qt\settings_dialog.h">
       <Filter>Gui</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\system_tab.h">
-      <Filter>Gui</Filter>
-    </CustomBuild>
     <CustomBuild Include="basic_keyboard_handler.h">
       <Filter>Io\Basic</Filter>
     </CustomBuild>
@@ -706,6 +597,24 @@
     <CustomBuild Include="rpcs3qt\vfs_dialog_tab.h">
       <Filter>Gui</Filter>
     </CustomBuild>
+    <CustomBuild Include="rpcs3qt\about_dialog.ui">
+      <Filter>Form Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="rpcs3qt\main_window.ui">
+      <Filter>Form Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="rpcs3qt\pad_settings_dialog.ui">
+      <Filter>Form Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="rpcs3qt\settings_dialog.ui">
+      <Filter>Form Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="rpcs3qt\welcome_dialog.ui">
+      <Filter>Form Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="rpcs3qt\about_dialog.h">
+      <Filter>Gui</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Image Include="rpcs3.ico" />

rpcs3/rpcs3qt/about_dialog.cpp

@@ -0,0 +1,27 @@
+#include "about_dialog.h"
+#include "ui_about_dialog.h"
+
+#include "rpcs3_version.h"
+
+#include <QDesktopServices>
+#include <QUrl>
+
+inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), _in.size()); }
+
+about_dialog::about_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::about_dialog)
+{
+	ui->setupUi(this);
+
+	ui->close->setDefault(true);
+
+	ui->version->setText(tr("RPCS3 Version: %1").arg(qstr(rpcs3::version.to_string())));
+
+	// Events
+	connect(ui->gitHub, &QAbstractButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://www.github.com/RPCS3")); });
+	connect(ui->website, &QAbstractButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://www.rpcs3.net")); });
+	connect(ui->forum, &QAbstractButton::clicked, [] { QDesktopServices::openUrl(QUrl("http://www.emunewz.net/forum/forumdisplay.php?fid=172")); });
+	connect(ui->patreon, &QAbstractButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://www.patreon.com/Nekotekina")); });
+	connect(ui->close, &QAbstractButton::clicked, this, &QWidget::close);
+
+	layout()->setSizeConstraint(QLayout::SetFixedSize);
+}

rpcs3/rpcs3qt/about_dialog.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <QDialog>
+
+namespace Ui {
+	class about_dialog;
+}
+
+class about_dialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	explicit about_dialog(QWidget* parent = nullptr);
+
+private:
+	Ui::about_dialog *ui;
+};

rpcs3/rpcs3qt/about_dialog.ui

@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>about_dialog</class>
+ <widget class="QDialog" name="about_dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>609</width>
+    <height>474</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>About RPCS3</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../resources.qrc">
+    <normaloff>:/rpcs3.ico</normaloff>:/rpcs3.ico</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <property name="styleSheet">
+      <string notr="true">background-color: rgb(255, 255, 255);</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QWidget" name="widget_2" native="true">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item alignment="Qt::AlignHCenter|Qt::AlignTop">
+          <widget class="QLabel" name="label_2">
+           <property name="maximumSize">
+            <size>
+             <width>50</width>
+             <height>50</height>
+            </size>
+           </property>
+           <property name="font">
+            <font>
+             <pointsize>8</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="pixmap">
+            <pixmap resource="../resources.qrc">:/Icons/insignia.png</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignHCenter|Qt::AlignTop</set>
+           </property>
+           <property name="margin">
+            <number>0</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="font">
+           <font>
+            <family>Arial</family>
+            <pointsize>14</pointsize>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string>RPCS3 PlayStation 3 Emulator</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_3">
+          <property name="font">
+           <font>
+            <family>Arial</family>
+            <kerning>true</kerning>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.&lt;br/&gt;It is written in C++ for Windows and Linux funded with &lt;a href=&quot;https://www.patreon.com/Nekotekina&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Patreon&lt;/span&gt;&lt;/a&gt;.&lt;br/&gt;Our developers and contributors are always working hard to ensure this project can be the best that it can be.&lt;br/&gt;There are still plenty of implementations to be made and optimizations to be done.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="textFormat">
+           <enum>Qt::RichText</enum>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
+          </property>
+          <property name="openExternalLinks">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="version">
+          <property name="font">
+           <font>
+            <family>Arial</family>
+            <kerning>true</kerning>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="textFormat">
+           <enum>Qt::RichText</enum>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,0,0,0">
+     <property name="spacing">
+      <number>50</number>
+     </property>
+     <property name="leftMargin">
+      <number>24</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>10</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>&lt;p&gt;&lt;b&gt;Developers:&lt;/b&gt;&lt;br&gt;&lt;br&gt;¬DH&lt;br&gt;¬AlexAltea&lt;br&gt;¬Hykem&lt;br&gt;Oil&lt;br&gt;Nekotekina&lt;br&gt;Bigpet&lt;br&gt;¬gopalsr83&lt;br&gt;¬tambry&lt;br&gt;vlj&lt;br&gt;kd-11&lt;br&gt;jarveson&lt;br&gt;raven02&lt;br&gt;AniLeo&lt;br&gt;cornytrace&lt;br&gt;ssshadow&lt;br&gt;Numan&lt;/p&gt;</string>
+       </property>
+       <property name="scaledContents">
+        <bool>false</bool>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>&lt;p&gt;&lt;b&gt;Contributors:&lt;/b&gt;&lt;br&gt;&lt;br&gt;BlackDaemon&lt;br&gt;elisha464&lt;br&gt;Aishou&lt;br&gt;krofna&lt;br&gt;xsacha&lt;br&gt;danilaml&lt;br&gt;unknownbrackets&lt;br&gt;Zangetsu38&lt;br&gt;lioncash&lt;br&gt;achurch&lt;br&gt;darkf&lt;br&gt;Syphurith&lt;br&gt;Blaypeg&lt;br&gt;Survanium90&lt;br&gt;georgemoralis&lt;br&gt;ikki84&lt;br&gt;hcorion&lt;br&gt;Megamouse&lt;br&gt;flash-fire&lt;br&gt;DAGINATSUKO&lt;/p&gt;</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>&lt;p&gt;&lt;b&gt;Supporters:&lt;/b&gt;&lt;br&gt;&lt;br&gt;Howard Garrison&lt;br&gt;EXPotemkin&lt;br&gt;Marko V.&lt;br&gt;danhp&lt;br&gt;Jake (5315825)&lt;br&gt;Ian Reid&lt;br&gt;Tad Sherlock&lt;br&gt;Tyler Friesen&lt;br&gt;Folzar&lt;br&gt;Payton Williams&lt;br&gt;RedPill Australia&lt;br&gt;yanghong&lt;br&gt;Mohammed El-Serougi&lt;br&gt;Дима ~Ximer13~ Кулин&lt;br&gt;James Reed&lt;br&gt;BaroqueSonata&lt;br&gt;Bonzay0&lt;br&gt;Henrijs Kons&lt;br&gt;Davide Balbi&lt;br&gt;Lena Stöffler&lt;/p&gt;</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="leftMargin">
+      <number>9</number>
+     </property>
+     <property name="topMargin">
+      <number>9</number>
+     </property>
+     <property name="rightMargin">
+      <number>9</number>
+     </property>
+     <property name="bottomMargin">
+      <number>9</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="gitHub">
+       <property name="text">
+        <string>GitHub</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="website">
+       <property name="text">
+        <string>Website</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="forum">
+       <property name="text">
+        <string>Forum</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="patreon">
+       <property name="text">
+        <string>Patreon</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="close">
+       <property name="text">
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../resources.qrc"/>
+  <include location="../resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>

rpcs3/rpcs3qt/audio_tab.cpp

@@ -1,37 +0,0 @@
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-
-#include "audio_tab.h"
-
-audio_tab::audio_tab(std::shared_ptr<emu_settings> xemu_settings, QWidget *parent) : QWidget(parent)
-{
-	// Audio Out
-	QGroupBox *audioOut = new QGroupBox(tr("Audio Out"));
-
-	QComboBox *audioOutBox = xemu_settings->CreateEnhancedComboBox(emu_settings::AudioRenderer, this);
-
-	QVBoxLayout *audioOutVbox = new QVBoxLayout;
-	audioOutVbox->addWidget(audioOutBox);
-	audioOut->setLayout(audioOutVbox);
-
-	// Checkboxes
-	QCheckBox *audioDump = xemu_settings->CreateEnhancedCheckBox(emu_settings::DumpToFile, this);
-	QCheckBox *conv = xemu_settings->CreateEnhancedCheckBox(emu_settings::ConvertTo16Bit, this);
-	QCheckBox *downmix = xemu_settings->CreateEnhancedCheckBox(emu_settings::DownmixStereo, this);
-
-	// Main layout
-	QVBoxLayout *vbox = new QVBoxLayout;
-	vbox->addWidget(audioOut);
-	vbox->addWidget(audioDump);
-	vbox->addWidget(conv);
-	vbox->addWidget(downmix);
-	vbox->addStretch();
-
-	QHBoxLayout *hbox = new QHBoxLayout;
-	hbox->addLayout(vbox);
-	hbox->addStretch();
-	setLayout(hbox);
-}

rpcs3/rpcs3qt/audio_tab.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include "emu_settings.h"
-
-#include <QWidget>
-
-#include <memory>
-
-class audio_tab : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit audio_tab(std::shared_ptr<emu_settings> xemu_settings, QWidget *parent = 0);
-};

rpcs3/rpcs3qt/core_tab.cpp

@@ -1,266 +0,0 @@
-#include "core_tab.h"
-
-#include "stdafx.h"
-#include "Emu/System.h"
-#include "Crypto/unself.h"
-
-#include "rpcs3qt/emu_settings.h"
-
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QRadioButton>
-#include <QButtonGroup>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-
-#include <unordered_set>
-
-inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); }
-
-core_tab::core_tab(std::shared_ptr<emu_settings> settings, QWidget *parent) : QWidget(parent), xemu_settings(settings)
-{
-	// PPU Decoder
-	QGroupBox *ppuDecoder = new QGroupBox(tr("PPU Decoder"));
-	QVBoxLayout *ppuVbox = new QVBoxLayout;
-
-	{ // PPU Stuff : I could make a lambda/special getter in emu_settings, but it's only used three times like this, and two times they're done slighly differently (one setting is disabled).
-		std::string selectedPPU = settings->GetSetting(emu_settings::PPUDecoder);
-		for (QString settingType : settings->GetSettingOptions(emu_settings::PPUDecoder))
-		{
-			std::string curr = sstr(settingType);
-			QRadioButton* butt = new QRadioButton(tr(curr.c_str()), this);
-			butt->setCheckable(true);
-			ppuVbox->addWidget(butt);
-			if (curr == selectedPPU)
-			{
-				butt->setChecked(true);
-			}
-#ifndef LLVM_AVAILABLE
-			if (curr == "Recompiler (LLVM)")
-			{
-				butt->setEnabled(false);
-				butt->setToolTip(tr("This version of RPCS3 wasn't compiled with LLVM support."));
-			}
-#endif
-			connect(butt, &QAbstractButton::pressed, [=]() {settings->SetSetting(emu_settings::PPUDecoder, curr); });
-		}
-	}
-	ppuDecoder->setLayout(ppuVbox);
-
-	// SPU Decoder
-	QGroupBox *spuDecoder = new QGroupBox(tr("SPU Decoder"));
-	QVBoxLayout *spuVbox = new QVBoxLayout;
-
-	{ // Spu stuff
-		std::string selectedSPU = settings->GetSetting(emu_settings::SPUDecoder);
-		for (QString settingType : settings->GetSettingOptions(emu_settings::SPUDecoder))
-		{
-			std::string curr = sstr(settingType);
-			QRadioButton* butt = new QRadioButton(tr(curr.c_str()), this);
-			if (curr == "Recompiler (LLVM)")
-			{
-				butt->setEnabled(false);
-			}
-			butt->setCheckable(true);
-			spuVbox->addWidget(butt);
-			if (curr == selectedSPU)
-			{
-				butt->setChecked(true);
-			}
-			connect(butt, &QAbstractButton::pressed, [=]() {settings->SetSetting(emu_settings::SPUDecoder, curr); });
-		}
-	}
-	spuDecoder->setLayout(spuVbox);
-
-	// Checkboxes
-	QCheckBox *hookStFunc = settings->CreateEnhancedCheckBox(emu_settings::HookStaticFuncs, this);
-	QCheckBox *bindSPUThreads = settings->CreateEnhancedCheckBox(emu_settings::BindSPUThreads, this);
-	QCheckBox *lowerSPUThrPrio = settings->CreateEnhancedCheckBox(emu_settings::LowerSPUThreadPrio, this);
-
-	// Load libraries
-	QGroupBox *lle = new QGroupBox(tr("Load libraries"));
-	QButtonGroup *libModeBG = new QButtonGroup(this);
-	QVBoxLayout *lleVbox = new QVBoxLayout;
-
-	
-	{// Handle lib loading options
-		std::string selectedLib = settings->GetSetting(emu_settings::LibLoadOptions);
-		for (QString settingType : settings->GetSettingOptions(emu_settings::LibLoadOptions))
-		{
-			std::string curr = sstr(settingType);
-			QRadioButton* butt = new QRadioButton(tr(curr.c_str()), lle);
-			butt->setCheckable(true);
-			libModeBG->addButton(butt);
-			lleVbox->addWidget(butt);
-			if (curr == selectedLib)
-			{
-				butt->setChecked(true);
-			}
-			connect(butt, &QAbstractButton::pressed, [=]() {settings->SetSetting(emu_settings::LibLoadOptions, curr); });
-		}
-	}
-	lleList = new QListWidget;
-	lleList->setSelectionMode(QAbstractItemView::MultiSelection);
-	searchBox = new QLineEdit;
-
-	// Sort string vector alphabetically
-	static const auto sort_string_vector = [](std::vector<std::string>& vec)
-	{
-		std::sort(vec.begin(), vec.end(), [](const std::string &str1, const std::string &str2) { return str1 < str2; });
-	};
-
-	std::vector<std::string> loadedLibs = xemu_settings->GetLoadedLibraries();
-
-	sort_string_vector(loadedLibs);
-
-	for (auto lib : loadedLibs)
-	{
-		QListWidgetItem* item = new QListWidgetItem(qstr(lib), lleList);
-		item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
-		item->setCheckState(Qt::Checked); // AND initialize check state
-		lleList->addItem(item);
-	}
-	const std::string& lle_dir = Emu.GetLibDir(); // TODO
-
-	std::unordered_set<std::string> set(loadedLibs.begin(), loadedLibs.end());
-	std::vector<std::string> lle_module_list_unselected;
-
-	for (const auto& prxf : fs::dir(lle_dir))
-	{
-		// List found unselected modules
-		if (prxf.is_directory || (prxf.name.substr(std::max<size_t>(size_t(3), prxf.name.length()) - 4)) != "sprx")
-			continue;
-		if (verify_npdrm_self_headers(fs::file(lle_dir + prxf.name)) && !set.count(prxf.name))
-		{
-			lle_module_list_unselected.push_back(prxf.name);
-		}
-
-	}
-
-	sort_string_vector(lle_module_list_unselected);
-
-	for (auto lib : lle_module_list_unselected)
-	{
-		QListWidgetItem* item = new QListWidgetItem(qstr(lib), lleList);
-		item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
-		item->setCheckState(Qt::Unchecked); // AND initialize check state
-		lleList->addItem(item);
-	}
-
-
-	// lleVbox
-	lleVbox->addSpacing(5);
-	lleVbox->addWidget(lleList);
-	lleVbox->addWidget(searchBox);
-	lle->setLayout(lleVbox);
-
-	// Main layout
-	QVBoxLayout *vbox = new QVBoxLayout;
-	vbox->addWidget(ppuDecoder);
-	vbox->addWidget(spuDecoder);
-	vbox->addWidget(hookStFunc);
-	vbox->addWidget(bindSPUThreads);
-	vbox->addWidget(lowerSPUThrPrio);
-	vbox->addStretch();
-
-	QHBoxLayout *hbox = new QHBoxLayout;
-	hbox->addLayout(vbox);
-	hbox->addWidget(lle);
-	setLayout(hbox);
-
-	auto l_OnLibButtonClicked = [=](int ind)
-	{
-		if (ind == -3 || ind == -4)
-		{
-			shouldSaveLibs = true;
-			searchBox->setEnabled(true);
-			lleList->setEnabled(true);
-		}
-		else
-		{
-			shouldSaveLibs = false;
-			searchBox->setEnabled(false);
-			lleList->setEnabled(false);
-		}
-	};
-
-	auto l_OnSearchBoxTextChanged = [=](QString text)
-	{
-		QString searchTerm = text.toLower();
-		QList<QListWidgetItem*> checked_Libs;
-		QList<QListWidgetItem*> unchecked_Libs;
-
-		// create sublists. we need clones to preserve checkstates
-		for (int i = 0; i < lleList->count(); ++i)
-		{
-			if (lleList->item(i)->checkState() == Qt::Checked)
-			{
-				checked_Libs.append(lleList->item(i)->clone());
-			}
-			else
-			{
-				unchecked_Libs.append(lleList->item(i)->clone());
-			}
-		}
-
-		// sort sublists
-		auto qLessThan = [](QListWidgetItem *i1, QListWidgetItem *i2) { return i1->text() < i2->text(); };
-		qSort(checked_Libs.begin(), checked_Libs.end(), qLessThan);
-		qSort(unchecked_Libs.begin(), unchecked_Libs.end(), qLessThan);
-
-		// refill library list
-		lleList->clear();
-
-		for (auto lib : checked_Libs)
-		{
-			lleList->addItem(lib);
-		}
-		for (auto lib : unchecked_Libs)
-		{
-			lleList->addItem(lib);
-		}
-
-		// only show items filtered for search text
-		for (int i = 0; i < lleList->count(); i++)
-		{
-			if (lleList->item(i)->text().contains(searchTerm))
-			{
-				lleList->setRowHidden(i, false);
-			}
-			else
-			{
-				lleList->setRowHidden(i, true);
-			}
-		}
-	};
-
-	// Events
-	connect(libModeBG, static_cast<void(QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), l_OnLibButtonClicked);
-	connect(searchBox, &QLineEdit::textChanged, l_OnSearchBoxTextChanged);
-
-	int buttid = libModeBG->checkedId();
-	if (buttid != -1)
-	{
-		l_OnLibButtonClicked(buttid);
-	}
-}
-
-void core_tab::SaveSelectedLibraries()
-{
-	if (shouldSaveLibs)
-	{
-		std::set<std::string> selectedlle;
-		for (int i =0; i<lleList->count(); ++i)
-		{
-			auto item = lleList->item(i);
-			if (item->checkState() != Qt::CheckState::Unchecked)
-			{
-				std::string lib = sstr(item->text());
-				selectedlle.emplace(lib);
-			}
-		}
-
-		std::vector<std::string> selected_ls = std::vector<std::string>(selectedlle.begin(), selectedlle.end());
-		xemu_settings->SaveSelectedLibraries(selected_ls);
-	}
-}

rpcs3/rpcs3qt/core_tab.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include "emu_settings.h"
-
-#include <QLineEdit>
-#include <QListWidget>
-#include <QWidget>
-
-#include <memory>
-
-class core_tab : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit core_tab(std::shared_ptr<emu_settings> xSettings, QWidget *parent = 0);
-public Q_SLOTS:
-	void SaveSelectedLibraries();
-
-private:
-	bool shouldSaveLibs = false;
-	QListWidget *lleList;
-	QLineEdit *searchBox;
-
-	std::shared_ptr<emu_settings> xemu_settings;
-};

rpcs3/rpcs3qt/emu_settings.cpp

@@ -207,53 +207,47 @@ void emu_settings::SaveSettings()
 	config.write(out.c_str(), out.size());
 }
 
-QComboBox* emu_settings::CreateEnhancedComboBox(SettingsType type, QWidget* parent)
+void emu_settings::EnhanceComboBox(QComboBox* combobox, SettingsType type)
 {
-	QComboBox* box = new QComboBox(parent);
-
 	for (QString setting : GetSettingOptions(type))
 	{
-		box->addItem(tr(setting.toStdString().c_str()), QVariant(setting));
+		combobox->addItem(tr(setting.toStdString().c_str()), QVariant(setting));
 	}
 
 	QString selected = qstr(GetSetting(type));
-	int index = box->findData(selected);
+	int index = combobox->findData(selected);
 	if (index == -1)
 	{
 		LOG_WARNING(GENERAL, "Current setting not found while creating combobox");
 	}
 	else
 	{
-		box->setCurrentIndex(index);
+		combobox->setCurrentIndex(index);
 	}
 
-	connect(box, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [=](int index) {
-		SetSetting(type, sstr(box->itemData(index)));
+	connect(combobox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [=](int index) {
+		SetSetting(type, sstr(combobox->itemData(index)));
 	});
-
-	return box;
 }
 
-QCheckBox* emu_settings::CreateEnhancedCheckBox(SettingsType type, QWidget* parent)
+void emu_settings::EnhanceCheckBox(QCheckBox* checkbox, SettingsType type)
 {
 	cfg_location loc = SettingsLoc[type];
-	std::string name = loc[loc.size()-1];
-	QCheckBox* settingsButton = new QCheckBox(tr(name.c_str()), parent);
+	std::string name = loc[loc.size() - 1];
 
 	std::string currSet = GetSetting(type);
 	if (currSet == "true")
 	{
-		settingsButton->setChecked(true);
+		checkbox->setChecked(true);
 	}
 	else if (currSet != "false")
 	{
 		LOG_WARNING(GENERAL, "Passed in an invalid setting for creating enhanced checkbox");
 	}
-	connect(settingsButton, &QCheckBox::stateChanged, [=](int val) {
+	connect(checkbox, &QCheckBox::stateChanged, [=](int val) {
 		std::string str = val != 0 ? "true" : "false";
 		SetSetting(type, str);
 	});
-	return settingsButton;
 }
 
 std::vector<std::string> emu_settings::GetLoadedLibraries()

rpcs3/rpcs3qt/emu_settings.h

@@ -107,11 +107,11 @@ public:
 	emu_settings(const std::string& path);
 	~emu_settings();
 
-	/** Returns a combo box of that setting type that is bound to the parent. */
-	QComboBox* CreateEnhancedComboBox(SettingsType type, QWidget* parent = nullptr);
+	/** Connects a combo box with the target settings type*/
+	void EnhanceComboBox(QComboBox* combobox, SettingsType type);
 
-	/** Returns a check button that is connected to the target settings type, bound to the life of parent*/
-	QCheckBox* CreateEnhancedCheckBox(SettingsType target, QWidget* parent = nullptr);
+	/** Connects a check box with the target settings type*/
+	void EnhanceCheckBox(QCheckBox* checkbox, SettingsType type);
 
 	std::vector<std::string> GetLoadedLibraries();
 	void SaveSelectedLibraries(const std::vector<std::string>& libs);

rpcs3/rpcs3qt/game_list_frame.cpp

@@ -25,7 +25,7 @@
 static const std::string m_class_name = "GameViewer";
 inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); }
 
-game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, Render_Creator r_Creator, QWidget *parent) 
+game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, const Render_Creator& r_Creator, QWidget *parent)
 	: QDockWidget(tr("Game List"), parent), xgui_settings(settings), m_Render_Creator(r_Creator)
 {
 	m_isListLayout = xgui_settings->GetValue(GUI::gl_listMode).toBool();
@@ -33,6 +33,7 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, Render_
 	m_Margin_Factor = xgui_settings->GetValue(GUI::gl_marginFactor).toReal();
 	m_Text_Factor = xgui_settings->GetValue(GUI::gl_textFactor).toReal();
 	m_showToolBar = xgui_settings->GetValue(GUI::gl_toolBarVisible).toBool();
+	m_Icon_Color = xgui_settings->GetValue(GUI::gl_iconColor).value<QColor>();
 
 	m_oldLayoutIsList = m_isListLayout;
 
@@ -49,6 +50,7 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, Render_
 	}
 
 	// Save factors for first setup
+	xgui_settings->SetValue(GUI::gl_iconColor, m_Icon_Color);
 	xgui_settings->SetValue(GUI::gl_marginFactor, m_Margin_Factor);
 	xgui_settings->SetValue(GUI::gl_textFactor, m_Text_Factor);
 	xgui_settings->SetValue(GUI::gl_toolBarVisible, m_showToolBar);
@@ -118,7 +120,8 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, Render_
 	// Search Bar
 	m_Search_Bar = new QLineEdit(m_Tool_Bar);
 	m_Search_Bar->setPlaceholderText(tr("Search games ..."));
-	connect(m_Search_Bar, &QLineEdit::textChanged, [this]() {
+	connect(m_Search_Bar, &QLineEdit::textChanged, [this](const QString& text) {
+		m_searchText = text;
 		Refresh();
 	});
 
@@ -148,7 +151,7 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, Render_
 	setWidget(m_Game_Dock);
 
 	bool showText = (m_Icon_Size_Str != GUI::gl_icon_key_small && m_Icon_Size_Str != GUI::gl_icon_key_tiny);
-	m_xgrid = new game_list_grid(m_Icon_Size, m_Margin_Factor, m_Text_Factor, showText);
+	m_xgrid = new game_list_grid(m_Icon_Size, m_Icon_Color, m_Margin_Factor, m_Text_Factor, showText);
 
 	gameList = new QTableWidget();
 	gameList->setShowGrid(false);
@@ -167,7 +170,6 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, Render_
 	gameList->horizontalHeader()->setDefaultSectionSize(150);
 	gameList->setContextMenuPolicy(Qt::CustomContextMenu);
 	gameList->setAlternatingRowColors(true);
-	gameList->setStyleSheet("alternate-background-color: rgb(242, 242, 242);");
 
 	gameList->setColumnCount(10);
 	gameList->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Icon")));
@@ -292,6 +294,8 @@ void game_list_frame::LoadSettings()
 
 	m_sortColumn = xgui_settings->GetValue(GUI::gl_sortCol).toInt();
 
+	m_Icon_Color = xgui_settings->GetValue(GUI::gl_iconColor).value<QColor>();
+
 	m_categoryFilters = xgui_settings->GetGameListCategoryFilters();
 
 	Refresh(true);
@@ -393,7 +397,7 @@ void game_list_frame::Refresh(bool fromDrive)
 				{
 					game.icon_path = dir + "/ICON0.PNG";
 				}
-			
+
 				game.category = sstr(cat->second);
 				bootable = true;
 			}
@@ -419,7 +423,7 @@ void game_list_frame::Refresh(bool fromDrive)
 			if (!game.icon_path.empty() && img.load(qstr(game.icon_path)))
 			{
 				QImage scaled = QImage(m_Icon_Size, QImage::Format_ARGB32);
-				scaled.fill(QColor(209, 209, 209, 255));
+				scaled.fill(m_Icon_Color);
 				QPainter painter(&scaled);
 				painter.drawImage(QPoint(0,0), img.scaled(m_Icon_Size, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation));
 				painter.end();
@@ -470,7 +474,7 @@ void game_list_frame::Refresh(bool fromDrive)
 			m_games_per_row = 0;
 		}
 
-		PopulateGameGrid(m_games_per_row, m_Icon_Size);
+		PopulateGameGrid(m_games_per_row, m_Icon_Size, m_Icon_Color);
 		connect(m_xgrid, &QTableWidget::doubleClicked, this, &game_list_frame::doubleClickedSlot);
 		connect(m_xgrid, &QTableWidget::customContextMenuRequested, this, &game_list_frame::ShowContextMenu);
 		m_Central_Widget->addWidget(m_xgrid);
@@ -612,7 +616,7 @@ void game_list_frame::ShowSpecifiedContextMenu(const QPoint &pos, int row)
 
 	connect(boot, &QAction::triggered, [=]() {Boot(row); });
 	connect(configure, &QAction::triggered, [=]() {
-		settings_dialog(xgui_settings, m_Render_Creator, this, &m_game_data[row].info).exec();
+		settings_dialog (xgui_settings, m_Render_Creator, 0, this, &m_game_data[row].info).exec();
 	});
 	connect(removeGame, &QAction::triggered, [=]() {
 		if (QMessageBox::question(this, tr("Confirm Delete"), tr("Permanently delete files?")) == QMessageBox::Yes)
@@ -699,19 +703,22 @@ void game_list_frame::RemoveCustomConfiguration(int row)
 	}
 }
 
-void game_list_frame::ResizeIcons(const QSize& size, const int& idx)
+void game_list_frame::ResizeIcons(const QString& sizeStr, const QSize& size, const int& index)
 {
-	if (m_Slider_Size->value() != idx) m_Slider_Size->setSliderPosition(idx);
-	m_Icon_Size_Str = GUI::gl_icon_size.at(idx).first;
+	m_Icon_Size_Str = sizeStr;
+	m_Icon_Size = size;
+
+	if (m_Slider_Size->value() != index)
+	{
+		m_Slider_Size->setSliderPosition(index);
+	}
 
 	xgui_settings->SetValue(GUI::gl_iconSize, m_Icon_Size_Str);
 
-	m_Icon_Size = size;
-
 	for (size_t i = 0; i < m_game_data.size(); i++)
 	{
 		QImage scaled = QImage(m_Icon_Size, QImage::Format_ARGB32);
-		scaled.fill(QColor(209, 209, 209, 255));
+		scaled.fill(m_Icon_Color);
 		QPainter painter(&scaled);
 		painter.drawImage(QPoint(0, 0), m_game_data[i].icon.scaled(m_Icon_Size, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation));
 		painter.end();
@@ -743,12 +750,22 @@ void game_list_frame::SetToolBarVisible(const bool& showToolBar)
 	m_Tool_Bar->setVisible(showToolBar);
 	xgui_settings->SetValue(GUI::gl_toolBarVisible, showToolBar);
 }
+bool game_list_frame::GetToolBarVisible()
+{
+	return m_showToolBar;
+}
 
 void game_list_frame::SetCategoryActIcon(const int& id, const bool& active)
 {
 	m_categoryButtons.at(id).action->setIcon(active ? m_categoryButtons.at(id).colored : m_categoryButtons.at(id).gray);
 }
 
+void game_list_frame::SetSearchText(const QString& text)
+{
+	m_searchText = text;
+	Refresh();
+}
+
 void game_list_frame::closeEvent(QCloseEvent *event)
 {
 	QDockWidget::closeEvent(event);
@@ -814,7 +831,7 @@ int game_list_frame::PopulateGameList()
 	return result;
 }
 
-void game_list_frame::PopulateGameGrid(uint maxCols, const QSize& image_size)
+void game_list_frame::PopulateGameGrid(uint maxCols, const QSize& image_size, const QColor& image_color)
 {
 	uint r = 0;
 	uint c = 0;
@@ -827,11 +844,11 @@ void game_list_frame::PopulateGameGrid(uint maxCols, const QSize& image_size)
 
 	if (m_Icon_Size_Str == GUI::gl_icon_key_medium)
 	{
-		m_xgrid = new game_list_grid(image_size, m_Margin_Factor, m_Text_Factor * 2, showText);
+		m_xgrid = new game_list_grid(image_size, image_color, m_Margin_Factor, m_Text_Factor * 2, showText);
 	}
 	else
 	{
-		m_xgrid = new game_list_grid(image_size, m_Margin_Factor, m_Text_Factor, showText);
+		m_xgrid = new game_list_grid(image_size, image_color, m_Margin_Factor, m_Text_Factor, showText);
 	}
 
 	// Get number of things that'll be in grid and precompute grid size.
@@ -910,9 +927,9 @@ void game_list_frame::PopulateGameGrid(uint maxCols, const QSize& image_size)
 */
 bool game_list_frame::SearchMatchesApp(const std::string& name, const std::string& serial)
 {
-	if (m_Search_Bar->text() != "")
+	if (!m_searchText.isEmpty())
 	{
-		QString searchText = m_Search_Bar->text().toLower();
+		QString searchText = m_searchText.toLower();
 		return qstr(name).toLower().contains(searchText) || qstr(serial).toLower().contains(searchText);
 	}
 	return true;

rpcs3/rpcs3qt/game_list_frame.h

@@ -169,23 +169,32 @@ class game_list_frame : public QDockWidget {
 	Q_OBJECT
 
 public:
-	explicit game_list_frame(std::shared_ptr<gui_settings> settings, Render_Creator r_Creator, QWidget *parent = nullptr);
+	explicit game_list_frame(std::shared_ptr<gui_settings> settings, const Render_Creator& r_Creator, QWidget *parent = nullptr);
 	~game_list_frame();
+
+	/** Refresh the gamelist with/without loading game data from files. Public so that main frame can refresh after vfs or install */
 	void Refresh(const bool fromDrive = false);
+
+	/** Adds/removes categories that should be shown on gamelist. Public so that main frame menu actions can apply them */
 	void ToggleCategoryFilter(const QStringList& categories, bool show);
 
+	/** Returns the tool bar visibility. Public so that main frame can check the menu action accordingly */
+	bool GetToolBarVisible();
+
 	/** Loads from settings. Public so that main frame can easily reset these settings if needed. */
 	void LoadSettings();
 
 	/** Saves settings. Public so that main frame can save this when a caching of column widths is needed for settings backup */
 	void SaveSettings();
 
-public Q_SLOTS:
 	/** Resize Gamelist Icons to size */
-	void ResizeIcons(const QSize& size, const int& idx);
+	void ResizeIcons(const QString& sizeStr, const QSize& size, const int& index);
+
+public Q_SLOTS:
 	void SetListMode(const bool& isList);
 	void SetToolBarVisible(const bool& showToolBar);
 	void SetCategoryActIcon(const int& id, const bool& active);
+	void SetSearchText(const QString& text);
 
 private Q_SLOTS:
 	void Boot(int row);
@@ -207,7 +216,7 @@ protected:
 	void closeEvent(QCloseEvent* event);
 	void resizeEvent(QResizeEvent *event);
 private:
-	void PopulateGameGrid(uint maxCols, const QSize& image_size);
+	void PopulateGameGrid(uint maxCols, const QSize& image_size, const QColor& image_color);
 	void FilterData();
 
 	int PopulateGameList();
@@ -269,9 +278,11 @@ private:
 	std::vector<GUI_GameInfo> m_game_data;
 	QSize m_Icon_Size;
 	QString m_Icon_Size_Str;
+	QColor m_Icon_Color;
 	qreal m_Margin_Factor;
 	qreal m_Text_Factor;
 	QStringList m_categoryFilters;
+	QString m_searchText;
 	Render_Creator m_Render_Creator;
 
 	uint m_games_per_row = 0;

rpcs3/rpcs3qt/game_list_grid.cpp

@@ -3,8 +3,8 @@
 
 #include <QHeaderView>
 
-game_list_grid::game_list_grid(const QSize& icon_size, const qreal& margin_factor, const qreal& text_factor, const bool& showText)
-	: QTableWidget(), m_icon_size(icon_size), m_margin_factor(margin_factor), m_text_factor(text_factor), m_text_enabled(showText)
+game_list_grid::game_list_grid(const QSize& icon_size, const QColor& icon_color, const qreal& margin_factor, const qreal& text_factor, const bool& showText)
+	: QTableWidget(), m_icon_size(icon_size), m_icon_color(icon_color), m_margin_factor(margin_factor), m_text_factor(text_factor), m_text_enabled(showText)
 {
 	QSize item_size;
 	if (m_text_enabled)
@@ -71,7 +71,7 @@ void game_list_grid::addItem(const QPixmap& img, const QString& name, const int&
 
 	// create background for image
 	QImage bg_img = QImage(img.size(), QImage::Format_ARGB32);
-	bg_img.fill(QColor(209, 209, 209, 255));
+	bg_img.fill(m_icon_color);
 
 	// place raw image inside expanded image
 	QPainter painter(&exp_img);

rpcs3/rpcs3qt/game_list_grid.h

@@ -14,12 +14,13 @@ class game_list_grid : public QTableWidget
 	Q_OBJECT
 
 	QSize m_icon_size;
+	QColor m_icon_color;
 	qreal m_margin_factor;
 	qreal m_text_factor;
 	bool m_text_enabled = true;
 
 public:
-	explicit game_list_grid(const QSize& icon_size, const qreal& margin_factor, const qreal& text_factor, const bool& showText);
+	explicit game_list_grid(const QSize& icon_size, const QColor& icon_color, const qreal& margin_factor, const qreal& text_factor, const bool& showText);
 	~game_list_grid();
 
 	void enableText(const bool& enabled);

rpcs3/rpcs3qt/graphics_tab.cpp

@@ -1,314 +0,0 @@
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-
-#include "graphics_tab.h"
-
-inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); }
-
-graphics_tab::graphics_tab(std::shared_ptr<emu_settings> xSettings, Render_Creator r_Creator, QWidget *parent) : QWidget(parent), xemu_settings(xSettings)
-{
-	// Render
-	QGroupBox *render = new QGroupBox(tr("Render"));
-
-	QComboBox *renderBox = xemu_settings->CreateEnhancedComboBox(emu_settings::Renderer, this);
-
-	QVBoxLayout *renderVbox = new QVBoxLayout();
-	renderVbox->addWidget(renderBox);
-	render->setLayout(renderVbox);
-
-	// Resolution
-	QGroupBox *res = new QGroupBox(tr("Resolution"));
-
-	QComboBox* resBox = xemu_settings->CreateEnhancedComboBox(emu_settings::Resolution, this);
-
-	QVBoxLayout *resVbox = new QVBoxLayout();
-	resVbox->addWidget(resBox);
-	res->setLayout(resVbox);
-
-	// Graphics Adapter
-	QStringList D3D12Adapters = r_Creator.D3D12Adapters;
-	QStringList vulkanAdapters = r_Creator.vulkanAdapters;
-	bool supportsD3D12 = r_Creator.supportsD3D12;
-	bool supportsVulkan = r_Creator.supportsVulkan;
-	QString r_D3D12 = r_Creator.render_D3D12;
-	QString r_Vulkan = r_Creator.render_Vulkan;
-	QString r_OpenGL = r_Creator.render_OpenGL;
-	QString old_D3D12;
-	QString old_Vulkan;
-	QGroupBox *graphicsAdapter;
-	QComboBox *graphicsAdapterBox;
-
-	if (supportsD3D12)
-	{
-		old_D3D12 = qstr(xemu_settings->GetSetting(emu_settings::D3D12Adapter));
-	}
-	else
-	{
-		// Remove D3D12 option from render combobox
-		for (int i = 0; i < renderBox->count(); i++)
-		{
-			if (renderBox->itemText(i) == r_D3D12)
-			{
-				renderBox->removeItem(i);
-				break;
-			}
-		}
-	}
-
-	if (supportsVulkan)
-	{
-		old_Vulkan = qstr(xemu_settings->GetSetting(emu_settings::VulkanAdapter));
-	}
-	else
-	{
-		// Remove Vulkan option from render combobox
-		for (int i = 0; i < renderBox->count(); i++)
-		{
-			if (renderBox->itemText(i) == r_Vulkan)
-			{
-				renderBox->removeItem(i);
-				break;
-			}
-		}
-	}
-
-	if (supportsD3D12 || supportsVulkan)
-	{
-		graphicsAdapter = new QGroupBox(tr("Select Graphics Device"));
-		graphicsAdapterBox = new QComboBox(this);
-		QVBoxLayout *graphicsAdapterVbox = new QVBoxLayout();
-		graphicsAdapterVbox->addWidget(graphicsAdapterBox);
-		graphicsAdapter->setLayout(graphicsAdapterVbox);
-		QString oldRender = renderBox->itemText(renderBox->currentIndex());
-
-		auto switchGraphicsAdapter = [=](int index)
-		{
-			QString render = renderBox->itemText(index);
-			m_isD3D12 = render == r_D3D12;
-			m_isVulkan = render == r_Vulkan;
-			graphicsAdapter->setEnabled(m_isD3D12 || m_isVulkan);
-
-			// D3D Adapter
-			if (m_isD3D12)
-			{
-				// Reset other adapters to old config
-				if (supportsVulkan)
-				{
-					xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(old_Vulkan));
-				}
-				// Fill combobox
-				graphicsAdapterBox->clear();
-				for (auto adapter : D3D12Adapters)
-				{
-					graphicsAdapterBox->addItem(adapter);
-				}
-				// Reset Adapter to old config
-				int idx = graphicsAdapterBox->findText(old_D3D12);
-				if (idx == -1)
-				{
-					idx = 0;
-					if (old_D3D12.isEmpty())
-					{
-						LOG_WARNING(RSX, "%s adapter config empty: setting to default!", sstr(r_D3D12));
-					}
-					else
-					{
-						LOG_WARNING(RSX, "Last used %s adapter not found: setting to default!", sstr(r_D3D12));
-					}
-				}
-				graphicsAdapterBox->setCurrentIndex(idx);
-				xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(graphicsAdapterBox->currentText()));
-			}
-
-			// Vulkan Adapter
-			else if (m_isVulkan)
-			{
-				// Reset other adapters to old config
-				if (supportsD3D12)
-				{
-					xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(old_D3D12));
-				}
-				// Fill combobox
-				graphicsAdapterBox->clear();
-				for (auto adapter : vulkanAdapters)
-				{
-					graphicsAdapterBox->addItem(adapter);
-				}
-				// Reset Adapter to old config
-				int idx = graphicsAdapterBox->findText(old_Vulkan);
-				if (idx == -1)
-				{
-					idx = 0;
-					if (old_Vulkan.isEmpty())
-					{
-						LOG_WARNING(RSX, "%s adapter config empty: setting to default!", sstr(r_Vulkan));
-					}
-					else
-					{
-						LOG_WARNING(RSX, "Last used %s adapter not found: setting to default!", sstr(r_Vulkan));
-					}
-				}
-				graphicsAdapterBox->setCurrentIndex(idx);
-				xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(graphicsAdapterBox->currentText()));
-			}
-
-			// Other Adapter
-			else
-			{
-				// Reset Adapters to old config
-				if (supportsD3D12)
-				{
-					xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(old_D3D12));
-				}
-				if (supportsVulkan)
-				{
-					xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(old_Vulkan));
-				}
-
-				// Fill combobox with placeholder
-				graphicsAdapterBox->clear();
-				graphicsAdapterBox->addItem(tr("Not needed for %1 renderer").arg(render));
-			}
-		};
-
-		auto setAdapter = [=](QString text)
-		{
-			if (text.isEmpty()) return;
-
-			// don't set adapter if signal was created by switching render
-			QString newRender = renderBox->itemText(renderBox->currentIndex());
-			if (m_oldRender == newRender)
-			{
-				if (m_isD3D12 && D3D12Adapters.contains(text))
-				{
-					xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(text));
-				}
-				else if (m_isVulkan && vulkanAdapters.contains(text))
-				{
-					xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(text));
-				}
-			}
-			else
-			{
-				m_oldRender = newRender;
-			}
-		};
-
-		// Init
-		setAdapter(graphicsAdapterBox->currentText());
-		switchGraphicsAdapter(renderBox->currentIndex());
-
-		// Events
-		connect(graphicsAdapterBox, &QComboBox::currentTextChanged, setAdapter);
-		connect(renderBox, static_cast<void (QComboBox::*)(int index)>(&QComboBox::currentIndexChanged), switchGraphicsAdapter);
-	}
-
-	// Aspect ratio
-	QGroupBox *aspect = new QGroupBox(tr("Aspect ratio"));
-
-	QComboBox *aspectBox = xemu_settings->CreateEnhancedComboBox(emu_settings::AspectRatio, this);
-
-	QVBoxLayout *aspectVbox = new QVBoxLayout();
-	aspectVbox->addWidget(aspectBox);
-	aspect->setLayout(aspectVbox);
-
-	// Frame limit
-	QGroupBox *frameLimit = new QGroupBox(tr("Frame limit"));
-
-	QComboBox *frameLimitBox = xemu_settings->CreateEnhancedComboBox(emu_settings::FrameLimit, this);
-
-	QVBoxLayout *frameLimitVbox = new QVBoxLayout();
-	frameLimitVbox->addWidget(frameLimitBox);
-	frameLimit->setLayout(frameLimitVbox);
-
-	// Checkboxes
-	QCheckBox *dumpColor = xemu_settings->CreateEnhancedCheckBox(emu_settings::WriteColorBuffers, this);
-	QCheckBox *readColor = xemu_settings->CreateEnhancedCheckBox(emu_settings::ReadColorBuffers, this);
-	QCheckBox *dumpDepth = xemu_settings->CreateEnhancedCheckBox(emu_settings::WriteDepthBuffer, this);
-	QCheckBox *readDepth = xemu_settings->CreateEnhancedCheckBox(emu_settings::ReadDepthBuffer, this);
-	QCheckBox *glLegacyBuffers = xemu_settings->CreateEnhancedCheckBox(emu_settings::LegacyBuffers, this);
-	QCheckBox *debugOutput = xemu_settings->CreateEnhancedCheckBox(emu_settings::DebugOutput, this);
-	QCheckBox *debugOverlay = xemu_settings->CreateEnhancedCheckBox(emu_settings::DebugOverlay, this);
-	QCheckBox *logProg = xemu_settings->CreateEnhancedCheckBox(emu_settings::LogShaderPrograms, this);
-	QCheckBox *vsync = xemu_settings->CreateEnhancedCheckBox(emu_settings::VSync, this);
-	QCheckBox *gpuTextureScaling = xemu_settings->CreateEnhancedCheckBox(emu_settings::GPUTextureScaling, this);
-	QCheckBox *stretchToDisplayArea = xemu_settings->CreateEnhancedCheckBox(emu_settings::StretchToDisplayArea, this);
-	QCheckBox *forceHighpZ = xemu_settings->CreateEnhancedCheckBox(emu_settings::ForceHighpZ, this);
-	QCheckBox *autoInvalidateCache = xemu_settings->CreateEnhancedCheckBox(emu_settings::AutoInvalidateCache, this);
-	QCheckBox *scrictModeRendering = xemu_settings->CreateEnhancedCheckBox(emu_settings::StrictRenderingMode, this);
-
-	// Combobox Part
-	QHBoxLayout *hbox1 = new QHBoxLayout();
-	QVBoxLayout *vbox11 = new QVBoxLayout();
-	vbox11->addWidget(render);
-	vbox11->addWidget(res);
-	if (supportsD3D12 || supportsVulkan) 
-	{
-		// be careful with layout changes due to render when adding new stuff
-		vbox11->addWidget(graphicsAdapter);
-	}
-	vbox11->addStretch();
-	QVBoxLayout *vbox12 = new QVBoxLayout();
-	vbox12->addWidget(aspect);
-	vbox12->addWidget(frameLimit);
-	vbox12->addStretch();
-	hbox1->addLayout(vbox11);
-	hbox1->addLayout(vbox12);
-
-	// Checkbox Part
-	QGroupBox *mainOptions = new QGroupBox(tr("Main Options"));
-	QHBoxLayout *hbox2 = new QHBoxLayout();	//main options
-	QVBoxLayout *vbox21 = new QVBoxLayout();
-	vbox21->addWidget(dumpColor);
-	vbox21->addWidget(readColor);
-	vbox21->addWidget(dumpDepth);
-	vbox21->addWidget(readDepth);
-	QVBoxLayout *vbox22 = new QVBoxLayout();
-	vbox22->addWidget(vsync);
-	vbox22->addWidget(autoInvalidateCache);
-	vbox22->addWidget(gpuTextureScaling);
-	vbox22->addWidget(stretchToDisplayArea);
-	vbox22->addSpacing(20);
-
-	hbox2->addLayout(vbox21);
-	hbox2->addLayout(vbox22);
-
-	QGroupBox *debugOptions = new QGroupBox(tr("Debugging Options"));
-	QHBoxLayout *hbox3 = new QHBoxLayout();
-	QBoxLayout *vbox31 = new QVBoxLayout();
-	vbox31->addWidget(glLegacyBuffers);
-	vbox31->addWidget(scrictModeRendering);
-	vbox31->addWidget(forceHighpZ);
-	QVBoxLayout *vbox32 = new QVBoxLayout();
-	vbox32->addWidget(debugOutput);
-	vbox32->addWidget(debugOverlay);
-	vbox32->addWidget(logProg);
-
-	hbox3->addLayout(vbox31);
-	hbox3->addLayout(vbox32);
-
-	mainOptions->setLayout(hbox2);
-	debugOptions->setLayout(hbox3);
-
-	QVBoxLayout *options_container = new QVBoxLayout();
-	options_container->addWidget(mainOptions);
-	options_container->addWidget(debugOptions);
-
-	QVBoxLayout *vbox = new QVBoxLayout();
-	vbox->addLayout(hbox1);
-	vbox->addSpacing(10);
-	vbox->addLayout(options_container);
-	vbox->addStretch();
-	setLayout(vbox);
-	
-	auto fixGLLegacy = [=](const QString& text) {
-		glLegacyBuffers->setEnabled(text == r_OpenGL);
-	};
-
-	// Handle connects to disable specific checkboxes that depend on GUI state.
-	fixGLLegacy(renderBox->currentText()); // Init
-	connect(renderBox, &QComboBox::currentTextChanged, fixGLLegacy);
-}

rpcs3/rpcs3qt/graphics_tab.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "emu_settings.h"
-
-#include <QWidget>
-
-#include <memory>
-
-class graphics_tab : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit graphics_tab(std::shared_ptr<emu_settings> xemu_settings, Render_Creator r_Creator, QWidget *parent = 0);
-
-private:
-	std::shared_ptr<emu_settings> xemu_settings;
-	QString m_oldRender = "";
-	bool m_isD3D12 = false;
-	bool m_isVulkan = false;
-};

rpcs3/rpcs3qt/gui_settings.cpp

@@ -179,6 +179,11 @@ void gui_settings::SetGamelistColVisibility(int col, bool val)
 	SetValue(GUI_SAVE(GUI::game_list, "Col" + QString::number(col) + "visible", show), val);
 }
 
+void gui_settings::SetCustomColor(int col, const QColor& val)
+{
+	SetValue(GUI_SAVE(GUI::meta, "CustomColor" + QString::number(col), GUI::mw_tool_bar_color), val);
+}
+
 void gui_settings::SaveCurrentConfig(const QString& friendlyName)
 {
 	SetValue(GUI::m_currentConfig, friendlyName);
@@ -197,6 +202,11 @@ bool gui_settings::GetGamelistColVisibility(int col)
 	return GetValue(GUI_SAVE(GUI::game_list, "Col" + QString::number(col) + "visible", show)).toBool();
 }
 
+QColor gui_settings::GetCustomColor(int col)
+{
+	return GetValue(GUI_SAVE(GUI::meta, "CustomColor" + QString::number(col), GUI::mw_tool_bar_color)).value<QColor>();
+}
+
 QStringList gui_settings::GetConfigEntries()
 {
 	QStringList nameFilter;

rpcs3/rpcs3qt/gui_settings.h

@@ -6,6 +6,7 @@
 #include <QDir>
 #include <QVariant>
 #include <QSize>
+#include <QColor>
 
 typedef struct GUI_SAVE
 {
@@ -51,6 +52,9 @@ namespace GUI
 	const QString meta        = "Meta";
 	const QString fs          = "FileSystem";
 
+	const QColor mw_tool_bar_color = QColor(227, 227, 227, 255);
+	const QColor gl_icon_color     = QColor(209, 209, 209, 255);
+
 	const GUI_SAVE rg_freeze  = GUI_SAVE(main_window, "recentGamesFrozen", false);
 	const GUI_SAVE rg_entries = GUI_SAVE(main_window, "recentGamesNames", QVariant::fromValue(q_pair_list()));
 
@@ -65,12 +69,14 @@ namespace GUI
 	const GUI_SAVE fd_decrypt_sprx = GUI_SAVE( main_window, "lastExplorePathSPRX", "" );
 	const GUI_SAVE fd_cg_disasm    = GUI_SAVE( main_window, "lastExplorePathCGD",  "" );
 
-	const GUI_SAVE mw_debugger    = GUI_SAVE( main_window, "debuggerVisible", false );
-	const GUI_SAVE mw_logger      = GUI_SAVE( main_window, "loggerVisible",   true );
-	const GUI_SAVE mw_gamelist    = GUI_SAVE( main_window, "gamelistVisible", true );
-	const GUI_SAVE mw_controls    = GUI_SAVE( main_window, "controlsVisible", true );
-	const GUI_SAVE mw_geometry    = GUI_SAVE( main_window, "geometry",        QByteArray() );
-	const GUI_SAVE mw_windowState = GUI_SAVE( main_window, "windowState",     QByteArray() );
+	const GUI_SAVE mw_debugger       = GUI_SAVE( main_window, "debuggerVisible", false );
+	const GUI_SAVE mw_logger         = GUI_SAVE( main_window, "loggerVisible",   true );
+	const GUI_SAVE mw_gamelist       = GUI_SAVE( main_window, "gamelistVisible", true );
+	const GUI_SAVE mw_toolBarVisible = GUI_SAVE( main_window, "toolBarVisible",  true );
+	const GUI_SAVE mw_toolBarColor   = GUI_SAVE( main_window, "toolBarColor",    mw_tool_bar_color);
+	const GUI_SAVE mw_geometry       = GUI_SAVE( main_window, "geometry",        QByteArray() );
+	const GUI_SAVE mw_windowState    = GUI_SAVE( main_window, "windowState",     QByteArray() );
+	const GUI_SAVE mw_mwState        = GUI_SAVE( main_window, "wwState",         QByteArray() );
 
 	const GUI_SAVE cat_hdd_game    = GUI_SAVE( game_list, "categoryVisibleHDDGame",    true );
 	const GUI_SAVE cat_disc_game   = GUI_SAVE( game_list, "categoryVisibleDiscGame",   true );
@@ -84,10 +90,11 @@ namespace GUI
 	const GUI_SAVE gl_sortCol        = GUI_SAVE( game_list, "sortCol",        1 );
 	const GUI_SAVE gl_state          = GUI_SAVE( game_list, "state",          QByteArray() );
 	const GUI_SAVE gl_iconSize       = GUI_SAVE( game_list, "iconSize",       gl_icon_key_small );
+	const GUI_SAVE gl_iconColor      = GUI_SAVE( game_list, "iconColor",      gl_icon_color);
 	const GUI_SAVE gl_listMode       = GUI_SAVE( game_list, "listMode",       true );
 	const GUI_SAVE gl_textFactor     = GUI_SAVE( game_list, "textFactor",     (qreal) 2.0 );
 	const GUI_SAVE gl_marginFactor   = GUI_SAVE( game_list, "marginFactor",   (qreal) 0.09 );
-	const GUI_SAVE gl_toolBarVisible = GUI_SAVE( game_list, "toolBarVisible", true );
+	const GUI_SAVE gl_toolBarVisible = GUI_SAVE( game_list, "toolBarVisible", false);
 
 	const GUI_SAVE fs_dev_hdd0_list = GUI_SAVE(fs, "dev_hdd0_list", QStringList());
 	const GUI_SAVE fs_dev_hdd1_list = GUI_SAVE(fs, "dev_hdd1_list", QStringList());
@@ -128,6 +135,7 @@ public:
 
 	logs::level GetLogLevel();
 	bool GetGamelistColVisibility(int col);
+	QColor GetCustomColor(int col);
 	QStringList GetConfigEntries();
 	QString GetCurrentStylesheetPath();
 	QStringList GetStylesheetEntries();
@@ -144,6 +152,8 @@ public Q_SLOTS:
 
 	void SetGamelistColVisibility(int col, bool val);
 
+	void SetCustomColor(int col, const QColor& val);
+
 	void SaveCurrentConfig(const QString& friendlyName);
 
 private:

rpcs3/rpcs3qt/gui_tab.cpp

@@ -1,208 +0,0 @@
-#include "gui_tab.h"
-
-#include <QFileDialog>
-#include <QInputDialog>
-#include <QAction>
-#include <QDesktopServices>
-#include <QCheckBox>
-
-gui_tab::gui_tab(std::shared_ptr<gui_settings> xSettings, QWidget *parent) : QWidget(parent), xgui_settings(xSettings)
-{
-	// Left Widgets
-	// configs
-	QGroupBox *gb_configs = new QGroupBox(tr("GUI Configs"), this);
-	QVBoxLayout *vbox_configs = new QVBoxLayout();
-	QHBoxLayout *hbox_configs = new QHBoxLayout();
-	combo_configs = new QComboBox(this);
-	QPushButton *pb_apply_config = new QPushButton(tr("Apply"), this);
-	// control buttons
-	QGroupBox *gb_controls = new QGroupBox(tr("GUI Controls"), this);
-	QVBoxLayout *vbox_controls = new QVBoxLayout();
-	QPushButton *pb_reset_default = new QPushButton(tr("Reset GUI to Default"), this);
-	QPushButton *pb_backup_config = new QPushButton(tr("Save Current Configuration"), this);
-	QPushButton *pb_open_folder = new QPushButton(tr("Open Config/Sheet Folder"), this);
-	QCheckBox *cb_show_welcome = new QCheckBox(tr("Show Welcome Screen"), this);
-	cb_show_welcome->setChecked(xSettings->GetValue(GUI::ib_show_welcome).toBool());
-
-	// Right Widgets
-	QGroupBox *gb_stylesheets = new QGroupBox(tr("Stylesheets"), this);
-	QVBoxLayout *vbox_stylesheets = new QVBoxLayout();
-	QHBoxLayout *hbox_stylesheets = new QHBoxLayout();
-	combo_stylesheets = new QComboBox(this);
-	QPushButton *pb_apply_stylesheet = new QPushButton(tr("Apply"), this);
-
-	// Left layout
-	QVBoxLayout *vbox_left = new QVBoxLayout();
-
-	hbox_configs->addWidget(pb_apply_config);
-	vbox_configs->addWidget(combo_configs);
-	vbox_configs->addLayout(hbox_configs);
-	gb_configs->setLayout(vbox_configs);
-
-	vbox_controls->addWidget(cb_show_welcome);
-	vbox_controls->addWidget(pb_reset_default);
-	vbox_controls->addWidget(pb_backup_config);
-	vbox_controls->addWidget(pb_open_folder);
-	gb_controls->setLayout(vbox_controls);
-
-	vbox_left->addWidget(gb_configs);
-	vbox_left->addWidget(gb_controls);
-	vbox_left->addStretch(1);
-
-	// Right layout
-	QVBoxLayout *vbox_right = new QVBoxLayout();
-	hbox_stylesheets->addWidget(pb_apply_stylesheet);
-	vbox_stylesheets->addWidget(combo_stylesheets);
-	vbox_stylesheets->addLayout(hbox_stylesheets);
-	gb_stylesheets->setLayout(vbox_stylesheets);
-	vbox_right->addWidget(gb_stylesheets);
-	vbox_right->addStretch(1);
-
-	// Main Layout
-	QHBoxLayout *hbox = new QHBoxLayout();
-	hbox->addLayout(vbox_left);
-	hbox->addLayout(vbox_right);
-	setLayout(hbox);
-
-	// Connections
-	connect(pb_reset_default, &QAbstractButton::clicked, this, &gui_tab::OnResetDefault);
-	connect(pb_backup_config, &QAbstractButton::clicked, this, &gui_tab::OnBackupCurrentConfig);
-	connect(pb_apply_config, &QAbstractButton::clicked, this, &gui_tab::OnApplyConfig);
-	connect(pb_apply_stylesheet, &QAbstractButton::clicked, this, &gui_tab::OnApplyStylesheet);
-	connect(pb_open_folder, &QAbstractButton::clicked, [=]() {QDesktopServices::openUrl(xgui_settings->GetSettingsDir()); });
-	connect(cb_show_welcome, &QCheckBox::clicked, [=](bool val) {xSettings->SetValue(GUI::ib_show_welcome, val); });
-
-	AddConfigs();
-	AddStylesheets();
-}
-
-void gui_tab::Accept()
-{
-	// Only attempt to load a config if changes occurred.
-	if (m_startingConfig != xgui_settings->GetValue(GUI::m_currentConfig).toString())
-	{
-		OnApplyConfig();
-	}
-	if (m_startingStylesheet != xgui_settings->GetValue(GUI::m_currentStylesheet).toString())
-	{
-		OnApplyStylesheet();
-	}
-}
-
-void gui_tab::AddConfigs()
-{
-	combo_configs->clear();
-	
-	combo_configs->addItem(tr("default"));
-
-	for (QString entry : xgui_settings->GetConfigEntries())
-	{
-		if (entry != tr("default"))
-		{
-			combo_configs->addItem(entry);
-		}
-	}
-
-	QString currentSelection = tr("CurrentSettings");
-	m_startingConfig = currentSelection;
-
-	int index = combo_configs->findText(currentSelection);
-	if (index != -1)
-	{
-		combo_configs->setCurrentIndex(index);
-	}
-	else
-	{
-		LOG_WARNING(GENERAL, "Trying to set an invalid config index ", index);
-	}
-}
-
-void gui_tab::AddStylesheets()
-{
-	combo_stylesheets->clear();
-
-	combo_stylesheets->addItem(tr("default"));
-
-	for (QString entry : xgui_settings->GetStylesheetEntries())
-	{
-		if (entry != tr("default"))
-		{
-			combo_stylesheets->addItem(entry);
-		}
-	}
-
-	QString currentSelection = xgui_settings->GetValue(GUI::m_currentStylesheet).toString();
-	m_startingStylesheet = currentSelection;
-
-	int index = combo_stylesheets->findText(currentSelection);
-	if (index != -1)
-	{
-		combo_stylesheets->setCurrentIndex(index);
-	}
-	else
-	{
-		LOG_WARNING(GENERAL, "Trying to set an invalid stylesheets index ", index);
-	}
-}
-
-void gui_tab::OnResetDefault()
-{
-	if (QMessageBox::question(this, tr("Reset GUI to default?"), tr("This will include your stylesheet as well. Do you wish to proceed?"), 
-		QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes)
-	{
-		xgui_settings->Reset(true);
-		xgui_settings->ChangeToConfig(tr("default"));
-		GuiStylesheetRequest(tr("default"));
-		GuiSettingsSyncRequest();
-		AddConfigs();
-		AddStylesheets();
-	}
-}
-
-void gui_tab::OnBackupCurrentConfig()
-{
-	QInputDialog* dialog = new QInputDialog(this);
-	dialog->setWindowTitle(tr("Choose a unique name"));
-	dialog->setLabelText(tr("Configuration Name: "));
-	dialog->resize(500, 100);
-
-	while (dialog->exec() != QDialog::Rejected)
-	{
-		dialog->resize(500, 100);
-		QString friendlyName = dialog->textValue();
-		if (friendlyName == "")
-		{
-			QMessageBox::warning(this, tr("Error"), tr("Name cannot be empty"));
-			continue;
-		}
-		if (friendlyName.contains("."))
-		{
-			QMessageBox::warning(this, tr("Error"), tr("Must choose a name with no '.'"));
-			continue;
-		}
-		if (combo_configs->findText(friendlyName) != -1)
-		{
-			QMessageBox::warning(this, tr("Error"), tr("Please choose a non-existing name"));
-			continue;
-		}
-		GuiSettingsSaveRequest();
-		xgui_settings->SaveCurrentConfig(friendlyName);
-		combo_configs->addItem(friendlyName);
-		combo_configs->setCurrentIndex(combo_configs->findText(friendlyName));
-		break;
-	}
-}
-
-void gui_tab::OnApplyConfig()
-{
-	QString name = combo_configs->currentText();
-	xgui_settings->SetValue(GUI::m_currentConfig, name);
-	xgui_settings->ChangeToConfig(name);
-	GuiSettingsSyncRequest();
-}
-
-void gui_tab::OnApplyStylesheet()
-{
-	xgui_settings->SetValue(GUI::m_currentStylesheet, combo_stylesheets->currentText());
-	GuiStylesheetRequest(xgui_settings->GetCurrentStylesheetPath());
-}

rpcs3/rpcs3qt/gui_tab.h

@@ -1,45 +0,0 @@
-#pragma once
-
-#include "gui_settings.h"
-
-#include <QWidget>
-#include <QMessageBox>
-#include <QHBoxLayout>
-#include <QAbstractButton>
-#include <QGroupBox>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QPushButton>
-
-#include <memory>
-
-class gui_tab : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit gui_tab(std::shared_ptr<gui_settings> guiSettings, QWidget *parent = 0);
-
-public Q_SLOTS:
-	void Accept();
-Q_SIGNALS:
-	void GuiSettingsSyncRequest();
-	void GuiSettingsSaveRequest();
-	void GuiStylesheetRequest(const QString& path);
-private Q_SLOTS:
-	void OnResetDefault();
-	void OnBackupCurrentConfig();
-	void OnApplyConfig();
-	void OnApplyStylesheet();
-private:
-	void AddConfigs();
-	void AddStylesheets();
-
-	QComboBox *combo_configs;
-	QComboBox *combo_stylesheets;
-
-	QString m_startingStylesheet;
-	QString m_startingConfig;
-
-	std::shared_ptr<gui_settings> xgui_settings;
-};

rpcs3/rpcs3qt/input_tab.cpp

@@ -1,72 +0,0 @@
-#include <QComboBox>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-
-#include "input_tab.h"
-
-input_tab::input_tab(std::shared_ptr<emu_settings> xemu_settings, QWidget *parent) : QWidget(parent)
-{
-	// Pad Handler
-	QGroupBox *padHandler = new QGroupBox(tr("Pad Handler"));
-
-	QComboBox *padHandlerBox = xemu_settings->CreateEnhancedComboBox(emu_settings::PadHandler, this);
-
-	QVBoxLayout *padHandlerVbox = new QVBoxLayout;
-	padHandlerVbox->addWidget(padHandlerBox);
-	padHandler->setLayout(padHandlerVbox);
-
-	// Keyboard Handler
-	QGroupBox *keyboardHandler = new QGroupBox(tr("Keyboard Handler"));
-
-	QComboBox *keyboardHandlerBox = xemu_settings->CreateEnhancedComboBox(emu_settings::KeyboardHandler, this);
-
-	QVBoxLayout *keyboardHandlerVbox = new QVBoxLayout;
-	keyboardHandlerVbox->addWidget(keyboardHandlerBox);
-	keyboardHandler->setLayout(keyboardHandlerVbox);
-
-	// Mouse Handler
-	QGroupBox *mouseHandler = new QGroupBox(tr("Mouse Handler"));
-
-	QComboBox *mouseHandlerBox = xemu_settings->CreateEnhancedComboBox(emu_settings::MouseHandler, this);
-
-	QVBoxLayout *mouseHandlerVbox = new QVBoxLayout;
-	mouseHandlerVbox->addWidget(mouseHandlerBox);
-	mouseHandler->setLayout(mouseHandlerVbox);
-
-	// Camera
-	QGroupBox *camera = new QGroupBox(tr("Camera"));
-
-	QComboBox *cameraBox = xemu_settings->CreateEnhancedComboBox(emu_settings::Camera, this);
-
-	QVBoxLayout *cameraVbox = new QVBoxLayout;
-	cameraVbox->addWidget(cameraBox);
-	camera->setLayout(cameraVbox);
-
-	// Camera type
-	QGroupBox *cameraType = new QGroupBox(tr("Camera type"));
-
-	QComboBox *cameraTypeBox = xemu_settings->CreateEnhancedComboBox(emu_settings::CameraType, this);
-
-	QVBoxLayout *cameraTypeVbox = new QVBoxLayout;
-	cameraTypeVbox->addWidget(cameraTypeBox);
-	cameraType->setLayout(cameraTypeVbox);
-
-	// Main layout
-	QVBoxLayout *vbox1 = new QVBoxLayout;
-	vbox1->addWidget(padHandler);
-	vbox1->addWidget(keyboardHandler);
-	vbox1->addWidget(mouseHandler);
-	vbox1->addStretch();
-
-	QVBoxLayout *vbox2 = new QVBoxLayout;
-	vbox2->addWidget(camera);
-	vbox2->addWidget(cameraType);
-	vbox2->addStretch();
-
-	QHBoxLayout *hbox = new QHBoxLayout;
-	hbox->addLayout(vbox1);
-	hbox->addLayout(vbox2);
-	setLayout(hbox);
-}
-

rpcs3/rpcs3qt/input_tab.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include "emu_settings.h"
-
-#include <QWidget>
-
-#include <memory>
-
-class input_tab : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit input_tab(std::shared_ptr<emu_settings> xemu_settings, QWidget *parent = 0);
-};

rpcs3/rpcs3qt/main_window.h

@@ -18,28 +18,31 @@
 
 #include <memory>
 
+namespace Ui {
+	class main_window;
+}
+
 class main_window : public QMainWindow
 {
 	Q_OBJECT
 
+	Ui::main_window *ui;
+
 	bool m_sys_menu_opened;
 
 	Render_Creator m_Render_Creator;
 
-	QWidget* controls;
-
 	QIcon appIcon;
 	QIcon icon_play;
 	QIcon icon_pause;
 	QIcon icon_stop;
 	QIcon icon_restart;
 
-	QPushButton* menu_run;
-	QPushButton* menu_stop;
-	QPushButton* menu_restart;
-	QPushButton* menu_capture_frame;
-
 #ifdef _WIN32
+	QIcon icon_thumb_play;
+	QIcon icon_thumb_pause;
+	QIcon icon_thumb_stop;
+	QIcon icon_thumb_restart;
 	QWinThumbnailToolBar *thumb_bar;
 	QWinThumbnailToolButton *thumb_playPause;
 	QWinThumbnailToolButton *thumb_stop;
@@ -72,7 +75,6 @@ private Q_SLOTS:
 	void InstallPkg();
 	void InstallPup();
 	void DecryptSPRXLibraries();
-	void About();
 
 	void SaveWindowState();
 
@@ -82,69 +84,25 @@ protected:
 private:
 	void CreateActions();
 	void CreateConnects();
-	void CreateMenus();
 	void CreateDockWindows();
 	void ConfigureGuiFromSettings(bool configureAll = false);
 	void EnableMenus(bool enabled);
 	void keyPressEvent(QKeyEvent *keyEvent);
+	void mouseDoubleClickEvent(QMouseEvent *event);
 
 	QAction* CreateRecentAction(const q_string_pair& entry, const uint& sc_idx);
 	void BootRecentAction(const QAction* act);
 	void AddRecentAction(const q_string_pair& entry);
 
 	q_pair_list m_rg_entries;
-	QMenu* m_bootRecentMenu;
 	QList<QAction*> m_recentGameActs;
 
 	QActionGroup* iconSizeActGroup;
 	QActionGroup* listModeActGroup;
 	QActionGroup* categoryVisibleActGroup;
 
-	QAction *bootElfAct;
-	QAction *bootGameAct;
-	QAction *clearRecentAct;
-	QAction *freezeRecentAct;
-	QAction *bootInstallPkgAct;
-	QAction *bootInstallPupAct;
-	QAction *sysPauseAct;
-	QAction *sysStopAct;
-	QAction *sysSendOpenMenuAct;
-	QAction *sysSendExitAct;
-	QAction *confSettingsAct;
-	QAction *confPadAct;
-	QAction *confAutopauseManagerAct;
-	QAction *confVFSDialogAct;
-	QAction *confSavedataManagerAct;
-	QAction *toolsCgDisasmAct;
-	QAction *toolskernel_explorerAct;
-	QAction *toolsmemory_viewerAct;
-	QAction *toolsRsxDebuggerAct;
-	QAction *toolsStringSearchAct;
-	QAction *toolsDecryptSprxLibsAct;
-	QAction *exitAct;
-	QAction *showDebuggerAct;
-	QAction *showLogAct;
-	QAction *showGameListAct;
-	QAction *showControlsAct;
-	QAction *refreshGameListAct;
-	QAction *showGameListToolBarAct;
-	QAction* showCatHDDGameAct;
-	QAction* showCatDiscGameAct;
-	QAction* showCatHomeAct;
-	QAction* showCatAudioVideoAct;
-	QAction* showCatGameDataAct;
-	QAction* showCatUnknownAct;
-	QAction* showCatOtherAct;
-	QAction* setIconSizeTinyAct;
-	QAction* setIconSizeSmallAct;
-	QAction* setIconSizeMediumAct;
-	QAction* setIconSizeLargeAct;
-	QAction* setlistModeListAct;
-	QAction* setlistModeGridAct;
-	QAction *aboutAct;
-	QAction *aboutQtAct;
-
 	// Dockable widget frames
+	QMainWindow *m_mw;
 	log_frame *logFrame;
 	debugger_frame *debuggerFrame;
 	game_list_frame *gameListFrame;

rpcs3/rpcs3qt/main_window.ui

@@ -0,0 +1,998 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>main_window</class>
+ <widget class="QMainWindow" name="main_window">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1058</width>
+    <height>580</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>4</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>RPCS3</string>
+  </property>
+  <property name="autoFillBackground">
+   <bool>false</bool>
+  </property>
+  <property name="animated">
+   <bool>true</bool>
+  </property>
+  <property name="dockNestingEnabled">
+   <bool>true</bool>
+  </property>
+  <property name="dockOptions">
+   <set>QMainWindow::AllowNestedDocks|QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks|QMainWindow::GroupedDragging</set>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <widget class="QLineEdit" name="searchBar">
+    <property name="geometry">
+     <rect>
+      <x>480</x>
+      <y>10</y>
+      <width>251</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="sizePolicy">
+     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+      <horstretch>0</horstretch>
+      <verstretch>0</verstretch>
+     </sizepolicy>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>10</pointsize>
+      <weight>50</weight>
+      <bold>false</bold>
+     </font>
+    </property>
+    <property name="focusPolicy">
+     <enum>Qt::ClickFocus</enum>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">color:#5e5e5e;
+margin-left:14px;</string>
+    </property>
+    <property name="frame">
+     <bool>false</bool>
+    </property>
+    <property name="placeholderText">
+     <string>Search...</string>
+    </property>
+    <property name="clearButtonEnabled">
+     <bool>false</bool>
+    </property>
+   </widget>
+   <widget class="QWidget" name="sizeSliderContainer" native="true">
+    <property name="geometry">
+     <rect>
+      <x>280</x>
+      <y>10</y>
+      <width>181</width>
+      <height>21</height>
+     </rect>
+    </property>
+    <property name="sizePolicy">
+     <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+      <horstretch>0</horstretch>
+      <verstretch>0</verstretch>
+     </sizepolicy>
+    </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="leftMargin">
+      <number>14</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>14</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QSlider" name="sizeSlider">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::ClickFocus</enum>
+       </property>
+       <property name="autoFillBackground">
+        <bool>false</bool>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QSlider::handle:horizontal {
+	background: #404040;
+}
+</string>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="tickPosition">
+        <enum>QSlider::NoTicks</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>1058</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
+     <string>File</string>
+    </property>
+    <widget class="QMenu" name="bootRecentMenu">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="title">
+      <string>Boot Recent</string>
+     </property>
+     <addaction name="clearRecentAct"/>
+     <addaction name="freezeRecentAct"/>
+     <addaction name="separator"/>
+    </widget>
+    <addaction name="bootElfAct"/>
+    <addaction name="bootGameAct"/>
+    <addaction name="bootRecentMenu"/>
+    <addaction name="separator"/>
+    <addaction name="bootInstallPkgAct"/>
+    <addaction name="bootInstallPupAct"/>
+    <addaction name="separator"/>
+    <addaction name="exitAct"/>
+   </widget>
+   <widget class="QMenu" name="menuEmulation">
+    <property name="title">
+     <string>Emulation</string>
+    </property>
+    <addaction name="sysPauseAct"/>
+    <addaction name="sysStopAct"/>
+    <addaction name="sysRebootAct"/>
+    <addaction name="separator"/>
+    <addaction name="captureFrame"/>
+    <addaction name="separator"/>
+    <addaction name="sysSendOpenMenuAct"/>
+    <addaction name="sysSendExitAct"/>
+   </widget>
+   <widget class="QMenu" name="menuConfiguration">
+    <property name="title">
+     <string>Configuration</string>
+    </property>
+    <addaction name="confCPUAct"/>
+    <addaction name="confGPUAct"/>
+    <addaction name="separator"/>
+    <addaction name="confPadAct"/>
+    <addaction name="confAudioAct"/>
+    <addaction name="confIOAct"/>
+    <addaction name="confSystemAct"/>
+    <addaction name="separator"/>
+    <addaction name="confAutopauseManagerAct"/>
+   </widget>
+   <widget class="QMenu" name="menuManage">
+    <property name="title">
+     <string>Manage</string>
+    </property>
+    <addaction name="confVFSDialogAct"/>
+    <addaction name="separator"/>
+    <addaction name="actionManage_Users"/>
+    <addaction name="confSavedataManagerAct"/>
+    <addaction name="actionManage_RAP_Licences"/>
+    <addaction name="actionManage_Trophy_Data"/>
+   </widget>
+   <widget class="QMenu" name="menuUtilities">
+    <property name="title">
+     <string>Utilities</string>
+    </property>
+    <addaction name="toolsCgDisasmAct"/>
+    <addaction name="toolskernel_explorerAct"/>
+    <addaction name="toolsmemory_viewerAct"/>
+    <addaction name="toolsRsxDebuggerAct"/>
+    <addaction name="toolsStringSearchAct"/>
+    <addaction name="separator"/>
+    <addaction name="toolsDecryptSprxLibsAct"/>
+   </widget>
+   <widget class="QMenu" name="menuView">
+    <property name="title">
+     <string>View</string>
+    </property>
+    <widget class="QMenu" name="menuGame_List_Icons">
+     <property name="title">
+      <string>Game List Icons</string>
+     </property>
+     <addaction name="setIconSizeTinyAct"/>
+     <addaction name="setIconSizeSmallAct"/>
+     <addaction name="setIconSizeMediumAct"/>
+     <addaction name="setIconSizeLargeAct"/>
+    </widget>
+    <widget class="QMenu" name="menuGame_List_Mode">
+     <property name="title">
+      <string>Game List Mode</string>
+     </property>
+     <addaction name="setlistModeListAct"/>
+     <addaction name="setlistModeGridAct"/>
+    </widget>
+    <widget class="QMenu" name="menuGame_Categories">
+     <property name="title">
+      <string>Game Categories</string>
+     </property>
+     <addaction name="showCatHDDGameAct"/>
+     <addaction name="showCatDiscGameAct"/>
+     <addaction name="showCatHomeAct"/>
+     <addaction name="showCatAudioVideoAct"/>
+     <addaction name="showCatGameDataAct"/>
+     <addaction name="showCatUnknownAct"/>
+     <addaction name="showCatOtherAct"/>
+    </widget>
+    <addaction name="showDebuggerAct"/>
+    <addaction name="showLogAct"/>
+    <addaction name="separator"/>
+    <addaction name="showToolBarAct"/>
+    <addaction name="separator"/>
+    <addaction name="showGameListAct"/>
+    <addaction name="showGameToolBarAct"/>
+    <addaction name="separator"/>
+    <addaction name="refreshGameListAct"/>
+    <addaction name="menuGame_List_Mode"/>
+    <addaction name="menuGame_List_Icons"/>
+    <addaction name="menuGame_Categories"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionCheck_for_Updates"/>
+    <addaction name="separator"/>
+    <addaction name="aboutAct"/>
+    <addaction name="aboutQtAct"/>
+   </widget>
+   <addaction name="menuFile"/>
+   <addaction name="menuEmulation"/>
+   <addaction name="menuConfiguration"/>
+   <addaction name="menuManage"/>
+   <addaction name="menuUtilities"/>
+   <addaction name="menuView"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <widget class="QToolBar" name="toolBar">
+   <property name="contextMenuPolicy">
+    <enum>Qt::PreventContextMenu</enum>
+   </property>
+   <property name="windowTitle">
+    <string>Show tool bar</string>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">QToolBar { background-color: rgba(227, 227, 227, 255); }
+QToolBar::separator {background-color: #D1D1D1; width: 1px; margin-top: 2px; margin-bottom: 2px;}
+QSlider { background-color: rgba(227, 227, 227, 255); }
+QLineEdit { background-color: rgba(227, 227, 227, 255); }</string>
+   </property>
+   <property name="movable">
+    <bool>false</bool>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::TopToolBarArea</set>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>30</width>
+     <height>30</height>
+    </size>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonIconOnly</enum>
+   </property>
+   <property name="floatable">
+    <bool>false</bool>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="toolbar_disc"/>
+   <addaction name="toolbar_fullscreen"/>
+   <addaction name="toolbar_snap"/>
+   <addaction name="separator"/>
+   <addaction name="toolbar_stop"/>
+   <addaction name="toolbar_start"/>
+   <addaction name="separator"/>
+   <addaction name="toolbar_controls"/>
+   <addaction name="toolbar_config"/>
+   <addaction name="separator"/>
+   <addaction name="toolbar_refresh"/>
+   <addaction name="toolbar_list"/>
+   <addaction name="toolbar_grid"/>
+   <addaction name="toolbar_sort"/>
+   <addaction name="separator"/>
+  </widget>
+  <action name="bootElfAct">
+   <property name="text">
+    <string>Boot SELF/ELF</string>
+   </property>
+  </action>
+  <action name="bootGameAct">
+   <property name="text">
+    <string>Boot Game</string>
+   </property>
+  </action>
+  <action name="bootInstallPkgAct">
+   <property name="text">
+    <string>Install .pkg</string>
+   </property>
+   <property name="toolTip">
+    <string>Install application from pkg file</string>
+   </property>
+  </action>
+  <action name="bootInstallPupAct">
+   <property name="text">
+    <string>Install firmware</string>
+   </property>
+   <property name="toolTip">
+    <string>Install firmware from PS3UPDAT.PUP</string>
+   </property>
+  </action>
+  <action name="sysPauseAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/pause.png</normaloff>:/Icons/pause.png</iconset>
+   </property>
+   <property name="text">
+    <string>Pause</string>
+   </property>
+   <property name="toolTip">
+    <string>Start Emulation</string>
+   </property>
+  </action>
+  <action name="sysStopAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/stop.png</normaloff>:/Icons/stop.png</iconset>
+   </property>
+   <property name="text">
+    <string>Stop</string>
+   </property>
+   <property name="toolTip">
+    <string>Stop Emulation</string>
+   </property>
+  </action>
+  <action name="sysSendOpenMenuAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Send Open System Menu CMD</string>
+   </property>
+  </action>
+  <action name="sysSendExitAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Send Exit CMD</string>
+   </property>
+  </action>
+  <action name="confCPUAct">
+   <property name="text">
+    <string>CPU</string>
+   </property>
+   <property name="toolTip">
+    <string>Configure CPU</string>
+   </property>
+  </action>
+  <action name="confGPUAct">
+   <property name="text">
+    <string>GPU</string>
+   </property>
+   <property name="toolTip">
+    <string>Configure Graphics</string>
+   </property>
+  </action>
+  <action name="confPadAct">
+   <property name="text">
+    <string>Controls</string>
+   </property>
+   <property name="toolTip">
+    <string>Configure Controls</string>
+   </property>
+  </action>
+  <action name="confAudioAct">
+   <property name="text">
+    <string>Audio</string>
+   </property>
+   <property name="toolTip">
+    <string>Configure Audio</string>
+   </property>
+  </action>
+  <action name="confIOAct">
+   <property name="text">
+    <string>Input/Output</string>
+   </property>
+   <property name="toolTip">
+    <string>Configure Input/Output</string>
+   </property>
+  </action>
+  <action name="confSystemAct">
+   <property name="text">
+    <string>System</string>
+   </property>
+   <property name="toolTip">
+    <string>Configure System</string>
+   </property>
+  </action>
+  <action name="confAutopauseManagerAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Auto Pause</string>
+   </property>
+   <property name="toolTip">
+    <string>Configure Auto Pause</string>
+   </property>
+  </action>
+  <action name="exitAct">
+   <property name="text">
+    <string>Exit</string>
+   </property>
+   <property name="toolTip">
+    <string>Exit RPCS3</string>
+   </property>
+   <property name="statusTip">
+    <string>Exit the application</string>
+   </property>
+  </action>
+  <action name="confSavedataManagerAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Save Data</string>
+   </property>
+   <property name="toolTip">
+    <string>Manage Save Data</string>
+   </property>
+  </action>
+  <action name="actionManage_Trophy_Data">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Trophies</string>
+   </property>
+   <property name="toolTip">
+    <string>Manage Trophies</string>
+   </property>
+  </action>
+  <action name="actionManage_Users">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>User Accounts</string>
+   </property>
+   <property name="toolTip">
+    <string>Manage User Accounts</string>
+   </property>
+  </action>
+  <action name="actionManage_yml_Patches">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Manage .yml Patches</string>
+   </property>
+  </action>
+  <action name="toolsCgDisasmAct">
+   <property name="text">
+    <string>Cg Disasm</string>
+   </property>
+  </action>
+  <action name="toolskernel_explorerAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Kernel Explorer</string>
+   </property>
+  </action>
+  <action name="toolsmemory_viewerAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Memory Viewer</string>
+   </property>
+  </action>
+  <action name="toolsRsxDebuggerAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>RSX Debugger</string>
+   </property>
+  </action>
+  <action name="toolsStringSearchAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>String Search</string>
+   </property>
+  </action>
+  <action name="toolsDecryptSprxLibsAct">
+   <property name="text">
+    <string>SPRX Decryption</string>
+   </property>
+  </action>
+  <action name="showDebuggerAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Debugger</string>
+   </property>
+  </action>
+  <action name="showLogAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Log/TTY</string>
+   </property>
+  </action>
+  <action name="aboutAct">
+   <property name="text">
+    <string>About RPCS3</string>
+   </property>
+  </action>
+  <action name="aboutQtAct">
+   <property name="text">
+    <string>About Qt</string>
+   </property>
+  </action>
+  <action name="actionShow_Controls">
+   <property name="text">
+    <string>Show Controls</string>
+   </property>
+  </action>
+  <action name="showGameListAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Game List</string>
+   </property>
+  </action>
+  <action name="showToolBarAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Tool Bar</string>
+   </property>
+  </action>
+  <action name="refreshGameListAct">
+   <property name="text">
+    <string>Game List Refresh</string>
+   </property>
+  </action>
+  <action name="actionShow_Categories">
+   <property name="text">
+    <string>Game List Categories</string>
+   </property>
+  </action>
+  <action name="actionManage_RAP_Licences">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>RAP Files</string>
+   </property>
+  </action>
+  <action name="actionCheck_for_Updates">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Check for Updates</string>
+   </property>
+  </action>
+  <action name="confVFSDialogAct">
+   <property name="text">
+    <string>Virtual File System</string>
+   </property>
+  </action>
+  <action name="clearRecentAct">
+   <property name="text">
+    <string>List Clear</string>
+   </property>
+  </action>
+  <action name="freezeRecentAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>List Freeze</string>
+   </property>
+  </action>
+  <action name="setIconSizeTinyAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Tiny</string>
+   </property>
+  </action>
+  <action name="setIconSizeSmallAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Small</string>
+   </property>
+  </action>
+  <action name="setIconSizeMediumAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Medium</string>
+   </property>
+  </action>
+  <action name="setIconSizeLargeAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Large</string>
+   </property>
+  </action>
+  <action name="setlistModeListAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>List View</string>
+   </property>
+  </action>
+  <action name="setlistModeGridAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Grid View</string>
+   </property>
+  </action>
+  <action name="sysRebootAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/restart.png</normaloff>:/Icons/restart.png</iconset>
+   </property>
+   <property name="text">
+    <string>Restart</string>
+   </property>
+  </action>
+  <action name="actionPause">
+   <property name="text">
+    <string>Pause</string>
+   </property>
+  </action>
+  <action name="actionSave_State">
+   <property name="text">
+    <string>Save State</string>
+   </property>
+  </action>
+  <action name="showCatHDDGameAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>HDD Games</string>
+   </property>
+  </action>
+  <action name="showCatDiscGameAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Disc Games</string>
+   </property>
+  </action>
+  <action name="showCatHomeAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Home</string>
+   </property>
+  </action>
+  <action name="showCatAudioVideoAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Audio/Video</string>
+   </property>
+  </action>
+  <action name="showCatGameDataAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Game Data</string>
+   </property>
+  </action>
+  <action name="showCatUnknownAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Unknown</string>
+   </property>
+  </action>
+  <action name="captureFrame">
+   <property name="text">
+    <string>Capture Frame</string>
+   </property>
+   <property name="toolTip">
+    <string>Capture frame</string>
+   </property>
+  </action>
+  <action name="toolbar_start">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/pause.png</normaloff>:/Icons/pause.png</iconset>
+   </property>
+   <property name="text">
+    <string>start</string>
+   </property>
+   <property name="toolTip">
+    <string>Pause emulation</string>
+   </property>
+  </action>
+  <action name="toolbar_stop">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/stop.png</normaloff>:/Icons/stop.png</iconset>
+   </property>
+   <property name="text">
+    <string>stop</string>
+   </property>
+   <property name="toolTip">
+    <string>Stop emulation</string>
+   </property>
+  </action>
+  <action name="toolbar_config">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/configure.png</normaloff>:/Icons/configure.png</iconset>
+   </property>
+   <property name="text">
+    <string>config</string>
+   </property>
+   <property name="toolTip">
+    <string>Configuration</string>
+   </property>
+  </action>
+  <action name="toolbar_controls">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/controls.png</normaloff>:/Icons/controls.png</iconset>
+   </property>
+   <property name="text">
+    <string>controls</string>
+   </property>
+   <property name="toolTip">
+    <string>Configure controls</string>
+   </property>
+  </action>
+  <action name="toolbar_snap">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/screenshot.png</normaloff>:/Icons/screenshot.png</iconset>
+   </property>
+   <property name="text">
+    <string>snap</string>
+   </property>
+   <property name="toolTip">
+    <string>Capture frame</string>
+   </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
+  </action>
+  <action name="toolbar_fullscreen">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/fullscreen.png</normaloff>:/Icons/fullscreen.png</iconset>
+   </property>
+   <property name="text">
+    <string>fullscreen</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle fullscreen</string>
+   </property>
+  </action>
+  <action name="toolbar_list">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/list.png</normaloff>:/Icons/list.png</iconset>
+   </property>
+   <property name="text">
+    <string>list</string>
+   </property>
+   <property name="toolTip">
+    <string>Switch to list mode</string>
+   </property>
+  </action>
+  <action name="toolbar_grid">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/grid.png</normaloff>:/Icons/grid.png</iconset>
+   </property>
+   <property name="text">
+    <string>grid</string>
+   </property>
+   <property name="toolTip">
+    <string>Switch to grid mode</string>
+   </property>
+  </action>
+  <action name="toolbar_sort">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/sort.png</normaloff>:/Icons/sort.png</iconset>
+   </property>
+   <property name="text">
+    <string>sort</string>
+   </property>
+   <property name="toolTip">
+    <string>Sort options</string>
+   </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
+  </action>
+  <action name="toolbar_refresh">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/refresh.png</normaloff>:/Icons/refresh.png</iconset>
+   </property>
+   <property name="text">
+    <string>refresh</string>
+   </property>
+   <property name="toolTip">
+    <string>Refresh gamelist</string>
+   </property>
+  </action>
+  <action name="toolbar_disc">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/Icons/disc.png</normaloff>:/Icons/disc.png</iconset>
+   </property>
+   <property name="text">
+    <string>disc</string>
+   </property>
+   <property name="toolTip">
+    <string>Boot game</string>
+   </property>
+  </action>
+  <action name="showCatOtherAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Other</string>
+   </property>
+  </action>
+  <action name="showGameToolBarAct">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Game Tool Bar</string>
+   </property>
+  </action>
+  <action name="actionNetwork">
+   <property name="text">
+    <string>Network</string>
+   </property>
+  </action>
+  <action name="actionEmulator">
+   <property name="text">
+    <string>Emulator</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources>
+  <include location="../resources.qrc"/>
+  <include location="../resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>

rpcs3/rpcs3qt/misc_tab.cpp

@@ -1,31 +0,0 @@
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QComboBox>
-#include <QPushButton>
-
-#include "misc_tab.h"
-#include "main_window.h"
-
-misc_tab::misc_tab(std::shared_ptr<emu_settings> xemu_settings, QWidget *parent) : QWidget(parent)
-{
-	// Left Widgets
-	QCheckBox *exitOnStop = xemu_settings->CreateEnhancedCheckBox(emu_settings::ExitRPCS3OnFinish, this);
-	QCheckBox *alwaysStart = xemu_settings->CreateEnhancedCheckBox(emu_settings::StartOnBoot, this);
-	QCheckBox *startGameFullscreen = xemu_settings->CreateEnhancedCheckBox(emu_settings::StartGameFullscreen, this);
-	QCheckBox *showFPSInTitle = xemu_settings->CreateEnhancedCheckBox(emu_settings::ShowFPSInTitle, this);
-
-	// Left layout
-	QVBoxLayout *vbox_left = new QVBoxLayout;
-	vbox_left->addWidget(exitOnStop);
-	vbox_left->addWidget(alwaysStart);
-	vbox_left->addWidget(startGameFullscreen);
-	vbox_left->addWidget(showFPSInTitle);
-	vbox_left->addStretch(1);
-
-	// Main Layout
-	QHBoxLayout *hbox = new QHBoxLayout;
-	hbox->addLayout(vbox_left);
-	setLayout(hbox);
-}

rpcs3/rpcs3qt/misc_tab.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include "emu_settings.h"
-
-#include <QWidget>
-
-#include <memory>
-
-class misc_tab : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit misc_tab(std::shared_ptr<emu_settings> xemu_settings, QWidget *parent = 0);
-};

rpcs3/rpcs3qt/networking_tab.cpp

@@ -1,28 +0,0 @@
-#include <QComboBox>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-
-#include "networking_tab.h"
-
-networking_tab::networking_tab(std::shared_ptr<emu_settings> xemu_settings, QWidget *parent) : QWidget(parent)
-{
-	// Connection status
-	QGroupBox *netStatus = new QGroupBox(tr("Connection status"));
-
-	QComboBox *netStatusBox = xemu_settings->CreateEnhancedComboBox(emu_settings::ConnectionStatus, this);
-
-	QVBoxLayout *netStatusVbox = new QVBoxLayout;
-	netStatusVbox->addWidget(netStatusBox);
-	netStatus->setLayout(netStatusVbox);
-
-	// Main layout
-	QVBoxLayout *vbox = new QVBoxLayout;
-	vbox->addWidget(netStatus);
-	vbox->addStretch();
-
-	QHBoxLayout *hbox = new QHBoxLayout;
-	hbox->addLayout(vbox);
-	hbox->addStretch();
-	setLayout(hbox);
-}

rpcs3/rpcs3qt/networking_tab.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include "emu_settings.h"
-
-#include <QWidget>
-
-#include <memory>
-
-class networking_tab : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit networking_tab(std::shared_ptr<emu_settings> xemu_settings, QWidget *parent = 0);
-};

rpcs3/rpcs3qt/pad_settings_dialog.cpp

@@ -9,6 +9,7 @@
 
 #include "stdafx.h"
 #include "pad_settings_dialog.h"
+#include "ui_pad_settings_dialog.h"
 
 // TODO: rewrite with std::chrono or QTimer
 #include <time.h>
@@ -17,276 +18,62 @@ static const int PadButtonWidth = 60;
 
 extern keyboard_pad_config g_kbpad_config;
 
-pad_settings_dialog::pad_settings_dialog(QWidget *parent) : QDialog(parent)
+pad_settings_dialog::pad_settings_dialog(QWidget *parent) : QDialog(parent), ui(new Ui::pad_settings_dialog)
 {
-	// Left Analog Stick
-	QGroupBox *roundStickL = new QGroupBox(tr("Left Analog Stick"));
-	QVBoxLayout *roundStickLMainVBox = new QVBoxLayout;
-	QVBoxLayout *roundStickLVBox = new QVBoxLayout;
-	QHBoxLayout *roundStickLHBox1 = new QHBoxLayout;
-	QHBoxLayout *roundStickLHBox2 = new QHBoxLayout;
-	QHBoxLayout *roundStickLHBox3 = new QHBoxLayout;
-	b_up_lstick = new QPushButton(tr("W"));
-	b_left_lstick = new QPushButton(tr("A"));
-	b_right_lstick = new QPushButton(tr("D"));
-	b_down_lstick = new QPushButton(tr("S"));
-	roundStickLHBox1->addWidget(b_up_lstick);
-	roundStickLHBox2->addWidget(b_left_lstick);
-	roundStickLHBox2->addWidget(b_right_lstick);
-	roundStickLHBox3->addWidget(b_down_lstick);
-	roundStickLVBox->addLayout(roundStickLHBox1);
-	roundStickLVBox->addLayout(roundStickLHBox2);
-	roundStickLVBox->addLayout(roundStickLHBox3);
-	roundStickL->setLayout(roundStickLVBox);
-	roundStickLMainVBox->addWidget(roundStickL);
-	roundStickLMainVBox->addStretch();
-	b_up_lstick->setFixedWidth(PadButtonWidth);
-	b_left_lstick->setFixedWidth(PadButtonWidth);
-	b_right_lstick->setFixedWidth(PadButtonWidth);
-	b_down_lstick->setFixedWidth(PadButtonWidth);
+	ui->setupUi(this);
 
-	// D-Pad
-	QGroupBox *roundPadControls = new QGroupBox(tr("D-Pad"));
-	QVBoxLayout *roundPadControlsMainVBox = new QVBoxLayout;
-	QVBoxLayout *roundPadControlsVBox = new QVBoxLayout;
-	QHBoxLayout *roundPadControlsHBox1 = new QHBoxLayout;
-	QHBoxLayout *roundPadControlsHBox2 = new QHBoxLayout;
-	QHBoxLayout *roundPadControlsHBox3 = new QHBoxLayout;
-	b_up = new QPushButton(tr("Up"));
-	b_left = new QPushButton(tr("Left"));
-	b_right = new QPushButton(tr("Right"));
-	b_down = new QPushButton(tr("Down"));
-	roundPadControlsHBox1->addWidget(b_up);
-	roundPadControlsHBox2->addWidget(b_left);
-	roundPadControlsHBox2->addWidget(b_right);
-	roundPadControlsHBox3->addWidget(b_down);
-	roundPadControlsVBox->addLayout(roundPadControlsHBox1);
-	roundPadControlsVBox->addLayout(roundPadControlsHBox2);
-	roundPadControlsVBox->addLayout(roundPadControlsHBox3);
-	roundPadControls->setLayout(roundPadControlsVBox);
-	roundPadControlsMainVBox->addWidget(roundPadControls);
-	roundPadControlsMainVBox->addStretch();
-	b_up->setFixedWidth(PadButtonWidth);
-	b_left->setFixedWidth(PadButtonWidth);
-	b_right->setFixedWidth(PadButtonWidth);
-	b_down->setFixedWidth(PadButtonWidth);
-	
-	// Left Shifts
-	QGroupBox *roundPadShiftsL = new QGroupBox(tr("Left Shifts"));
-	QGroupBox *roundPadL1 = new QGroupBox(tr("L1"));
-	QGroupBox *roundPadL2 = new QGroupBox(tr("L2"));
-	QGroupBox *roundPadL3 = new QGroupBox(tr("L3"));
-	QVBoxLayout *roundPadShiftsLVbox = new QVBoxLayout;
-	QVBoxLayout *roundPadL1Vbox = new QVBoxLayout;
-	QVBoxLayout *roundPadL2Vbox = new QVBoxLayout;
-	QVBoxLayout *roundPadL3Vbox = new QVBoxLayout;
-	b_shift_l1 = new QPushButton(tr("Q"));
-	b_shift_l2 = new QPushButton(tr("R"));
-	b_shift_l3 = new QPushButton(tr("F"));
-	roundPadL1Vbox->addWidget(b_shift_l1);
-	roundPadL2Vbox->addWidget(b_shift_l2);
-	roundPadL3Vbox->addWidget(b_shift_l3);
-	roundPadL1->setLayout(roundPadL1Vbox);
-	roundPadL2->setLayout(roundPadL2Vbox);
-	roundPadL3->setLayout(roundPadL3Vbox);
-	roundPadShiftsLVbox->addWidget(roundPadL1);
-	roundPadShiftsLVbox->addWidget(roundPadL2);
-	roundPadShiftsLVbox->addWidget(roundPadL3);
-	roundPadShiftsL->setLayout(roundPadShiftsLVbox);
-	b_shift_l1->setFixedWidth(PadButtonWidth);
-	b_shift_l2->setFixedWidth(PadButtonWidth);
-	b_shift_l3->setFixedWidth(PadButtonWidth);
-
-	// Start / Select
-	QGroupBox *roundPadSystem = new QGroupBox(tr("System"));
-	QGroupBox *roundPadSelect = new QGroupBox(tr("Select"));
-	QGroupBox *roundPadStart = new QGroupBox(tr("Start"));
-	QVBoxLayout *roundPadSystemMainVbox = new QVBoxLayout;
-	QVBoxLayout *roundPadSystemVbox = new QVBoxLayout;
-	QVBoxLayout *roundPadSelectVbox = new QVBoxLayout;
-	QVBoxLayout *roundPadStartVbox = new QVBoxLayout;
-	b_select = new QPushButton(tr("Space"));
-	b_start = new QPushButton(tr("Enter"));
-	roundPadSelectVbox->addWidget(b_select);
-	roundPadStartVbox->addWidget(b_start);
-	roundPadSelect->setLayout(roundPadSelectVbox);
-	roundPadStart->setLayout(roundPadStartVbox);
-	roundPadSystemVbox->addWidget(roundPadSelect);
-	roundPadSystemVbox->addWidget(roundPadStart);
-	roundPadSystem->setLayout(roundPadSystemVbox);
-	roundPadSystemMainVbox->addWidget(roundPadSystem);
-	roundPadSystemMainVbox->addStretch();
-	b_select->setFixedWidth(PadButtonWidth);
-	b_start->setFixedWidth(PadButtonWidth);
-
-	// Right Shifts
-	QGroupBox *roundPadShiftsR = new QGroupBox(tr("Right Shifts"));
-	QGroupBox *roundPadR1 = new QGroupBox(tr("R1"));
-	QGroupBox *roundPadR2 = new QGroupBox(tr("R2"));
-	QGroupBox *roundPadR3 = new QGroupBox(tr("R3"));
-	QVBoxLayout *roundPadShiftsRVbox = new QVBoxLayout;
-	QVBoxLayout *roundPadR1Vbox = new QVBoxLayout;
-	QVBoxLayout *roundPadR2Vbox = new QVBoxLayout;
-	QVBoxLayout *roundPadR3Vbox = new QVBoxLayout;
-	b_shift_r1 = new QPushButton(tr("E"));
-	b_shift_r2 = new QPushButton(tr("T"));
-	b_shift_r3 = new QPushButton(tr("G"));
-	roundPadR1Vbox->addWidget(b_shift_r1);
-	roundPadR2Vbox->addWidget(b_shift_r2);
-	roundPadR3Vbox->addWidget(b_shift_r3);
-	roundPadR1->setLayout(roundPadR1Vbox);
-	roundPadR2->setLayout(roundPadR2Vbox);
-	roundPadR3->setLayout(roundPadR3Vbox);
-	roundPadShiftsRVbox->addWidget(roundPadR1);
-	roundPadShiftsRVbox->addWidget(roundPadR2);
-	roundPadShiftsRVbox->addWidget(roundPadR3);
-	roundPadShiftsR->setLayout(roundPadShiftsRVbox);
-	b_shift_r1->setFixedWidth(PadButtonWidth);
-	b_shift_r2->setFixedWidth(PadButtonWidth);
-	b_shift_r3->setFixedWidth(PadButtonWidth);
-
-	// Action buttons
-	QGroupBox *roundpad_buttons = new QGroupBox(tr("Buttons"));
-	QGroupBox *roundPadSquare = new QGroupBox(tr("Square"));
-	QGroupBox *roundPadCross = new QGroupBox(tr("Cross"));
-	QGroupBox *roundPadCircle = new QGroupBox(tr("Circle"));
-	QGroupBox *roundPadTriangle = new QGroupBox(tr("Triangle"));
-	QVBoxLayout *roundpad_buttonsVBox = new QVBoxLayout;
-	QHBoxLayout *roundpad_buttonsHBox1 = new QHBoxLayout;
-	QHBoxLayout *roundpad_buttonsHBox2 = new QHBoxLayout;
-	QHBoxLayout *roundpad_buttonsHBox3 = new QHBoxLayout;
-	QHBoxLayout *roundpad_buttonsHBox21 = new QHBoxLayout;
-	QHBoxLayout *roundpad_buttonsHBox22 = new QHBoxLayout;
-	QHBoxLayout *roundpad_buttonsHBox23 = new QHBoxLayout;
-	QHBoxLayout *roundpad_buttonsHBox24 = new QHBoxLayout;
-	b_triangle = new QPushButton(tr("V"));
-	b_square = new QPushButton(tr("Z"));
-	b_circle = new QPushButton(tr("C"));
-	b_cross = new QPushButton(tr("X"));
-	roundpad_buttonsHBox21->addWidget(b_triangle);
-	roundpad_buttonsHBox22->addWidget(b_square);
-	roundpad_buttonsHBox23->addWidget(b_circle);
-	roundpad_buttonsHBox24->addWidget(b_cross);
-	roundPadTriangle->setLayout(roundpad_buttonsHBox21);
-	roundPadSquare->setLayout(roundpad_buttonsHBox22);
-	roundPadCircle->setLayout(roundpad_buttonsHBox23);
-	roundPadCross->setLayout(roundpad_buttonsHBox24);
-	roundpad_buttonsHBox1->addStretch();
-	roundpad_buttonsHBox1->addWidget(roundPadTriangle);
-	roundpad_buttonsHBox1->addStretch();
-	roundpad_buttonsHBox2->addWidget(roundPadSquare);
-	roundpad_buttonsHBox2->addWidget(roundPadCircle);
-	roundpad_buttonsHBox3->addStretch();
-	roundpad_buttonsHBox3->addWidget(roundPadCross);
-	roundpad_buttonsHBox3->addStretch();
-	roundpad_buttonsVBox->addLayout(roundpad_buttonsHBox1);
-	roundpad_buttonsVBox->addLayout(roundpad_buttonsHBox2);
-	roundpad_buttonsVBox->addLayout(roundpad_buttonsHBox3);
-	roundpad_buttons->setLayout(roundpad_buttonsVBox);
-	b_triangle->setFixedWidth(PadButtonWidth);
-	b_square->setFixedWidth(PadButtonWidth);
-	b_circle->setFixedWidth(PadButtonWidth);
-	b_cross->setFixedWidth(PadButtonWidth);
-
-	// Right Analog Stick
-	QGroupBox *roundStickR = new QGroupBox(tr("Right Analog Stick"));
-	QVBoxLayout *roundStickRMainVBox = new QVBoxLayout;
-	QVBoxLayout *roundStickRVBox = new QVBoxLayout;
-	QHBoxLayout *roundStickRHBox1 = new QHBoxLayout;
-	QHBoxLayout *roundStickRHBox2 = new QHBoxLayout;
-	QHBoxLayout *roundStickRHBox3 = new QHBoxLayout;
-	b_up_rstick = new QPushButton(tr("PgUp"));
-	b_left_rstick = new QPushButton(tr("Home"));
-	b_right_rstick = new QPushButton(tr("End"));
-	b_down_rstick = new QPushButton(tr("PgDown"));
-	roundStickRHBox1->addWidget(b_up_rstick);
-	roundStickRHBox2->addWidget(b_left_rstick);
-	roundStickRHBox2->addWidget(b_right_rstick);
-	roundStickRHBox3->addWidget(b_down_rstick);
-	roundStickRVBox->addLayout(roundStickRHBox1);
-	roundStickRVBox->addLayout(roundStickRHBox2);
-	roundStickRVBox->addLayout(roundStickRHBox3);
-	roundStickR->setLayout(roundStickRVBox);
-	roundStickRMainVBox->addWidget(roundStickR);
-	roundStickRMainVBox->addStretch();
-	b_up_rstick->setFixedWidth(PadButtonWidth);
-	b_left_rstick->setFixedWidth(PadButtonWidth);
-	b_right_rstick->setFixedWidth(PadButtonWidth);
-	b_down_rstick->setFixedWidth(PadButtonWidth);
-
-	// Buttons
-	b_reset = new QPushButton(tr("By default"));
-	
-	b_ok = new QPushButton(tr("OK"));
-
-	b_cancel = new QPushButton(tr("Cancel"));
-	b_cancel->setDefault(true);
-	connect(b_cancel, &QAbstractButton::clicked, this, &QWidget::close);
+	ui->b_cancel->setDefault(true);
+	connect(ui->b_cancel, &QAbstractButton::clicked, this, &QWidget::close);
 
 	// Handling
 	QButtonGroup *padButtons = new QButtonGroup(this);
-	padButtons->addButton(b_left_lstick, 1);
-	padButtons->addButton(b_down_lstick, 2);
-	padButtons->addButton(b_right_lstick, 3);
-	padButtons->addButton(b_up_lstick, 4);
+	padButtons->addButton(ui->b_left_lstick, 1);
+	padButtons->addButton(ui->b_down_lstick, 2);
+	padButtons->addButton(ui->b_right_lstick, 3);
+	padButtons->addButton(ui->b_up_lstick, 4);
 	
-	padButtons->addButton(b_left, 5);
-	padButtons->addButton(b_down, 6);
-	padButtons->addButton(b_right, 7);
-	padButtons->addButton(b_up, 8);
+	padButtons->addButton(ui->b_left, 5);
+	padButtons->addButton(ui->b_down, 6);
+	padButtons->addButton(ui->b_right, 7);
+	padButtons->addButton(ui->b_up, 8);
 	
-	padButtons->addButton(b_shift_l1, 9);
-	padButtons->addButton(b_shift_l2, 10);
-	padButtons->addButton(b_shift_l3, 11);
+	padButtons->addButton(ui->b_shift_l1, 9);
+	padButtons->addButton(ui->b_shift_l2, 10);
+	padButtons->addButton(ui->b_shift_l3, 11);
 	
-	padButtons->addButton(b_start, 12);
-	padButtons->addButton(b_select, 13);
+	padButtons->addButton(ui->b_start, 12);
+	padButtons->addButton(ui->b_select, 13);
 	
-	padButtons->addButton(b_shift_r1, 14);
-	padButtons->addButton(b_shift_r2, 15);
-	padButtons->addButton(b_shift_r3, 16);
+	padButtons->addButton(ui->b_shift_r1, 14);
+	padButtons->addButton(ui->b_shift_r2, 15);
+	padButtons->addButton(ui->b_shift_r3, 16);
 	
-	padButtons->addButton(b_square, 17);
-	padButtons->addButton(b_cross, 18);
-	padButtons->addButton(b_circle, 19);
-	padButtons->addButton(b_triangle, 20);
+	padButtons->addButton(ui->b_square, 17);
+	padButtons->addButton(ui->b_cross, 18);
+	padButtons->addButton(ui->b_circle, 19);
+	padButtons->addButton(ui->b_triangle, 20);
 	
-	padButtons->addButton(b_left_rstick, 21);
-	padButtons->addButton(b_down_rstick, 22);
-	padButtons->addButton(b_right_rstick, 23);
-	padButtons->addButton(b_up_rstick, 24);
+	padButtons->addButton(ui->b_left_rstick, 21);
+	padButtons->addButton(ui->b_down_rstick, 22);
+	padButtons->addButton(ui->b_right_rstick, 23);
+	padButtons->addButton(ui->b_up_rstick, 24);
 	
-	padButtons->addButton(b_reset, 25);
-	padButtons->addButton(b_ok, 26);
-	padButtons->addButton(b_cancel, 27);
+	padButtons->addButton(ui->b_reset, 25);
+	padButtons->addButton(ui->b_ok, 26);
+	padButtons->addButton(ui->b_cancel, 27);
 
 	connect(padButtons, SIGNAL(buttonClicked(int)), this, SLOT(OnPadButtonClicked(int)));
 
-	// Main layout
-	QHBoxLayout *hbox1 = new QHBoxLayout;
-	hbox1->addLayout(roundStickLMainVBox);
-	hbox1->addLayout(roundPadControlsMainVBox);
-	hbox1->addWidget(roundPadShiftsL);
-	hbox1->addLayout(roundPadSystemMainVbox);
-	hbox1->addWidget(roundPadShiftsR);
-	hbox1->addWidget(roundpad_buttons);
-	hbox1->addLayout(roundStickRMainVBox);
-
-	QHBoxLayout *hbox2 = new QHBoxLayout;
-	hbox2->addWidget(b_reset);
-	hbox2->addStretch();
-	hbox2->addWidget(b_ok);
-	hbox2->addWidget(b_cancel);
-
-	QVBoxLayout *vbox = new QVBoxLayout;
-	vbox->addLayout(hbox1);
-	vbox->addLayout(hbox2);
-	setLayout(vbox);
-
-	setWindowTitle(tr("Input Settings"));
-
 	g_kbpad_config.load();
 	UpdateLabel();
+
+	ui->l_controller->setMaximumSize(ui->gb_description->sizeHint().width(), ui->l_controller->maximumHeight() * ui->gb_description->sizeHint().width() / ui->l_controller->maximumWidth());
+	layout()->setSizeConstraint(QLayout::SetFixedSize);
+}
+
+pad_settings_dialog::~pad_settings_dialog()
+{
+	delete ui;
 }
 
 void pad_settings_dialog::keyPressEvent(QKeyEvent *keyEvent)
@@ -346,36 +133,36 @@ void pad_settings_dialog::keyPressEvent(QKeyEvent *keyEvent)
 void pad_settings_dialog::UpdateLabel()
 {
 	// Get button labels from .ini
-	b_up_lstick->setText(GetKeyName(g_kbpad_config.left_stick_up));
-	b_down_lstick->setText(GetKeyName(g_kbpad_config.left_stick_down));
-	b_left_lstick->setText(GetKeyName(g_kbpad_config.left_stick_left));
-	b_right_lstick->setText(GetKeyName(g_kbpad_config.left_stick_right));
+	ui->b_up_lstick->setText(GetKeyName(g_kbpad_config.left_stick_up));
+	ui->b_down_lstick->setText(GetKeyName(g_kbpad_config.left_stick_down));
+	ui->b_left_lstick->setText(GetKeyName(g_kbpad_config.left_stick_left));
+	ui->b_right_lstick->setText(GetKeyName(g_kbpad_config.left_stick_right));
 	
-	b_up->setText(GetKeyName(g_kbpad_config.up));
-	b_down->setText(GetKeyName(g_kbpad_config.down));
-	b_left->setText(GetKeyName(g_kbpad_config.left));
-	b_right->setText(GetKeyName(g_kbpad_config.right));
+	ui->b_up->setText(GetKeyName(g_kbpad_config.up));
+	ui->b_down->setText(GetKeyName(g_kbpad_config.down));
+	ui->b_left->setText(GetKeyName(g_kbpad_config.left));
+	ui->b_right->setText(GetKeyName(g_kbpad_config.right));
 	
-	b_shift_l1->setText(GetKeyName(g_kbpad_config.l1));
-	b_shift_l2->setText(GetKeyName(g_kbpad_config.l2));
-	b_shift_l3->setText(GetKeyName(g_kbpad_config.l3));
+	ui->b_shift_l1->setText(GetKeyName(g_kbpad_config.l1));
+	ui->b_shift_l2->setText(GetKeyName(g_kbpad_config.l2));
+	ui->b_shift_l3->setText(GetKeyName(g_kbpad_config.l3));
 	
-	b_start->setText(GetKeyName(g_kbpad_config.start));
-	b_select->setText(GetKeyName(g_kbpad_config.select));
+	ui->b_start->setText(GetKeyName(g_kbpad_config.start));
+	ui->b_select->setText(GetKeyName(g_kbpad_config.select));
 	
-	b_shift_r1->setText(GetKeyName(g_kbpad_config.r1));
-	b_shift_r2->setText(GetKeyName(g_kbpad_config.r2));
-	b_shift_r3->setText(GetKeyName(g_kbpad_config.r3));
+	ui->b_shift_r1->setText(GetKeyName(g_kbpad_config.r1));
+	ui->b_shift_r2->setText(GetKeyName(g_kbpad_config.r2));
+	ui->b_shift_r3->setText(GetKeyName(g_kbpad_config.r3));
 	
-	b_square->setText(GetKeyName(g_kbpad_config.square));
-	b_cross->setText(GetKeyName(g_kbpad_config.cross));
-	b_circle->setText(GetKeyName(g_kbpad_config.circle));
-	b_triangle->setText(GetKeyName(g_kbpad_config.triangle));
+	ui->b_square->setText(GetKeyName(g_kbpad_config.square));
+	ui->b_cross->setText(GetKeyName(g_kbpad_config.cross));
+	ui->b_circle->setText(GetKeyName(g_kbpad_config.circle));
+	ui->b_triangle->setText(GetKeyName(g_kbpad_config.triangle));
 	
-	b_up_rstick->setText(GetKeyName(g_kbpad_config.right_stick_up));
-	b_down_rstick->setText(GetKeyName(g_kbpad_config.right_stick_down));
-	b_left_rstick->setText(GetKeyName(g_kbpad_config.right_stick_left));
-	b_right_rstick->setText(GetKeyName(g_kbpad_config.right_stick_right));
+	ui->b_up_rstick->setText(GetKeyName(g_kbpad_config.right_stick_up));
+	ui->b_down_rstick->setText(GetKeyName(g_kbpad_config.right_stick_down));
+	ui->b_left_rstick->setText(GetKeyName(g_kbpad_config.right_stick_left));
+	ui->b_right_rstick->setText(GetKeyName(g_kbpad_config.right_stick_right));
 }
 
 void pad_settings_dialog::UpdateTimerLabel(const u32 id)
@@ -387,36 +174,36 @@ void pad_settings_dialog::UpdateTimerLabel(const u32 id)
 
 	switch (id)
 	{
-	case id_pad_lstick_left: UpdateLabel(b_left_lstick); break;
-	case id_pad_lstick_down: UpdateLabel(b_down_lstick); break;
-	case id_pad_lstick_right: UpdateLabel(b_right_lstick); break;
-	case id_pad_lstick_up: UpdateLabel(b_up_lstick); break;
+	case id_pad_lstick_left: UpdateLabel(ui->b_left_lstick); break;
+	case id_pad_lstick_down: UpdateLabel(ui->b_down_lstick); break;
+	case id_pad_lstick_right: UpdateLabel(ui->b_right_lstick); break;
+	case id_pad_lstick_up: UpdateLabel(ui->b_up_lstick); break;
 
-	case id_pad_left: UpdateLabel(b_left); break;
-	case id_pad_down: UpdateLabel(b_down); break;
-	case id_pad_right: UpdateLabel(b_right); break;
-	case id_pad_up: UpdateLabel(b_up); break;
+	case id_pad_left: UpdateLabel(ui->b_left); break;
+	case id_pad_down: UpdateLabel(ui->b_down); break;
+	case id_pad_right: UpdateLabel(ui->b_right); break;
+	case id_pad_up: UpdateLabel(ui->b_up); break;
 
-	case id_pad_l1: UpdateLabel(b_shift_l1); break;
-	case id_pad_l2: UpdateLabel(b_shift_l2); break;
-	case id_pad_l3: UpdateLabel(b_shift_l3); break;
+	case id_pad_l1: UpdateLabel(ui->b_shift_l1); break;
+	case id_pad_l2: UpdateLabel(ui->b_shift_l2); break;
+	case id_pad_l3: UpdateLabel(ui->b_shift_l3); break;
 
-	case id_pad_start: UpdateLabel(b_start); break;
-	case id_pad_select: UpdateLabel(b_select); break;
+	case id_pad_start: UpdateLabel(ui->b_start); break;
+	case id_pad_select: UpdateLabel(ui->b_select); break;
 
-	case id_pad_r1: UpdateLabel(b_shift_r1); break;
-	case id_pad_r2: UpdateLabel(b_shift_r2); break;
-	case id_pad_r3: UpdateLabel(b_shift_r3); break;
+	case id_pad_r1: UpdateLabel(ui->b_shift_r1); break;
+	case id_pad_r2: UpdateLabel(ui->b_shift_r2); break;
+	case id_pad_r3: UpdateLabel(ui->b_shift_r3); break;
 
-	case id_pad_square: UpdateLabel(b_square); break;
-	case id_pad_cross: UpdateLabel(b_cross); break;
-	case id_pad_circle: UpdateLabel(b_circle); break;
-	case id_pad_triangle: UpdateLabel(b_triangle); break;
+	case id_pad_square: UpdateLabel(ui->b_square); break;
+	case id_pad_cross: UpdateLabel(ui->b_cross); break;
+	case id_pad_circle: UpdateLabel(ui->b_circle); break;
+	case id_pad_triangle: UpdateLabel(ui->b_triangle); break;
 
-	case id_pad_rstick_left: UpdateLabel(b_left_rstick); break;
-	case id_pad_rstick_down: UpdateLabel(b_down_rstick); break;
-	case id_pad_rstick_right: UpdateLabel(b_right_rstick); break;
-	case id_pad_rstick_up: UpdateLabel(b_up_rstick); break;
+	case id_pad_rstick_left: UpdateLabel(ui->b_left_rstick); break;
+	case id_pad_rstick_down: UpdateLabel(ui->b_down_rstick); break;
+	case id_pad_rstick_right: UpdateLabel(ui->b_right_rstick); break;
+	case id_pad_rstick_up: UpdateLabel(ui->b_up_rstick); break;
 
 	default: LOG_ERROR(HLE, "Unknown button ID: %d", id); break;
 	}
@@ -424,40 +211,40 @@ void pad_settings_dialog::UpdateTimerLabel(const u32 id)
 
 void pad_settings_dialog::SwitchButtons(const bool IsEnabled)
 {
-	b_up_lstick->setEnabled(IsEnabled);
-	b_down_lstick->setEnabled(IsEnabled);
-	b_left_lstick->setEnabled(IsEnabled);
-	b_right_lstick->setEnabled(IsEnabled);
+	ui->b_up_lstick->setEnabled(IsEnabled);
+	ui->b_down_lstick->setEnabled(IsEnabled);
+	ui->b_left_lstick->setEnabled(IsEnabled);
+	ui->b_right_lstick->setEnabled(IsEnabled);
 
-	b_up->setEnabled(IsEnabled);
-	b_down->setEnabled(IsEnabled);
-	b_left->setEnabled(IsEnabled);
-	b_right->setEnabled(IsEnabled);
+	ui->b_up->setEnabled(IsEnabled);
+	ui->b_down->setEnabled(IsEnabled);
+	ui->b_left->setEnabled(IsEnabled);
+	ui->b_right->setEnabled(IsEnabled);
 
-	b_shift_l1->setEnabled(IsEnabled);
-	b_shift_l2->setEnabled(IsEnabled);
-	b_shift_l3->setEnabled(IsEnabled);
+	ui->b_shift_l1->setEnabled(IsEnabled);
+	ui->b_shift_l2->setEnabled(IsEnabled);
+	ui->b_shift_l3->setEnabled(IsEnabled);
 
-	b_start->setEnabled(IsEnabled);
-	b_select->setEnabled(IsEnabled);
+	ui->b_start->setEnabled(IsEnabled);
+	ui->b_select->setEnabled(IsEnabled);
 
-	b_shift_r1->setEnabled(IsEnabled);
-	b_shift_r2->setEnabled(IsEnabled);
-	b_shift_r3->setEnabled(IsEnabled);
+	ui->b_shift_r1->setEnabled(IsEnabled);
+	ui->b_shift_r2->setEnabled(IsEnabled);
+	ui->b_shift_r3->setEnabled(IsEnabled);
 
-	b_square->setEnabled(IsEnabled);
-	b_cross->setEnabled(IsEnabled);
-	b_circle->setEnabled(IsEnabled);
-	b_triangle->setEnabled(IsEnabled);
+	ui->b_square->setEnabled(IsEnabled);
+	ui->b_cross->setEnabled(IsEnabled);
+	ui->b_circle->setEnabled(IsEnabled);
+	ui->b_triangle->setEnabled(IsEnabled);
 
-	b_up_rstick->setEnabled(IsEnabled);
-	b_down_rstick->setEnabled(IsEnabled);
-	b_left_rstick->setEnabled(IsEnabled);
-	b_right_rstick->setEnabled(IsEnabled);
+	ui->b_up_rstick->setEnabled(IsEnabled);
+	ui->b_down_rstick->setEnabled(IsEnabled);
+	ui->b_left_rstick->setEnabled(IsEnabled);
+	ui->b_right_rstick->setEnabled(IsEnabled);
 
-	b_ok->setEnabled(IsEnabled);
-	b_cancel->setEnabled(IsEnabled);
-	b_reset->setEnabled(IsEnabled);
+	ui->b_ok->setEnabled(IsEnabled);
+	ui->b_cancel->setEnabled(IsEnabled);
+	ui->b_reset->setEnabled(IsEnabled);
 }
 
 void pad_settings_dialog::RunTimer(const u32 seconds, const u32 id)

rpcs3/rpcs3qt/pad_settings_dialog.h

@@ -48,45 +48,11 @@ enum button_ids
 	id_cancel
 };
 
-struct pad_buttons
-{
-	QPushButton* b_up_lstick;
-	QPushButton* b_down_lstick;
-	QPushButton* b_left_lstick;
-	QPushButton* b_right_lstick;
+namespace Ui {
+	class pad_settings_dialog;
+}
 
-	QPushButton* b_up;
-	QPushButton* b_down;
-	QPushButton* b_left;
-	QPushButton* b_right;
-
-	QPushButton* b_shift_l1;
-	QPushButton* b_shift_l2;
-	QPushButton* b_shift_l3;
-
-	QPushButton* b_start;
-	QPushButton* b_select;
-
-	QPushButton* b_shift_r1;
-	QPushButton* b_shift_r2;
-	QPushButton* b_shift_r3;
-
-	QPushButton* b_square;
-	QPushButton* b_cross;
-	QPushButton* b_circle;
-	QPushButton* b_triangle;
-
-	QPushButton* b_up_rstick;
-	QPushButton* b_down_rstick;
-	QPushButton* b_left_rstick;
-	QPushButton* b_right_rstick;
-
-	QPushButton* b_ok;
-	QPushButton* b_cancel;
-	QPushButton* b_reset;
-};
-
-class pad_settings_dialog : public QDialog, pad_buttons, PadHandlerBase
+class pad_settings_dialog : public QDialog, PadHandlerBase
 {
 	Q_OBJECT
 
@@ -98,11 +64,13 @@ private:
 	u32 m_button_id;
 	bool m_key_pressed;
 	QAction *onButtonClickedAct;
+	Ui::pad_settings_dialog *ui;
 
 public:
 	// TODO get Init to work
 	virtual void Init(const u32 max_connect) override;
 	explicit pad_settings_dialog(QWidget *parent = 0);
+	~pad_settings_dialog();
 	void keyPressEvent(QKeyEvent *keyEvent);
 	void UpdateLabel();
 	void UpdateTimerLabel(const u32 id);

rpcs3/rpcs3qt/settings_dialog.cpp

@@ -1,20 +1,61 @@
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QPushButton>
+#include <QMessageBox>
+#include <QInputDialog>
+#include <QDesktopServices>
+#include <QUrl>
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QColorDialog>
 
-#include "core_tab.h"
-#include "graphics_tab.h"
-#include "audio_tab.h"
-#include "input_tab.h"
-#include "misc_tab.h"
-#include "gui_tab.h"
-#include "networking_tab.h"
-#include "system_tab.h"
 #include "settings_dialog.h"
 #include "emu_settings.h"
 
-settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xgui_settings, Render_Creator r_Creator, QWidget *parent, GameInfo* game) : QDialog(parent)
+#include "ui_settings_dialog.h"
+
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Crypto/unself.h"
+
+#include <unordered_set>
+
+inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); }
+
+settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const Render_Creator& r_Creator, const int& tabIndex, QWidget *parent, GameInfo* game)
+	: QDialog(parent), xgui_settings(xSettings), ui(new Ui::settings_dialog)
 {
+	ui->setupUi(this);
+	ui->cancelButton->setDefault(true);
+	ui->tabWidget->setUsesScrollButtons(false);
+	ui->tabWidget->setCurrentIndex(tabIndex);
+
+	// read tooltips from json
+	QFile json_file(":/Json/tooltips.json");
+	json_file.open(QIODevice::ReadOnly | QIODevice::Text);
+	QJsonObject json_obj = QJsonDocument::fromJson(json_file.readAll()).object();
+	json_file.close();
+
+	QJsonObject json_cpu = json_obj.value("cpu").toObject();
+	QJsonObject json_cpu_ppu = json_cpu.value("PPU").toObject();
+	QJsonObject json_cpu_spu = json_cpu.value("SPU").toObject();
+	QJsonObject json_cpu_cbs = json_cpu.value("checkboxes").toObject();
+	QJsonObject json_cpu_lib = json_cpu.value("libraries").toObject();
+
+	QJsonObject json_gpu = json_obj.value("gpu").toObject();
+	QJsonObject json_gpu_cbs = json_gpu.value("comboboxes").toObject();
+	QJsonObject json_gpu_main = json_gpu.value("main").toObject();
+	QJsonObject json_gpu_deb = json_gpu.value("debug").toObject();
+
+	QJsonObject json_audio = json_obj.value("audio").toObject();
+	QJsonObject json_input = json_obj.value("input").toObject();
+	QJsonObject json_sys = json_obj.value("system").toObject();
+	QJsonObject json_net = json_obj.value("network").toObject();
+
+	QJsonObject json_emu = json_obj.value("emulator").toObject();
+	QJsonObject json_emu_gui = json_emu.value("gui").toObject();
+	QJsonObject json_emu_misc = json_emu.value("misc").toObject();
+
 	std::shared_ptr<emu_settings> xemu_settings;
 	if (game)
 	{
@@ -26,47 +67,751 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xgui_settings, Re
 		xemu_settings.reset(new emu_settings(""));
 		setWindowTitle(tr("Settings"));
 	}
-	
-	core_tab* coreTab = new core_tab(xemu_settings, this);
-
-	QPushButton *okButton = new QPushButton(tr("OK"));
-	QPushButton *cancelButton = new QPushButton(tr("Cancel"));
-	cancelButton->setDefault(true);
-
-	tabWidget = new QTabWidget;
-	tabWidget->setUsesScrollButtons(false);
-	tabWidget->addTab(coreTab, tr("Core"));
-	tabWidget->addTab(new graphics_tab(xemu_settings, r_Creator, this), tr("Graphics"));
-	tabWidget->addTab(new audio_tab(xemu_settings, this), tr("Audio"));
-	tabWidget->addTab(new input_tab(xemu_settings, this), tr("Input / Output"));
-	tabWidget->addTab(new misc_tab(xemu_settings, this), tr("Misc"));
-	tabWidget->addTab(new networking_tab(xemu_settings, this), tr("Networking"));
-	tabWidget->addTab(new system_tab(xemu_settings, this), tr("System"));
-	
-	if (!game)
-	{	// Don't add gui tab to game settings.
-		gui_tab* guiTab = new gui_tab(xgui_settings, this);
-		tabWidget->addTab(guiTab, tr("GUI"));
-		connect(guiTab, &gui_tab::GuiSettingsSyncRequest, this, &settings_dialog::GuiSettingsSyncRequest);
-		connect(guiTab, &gui_tab::GuiSettingsSaveRequest, this, &settings_dialog::GuiSettingsSaveRequest);
-		connect(guiTab, &gui_tab::GuiStylesheetRequest, this, &settings_dialog::GuiStylesheetRequest);
-		connect(okButton, &QAbstractButton::clicked, guiTab, &gui_tab::Accept);
-	}
 
 	// Various connects
-	connect(okButton, &QAbstractButton::clicked, coreTab, &core_tab::SaveSelectedLibraries);
-	connect(okButton, &QAbstractButton::clicked, xemu_settings.get(), &emu_settings::SaveSettings);
-	connect(okButton, &QAbstractButton::clicked, this, &QDialog::accept);
-	connect(cancelButton, &QAbstractButton::clicked, this, &QWidget::close);
-	connect(tabWidget, &QTabWidget::currentChanged, [=]() {cancelButton->setFocus(); });
+	connect(ui->okButton, &QAbstractButton::clicked, ui->coreTab, [=]() {
+		std::set<std::string> selectedlle;
+		for (int i = 0; i<ui->lleList->count(); ++i)
+		{
+			const auto& item = ui->lleList->item(i);
+			if (item->checkState() != Qt::CheckState::Unchecked)
+			{
+				selectedlle.emplace(sstr(item->text()));
+			}
+		}
+		std::vector<std::string> selected_ls = std::vector<std::string>(selectedlle.begin(), selectedlle.end());
+		xemu_settings->SaveSelectedLibraries(selected_ls);
+	});
+	connect(ui->okButton, &QAbstractButton::clicked, xemu_settings.get(), &emu_settings::SaveSettings);
+	connect(ui->okButton, &QAbstractButton::clicked, this, &QDialog::accept);
+	connect(ui->cancelButton, &QAbstractButton::clicked, this, &QWidget::close);
+	connect(ui->tabWidget, &QTabWidget::currentChanged, [=]() {ui->cancelButton->setFocus(); });
 
-	QHBoxLayout *buttonsLayout = new QHBoxLayout;
-	buttonsLayout->addStretch();
-	buttonsLayout->addWidget(okButton);
-	buttonsLayout->addWidget(cancelButton);
+	//     _____ _____  _    _   _______    _     
+	//    / ____|  __ \| |  | | |__   __|  | |    
+	//   | |    | |__) | |  | |    | | __ _| |__  
+	//   | |    |  ___/| |  | |    | |/ _` | '_ \ 
+	//   | |____| |    | |__| |    | | (_| | |_) |
+	//    \_____|_|     \____/     |_|\__,_|_.__/ 
 
-	QVBoxLayout *mainLayout = new QVBoxLayout;
-	mainLayout->addWidget(tabWidget);
-	mainLayout->addLayout(buttonsLayout);
-	setLayout(mainLayout);
+	// Checkboxes
+	xemu_settings->EnhanceCheckBox(ui->hookStFunc, emu_settings::HookStaticFuncs);
+	ui->hookStFunc->setToolTip(json_cpu_cbs["hookStFunc"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->bindSPUThreads, emu_settings::BindSPUThreads);
+	ui->bindSPUThreads->setToolTip(json_cpu_cbs["bindSPUThreads"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->lowerSPUThrPrio, emu_settings::LowerSPUThreadPrio);
+	ui->lowerSPUThrPrio->setToolTip(json_cpu_cbs["lowerSPUThrPrio"].toString());
+
+	// PPU tool tips
+	ui->ppu_precise->setToolTip(json_cpu_ppu["precise"].toString());
+	ui->ppu_fast->setToolTip(json_cpu_ppu["fast"].toString());
+	ui->ppu_llvm->setToolTip(json_cpu_ppu["LLVM"].toString());
+
+	{ // PPU Stuff
+		QString selectedPPU = qstr(xemu_settings->GetSetting(emu_settings::PPUDecoder));
+		for (const auto& button : ui->ppuBG->buttons())
+		{
+			QString current = button->text();
+			button->setCheckable(true);
+			if (current == selectedPPU)
+			{
+				button->setChecked(true);
+			}
+#ifndef LLVM_AVAILABLE
+			if (current == "Recompiler (LLVM)")
+			{
+				button->setEnabled(false);
+			}
+#endif
+			connect(button, &QAbstractButton::pressed, [=]() {xemu_settings->SetSetting(emu_settings::PPUDecoder, sstr(current)); });
+		}
+	}
+
+	// SPU tool tips
+	ui->spu_precise->setToolTip(json_cpu_spu["precise"].toString());
+	ui->spu_fast->setToolTip(json_cpu_spu["fast"].toString());
+	ui->spu_asmjit->setToolTip(json_cpu_spu["ASMJIT"].toString());
+	ui->spu_llvm->setToolTip(json_cpu_spu["LLVM"].toString());
+
+	{ // Spu stuff
+		QString selectedSPU = qstr(xemu_settings->GetSetting(emu_settings::SPUDecoder));
+		for (const auto& button : ui->spuBG->buttons())
+		{
+			QString current = button->text();
+			if (current == "Recompiler (LLVM)")
+			{
+				button->setEnabled(false);
+			}
+			button->setCheckable(true);
+			if (current == selectedSPU)
+			{
+				button->setChecked(true);
+			}
+			connect(button, &QAbstractButton::pressed, [=]() {xemu_settings->SetSetting(emu_settings::SPUDecoder, sstr(current)); });
+		}
+	}
+
+	// lib options tool tips
+	ui->lib_auto->setToolTip(json_cpu_lib["auto"].toString());
+	ui->lib_manu->setToolTip(json_cpu_lib["manual"].toString());
+	ui->lib_both->setToolTip(json_cpu_lib["both"].toString());
+	ui->lib_lv2->setToolTip(json_cpu_lib["liblv2"].toString());
+
+	// creating this in ui file keeps scrambling the order...
+	QButtonGroup *libModeBG = new QButtonGroup(this);
+	libModeBG->addButton(ui->lib_auto, 0);
+	libModeBG->addButton(ui->lib_manu, 1);
+	libModeBG->addButton(ui->lib_both, 2);
+	libModeBG->addButton(ui->lib_lv2,  3);
+
+	{// Handle lib loading options
+		QString selectedLib = qstr(xemu_settings->GetSetting(emu_settings::LibLoadOptions));
+		for (const auto& button : libModeBG->buttons())
+		{
+			QString current = button->text();
+			button->setCheckable(true);
+			if (current == selectedLib)
+			{
+				button->setChecked(true);
+			}
+			connect(button, &QAbstractButton::pressed, [=]() {xemu_settings->SetSetting(emu_settings::LibLoadOptions, sstr(current)); });
+		}
+	}
+
+	// Sort string vector alphabetically
+	static const auto sort_string_vector = [](std::vector<std::string>& vec)
+	{
+		std::sort(vec.begin(), vec.end(), [](const std::string &str1, const std::string &str2) { return str1 < str2; });
+	};
+
+	std::vector<std::string> loadedLibs = xemu_settings->GetLoadedLibraries();
+
+	sort_string_vector(loadedLibs);
+
+	for (auto lib : loadedLibs)
+	{
+		QListWidgetItem* item = new QListWidgetItem(qstr(lib), ui->lleList);
+		item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
+		item->setCheckState(Qt::Checked); // AND initialize check state
+		ui->lleList->addItem(item);
+	}
+	const std::string& lle_dir = Emu.GetLibDir(); // TODO
+
+	std::unordered_set<std::string> set(loadedLibs.begin(), loadedLibs.end());
+	std::vector<std::string> lle_module_list_unselected;
+
+	for (const auto& prxf : fs::dir(lle_dir))
+	{
+		// List found unselected modules
+		if (prxf.is_directory || (prxf.name.substr(std::max<size_t>(size_t(3), prxf.name.length()) - 4)) != "sprx")
+			continue;
+		if (verify_npdrm_self_headers(fs::file(lle_dir + prxf.name)) && !set.count(prxf.name))
+		{
+			lle_module_list_unselected.push_back(prxf.name);
+		}
+	}
+
+	sort_string_vector(lle_module_list_unselected);
+
+	for (auto lib : lle_module_list_unselected)
+	{
+		QListWidgetItem* item = new QListWidgetItem(qstr(lib), ui->lleList);
+		item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
+		item->setCheckState(Qt::Unchecked); // AND initialize check state
+		ui->lleList->addItem(item);
+	}
+
+	auto l_OnLibButtonClicked = [=](int ind)
+	{
+		if (ind == 1 || ind == 2)
+		{
+			ui->searchBox->setEnabled(true);
+			ui->lleList->setEnabled(true);
+		}
+		else
+		{
+			ui->searchBox->setEnabled(false);
+			ui->lleList->setEnabled(false);
+		}
+	};
+
+	auto l_OnSearchBoxTextChanged = [=](QString text)
+	{
+		QString searchTerm = text.toLower();
+		QList<QListWidgetItem*> checked_Libs;
+		QList<QListWidgetItem*> unchecked_Libs;
+
+		// create sublists. we need clones to preserve checkstates
+		for (int i = 0; i < ui->lleList->count(); ++i)
+		{
+			if (ui->lleList->item(i)->checkState() == Qt::Checked)
+			{
+				checked_Libs.append(ui->lleList->item(i)->clone());
+			}
+			else
+			{
+				unchecked_Libs.append(ui->lleList->item(i)->clone());
+			}
+		}
+
+		// sort sublists
+		auto qLessThan = [](QListWidgetItem *i1, QListWidgetItem *i2) { return i1->text() < i2->text(); };
+		qSort(checked_Libs.begin(), checked_Libs.end(), qLessThan);
+		qSort(unchecked_Libs.begin(), unchecked_Libs.end(), qLessThan);
+
+		// refill library list
+		ui->lleList->clear();
+
+		for (const auto& lib : checked_Libs)
+		{
+			ui->lleList->addItem(lib);
+		}
+		for (const auto& lib : unchecked_Libs)
+		{
+			ui->lleList->addItem(lib);
+		}
+
+		// only show items filtered for search text
+		for (int i = 0; i < ui->lleList->count(); i++)
+		{
+			if (ui->lleList->item(i)->text().contains(searchTerm))
+			{
+				ui->lleList->setRowHidden(i, false);
+			}
+			else
+			{
+				ui->lleList->setRowHidden(i, true);
+			}
+		}
+	};
+
+	// Events
+	connect(libModeBG, static_cast<void(QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), l_OnLibButtonClicked);
+	connect(ui->searchBox, &QLineEdit::textChanged, l_OnSearchBoxTextChanged);
+
+	int buttid = libModeBG->checkedId();
+	if (buttid != -1)
+	{
+		l_OnLibButtonClicked(buttid);
+	}
+
+	//     _____ _____  _    _   _______    _     
+	//    / ____|  __ \| |  | | |__   __|  | |    
+	//   | |  __| |__) | |  | |    | | __ _| |__  
+	//   | | |_ |  ___/| |  | |    | |/ _` | '_ \ 
+	//   | |__| | |    | |__| |    | | (_| | |_) |
+	//    \_____|_|     \____/     |_|\__,_|_.__/ 
+
+	// Comboboxes
+	ui->graphicsAdapterBox->setToolTip(json_gpu_cbs["graphicsAdapterBox"].toString());
+
+	xemu_settings->EnhanceComboBox(ui->renderBox, emu_settings::Renderer);
+	ui->renderBox->setToolTip(json_gpu_cbs["renderBox"].toString());
+
+	xemu_settings->EnhanceComboBox(ui->resBox, emu_settings::Resolution);
+	ui->resBox->setToolTip(json_gpu_cbs["resBox"].toString());
+
+	xemu_settings->EnhanceComboBox(ui->aspectBox, emu_settings::AspectRatio);
+	ui->aspectBox->setToolTip(json_gpu_cbs["aspectBox"].toString());
+
+	xemu_settings->EnhanceComboBox(ui->frameLimitBox, emu_settings::FrameLimit);
+	ui->frameLimitBox->setToolTip(json_gpu_cbs["frameLimitBox"].toString());
+
+	// Checkboxes: main options
+	xemu_settings->EnhanceCheckBox(ui->dumpColor, emu_settings::WriteColorBuffers);
+	ui->dumpColor->setToolTip(json_gpu_main["dumpColor"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->readColor, emu_settings::ReadColorBuffers);
+	ui->readColor->setToolTip(json_gpu_main["readColor"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->dumpDepth, emu_settings::WriteDepthBuffer);
+	ui->dumpDepth->setToolTip(json_gpu_main["dumpDepth"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->readDepth, emu_settings::ReadDepthBuffer);
+	ui->readDepth->setToolTip(json_gpu_main["readDepth"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->vsync, emu_settings::VSync);
+	ui->vsync->setToolTip(json_gpu_main["vsync"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->autoInvalidateCache, emu_settings::AutoInvalidateCache);
+	ui->autoInvalidateCache->setToolTip(json_gpu_main["autoInvalidateCache"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->gpuTextureScaling, emu_settings::GPUTextureScaling);
+	ui->gpuTextureScaling->setToolTip(json_gpu_main["gpuTextureScaling"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->stretchToDisplayArea, emu_settings::StretchToDisplayArea);
+	ui->stretchToDisplayArea->setToolTip(json_gpu_main["stretchToDisplayArea"].toString());
+
+	// Checkboxes: debug options
+	xemu_settings->EnhanceCheckBox(ui->glLegacyBuffers, emu_settings::LegacyBuffers);
+	ui->glLegacyBuffers->setToolTip(json_gpu_deb["glLegacyBuffers"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->scrictModeRendering, emu_settings::StrictRenderingMode);
+	ui->scrictModeRendering->setToolTip(json_gpu_deb["scrictModeRendering"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->forceHighpZ, emu_settings::ForceHighpZ);
+	ui->forceHighpZ->setToolTip(json_gpu_deb["forceHighpZ"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->debugOutput, emu_settings::DebugOutput);
+	ui->debugOutput->setToolTip(json_gpu_deb["debugOutput"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->debugOverlay, emu_settings::DebugOverlay);
+	ui->debugOverlay->setToolTip(json_gpu_deb["debugOverlay"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->logProg, emu_settings::LogShaderPrograms);
+	ui->logProg->setToolTip(json_gpu_deb["logProg"].toString());
+
+	// Graphics Adapter
+	QStringList D3D12Adapters = r_Creator.D3D12Adapters;
+	QStringList vulkanAdapters = r_Creator.vulkanAdapters;
+	bool supportsD3D12 = r_Creator.supportsD3D12;
+	bool supportsVulkan = r_Creator.supportsVulkan;
+	QString r_D3D12 = r_Creator.render_D3D12;
+	QString r_Vulkan = r_Creator.render_Vulkan;
+	QString r_OpenGL = r_Creator.render_OpenGL;
+	QString old_D3D12;
+	QString old_Vulkan;
+
+	if (supportsD3D12)
+	{
+		old_D3D12 = qstr(xemu_settings->GetSetting(emu_settings::D3D12Adapter));
+	}
+	else
+	{
+		// Remove D3D12 option from render combobox
+		for (int i = 0; i < ui->renderBox->count(); i++)
+		{
+			if (ui->renderBox->itemText(i) == r_D3D12)
+			{
+				ui->renderBox->removeItem(i);
+				break;
+			}
+		}
+	}
+
+	if (supportsVulkan)
+	{
+		old_Vulkan = qstr(xemu_settings->GetSetting(emu_settings::VulkanAdapter));
+	}
+	else
+	{
+		// Remove Vulkan option from render combobox
+		for (int i = 0; i < ui->renderBox->count(); i++)
+		{
+			if (ui->renderBox->itemText(i) == r_Vulkan)
+			{
+				ui->renderBox->removeItem(i);
+				break;
+			}
+		}
+	}
+
+	QString oldRender = ui->renderBox->itemText(ui->renderBox->currentIndex());
+
+	auto switchGraphicsAdapter = [=](int index)
+	{
+		QString render = ui->renderBox->itemText(index);
+		m_isD3D12 = render == r_D3D12;
+		m_isVulkan = render == r_Vulkan;
+		ui->graphicsAdapterBox->setEnabled(m_isD3D12 || m_isVulkan);
+
+		// D3D Adapter
+		if (m_isD3D12)
+		{
+			// Reset other adapters to old config
+			if (supportsVulkan)
+			{
+				xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(old_Vulkan));
+			}
+			// Fill combobox
+			ui->graphicsAdapterBox->clear();
+			for (const auto& adapter : D3D12Adapters)
+			{
+				ui->graphicsAdapterBox->addItem(adapter);
+			}
+			// Reset Adapter to old config
+			int idx = ui->graphicsAdapterBox->findText(old_D3D12);
+			if (idx == -1)
+			{
+				idx = 0;
+				if (old_D3D12.isEmpty())
+				{
+					LOG_WARNING(RSX, "%s adapter config empty: setting to default!", sstr(r_D3D12));
+				}
+				else
+				{
+					LOG_WARNING(RSX, "Last used %s adapter not found: setting to default!", sstr(r_D3D12));
+				}
+			}
+			ui->graphicsAdapterBox->setCurrentIndex(idx);
+			xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(ui->graphicsAdapterBox->currentText()));
+		}
+
+		// Vulkan Adapter
+		else if (m_isVulkan)
+		{
+			// Reset other adapters to old config
+			if (supportsD3D12)
+			{
+				xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(old_D3D12));
+			}
+			// Fill combobox
+			ui->graphicsAdapterBox->clear();
+			for (const auto& adapter : vulkanAdapters)
+			{
+				ui->graphicsAdapterBox->addItem(adapter);
+			}
+			// Reset Adapter to old config
+			int idx = ui->graphicsAdapterBox->findText(old_Vulkan);
+			if (idx == -1)
+			{
+				idx = 0;
+				if (old_Vulkan.isEmpty())
+				{
+					LOG_WARNING(RSX, "%s adapter config empty: setting to default!", sstr(r_Vulkan));
+				}
+				else
+				{
+					LOG_WARNING(RSX, "Last used %s adapter not found: setting to default!", sstr(r_Vulkan));
+				}
+			}
+			ui->graphicsAdapterBox->setCurrentIndex(idx);
+			xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(ui->graphicsAdapterBox->currentText()));
+		}
+
+		// Other Adapter
+		else
+		{
+			// Reset Adapters to old config
+			if (supportsD3D12)
+			{
+				xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(old_D3D12));
+			}
+			if (supportsVulkan)
+			{
+				xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(old_Vulkan));
+			}
+
+			// Fill combobox with placeholder
+			ui->graphicsAdapterBox->clear();
+			ui->graphicsAdapterBox->addItem(tr("Not needed for %1 renderer").arg(render));
+		}
+	};
+
+	auto setAdapter = [=](QString text)
+	{
+		if (text.isEmpty()) return;
+
+		// don't set adapter if signal was created by switching render
+		QString newRender = ui->renderBox->itemText(ui->renderBox->currentIndex());
+		if (m_oldRender == newRender)
+		{
+			if (m_isD3D12 && D3D12Adapters.contains(text))
+			{
+				xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(text));
+			}
+			else if (m_isVulkan && vulkanAdapters.contains(text))
+			{
+				xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(text));
+			}
+		}
+		else
+		{
+			m_oldRender = newRender;
+		}
+	};
+
+	// Init
+	setAdapter(ui->graphicsAdapterBox->currentText());
+	switchGraphicsAdapter(ui->renderBox->currentIndex());
+
+	// Events
+	connect(ui->graphicsAdapterBox, &QComboBox::currentTextChanged, setAdapter);
+	connect(ui->renderBox, static_cast<void (QComboBox::*)(int index)>(&QComboBox::currentIndexChanged), switchGraphicsAdapter);
+
+	auto fixGLLegacy = [=](const QString& text) {
+		ui->glLegacyBuffers->setEnabled(text == r_OpenGL);
+	};
+
+	// Handle connects to disable specific checkboxes that depend on GUI state.
+	fixGLLegacy(ui->renderBox->currentText()); // Init
+	connect(ui->renderBox, &QComboBox::currentTextChanged, fixGLLegacy);
+
+	//                      _ _         _______    _     
+	//       /\            | (_)       |__   __|  | |    
+	//      /  \  _   _  __| |_  ___      | | __ _| |__  
+	//     / /\ \| | | |/ _` | |/ _ \     | |/ _` | '_ \ 
+	//    / ____ \ |_| | (_| | | (_) |    | | (_| | |_) |
+	//   /_/    \_\__,_|\__,_|_|\___/     |_|\__,_|_.__/ 
+
+	// Comboboxes
+
+	xemu_settings->EnhanceComboBox(ui->audioOutBox, emu_settings::AudioRenderer);
+	ui->audioOutBox->setToolTip(json_audio["audioOutBox"].toString());
+
+	// Checkboxes
+
+	xemu_settings->EnhanceCheckBox(ui->audioDump, emu_settings::DumpToFile);
+	ui->audioDump->setToolTip(json_audio["audioDump"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->convert, emu_settings::ConvertTo16Bit);
+	ui->convert->setToolTip(json_audio["convert"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->downmix, emu_settings::DownmixStereo);
+	ui->downmix->setToolTip(json_audio["downmix"].toString());
+
+	//    _____       __   ____    _______    _     
+	//   |_   _|     / /  / __ \  |__   __|  | |    
+	//     | |      / /  | |  | |    | | __ _| |__  
+	//     | |     / /   | |  | |    | |/ _` | '_ \ 
+	//    _| |_   / /    | |__| |    | | (_| | |_) |
+	//   |_____| /_/      \____/     |_|\__,_|_.__/ 
+
+	// Comboboxes
+
+	xemu_settings->EnhanceComboBox(ui->padHandlerBox, emu_settings::PadHandler);
+	ui->padHandlerBox->setToolTip(json_input["padHandlerBox"].toString());
+
+	xemu_settings->EnhanceComboBox(ui->keyboardHandlerBox, emu_settings::KeyboardHandler);
+	ui->keyboardHandlerBox->setToolTip(json_input["keyboardHandlerBox"].toString());
+
+	xemu_settings->EnhanceComboBox(ui->mouseHandlerBox, emu_settings::MouseHandler);
+	ui->mouseHandlerBox->setToolTip(json_input["mouseHandlerBox"].toString());
+
+	xemu_settings->EnhanceComboBox(ui->cameraTypeBox, emu_settings::CameraType);
+	ui->cameraTypeBox->setToolTip(json_input["cameraTypeBox"].toString());
+
+	// Checkboxes
+
+	xemu_settings->EnhanceCheckBox(ui->useFakeCamera, emu_settings::Camera);
+	ui->useFakeCamera->setToolTip(json_input["useFakeCamera"].toString());
+
+	//     _____           _                   _______    _     
+	//    / ____|         | |                 |__   __|  | |    
+	//   | (___  _   _ ___| |_ ___ _ __ ___      | | __ _| |__  
+	//    \___ \| | | / __| __/ _ \ '_ ` _ \     | |/ _` | '_ \ 
+	//    ____) | |_| \__ \ ||  __/ | | | | |    | | (_| | |_) |
+	//   |_____/ \__, |___/\__\___|_| |_| |_|    |_|\__,_|_.__/ 
+	//            __/ |                                         
+	//           |___/                                          
+
+	// Comboboxes
+
+	xemu_settings->EnhanceComboBox(ui->sysLangBox, emu_settings::Language);
+	ui->sysLangBox->setToolTip(json_sys["sysLangBox"].toString());
+
+	// Checkboxes
+
+	xemu_settings->EnhanceCheckBox(ui->enableHostRoot, emu_settings::EnableHostRoot);
+	ui->enableHostRoot->setToolTip(json_sys["enableHostRoot"].toString());
+
+	//    _   _      _                      _      _______    _     
+	//   | \ | |    | |                    | |    |__   __|  | |    
+	//   |  \| | ___| |___      _____  _ __| | __    | | __ _| |__  
+	//   | . ` |/ _ \ __\ \ /\ / / _ \| '__| |/ /    | |/ _` | '_ \ 
+	//   | |\  |  __/ |_ \ V  V / (_) | |  |   <     | | (_| | |_) |
+	//   |_| \_|\___|\__| \_/\_/ \___/|_|  |_|\_\    |_|\__,_|_.__/ 
+
+	// Comboboxes
+
+	xemu_settings->EnhanceComboBox(ui->netStatusBox, emu_settings::ConnectionStatus);
+	ui->netStatusBox->setToolTip(json_net["netStatusBox"].toString());
+
+	//    ______                 _       _               _______    _     
+	//   |  ____|               | |     | |             |__   __|  | |    
+	//   | |__   _ __ ___  _   _| | __ _| |_ ___  _ __     | | __ _| |__  
+	//   |  __| | '_ ` _ \| | | | |/ _` | __/ _ \| '__|    | |/ _` | '_ \ 
+	//   | |____| | | | | | |_| | | (_| | || (_) | |       | | (_| | |_) |
+	//   |______|_| |_| |_|\__,_|_|\__,_|\__\___/|_|       |_|\__,_|_.__/ 
+
+	// Comboboxes
+
+	ui->combo_configs->setToolTip(json_emu_gui["configs"].toString());
+	ui->combo_stylesheets->setToolTip(json_emu_gui["stylesheets"].toString());
+
+	// Checkboxes
+
+	ui->cb_show_welcome->setToolTip(json_emu_gui["show_welcome"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->exitOnStop, emu_settings::ExitRPCS3OnFinish);
+	ui->exitOnStop->setToolTip(json_emu_misc["exitOnStop"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->alwaysStart, emu_settings::StartOnBoot);
+	ui->alwaysStart->setToolTip(json_emu_misc["alwaysStart"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->startGameFullscreen, emu_settings::StartGameFullscreen);
+	ui->startGameFullscreen->setToolTip(json_emu_misc["startGameFullscreen"].toString());
+
+	xemu_settings->EnhanceCheckBox(ui->showFPSInTitle, emu_settings::ShowFPSInTitle);
+	ui->showFPSInTitle->setToolTip(json_emu_misc["showFPSInTitle"].toString());
+
+	if (game)
+	{
+		ui->gb_stylesheets->setEnabled(false);
+		ui->gb_configs->setEnabled(false);
+		ui->gb_settings->setEnabled(false);
+	}
+	else
+	{
+		ui->cb_show_welcome->setChecked(xgui_settings->GetValue(GUI::ib_show_welcome).toBool());
+
+		connect(ui->okButton, &QAbstractButton::clicked, [this]() {
+			// Only attempt to load a config if changes occurred.
+			if (m_startingConfig != xgui_settings->GetValue(GUI::m_currentConfig).toString())
+			{
+				OnApplyConfig();
+			}
+			if (m_startingStylesheet != xgui_settings->GetValue(GUI::m_currentStylesheet).toString())
+			{
+				OnApplyStylesheet();
+			}
+		});
+		connect(ui->pb_reset_default, &QAbstractButton::clicked, [=]() {
+			if (QMessageBox::question(this, tr("Reset GUI to default?"), tr("This will include your stylesheet as well. Do you wish to proceed?"),
+				QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes)
+			{
+				xgui_settings->Reset(true);
+				xgui_settings->ChangeToConfig(tr("default"));
+				Q_EMIT GuiStylesheetRequest(tr("default"));
+				Q_EMIT GuiSettingsSyncRequest();
+				AddConfigs();
+				AddStylesheets();
+			}
+		});
+		connect(ui->pb_backup_config, &QAbstractButton::clicked, this, &settings_dialog::OnBackupCurrentConfig);
+		connect(ui->pb_apply_config, &QAbstractButton::clicked, this, &settings_dialog::OnApplyConfig);
+		connect(ui->pb_apply_stylesheet, &QAbstractButton::clicked, this, &settings_dialog::OnApplyStylesheet);
+		connect(ui->pb_open_folder, &QAbstractButton::clicked, [=]() {QDesktopServices::openUrl(xgui_settings->GetSettingsDir()); });
+		connect(ui->cb_show_welcome, &QCheckBox::clicked, [=](bool val) {xgui_settings->SetValue(GUI::ib_show_welcome, val); });
+		auto colorDialog = [&](const GUI_SAVE& color, const QString& title){
+			QColorDialog dlg(xgui_settings->GetValue(color).value<QColor>(), this);
+			dlg.setWindowTitle(title);
+			dlg.setOptions(QColorDialog::ShowAlphaChannel);
+			for (int i = 0; i < dlg.customCount(); i++)
+			{
+				dlg.setCustomColor(i, xgui_settings->GetCustomColor(i));
+			}
+			if (dlg.exec() == QColorDialog::Accepted)
+			{
+				for (int i = 0; i < dlg.customCount(); i++)
+				{
+					xgui_settings->SetCustomColor(i, dlg.customColor(i));
+				}
+				xgui_settings->SetValue(color, dlg.selectedColor());
+			}
+		};
+		connect(ui->pb_icon_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::gl_iconColor, "Choose icon color"); });
+		connect(ui->pb_tool_bar_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::mw_toolBarColor, "Choose tool bar color"); });
+
+		AddConfigs();
+		AddStylesheets();
+	}
+
+	layout()->setSizeConstraint(QLayout::SetFixedSize);
+}
+
+void settings_dialog::AddConfigs()
+{
+	ui->combo_configs->clear();
+
+	ui->combo_configs->addItem(tr("default"));
+
+	for (QString entry : xgui_settings->GetConfigEntries())
+	{
+		if (entry != tr("default"))
+		{
+			ui->combo_configs->addItem(entry);
+		}
+	}
+
+	QString currentSelection = tr("CurrentSettings");
+	m_startingConfig = currentSelection;
+
+	int index = ui->combo_configs->findText(currentSelection);
+	if (index != -1)
+	{
+		ui->combo_configs->setCurrentIndex(index);
+	}
+	else
+	{
+		LOG_WARNING(GENERAL, "Trying to set an invalid config index ", index);
+	}
+}
+
+void settings_dialog::AddStylesheets()
+{
+	ui->combo_stylesheets->clear();
+
+	ui->combo_stylesheets->addItem(tr("default"));
+
+	for (QString entry : xgui_settings->GetStylesheetEntries())
+	{
+		if (entry != tr("default"))
+		{
+			ui->combo_stylesheets->addItem(entry);
+		}
+	}
+
+	QString currentSelection = xgui_settings->GetValue(GUI::m_currentStylesheet).toString();
+	m_startingStylesheet = currentSelection;
+
+	int index = ui->combo_stylesheets->findText(currentSelection);
+	if (index != -1)
+	{
+		ui->combo_stylesheets->setCurrentIndex(index);
+	}
+	else
+	{
+		LOG_WARNING(GENERAL, "Trying to set an invalid stylesheets index ", index);
+	}
+}
+
+void settings_dialog::OnBackupCurrentConfig()
+{
+	QInputDialog* dialog = new QInputDialog(this);
+	dialog->setWindowTitle(tr("Choose a unique name"));
+	dialog->setLabelText(tr("Configuration Name: "));
+	dialog->resize(500, 100);
+
+	while (dialog->exec() != QDialog::Rejected)
+	{
+		dialog->resize(500, 100);
+		QString friendlyName = dialog->textValue();
+		if (friendlyName == "")
+		{
+			QMessageBox::warning(this, tr("Error"), tr("Name cannot be empty"));
+			continue;
+		}
+		if (friendlyName.contains("."))
+		{
+			QMessageBox::warning(this, tr("Error"), tr("Must choose a name with no '.'"));
+			continue;
+		}
+		if (ui->combo_configs->findText(friendlyName) != -1)
+		{
+			QMessageBox::warning(this, tr("Error"), tr("Please choose a non-existing name"));
+			continue;
+		}
+		Q_EMIT GuiSettingsSaveRequest();
+		xgui_settings->SaveCurrentConfig(friendlyName);
+		ui->combo_configs->addItem(friendlyName);
+		ui->combo_configs->setCurrentIndex(ui->combo_configs->findText(friendlyName));
+		break;
+	}
+}
+
+void settings_dialog::OnApplyConfig()
+{
+	QString name = ui->combo_configs->currentText();
+	xgui_settings->SetValue(GUI::m_currentConfig, name);
+	xgui_settings->ChangeToConfig(name);
+	Q_EMIT GuiSettingsSyncRequest();
+}
+
+void settings_dialog::OnApplyStylesheet()
+{
+	xgui_settings->SetValue(GUI::m_currentStylesheet, ui->combo_stylesheets->currentText());
+	Q_EMIT GuiStylesheetRequest(xgui_settings->GetCurrentStylesheetPath());
 }

rpcs3/rpcs3qt/settings_dialog.h

@@ -10,16 +10,35 @@
 
 #include <memory>
 
+namespace Ui {
+	class settings_dialog;
+}
+
 class settings_dialog : public QDialog
 {
 	Q_OBJECT
 
 public:
-	explicit settings_dialog(std::shared_ptr<gui_settings> xSettings, Render_Creator r_Creator, QWidget *parent = 0, GameInfo *game = nullptr);
+	explicit settings_dialog(std::shared_ptr<gui_settings> xSettings, const Render_Creator& r_Creator, const int& tabIndex = 0, QWidget *parent = 0, GameInfo *game = nullptr);
 Q_SIGNALS:
 	void GuiSettingsSyncRequest();
 	void GuiStylesheetRequest(const QString& path);
 	void GuiSettingsSaveRequest();
+private Q_SLOTS:
+	void OnBackupCurrentConfig();
+	void OnApplyConfig();
+	void OnApplyStylesheet();
 private:
-	QTabWidget *tabWidget;
+	//emulator tab
+	void AddConfigs();
+	void AddStylesheets();
+	QString m_startingStylesheet;
+	QString m_startingConfig;
+	//gpu tab
+	QString m_oldRender = "";
+	bool m_isD3D12 = false;
+	bool m_isVulkan = false;
+
+	Ui::settings_dialog *ui;
+	std::shared_ptr<gui_settings> xgui_settings;
 };

rpcs3/rpcs3qt/system_tab.cpp

@@ -1,33 +0,0 @@
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-
-#include "system_tab.h"
-
-system_tab::system_tab(std::shared_ptr<emu_settings> xemu_settings, QWidget *parent) : QWidget(parent)
-{
-	// Language
-	QGroupBox *sysLang = new QGroupBox(tr("Language"));
-
-	QComboBox *sysLangBox = xemu_settings->CreateEnhancedComboBox(emu_settings::Language, this);
-
-	QVBoxLayout *sysLangVbox = new QVBoxLayout;
-	sysLangVbox->addWidget(sysLangBox);
-	sysLang->setLayout(sysLangVbox);
-
-	// Checkboxes
-	QCheckBox *enableHostRoot = xemu_settings->CreateEnhancedCheckBox(emu_settings::EnableHostRoot, this);
-
-	// Main layout
-	QVBoxLayout *vbox = new QVBoxLayout;
-	vbox->addWidget(enableHostRoot);
-	vbox->addWidget(sysLang);
-	vbox->addStretch();
-
-	QHBoxLayout *hbox = new QHBoxLayout;
-	hbox->addLayout(vbox);
-	hbox->addStretch();
-	setLayout(hbox);
-}

rpcs3/rpcs3qt/system_tab.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include "emu_settings.h"
-
-#include <QWidget>
-
-#include <memory>
-
-class system_tab : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit system_tab(std::shared_ptr<emu_settings> xemu_settings, QWidget *parent = 0);
-};

rpcs3/rpcs3qt/vfs_dialog.cpp

@@ -49,6 +49,9 @@ vfs_dialog::vfs_dialog(QWidget* parent) : QDialog(parent),
 		}
 	});
 	QPushButton* okay = new QPushButton(tr("Okay"));
+	okay->setAutoDefault(true);
+	okay->setDefault(true);
+
 	connect(okay, &QAbstractButton::pressed, [this]() {
 		for (int i = 0; i < tabs->count(); ++i)
 		{