externals: Use the conan helper for boost.

This partially reverts 292dd642ce.
The real issue was the missing components in the find_package(boost) call.
This is now fixed here.

.ci/scripts/linux/docker.sh

@@ -8,17 +8,7 @@ cd /yuzu
 ccache -s
 
 mkdir build || true && cd build
-cmake .. \
-      -DBoost_USE_STATIC_LIBS=ON \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \
-      -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \
-      -DCMAKE_INSTALL_PREFIX="/usr" \
-      -DDISPLAY_VERSION=$1 \
-      -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-      -DENABLE_QT_TRANSLATION=ON \
-      -DUSE_DISCORD_PRESENCE=ON \
-      -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"}
+cmake .. -DDISPLAY_VERSION=$1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_INSTALL_PREFIX="/usr"
 
 make -j$(nproc)
 

.ci/templates/build-msvc.yml

@@ -8,7 +8,7 @@ steps:
   displayName: 'Install vulkan-sdk'
 - script: python -m pip install --upgrade pip conan
   displayName: 'Install conan'
-- script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cmake --install . --config Release && cd ..
+- script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cmake --install . --config Release && cd ..
   displayName: 'Configure CMake'
 - task: MSBuild@1
   displayName: 'Build'

.gitmodules

@@ -40,6 +40,3 @@
 [submodule "ffmpeg"]
 	path = externals/ffmpeg
 	url = https://git.ffmpeg.org/ffmpeg.git
-[submodule "SDL"]
-	path = externals/SDL
-	url = https://github.com/libsdl-org/SDL.git

CMakeLists.txt

@@ -11,7 +11,6 @@ project(yuzu)
 # Set bundled sdl2/qt as dependent options.
 # OFF by default, but if ENABLE_SDL2 and MSVC are true then ON
 option(ENABLE_SDL2 "Enable the SDL2 frontend" ON)
-CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON "ENABLE_SDL2;MSVC" OFF)
 
 option(ENABLE_QT "Enable the Qt frontend" ON)
 option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
@@ -19,9 +18,7 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" ON "EN
 
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
 
-option(YUZU_USE_BUNDLED_BOOST "Download bundled Boost" OFF)
-
-CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" ON "WIN32" OFF)
+CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled yuzu" ON "WIN32" OFF)
 
 option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
 
@@ -166,9 +163,12 @@ macro(yuzu_find_packages)
     # Cmake has a *serious* lack of 2D array or associative array...
     # Capitalization matters here. We need the naming to match the generated paths from Conan
     set(REQUIRED_LIBS
-    #    Cmake Pkg Prefix  Version     Conan Pkg
+    #    Cmake Pkg Prefix  Version     Conan Pkg            Components
+        "Boost             1.73        boost/1.73.0         context headers"
         "Catch2            2.13        catch2/2.13.0"
         "fmt               7.1         fmt/7.1.2"
+    # can't use until https://github.com/bincrafters/community/issues/1173
+        #"libzip            1.5         libzip/1.5.2@bincrafters/stable"
         "lz4               1.8         lz4/1.9.2"
         "nlohmann_json     3.8         nlohmann_json/3.8.0"
         "ZLIB              1.2         zlib/1.2.11"
@@ -177,18 +177,54 @@ macro(yuzu_find_packages)
         #"opus              1.3         opus/1.3.1"
     )
 
+    if(ENABLE_SDL2)
+        list(APPEND REQUIRED_LIBS "SDL2 2.0.10 sdl2/2.0.14@bincrafters/stable")
+    endif()
+
+    if(ENABLE_QT)
+        # Workaround for an issue where conan tries to build Qt from scratch instead of download prebuilt binaries
+        set(QT_PREFIX_HINT)
+        if(YUZU_USE_BUNDLED_QT)
+            if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
+                set(QT_VER qt-5.12.8-msvc2017_64)
+            else()
+                message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")
+            endif()
+
+            if (DEFINED QT_VER)
+                download_bundled_external("qt/" ${QT_VER} QT_PREFIX)
+            endif()
+
+            set(QT_PREFIX_HINT HINTS "${QT_PREFIX}")
+        endif()
+
+        set(QT_ADDITIONAL_COMPONENTS)
+        if (YUZU_USE_QT_WEB_ENGINE)
+            set(QT_ADDITIONAL_COMPONENTS "WebEngineCore WebEngineWidgets")
+        endif()
+
+        if (ENABLE_QT_TRANSLATION)
+            set(QT_ADDITIONAL_COMPONENTS "${QT_ADDITIONAL_COMPONENTS} LinguistTools")
+        endif()
+
+        list(APPEND REQUIRED_LIBS "Qt5 5.11 qt/5.14.1@bincrafters/stable Widgets ${QT_ADDITIONAL_COMPONENTS} ${QT_PREFIX_HINT}")
+    endif()
+
     foreach(PACKAGE ${REQUIRED_LIBS})
         string(REGEX REPLACE "[ \t\r\n]+" ";" PACKAGE_SPLIT ${PACKAGE})
         list(GET PACKAGE_SPLIT 0 PACKAGE_PREFIX)
         list(GET PACKAGE_SPLIT 1 PACKAGE_VERSION)
         list(GET PACKAGE_SPLIT 2 PACKAGE_CONAN)
+        list(REMOVE_AT PACKAGE_SPLIT 0 1 2)
+        set(PACKAGE_COMPONENTS ${PACKAGE_SPLIT})
+
         # This function is called twice, once to check if the packages exist on the system already
         # and a second time to check if conan installed them properly. The second check passes in FORCE_REQUIRED
         if (NOT ${PACKAGE_PREFIX}_FOUND)
             if (FN_FORCE_REQUIRED)
-                find_package(${PACKAGE_PREFIX} ${PACKAGE_VERSION} REQUIRED)
+                find_package(${PACKAGE_PREFIX} ${PACKAGE_VERSION} REQUIRED COMPONENTS ${PACKAGE_COMPONENTS})
             else()
-                find_package(${PACKAGE_PREFIX} ${PACKAGE_VERSION})
+                find_package(${PACKAGE_PREFIX} ${PACKAGE_VERSION} COMPONENTS ${PACKAGE_COMPONENTS})
             endif()
         endif()
         if (NOT ${PACKAGE_PREFIX}_FOUND)
@@ -201,115 +237,9 @@ macro(yuzu_find_packages)
     unset(FN_FORCE_REQUIRED)
 endmacro()
 
-if (NOT YUZU_USE_BUNDLED_BOOST)
-    find_package(Boost 1.73.0 COMPONENTS context headers QUIET)
-endif()
-if (Boost_FOUND)
-    set(Boost_LIBRARIES Boost::boost)
-    # Conditionally add Boost::context only if the active version of the Conan or system Boost package provides it
-    # The old version is missing Boost::context, so we want to avoid adding in that case
-    # The new version requires adding Boost::context to prevent linking issues
-    #
-    # This one is used by Conan on subsequent CMake configures, not the first configure.
-    if (TARGET Boost::context)
-        list(APPEND Boost_LIBRARIES Boost::context)
-    endif()
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST)
-    message(STATUS "Boost 1.73.0 or newer not found, falling back to externals")
-    set(YUZU_USE_BUNDLED_BOOST ON CACHE BOOL "Download bundled Boost" FORCE)
-
-    # Use yuzu Boost binaries
-    set(Boost_EXT_NAME "boost_1_75_0")
-    set(Boost_PATH "${CMAKE_BINARY_DIR}/externals/${Boost_EXT_NAME}")
-    download_bundled_external("boost/" ${Boost_EXT_NAME} "")
-    set(Boost_USE_DEBUG_RUNTIME FALSE)
-    set(Boost_USE_STATIC_LIBS ON)
-    find_package(Boost 1.75.0 REQUIRED COMPONENTS context headers PATHS ${Boost_PATH} NO_DEFAULT_PATH)
-    # Manually set the include dirs since the find_package sets it incorrectly
-    set(Boost_INCLUDE_DIRS ${Boost_PATH}/include CACHE PATH "Path to Boost headers" FORCE)
-    include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
-else()
-    message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan")
-    list(APPEND CONAN_REQUIRED_LIBS "boost/1.73.0")
-endif()
-
 # Attempt to locate any packages that are required and report the missing ones in CONAN_REQUIRED_LIBS
 yuzu_find_packages()
 
-# Qt5 requires that we find components, so it doesn't fit our pretty little find package function
-if(ENABLE_QT)
-    # We want to load the generated conan qt config so that we get the QT_ROOT var so that we can use the official
-    # Qt5Config inside the root folder instead of the conan generated one.
-    if(EXISTS ${CMAKE_BINARY_DIR}/qtConfig.cmake)
-        include(${CMAKE_BINARY_DIR}/qtConfig.cmake)
-        list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}")
-        list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}")
-    endif()
-    # Workaround for an issue where conan tries to build Qt from scratch instead of download prebuilt binaries
-    set(QT_PREFIX_HINT)
-    if(YUZU_USE_BUNDLED_QT)
-        if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
-            set(QT_VER qt-5.12.8-msvc2017_64)
-        else()
-            message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")
-        endif()
-
-        if (DEFINED QT_VER)
-            download_bundled_external("qt/" ${QT_VER} QT_PREFIX)
-        endif()
-
-        set(QT_PREFIX_HINT HINTS "${QT_PREFIX}")
-    endif()
-    find_package(Qt5 5.9 COMPONENTS Widgets ${QT_PREFIX_HINT})
-    if (YUZU_USE_QT_WEB_ENGINE)
-        find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets)
-    endif()
-
-    if (ENABLE_QT_TRANSLATION)
-        find_package(Qt5 REQUIRED COMPONENTS LinguistTools ${QT_PREFIX_HINT})
-    endif()
-endif()
-# find SDL2 exports a bunch of variables that are needed, so its easier to do this outside of the yuzu_find_package
-if (ENABLE_SDL2)
-    if (YUZU_USE_BUNDLED_SDL2)
-        # Detect toolchain and platform
-        if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
-            set(SDL2_VER "SDL2-2.0.14")
-        else()
-            message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")
-        endif()
-
-        if (DEFINED SDL2_VER)
-            download_bundled_external("sdl2/" ${SDL2_VER} SDL2_PREFIX)
-        endif()
-
-        set(SDL2_FOUND YES)
-        set(SDL2_INCLUDE_DIR "${SDL2_PREFIX}/include" CACHE PATH "Path to SDL2 headers")
-        set(SDL2_LIBRARY "${SDL2_PREFIX}/lib/x64/SDL2.lib" CACHE PATH "Path to SDL2 library")
-        set(SDL2_DLL_DIR "${SDL2_PREFIX}/lib/x64/" CACHE PATH "Path to SDL2.dll")
-
-        add_library(SDL2 INTERFACE)
-        target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
-        target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
-    else()
-        find_package(SDL2 2.0.14 QUIET)
-
-        if (SDL2_FOUND)
-            # Some installations don't set SDL2_LIBRARIES
-            if("${SDL2_LIBRARIES}" STREQUAL "")
-                message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
-                set(SDL2_LIBRARIES "SDL2::SDL2")
-            endif()
-
-            include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
-            add_library(SDL2 INTERFACE)
-            target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
-        else()
-            message(STATUS "SDL2 2.0.14 or newer not found, falling back to externals.")
-        endif()
-    endif()
-endif()
-
 # Install any missing dependencies with conan install
 if (CONAN_REQUIRED_LIBS)
     message(STATUS "Packages ${CONAN_REQUIRED_LIBS} not found!")
@@ -328,6 +258,9 @@ if (CONAN_REQUIRED_LIBS)
     )
 
     conan_check(VERSION 1.24.0 REQUIRED)
+    # Add the bincrafters remote
+    conan_add_remote(NAME bincrafters
+                    URL https://api.bintray.com/conan/bincrafters/public-conan)
 
     # Manually add iconv to fix a dep conflict between qt and sdl2
     # We don't need to add it through find_package or anything since the other two can find it just fine
@@ -358,17 +291,6 @@ if (CONAN_REQUIRED_LIBS)
     # this time with required, so we bail if its not found.
     yuzu_find_packages(FORCE_REQUIRED)
 
-    if (NOT Boost_FOUND)
-        find_package(Boost 1.73.0 REQUIRED COMPONENTS context headers)
-        set(Boost_LIBRARIES Boost::boost)
-        # Conditionally add Boost::context only if the active version of the Conan Boost package provides it
-        # The old version is missing Boost::context, so we want to avoid adding in that case
-        # The new version requires adding Boost::context to prevent linking issues
-        if (TARGET Boost::context)
-            list(APPEND Boost_LIBRARIES Boost::context)
-        endif()
-    endif()
-
     # Due to issues with variable scopes in functions, we need to also find_package(qt5) outside of the function
     if(ENABLE_QT)
         list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}")
@@ -378,6 +300,11 @@ if (CONAN_REQUIRED_LIBS)
             find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets)
         endif()
     endif()
+    if(ENABLE_SDL2)
+        list(APPEND CMAKE_MODULE_PATH "${CONAN_SDL2_ROOT_RELEASE}")
+        list(APPEND CMAKE_PREFIX_PATH "${CONAN_SDL2_ROOT_RELEASE}")
+        find_package(SDL2 REQUIRED)
+    endif()
 
 endif()
 
@@ -393,6 +320,28 @@ elseif (TARGET Boost::boost)
     add_library(boost ALIAS Boost::boost)
 endif()
 
+# Some boost packages lack the context target, so let's just alias it from the global boost target.
+if (NOT TARGET Boost::context)
+    add_library(Boost::context ALIAS Boost::boost)
+endif()
+
+if (TARGET sdl2::sdl2)
+    # imported from the conan generated sdl2Config.cmake
+    set_target_properties(sdl2::sdl2 PROPERTIES IMPORTED_GLOBAL TRUE)
+    add_library(SDL2 ALIAS sdl2::sdl2)
+elseif(SDL2_FOUND)
+    # found through the system package manager
+    # Some installations don't set SDL2_LIBRARIES
+    if("${SDL2_LIBRARIES}" STREQUAL "")
+        message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
+        set(SDL2_LIBRARIES "SDL2::SDL2")
+    endif()
+
+    include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
+    add_library(SDL2 INTERFACE)
+    target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
+endif()
+
 # Ensure libusb is properly configured (based on dolphin libusb include)
 if(NOT APPLE)
     include(FindPkgConfig)
@@ -412,7 +361,7 @@ set(FFmpeg_COMPONENTS
 
 if (NOT YUZU_USE_BUNDLED_FFMPEG)
     # Use system installed FFmpeg
-    find_package(FFmpeg QUIET COMPONENTS ${FFmpeg_COMPONENTS})
+    find_package(FFmpeg REQUIRED COMPONENTS ${FFmpeg_COMPONENTS})
 
     if (FFmpeg_FOUND)
         # Overwrite aggregate defines from FFmpeg module to avoid over-linking libraries.
@@ -451,7 +400,6 @@ if (YUZU_USE_BUNDLED_FFMPEG)
             set(FFmpeg_FOUND YES)
         endif()
 
-        unset(FFmpeg_LIBRARIES CACHE)
         foreach(COMPONENT ${FFmpeg_COMPONENTS})
             set(FFmpeg_${COMPONENT}_PREFIX "${FFmpeg_BUILD_DIR}/lib${COMPONENT}")
             set(FFmpeg_${COMPONENT}_LIB_NAME "lib${COMPONENT}.a")
@@ -464,7 +412,7 @@ if (YUZU_USE_BUNDLED_FFMPEG)
         endforeach()
 
         set(FFmpeg_INCLUDE_DIR
-            "${FFmpeg_PREFIX};${FFmpeg_BUILD_DIR}"
+            ${FFmpeg_PREFIX}
             CACHE PATH "Path to FFmpeg headers" FORCE)
 
         # `configure` parameters builds only exactly what yuzu needs from FFmpeg
@@ -511,11 +459,13 @@ if (YUZU_USE_BUNDLED_FFMPEG)
 
         # ALL makes this custom target build every time
         # but it won't actually build if the DEPENDS parameter is up to date
+        add_custom_target(ffmpeg-build ALL DEPENDS ${FFmpeg_LIBRARIES})
         add_custom_target(ffmpeg-configure ALL DEPENDS ${FFmpeg_MAKEFILE})
-        add_custom_target(ffmpeg-build ALL DEPENDS ${FFmpeg_LIBRARIES} ffmpeg-configure)
 
         if (FFmpeg_FOUND)
             message(STATUS "Found FFmpeg version ${FFmpeg_VERSION}")
+
+            add_dependencies(ffmpeg-build ffmpeg-configure)
         else()
             message(FATAL_ERROR "FFmpeg not found")
         endif()

CMakeModules/DownloadExternals.cmake

@@ -4,29 +4,15 @@
 #   remote_path: path to the file to download, relative to the remote repository root
 #   prefix_var: name of a variable which will be set with the path to the extracted contents
 function(download_bundled_external remote_path lib_name prefix_var)
-
-set(package_repo "no_platform")
-set(package_extension "no_platform")
-if (WIN32)
-    set(package_repo "ext-windows-bin/raw/master/")
-    set(package_extension ".7z")
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    set(package_repo "ext-linux-bin/raw/main/")
-    set(package_extension ".tar.xz")
-else()
-    message(FATAL_ERROR "No package available for this platform")
-endif()
-set(package_url "https://github.com/yuzu-emu/${package_repo}")
-
 set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}")
 if (NOT EXISTS "${prefix}")
     message(STATUS "Downloading binaries for ${lib_name}...")
     file(DOWNLOAD
-        ${package_url}${remote_path}${lib_name}${package_extension}
-        "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}" SHOW_PROGRESS)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}"
+        https://github.com/yuzu-emu/ext-windows-bin/raw/master/${remote_path}${lib_name}.7z
+        "${CMAKE_BINARY_DIR}/externals/${lib_name}.7z" SHOW_PROGRESS)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/externals/${lib_name}.7z"
         WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
 endif()
 message(STATUS "Using bundled binaries at ${prefix}")
 set(${prefix_var} "${prefix}" PARENT_SCOPE)
-endfunction()
+endfunction()

dist/icons/overlay/overlay.qrc

@@ -1,64 +0,0 @@
-<RCC>
-  <qresource prefix="overlay">
-    <file>arrow_left.png</file>
-    <file>arrow_left_dark.png</file>
-    <file>arrow_right.png</file>
-    <file>arrow_right_dark.png</file>
-    <file>button_minus.png</file>
-    <file>button_minus_dark.png</file>
-    <file>button_plus.png</file>
-    <file>button_plus_dark.png</file>
-    <file>button_A.png</file>
-    <file>button_A_dark.png</file>
-    <file>button_B.png</file>
-    <file>button_B_dark.png</file>
-    <file>button_X.png</file>
-    <file>button_X_dark.png</file>
-    <file>button_Y.png</file>
-    <file>button_Y_dark.png</file>
-    <file>button_L.png</file>
-    <file>button_L_dark.png</file>
-    <file>button_R.png</file>
-    <file>button_R_dark.png</file>
-    <file>button_press_stick.png</file>
-    <file>button_press_stick_dark.png</file>
-    <file>osk_button_B.png</file>
-    <file>osk_button_B_disabled.png</file>
-    <file>osk_button_B_dark.png</file>
-    <file>osk_button_B_dark_disabled.png</file>
-    <file>osk_button_Y.png</file>
-    <file>osk_button_Y_disabled.png</file>
-    <file>osk_button_Y_dark.png</file>
-    <file>osk_button_Y_dark_disabled.png</file>
-    <file>osk_button_backspace.png</file>
-    <file>osk_button_backspace_dark.png</file>
-    <file>osk_button_plus.png</file>
-    <file>osk_button_plus_disabled.png</file>
-    <file>osk_button_plus_dark.png</file>
-    <file>osk_button_plus_dark_disabled.png</file>
-    <file>osk_button_shift.png</file>
-    <file>osk_button_shift_dark.png</file>
-    <file>osk_button_shift_on.png</file>
-    <file>osk_button_shift_on_dark.png</file>
-    <file>osk_button_shift_lock_on.png</file>
-    <file>osk_button_shift_lock_off.png</file>
-    <file>controller_dual_joycon.png</file>
-    <file>controller_dual_joycon_dark.png</file>
-    <file>controller_pro.png</file>
-    <file>controller_pro_dark.png</file>
-    <file>controller_handheld.png</file>
-    <file>controller_handheld_dark.png</file>
-    <file>controller_single_joycon_left.png</file>
-    <file>controller_single_joycon_left_dark.png</file>
-    <file>controller_single_joycon_right.png</file>
-    <file>controller_single_joycon_right_dark.png</file>
-    <file>controller_single_joycon_left_a.png</file>
-    <file>controller_single_joycon_left_a_dark.png</file>
-    <file>controller_single_joycon_left_b.png</file>
-    <file>controller_single_joycon_left_b_dark.png</file>
-    <file>controller_single_joycon_left_x.png</file>
-    <file>controller_single_joycon_left_x_dark.png</file>
-    <file>controller_single_joycon_left_y.png</file>
-    <file>controller_single_joycon_left_y_dark.png</file>
-  </qresource>
-</RCC>

dist/license.md

@@ -12,7 +12,6 @@ qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
 qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/default/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
 qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
@@ -21,7 +20,6 @@ qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
 qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/qdarkstyle/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
 qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
@@ -30,6 +28,5 @@ qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/48x48/plus.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/colorful/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com
 
 <!-- TODO: Add the license of the yuzu icon -->

dist/qt_themes/colorful/style.qrc

@@ -7,7 +7,6 @@
         <file alias="48x48/folder.png">icons/48x48/folder.png</file>
         <file alias="48x48/plus.png">icons/48x48/plus.png</file>
         <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
-        <file alias="48x48/star.png">icons/48x48/star.png</file>
         <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
     </qresource>
     <qresource prefix="colorful">

dist/qt_themes/default/default.qrc

@@ -10,7 +10,6 @@
         <file alias="48x48/folder.png">icons/48x48/folder.png</file>
         <file alias="48x48/plus.png">icons/48x48/plus.png</file>
         <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
-        <file alias="48x48/star.png">icons/48x48/star.png</file>
         <file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file>
         <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
     </qresource>

dist/qt_themes/default/style.qss

@@ -281,370 +281,3 @@ QWidget#controllerPlayer7,
 QWidget#controllerPlayer8 {
     background: transparent;
 }
-
-QDialog#QtSoftwareKeyboardDialog,
-QStackedWidget#topOSK {
-    background: rgba(51, 51, 51, .9);
-}
-
-
-QDialog#OverlayDialog,
-QStackedWidget#stackedDialog {
-    background: rgba(51, 51, 51, .7);
-}
-
-QWidget#boxOSK,
-QWidget#lineOSK,
-QWidget#richDialog,
-QWidget#lineDialog {
-    background: transparent;
-}
-
-QStackedWidget#bottomOSK,
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-    background: rgba(240, 240, 240, 1);
-}
-
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-    margin: 5px;
-    border-radius: 6px;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog {
-    margin: 5px;
-    border-top: 2px solid rgba(44, 44, 44, 1);
-}
-
-QWidget#legendOSKnum {
-    border-top: 1px solid rgba(44, 44, 44, 1);
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::vertical {
-    background: #cdcdcd;
-    width: 15px;
-    margin: 15px 3px 15px 3px;
-    border: 1px transparent;
-    border-radius: 4px;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::horizoncal {
-    background: #cdcdcd;
-    height: 15px;
-    margin: 3px 15px 3px 15px;
-    border: 1px transparent;
-    border-radius: 4px;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::handle {
-    background: #fff;
-    border-radius: 4px;
-    min-height: 5px;
-    min-width: 5px;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-line,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-line,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-page,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-page {
-    background: none;
-}
-
-QWidget#inputOSK {
-    border-bottom: 3px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputOSK QLineEdit {
-    background: transparent;
-    border: none;
-    color: #ccc;
-}
-
-QWidget#inputBoxOSK {
-    border: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputBoxOSK QTextEdit {
-    background: transparent;
-    border: none;
-    color: #ccc;
-}
-
-QWidget#richDialog QTextBrowser {
-    background: transparent;
-    border: none;
-    padding: 35px 65px;
-}
-
-
-QWidget#lineOSK QLabel#label_header {
-    color: #f0f0f0;
-}
-
-QWidget#lineOSK QLabel#label_sub,
-QWidget#lineOSK QLabel#label_characters,
-QWidget#boxOSK QLabel#label_characters_box {
-    color: #ccc;
-}
-
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich {
-    color: #888;
-}
-
-QWidget#contentDialog QLabel#label_dialog {
-    padding: 20px 65px;
-}
-
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich {
-    padding: 0px 65px;
-}
-
-QDialog#OverlayDialog QPushButton {
-    color: rgba(49, 79, 239, 1);
-    background: transparent;
-    border: none;
-    padding: 0px;
-    min-width: 0px;
-}
-
-QDialog#OverlayDialog QPushButton:focus,
-QDialog#OverlayDialog QPushButton:hover {
-    color: rgba(49, 79, 239, 1);
-    background: rgba(255, 255, 255, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#OverlayDialog QPushButton:pressed {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(150, 150, 150, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton {
-    background: rgba(232, 232, 232, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    background: rgba(218, 218, 218, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(44, 44, 44, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(49, 79, 239, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:focus,
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:hover {
-    color: rgba(0, 0, 0, 1);
-    background: rgba(255, 255, 255, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(150, 150, 150, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    image: url(:/overlay/osk_button_B.png);
-    image-position: right;
-    qproperty-icon: url(:/overlay/osk_button_backspace.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    image: url(:/overlay/osk_button_Y.png);
-    image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    image: url(:/overlay/osk_button_plus.png);
-    image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-    image: url(:/overlay/osk_button_shift_lock_off.png);
-    image-position: left;
-    qproperty-icon: url(:/overlay/osk_button_shift.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-    image: url(:/overlay/osk_button_shift_lock_off.png);
-    image-position: left;
-    qproperty-icon: url(:/overlay/osk_button_shift_on.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_parenthesis,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_parenthesis {
-    padding-bottom: 7px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel {
-    background: transparent;
-    color: #ccc;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num {
-    image: url(:/overlay/button_L.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num {
-    image: url(:/overlay/arrow_left.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num {
-    image: url(:/overlay/button_R.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num {
-    image: url(:/overlay/arrow_right.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift {
-    image: url(:/overlay/button_press_stick.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num {
-    image: url(:/overlay/button_X.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num {
-    image: url(:/overlay/button_A.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    color: rgba(164, 164, 164, 1);
-    background-color: rgba(218, 218, 218, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_at:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_slash:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_percent:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_1:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_2:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_3:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_4:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_5:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_6:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_7:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_8:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_9:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_0:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
-    color: rgba(164, 164, 164, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-    image: url(:/overlay/osk_button_plus_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    image: url(:/overlay/osk_button_B_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-    image: url(:/overlay/osk_button_Y_disabled.png);
-}

dist/qt_themes/qdarkstyle/style.qrc

@@ -8,7 +8,6 @@
     <file alias="48x48/folder.png">icons/48x48/folder.png</file>
     <file alias="48x48/plus.png">icons/48x48/plus.png</file>
     <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
-    <file alias="48x48/star.png">icons/48x48/star.png</file>
     <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
   </qresource>
   <qresource prefix="qss_icons">

dist/qt_themes/qdarkstyle/style.qss

@@ -1560,390 +1560,7 @@ QWidget#controllerPlayer8 {
     background: transparent;
 }
 
-QDialog#QtSoftwareKeyboardDialog,
-QStackedWidget#topOSK {
-    background: rgba(41, 41, 41, .9);
-}
-
-
-QDialog#OverlayDialog,
-QStackedWidget#stackedDialog {
-    background: rgba(41, 41, 41, .7);
-}
-
-QWidget#boxOSK,
-QWidget#lineOSK,
-QWidget#richDialog,
-QWidget#lineDialog {
-    background: transparent;
-}
-
-QStackedWidget#bottomOSK,
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-    background: rgba(71, 69, 71, 1);
-}
-
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-    margin: 5px;
-    border-radius: 6px;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog {
-    margin: 5px;
-    border-top: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#legendOSKnum {
-    border-top: 1px solid rgba(255, 255, 255, 1);
-}
-
-QStackedWidget#stackedDialog QTextBrowser QWidget {
-    background: transparent;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar {
-    background: #2a2929;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-line,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-line {
-    border-image: none;
-}
-
-QWidget#inputOSK {
-    border-bottom: 3px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputOSK QLineEdit {
-    background: transparent;
-    border: none;
-    color: #ccc;
-    padding: 0px;
-}
-
-QWidget#inputBoxOSK {
-    border: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputBoxOSK QTextEdit {
-    background: transparent;
-    border: none;
-    color: #ccc;
-}
-
-QWidget#richDialog QTextBrowser {
-    background: transparent;
-    border: none;
-    color: #fff;
-    padding: 35px 65px;
-}
-
-QWidget#lineOSK QLabel#label_header {
-    color: #f0f0f0;
-}
-
-QWidget#lineOSK QLabel#label_sub,
-QWidget#lineOSK QLabel#label_characters,
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich,
-QWidget#boxOSK QLabel#label_characters_box {
-    color: #ccc;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog,
-QWidget#mainOSK,
-QWidget#headerOSK,
-QWidget#normalOSK,
-QWidget#shiftOSK,
-QWidget#numOSK,
-QWidget#subOSK,
-QWidget#inputOSK,
-QWidget#inputBoxOSK,
-QWidget#charactersOSK,
-QWidget#charactersBoxOSK,
-QWidget#legendOSK,
-QWidget#legendOSK QWidget,
-QWidget#legendOSKshift,
-QWidget#legendOSKshift QWidget,
-QWidget#legendOSKnum,
-QWidget#legendOSKnum QWidget {
-    background: transparent;
-}
-
-QWidget#contentDialog QLabel,
-QWidget#legendOSK QLabel,
-QWidget#legendOSKshift QLabel,
-QWidget#legendOSKnum QLabel {
-    color: rgba(255, 255, 255, 1);
-}
-
-QWidget#contentDialog QLabel#label_dialog {
-    padding: 20px 65px;
-}
-
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich {
-    padding: 0px 65px;
-}
-
-QDialog#OverlayDialog QPushButton {
-    color: rgba(1, 253, 201, 1);
-    background: transparent;
-    border: none;
-    padding: 0px;
-    min-width: 0px;
-}
-
-QDialog#OverlayDialog QPushButton:focus,
-QDialog#OverlayDialog QPushButton:hover {
-    color: rgba(1, 253, 201, 1);
-    background: rgba(58, 61, 66, 1);
-    border: 5px solid rgba(56, 189, 225, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#OverlayDialog QPushButton:pressed {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(150, 150, 150, 1);
-    border: 5px solid rgba(56, 189, 225, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton {
-    color: rgba(255, 255, 255, 1);
-    background: rgba(80, 79, 80, 1);
-    border: 2px solid rgba(71, 69, 71, 1);
-    padding: 0px;
-    min-width: 0px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    background: rgba(95, 94, 95, 1);
-    border: 2px solid rgba(71, 69, 71, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(255, 255, 255, 1);
-    border: 2px solid rgba(71, 69, 71, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    color: rgba(0, 0, 0, 1);
-    background: rgba(1, 253, 201, 1);
-    border: 2px solid rgba(71, 69, 71, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:focus,
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:hover {
-    color: rgba(255, 255, 255, 1);
-    background: rgba(58, 61, 66, 1);
-    border: 5px solid rgba(56, 189, 225, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(150, 150, 150, 1);
-    border: 5px solid rgba(56, 189, 225, 1);
-    border-radius: 6px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    image: url(:/overlay/osk_button_B_dark.png);
-    image-position: right;
-    qproperty-icon: url(:/overlay/osk_button_backspace_dark.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    image: url(:/overlay/osk_button_Y_dark.png);
-    image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    color: rgba(44, 44, 44, 1);
-    image: url(:/overlay/osk_button_plus_dark.png);
-    image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-    image: url(:/overlay/osk_button_shift_lock_off.png);
-    image-position: left;
-    qproperty-icon: url(:/overlay/osk_button_shift_dark.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-    image: url(:/overlay/osk_button_shift_lock_off.png);
-    image-position: left;
-    qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_parenthesis,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_parenthesis {
-    padding-bottom: 7px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel {
-    background: transparent;
-    color: #ccc;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num {
-    image: url(:/overlay/button_L_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num {
-    image: url(:/overlay/arrow_left_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num {
-    image: url(:/overlay/button_R_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num {
-    image: url(:/overlay/arrow_right_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift {
-    image: url(:/overlay/button_press_stick_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num {
-    image: url(:/overlay/button_X_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num {
-    image: url(:/overlay/button_A_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    color: rgba(144, 144, 144, 1);
-    background-color: rgba(95, 94, 95, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_at:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_slash:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_percent:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_1:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_2:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_3:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_4:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_5:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_6:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_7:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_8:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_9:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_0:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
-    color: rgba(144, 144, 144, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-    image: url(:/overlay/osk_button_plus_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    image: url(:/overlay/osk_button_B_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-    image: url(:/overlay/osk_button_Y_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QFrame,
-QDialog#QtSoftwareKeyboardDialog QFrame[frameShape="0"],
-QDialog#OverlayDialog QFrame,
-QDialog#OverlayDialog QFrame[frameShape="0"] {
-    border-radius: 0px;
-    border: none;
+/* touchscreen mapping widget */
+TouchScreenPreview {
+    qproperty-dotHighlightColor: #3daee9;
 }

dist/qt_themes/qdarkstyle_midnight_blue/style.qrc

@@ -8,7 +8,6 @@
     <file alias="48x48/folder.png">icons/48x48/folder.png</file>
     <file alias="48x48/plus.png">icons/48x48/plus.png</file>
     <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
-    <file alias="48x48/star.png">icons/48x48/star.png</file>
     <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
   </qresource>
   <qresource prefix="qss_icons">

dist/qt_themes/qdarkstyle_midnight_blue/style.qss

@@ -1,10 +1,10 @@
 /* ---------------------------------------------------------------------------
 
-  Created by the qtsass compiler v0.1.1
+    Created by the qtsass compiler v0.1.1
 
-  The definitions are in the "qdarkstyle.qss._styles.scss" module
+    The definitions are in the "qdarkstyle.qss._styles.scss" module
 
-  WARNING! All changes made in this file will be lost!
+    WARNING! All changes made in this file will be lost!
 
 --------------------------------------------------------------------------- */
 /* QDarkStyleSheet -----------------------------------------------------------
@@ -15,34 +15,34 @@ It is based on three selecting colors, three greyish (background) colors
 plus three whitish (foreground) colors. Each set of widgets of the same
 type have a header like this:
 
-  ------------------
-  GroupName --------
-  ------------------
+    ------------------
+    GroupName --------
+    ------------------
 
 And each widget is separated with a header like this:
 
-  QWidgetName ------
+    QWidgetName ------
 
 This makes more easy to find and change some css field. The basic
 configuration is described bellow.
 
-  BACKGROUND -----------
+    BACKGROUND -----------
 
-    Light   (unpressed)
-    Normal  (border, disabled, pressed, checked, toolbars, menus)
-    Dark    (background)
+        Light   (unpressed)
+        Normal  (border, disabled, pressed, checked, toolbars, menus)
+        Dark    (background)
 
-  FOREGROUND -----------
+    FOREGROUND -----------
 
-    Light   (texts/labels)
-    Normal  (not used yet)
-    Dark    (disabled texts)
+        Light   (texts/labels)
+        Normal  (not used yet)
+        Dark    (disabled texts)
 
-  SELECTION ------------
+    SELECTION ------------
 
-    Light  (selection/hover/active)
-    Normal (selected)
-    Dark   (selected disabled)
+        Light  (selection/hover/active)
+        Normal (selected)
+        Dark   (selected disabled)
 
 If a stranger configuration is required because of a bugfix or anything
 else, keep the comment on the line above so nobody changes it, including the
@@ -2483,394 +2483,3 @@ QWidget#controllerPlayer7,
 QWidget#controllerPlayer8 {
   background: transparent;
 }
-
-QDialog#QtSoftwareKeyboardDialog,
-QStackedWidget#topOSK {
-  background: rgba(15, 25, 34, .9);
-}
-
-QDialog#OverlayDialog,
-QStackedWidget#stackedDialog {
-  background: rgba(15, 25, 34, .7);
-}
-
-QWidget#boxOSK,
-QWidget#lineOSK,
-QWidget#richDialog,
-QWidget#lineDialog {
-  background: transparent;
-}
-
-QStackedWidget#bottomOSK,
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-  background: rgba(31, 41, 51, 1);
-}
-
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-  margin: 5px;
-  border-radius: 6px;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog {
-  margin: 5px;
-  border-top: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#legendOSKnum {
-  border-top: 1px solid rgba(255, 255, 255, 1);
-}
-
-QStackedWidget#stackedDialog QTextBrowser QWidget {
-  background: transparent;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar {
-  background: #19232d;
-  border: none;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-line,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-line {
-  border-image: none;
-}
-
-QWidget#mainOSK QStackedWidget,
-QDialog#OverlayDialog QStackedWidget {
-  border: none;
-  padding: 0px;
-}
-
-QWidget#inputOSK {
-  border-bottom: 3px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputOSK QLineEdit {
-  background: transparent;
-  border: none;
-  color: #ccc;
-  padding: 0px;
-}
-
-QWidget#inputBoxOSK {
-  border: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputBoxOSK QTextEdit {
-  background: transparent;
-  border: none;
-  color: #ccc;
-}
-
-QWidget#richDialog QTextBrowser {
-  background: transparent;
-  border: none;
-  color: #fff;
-  padding: 35px 65px;
-}
-
-QWidget#lineOSK QLabel#label_header {
-  color: #f0f0f0;
-}
-
-QWidget#lineOSK QLabel#label_sub,
-QWidget#lineOSK QLabel#label_characters,
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich,
-QWidget#boxOSK QLabel#label_characters_box {
-  color: #ccc;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog,
-QWidget#mainOSK,
-QWidget#headerOSK,
-QWidget#normalOSK,
-QWidget#shiftOSK,
-QWidget#numOSK,
-QWidget#subOSK,
-QWidget#inputOSK,
-QWidget#inputBoxOSK,
-QWidget#charactersOSK,
-QWidget#charactersBoxOSK,
-QWidget#legendOSK,
-QWidget#legendOSK QWidget,
-QWidget#legendOSKshift,
-QWidget#legendOSKshift QWidget,
-QWidget#legendOSKnum,
-QWidget#legendOSKnum QWidget {
-  background: transparent;
-}
-
-QWidget#contentDialog QLabel,
-QWidget#legendOSK QLabel,
-QWidget#legendOSKshift QLabel,
-QWidget#legendOSKnum QLabel {
-  color: rgba(255, 255, 255, 1);
-}
-
-QWidget#contentDialog QLabel#label_dialog {
-  padding: 20px 65px;
-}
-
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich {
-  padding: 0px 65px;
-}
-
-QDialog#OverlayDialog QPushButton {
-  color: rgba(1, 253, 201, 1);
-  background: transparent;
-  border: none;
-  padding: 0px;
-  min-width: 0px;
-}
-
-QDialog#OverlayDialog QPushButton:focus,
-QDialog#OverlayDialog QPushButton:hover {
-  color: rgba(1, 253, 201, 1);
-  background: rgba(18, 33, 46, 1);
-  border: 5px solid rgba(56, 189, 225, 1);
-  border-radius: 6px;
-  outline: none;
-}
-
-QDialog#OverlayDialog QPushButton:pressed {
-  color: rgba(240, 240, 240, 1);
-  background: rgba(110, 122, 130, 1);
-  border: 5px solid rgba(56, 189, 225, 1);
-  border-radius: 6px;
-  outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QLabel {
-  padding: 0px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton {
-  color: rgba(255, 255, 255, 1);
-  background: rgba(40, 51, 60, 1);
-  border: 2px solid rgba(31, 41, 51, 1);
-  border-radius: 0px;
-  padding: 0px;
-  min-width: 0px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-  background: rgba(55, 66, 75, 1);
-  border: 2px solid rgba(31, 41, 51, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-  color: rgba(240, 240, 240, 1);
-  background: rgba(255, 255, 255, 1);
-  border: 2px solid rgba(31, 41, 51, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-  color: rgba(0, 0, 0, 1);
-  background: rgba(1, 253, 201, 1);
-  border: 2px solid rgba(31, 41, 51, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:focus,
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:hover {
-  color: rgba(255, 255, 255, 1);
-  background: rgba(18, 33, 46, 1);
-  border: 5px solid rgba(56, 189, 225, 1);
-  border-radius: 6px;
-  outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
-  color: rgba(240, 240, 240, 1);
-  background: rgba(110, 122, 130, 1);
-  border: 5px solid rgba(56, 189, 225, 1);
-  border-radius: 6px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-  image: url(:/overlay/osk_button_B_dark.png);
-  image-position: right;
-  qproperty-icon: url(:/overlay/osk_button_backspace_dark.png);
-  qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-  image: url(:/overlay/osk_button_Y_dark.png);
-  image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-  color: rgba(44, 44, 44, 1);
-  image: url(:/overlay/osk_button_plus_dark.png);
-  image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-  image: url(:/overlay/osk_button_shift_lock_off.png);
-  image-position: left;
-  qproperty-icon: url(:/overlay/osk_button_shift_dark.png);
-  qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-  image: url(:/overlay/osk_button_shift_lock_off.png);
-  image-position: left;
-  qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png);
-  qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_parenthesis,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_parenthesis {
-  padding-bottom: 7px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel {
-  background: transparent;
-  color: #ccc;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num {
-  image: url(:/overlay/button_L_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num {
-  image: url(:/overlay/arrow_left_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num {
-  image: url(:/overlay/button_R_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num {
-  image: url(:/overlay/arrow_right_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift {
-  image: url(:/overlay/button_press_stick_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num {
-  image: url(:/overlay/button_X_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num {
-  image: url(:/overlay/button_A_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-  color: rgba(144, 144, 144, 1);
-  background-color: rgba(55, 66, 75, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_at:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_slash:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_percent:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_1:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_2:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_3:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_4:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_5:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_6:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_7:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_8:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_9:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_0:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
-  color: rgba(144, 144, 144, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-  image: url(:/overlay/osk_button_plus_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-  image: url(:/overlay/osk_button_B_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-  image: url(:/overlay/osk_button_Y_dark_disabled.png);
-}

externals/CMakeLists.txt

@@ -45,11 +45,6 @@ target_include_directories(microprofile INTERFACE ./microprofile)
 add_library(unicorn-headers INTERFACE)
 target_include_directories(unicorn-headers INTERFACE ./unicorn/include)
 
-# SDL2
-if (NOT SDL2_FOUND AND ENABLE_SDL2)
-    add_subdirectory(SDL EXCLUDE_FROM_ALL)
-endif()
-
 # SoundTouch
 add_subdirectory(soundtouch)
 

license.txt

@@ -358,7 +358,6 @@ chip.png (Colorful, Colorful Dark)          | CC BY-ND 3.0  | https://icons8.com
 folder.png (Colorful, Colorful Dark)        | CC BY-ND 3.0  | https://icons8.com
 plus.png (Colorful, Colorful Dark)          | CC BY-ND 3.0  | https://icons8.com
 sd_card.png (Colorful, Colorful Dark)       | CC BY-ND 3.0  | https://icons8.com
-star.png                                    | CC BY-ND 3.0  | https://icons8.com
 
 Note:
 Some icons are different in different themes, and they are separately listed

src/audio_core/audio_out.cpp

@@ -7,7 +7,7 @@
 #include "audio_core/sink_details.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
-#include "common/settings.h"
+#include "core/settings.h"
 
 namespace AudioCore {
 

src/audio_core/audio_renderer.cpp

@@ -11,8 +11,8 @@
 #include "audio_core/info_updater.h"
 #include "audio_core/voice_context.h"
 #include "common/logging/log.h"
-#include "common/settings.h"
 #include "core/memory.h"
+#include "core/settings.h"
 
 namespace {
 [[nodiscard]] static constexpr s16 ClampToS16(s32 value) {

src/audio_core/cubeb_sink.cpp

@@ -11,7 +11,7 @@
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/ring_buffer.h"
-#include "common/settings.h"
+#include "core/settings.h"
 
 #ifdef _WIN32
 #include <objbase.h>

src/audio_core/stream.cpp

@@ -11,8 +11,8 @@
 #include "audio_core/stream.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
-#include "common/settings.h"
 #include "core/core_timing.h"
+#include "core/settings.h"
 
 namespace AudioCore {
 

src/common/CMakeLists.txt

@@ -152,10 +152,6 @@ add_library(common STATIC
     scm_rev.cpp
     scm_rev.h
     scope_exit.h
-    settings.cpp
-    settings.h
-    settings_input.cpp
-    settings_input.h
     spin_lock.cpp
     spin_lock.h
     stream.cpp
@@ -219,7 +215,7 @@ endif()
 
 create_target_directory_groups(common)
 
-target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile)
+target_link_libraries(common PUBLIC Boost::boost Boost::context fmt::fmt microprofile)
 target_link_libraries(common PRIVATE lz4::lz4 xbyak)
 if (MSVC)
   target_link_libraries(common PRIVATE zstd::zstd)

src/common/assert.cpp

@@ -3,12 +3,9 @@
 // Refer to the license.txt file included.
 
 #include "common/assert.h"
+
 #include "common/common_funcs.h"
 
-#include "common/settings.h"
-
 void assert_handle_failure() {
-    if (Settings::values.use_debug_asserts) {
-        Crash();
-    }
+    Crash();
 }

src/common/logging/backend.cpp

@@ -21,11 +21,11 @@
 #include "common/logging/backend.h"
 #include "common/logging/log.h"
 #include "common/logging/text_formatter.h"
-#include "common/settings.h"
 #include "common/string_util.h"
 #include "common/threadsafe_queue.h"
+#include "core/settings.h"
 
-namespace Common::Log {
+namespace Log {
 
 /**
  * Static state as a singleton.
@@ -37,11 +37,8 @@ public:
         return backend;
     }
 
-    Impl(const Impl&) = delete;
-    Impl& operator=(const Impl&) = delete;
-
-    Impl(Impl&&) = delete;
-    Impl& operator=(Impl&&) = delete;
+    Impl(Impl const&) = delete;
+    const Impl& operator=(Impl const&) = delete;
 
     void PushEntry(Class log_class, Level log_level, const char* filename, unsigned int line_num,
                    const char* function, std::string message) {
@@ -56,10 +53,10 @@ public:
 
     void RemoveBackend(std::string_view backend_name) {
         std::lock_guard lock{writing_mutex};
-
-        std::erase_if(backends, [&backend_name](const auto& backend) {
-            return backend_name == backend->GetName();
-        });
+        const auto it =
+            std::remove_if(backends.begin(), backends.end(),
+                           [&backend_name](const auto& i) { return backend_name == i->GetName(); });
+        backends.erase(it, backends.end());
     }
 
     const Filter& GetGlobalFilter() const {
@@ -135,7 +132,7 @@ private:
     std::mutex writing_mutex;
     std::thread backend_thread;
     std::vector<std::unique_ptr<Backend>> backends;
-    MPSCQueue<Entry> message_queue;
+    Common::MPSCQueue<Log::Entry> message_queue;
     Filter filter;
     std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()};
 };
@@ -148,19 +145,17 @@ void ColorConsoleBackend::Write(const Entry& entry) {
     PrintColoredMessage(entry);
 }
 
-FileBackend::FileBackend(const std::string& filename) {
-    const auto old_filename = filename + ".old.txt";
-
-    if (FS::Exists(old_filename)) {
-        FS::Delete(old_filename);
+FileBackend::FileBackend(const std::string& filename) : bytes_written(0) {
+    if (Common::FS::Exists(filename + ".old.txt")) {
+        Common::FS::Delete(filename + ".old.txt");
     }
-    if (FS::Exists(filename)) {
-        FS::Rename(filename, old_filename);
+    if (Common::FS::Exists(filename)) {
+        Common::FS::Rename(filename, filename + ".old.txt");
     }
 
     // _SH_DENYWR allows read only access to the file for other programs.
     // It is #defined to 0 on other platforms
-    file = FS::IOFile(filename, "w", _SH_DENYWR);
+    file = Common::FS::IOFile(filename, "w", _SH_DENYWR);
 }
 
 void FileBackend::Write(const Entry& entry) {
@@ -187,7 +182,7 @@ void FileBackend::Write(const Entry& entry) {
 
 void DebuggerBackend::Write(const Entry& entry) {
 #ifdef _WIN32
-    ::OutputDebugStringW(UTF8ToUTF16W(FormatLogMessage(entry).append(1, '\n')).c_str());
+    ::OutputDebugStringW(Common::UTF8ToUTF16W(FormatLogMessage(entry).append(1, '\n')).c_str());
 #endif
 }
 
@@ -347,4 +342,4 @@ void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename,
     instance.PushEntry(log_class, log_level, filename, line_num, function,
                        fmt::vformat(format, args));
 }
-} // namespace Common::Log
+} // namespace Log

src/common/logging/backend.h

@@ -11,7 +11,7 @@
 #include "common/logging/filter.h"
 #include "common/logging/log.h"
 
-namespace Common::Log {
+namespace Log {
 
 class Filter;
 
@@ -94,8 +94,8 @@ public:
     void Write(const Entry& entry) override;
 
 private:
-    FS::IOFile file;
-    std::size_t bytes_written = 0;
+    Common::FS::IOFile file;
+    std::size_t bytes_written;
 };
 
 /**
@@ -135,4 +135,4 @@ const char* GetLevelName(Level log_level);
  * never get the message
  */
 void SetGlobalFilter(const Filter& filter);
-} // namespace Common::Log
+} // namespace Log

src/common/logging/filter.cpp

@@ -7,7 +7,7 @@
 #include "common/logging/filter.h"
 #include "common/string_util.h"
 
-namespace Common::Log {
+namespace Log {
 namespace {
 template <typename It>
 Level GetLevelByName(const It begin, const It end) {
@@ -103,4 +103,4 @@ bool Filter::IsDebug() const {
     });
 }
 
-} // namespace Common::Log
+} // namespace Log

src/common/logging/filter.h

@@ -9,7 +9,7 @@
 #include <string_view>
 #include "common/logging/log.h"
 
-namespace Common::Log {
+namespace Log {
 
 /**
  * Implements a log message filter which allows different log classes to have different minimum
@@ -51,4 +51,4 @@ public:
 private:
     std::array<Level, static_cast<std::size_t>(Class::Count)> class_levels;
 };
-} // namespace Common::Log
+} // namespace Log

src/common/logging/log.h

@@ -7,7 +7,7 @@
 #include <fmt/format.h>
 #include "common/common_types.h"
 
-namespace Common::Log {
+namespace Log {
 
 // trims up to and including the last of ../, ..\, src/, src\ in a string
 constexpr const char* TrimSourcePath(std::string_view source) {
@@ -148,34 +148,28 @@ void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsig
                       fmt::make_format_args(args...));
 }
 
-} // namespace Common::Log
+} // namespace Log
 
 #ifdef _DEBUG
 #define LOG_TRACE(log_class, ...)                                                                  \
-    Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Trace,           \
-                               Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__,          \
-                               __VA_ARGS__)
+    ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Trace,                             \
+                         ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
 #else
 #define LOG_TRACE(log_class, fmt, ...) (void(0))
 #endif
 
 #define LOG_DEBUG(log_class, ...)                                                                  \
-    Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Debug,           \
-                               Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__,          \
-                               __VA_ARGS__)
+    ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Debug,                             \
+                         ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
 #define LOG_INFO(log_class, ...)                                                                   \
-    Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Info,            \
-                               Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__,          \
-                               __VA_ARGS__)
+    ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Info,                              \
+                         ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
 #define LOG_WARNING(log_class, ...)                                                                \
-    Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Warning,         \
-                               Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__,          \
-                               __VA_ARGS__)
+    ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Warning,                           \
+                         ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
 #define LOG_ERROR(log_class, ...)                                                                  \
-    Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Error,           \
-                               Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__,          \
-                               __VA_ARGS__)
+    ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Error,                             \
+                         ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)
 #define LOG_CRITICAL(log_class, ...)                                                               \
-    Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Critical,        \
-                               Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__,          \
-                               __VA_ARGS__)
+    ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Critical,                          \
+                         ::Log::TrimSourcePath(__FILE__), __LINE__, __func__, __VA_ARGS__)

src/common/logging/text_formatter.cpp

@@ -16,7 +16,7 @@
 #include "common/logging/text_formatter.h"
 #include "common/string_util.h"
 
-namespace Common::Log {
+namespace Log {
 
 std::string FormatLogMessage(const Entry& entry) {
     unsigned int time_seconds = static_cast<unsigned int>(entry.timestamp.count() / 1000000);
@@ -108,4 +108,4 @@ void PrintColoredMessage(const Entry& entry) {
 #undef ESC
 #endif
 }
-} // namespace Common::Log
+} // namespace Log

src/common/logging/text_formatter.h

@@ -7,7 +7,7 @@
 #include <cstddef>
 #include <string>
 
-namespace Common::Log {
+namespace Log {
 
 struct Entry;
 
@@ -17,4 +17,4 @@ std::string FormatLogMessage(const Entry& entry);
 void PrintMessage(const Entry& entry);
 /// Prints the same message as `PrintMessage`, but colored according to the severity level.
 void PrintColoredMessage(const Entry& entry);
-} // namespace Common::Log
+} // namespace Log

src/common/nvidia_flags.h

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#pragma once
-
 namespace Common {
 
 /// Configure platform specific flags for Nvidia's driver

src/core/CMakeLists.txt

@@ -273,7 +273,6 @@ add_library(core STATIC
     hle/service/am/applets/profile_select.h
     hle/service/am/applets/software_keyboard.cpp
     hle/service/am/applets/software_keyboard.h
-    hle/service/am/applets/software_keyboard_types.h
     hle/service/am/applets/web_browser.cpp
     hle/service/am/applets/web_browser.h
     hle/service/am/applets/web_types.h
@@ -377,8 +376,6 @@ add_library(core STATIC
     hle/service/glue/arp.h
     hle/service/glue/bgtc.cpp
     hle/service/glue/bgtc.h
-    hle/service/glue/ectx.cpp
-    hle/service/glue/ectx.h
     hle/service/glue/errors.h
     hle/service/glue/glue.cpp
     hle/service/glue/glue.h
@@ -393,8 +390,6 @@ add_library(core STATIC
     hle/service/hid/xcd.cpp
     hle/service/hid/xcd.h
     hle/service/hid/errors.h
-    hle/service/hid/controllers/console_sixaxis.cpp
-    hle/service/hid/controllers/console_sixaxis.h
     hle/service/hid/controllers/controller_base.cpp
     hle/service/hid/controllers/controller_base.h
     hle/service/hid/controllers/debug_pad.cpp
@@ -626,6 +621,8 @@ add_library(core STATIC
     perf_stats.h
     reporter.cpp
     reporter.h
+    settings.cpp
+    settings.h
     telemetry_session.cpp
     telemetry_session.h
     tools/freezer.cpp

src/core/arm/dynarmic/arm_dynarmic_32.cpp

@@ -10,7 +10,6 @@
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/page_table.h"
-#include "common/settings.h"
 #include "core/arm/cpu_interrupt_handler.h"
 #include "core/arm/dynarmic/arm_dynarmic_32.h"
 #include "core/arm/dynarmic/arm_dynarmic_cp15.h"
@@ -19,6 +18,7 @@
 #include "core/core_timing.h"
 #include "core/hle/kernel/svc.h"
 #include "core/memory.h"
+#include "core/settings.h"
 
 namespace Core {
 

src/core/arm/dynarmic/arm_dynarmic_64.cpp

@@ -9,7 +9,6 @@
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/page_table.h"
-#include "common/settings.h"
 #include "core/arm/cpu_interrupt_handler.h"
 #include "core/arm/dynarmic/arm_dynarmic_64.h"
 #include "core/arm/dynarmic/arm_exclusive_monitor.h"
@@ -20,6 +19,7 @@
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/svc.h"
 #include "core/memory.h"
+#include "core/settings.h"
 
 namespace Core {
 

src/core/core.cpp

@@ -9,7 +9,6 @@
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/microprofile.h"
-#include "common/settings.h"
 #include "common/string_util.h"
 #include "core/arm/exclusive_monitor.h"
 #include "core/core.h"
@@ -37,7 +36,6 @@
 #include "core/hle/service/apm/controller.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/glue/manager.h"
-#include "core/hle/service/hid/hid.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sm/sm.h"
 #include "core/hle/service/time/time_manager.h"
@@ -47,6 +45,7 @@
 #include "core/network/network.h"
 #include "core/perf_stats.h"
 #include "core/reporter.h"
+#include "core/settings.h"
 #include "core/telemetry_session.h"
 #include "core/tools/freezer.h"
 #include "video_core/renderer_base.h"
@@ -775,12 +774,4 @@ void System::ExecuteProgram(std::size_t program_index) {
     }
 }
 
-void System::ApplySettings() {
-    if (IsPoweredOn()) {
-        Renderer().RefreshBaseSettings();
-    }
-
-    Service::HID::ReloadInputDevices();
-}
-
 } // namespace Core