configuration: Toggle controller vibrations

Allow toggling controller vibrations on/off, this is exactly the same as the setting found in System Settings on hardware.

.ci/scripts/format/script.sh

@@ -8,6 +8,8 @@ fi
 
 # Default clang-format points to default 3.5 version one
 CLANG_FORMAT=clang-format-10
+ls /usr/bin
+
 $CLANG_FORMAT --version
 
 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then

.ci/yuzu-patreon-step2.yml

@@ -9,7 +9,6 @@ stages:
   displayName: 'build'
   jobs:
   - job: build
-    timeoutInMinutes: 120
     displayName: 'windows-msvc'
     pool:
       vmImage: windows-2019

.gitmodules

@@ -16,9 +16,6 @@
 [submodule "libressl"]
     path = externals/libressl
     url = https://github.com/citra-emu/ext-libressl-portable.git
-[submodule "libusb"]
-	path = externals/libusb/libusb
-	url = https://github.com/libusb/libusb.git
 [submodule "discord-rpc"]
     path = externals/discord-rpc
     url = https://github.com/discordapp/discord-rpc.git
@@ -37,6 +34,9 @@
 [submodule "xbyak"]
     path = externals/xbyak
     url = https://github.com/herumi/xbyak.git
+[submodule "externals/libusb"]
+	path = externals/libusb
+	url = https://github.com/ameerj/libusb
 [submodule "opus"]
 	path = externals/opus/opus
 	url = https://github.com/xiph/opus.git

.lgtm.yml

@@ -1,10 +0,0 @@
-path_classifiers:
-  library: "externals"
-extraction:
-  cpp:
-    prepare:
-      packages:
-      - "libsdl2-dev"
-      - "qtmultimedia5-dev"
-      - "libtbb-dev"
-      - "libjack-jackd2-dev"

CMakeLists.txt

@@ -161,7 +161,7 @@ macro(yuzu_find_packages)
     #    Cmake Pkg Prefix  Version     Conan Pkg
         "Boost             1.73        boost/1.73.0"
         "Catch2            2.13        catch2/2.13.0"
-        "fmt               7.0         fmt/7.0.3"
+        "fmt               7.0         fmt/7.0.1"
     # 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"
@@ -210,7 +210,7 @@ if(ENABLE_QT)
     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)
+            set(QT_VER qt-5.12.0-msvc2017_64)
         else()
             message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")
         endif()
@@ -263,7 +263,6 @@ if (CONAN_REQUIRED_LIBS)
         libzip:with_openssl=False
         libzip:enable_windows_crypto=False
     )
-
     conan_check(VERSION 1.24.0 REQUIRED)
     # Add the bincrafters remote
     conan_add_remote(NAME bincrafters
@@ -355,19 +354,6 @@ if (NOT LIBUSB_FOUND)
     set(LIBUSB_LIBRARIES usb)
 endif()
 
-# Use system installed ffmpeg.
-if (NOT MSVC)
-    find_package(FFmpeg REQUIRED)
-else()
-    set(FFMPEG_EXT_NAME "ffmpeg-4.2.1")
-    set(FFMPEG_PATH "${CMAKE_BINARY_DIR}/externals/${FFMPEG_EXT_NAME}")
-    download_bundled_external("ffmpeg/" ${FFMPEG_EXT_NAME} "")
-    set(FFMPEG_FOUND YES)
-    set(FFMPEG_INCLUDE_DIR "${FFMPEG_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE)
-    set(FFMPEG_LIBRARY_DIR "${FFMPEG_PATH}/bin" CACHE PATH "Path to FFmpeg library" FORCE)
-    set(FFMPEG_DLL_DIR "${FFMPEG_PATH}/bin" CACHE PATH "Path to FFmpeg dll's" FORCE)
-endif()
-
 # Prefer the -pthread flag on Linux.
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)

CMakeModules/CopyYuzuFFmpegDeps.cmake

@@ -1,10 +0,0 @@
-function(copy_yuzu_FFmpeg_deps target_dir)
-    include(WindowsCopyFiles)
-    set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
-    windows_copy_files(${target_dir} ${FFMPEG_DLL_DIR} ${DLL_DEST}
-        avcodec-58.dll
-        avutil-56.dll
-        swresample-3.dll
-        swscale-5.dll
-    )
-endfunction(copy_yuzu_FFmpeg_deps)

dist/icons/controller/controller.qrc

@@ -1,55 +0,0 @@
-<RCC>
-  <qresource prefix="controller">
-    <file alias="dual_joycon">dual_joycon.png</file>
-    <file alias="dual_joycon_dark">dual_joycon_dark.png</file>
-    <file alias="dual_joycon_midnight">dual_joycon_midnight.png</file>
-    <file alias="handheld">handheld.png</file>
-    <file alias="handheld_dark">handheld_dark.png</file>
-    <file alias="handheld_midnight">handheld_midnight.png</file>
-    <file alias="pro_controller">pro_controller.png</file>
-    <file alias="pro_controller_dark">pro_controller_dark.png</file>
-    <file alias="pro_controller_midnight">pro_controller_midnight.png</file>
-    <file alias="single_joycon_left">single_joycon_left.png</file>
-    <file alias="single_joycon_left_dark">single_joycon_left_dark.png</file>
-    <file alias="single_joycon_left_midnight">single_joycon_left_midnight.png</file>
-    <file alias="single_joycon_right">single_joycon_right.png</file>
-    <file alias="single_joycon_right_dark">single_joycon_right_dark.png</file>
-    <file alias="single_joycon_right_midnight">single_joycon_right_midnight.png</file>
-    <file alias="single_joycon_left_vertical">single_joycon_left_vertical.png</file>
-    <file alias="single_joycon_left_vertical_dark">single_joycon_left_vertical_dark.png</file>
-    <file alias="single_joycon_left_vertical_midnight">single_joycon_left_vertical_midnight.png</file>
-    <file alias="single_joycon_right_vertical">single_joycon_right_vertical.png</file>
-    <file alias="single_joycon_right_vertical_dark">single_joycon_right_vertical_dark.png</file>
-    <file alias="single_joycon_right_vertical_midnight">single_joycon_right_vertical_midnight.png</file>
-    <file alias="applet_dual_joycon">applet_dual_joycon.png</file>
-    <file alias="applet_dual_joycon_dark">applet_dual_joycon_dark.png</file>	
-    <file alias="applet_dual_joycon_midnight">applet_dual_joycon_midnight.png</file>	
-    <file alias="applet_handheld">applet_handheld.png</file>
-    <file alias="applet_handheld_dark">applet_handheld_dark.png</file>	
-    <file alias="applet_handheld_midnight">applet_handheld_midnight.png</file>
-    <file alias="applet_pro_controller">applet_pro_controller.png</file>
-    <file alias="applet_pro_controller_dark">applet_pro_controller_dark.png</file>
-    <file alias="applet_pro_controller_midnight">applet_pro_controller_midnight.png</file>
-    <file alias="applet_joycon_left">applet_single_joycon_left.png</file>
-    <file alias="applet_joycon_left_dark">applet_single_joycon_left_dark.png</file>
-    <file alias="applet_joycon_left_midnight">applet_single_joycon_left_midnight.png</file>
-    <file alias="applet_joycon_right">applet_single_joycon_right.png</file>
-    <file alias="applet_joycon_right_dark">applet_single_joycon_right_dark.png</file>
-    <file alias="applet_joycon_right_midnight">applet_single_joycon_right_midnight.png</file>
-    <file alias="applet_dual_joycon_disabled">applet_dual_joycon_disabled.png</file>
-    <file alias="applet_dual_joycon_dark_disabled">applet_dual_joycon_dark_disabled.png</file>
-    <file alias="applet_dual_joycon_midnight_disabled">applet_dual_joycon_midnight_disabled.png</file>
-    <file alias="applet_handheld_disabled">applet_handheld_disabled.png</file>
-    <file alias="applet_handheld_dark_disabled">applet_handheld_dark_disabled.png</file>
-    <file alias="applet_handheld_midnight_disabled">applet_handheld_midnight_disabled.png</file>
-    <file alias="applet_pro_controller_disabled">applet_pro_controller_disabled.png</file>
-    <file alias="applet_pro_controller_dark_disabled">applet_pro_controller_dark_disabled.png</file>
-    <file alias="applet_pro_controller_midnight_disabled">applet_pro_controller_midnight_disabled.png</file>
-    <file alias="applet_joycon_left_disabled">applet_single_joycon_left_disabled.png</file>
-    <file alias="applet_joycon_left_dark_disabled">applet_single_joycon_left_dark_disabled.png</file>
-    <file alias="applet_joycon_left_midnight_disabled">applet_single_joycon_left_midnight_disabled.png</file>
-    <file alias="applet_joycon_right_disabled">applet_single_joycon_right_disabled.png</file>
-    <file alias="applet_joycon_right_dark_disabled">applet_single_joycon_right_dark_disabled.png</file>
-    <file alias="applet_joycon_right_midnight_disabled">applet_single_joycon_right_midnight_disabled.png</file>
-  </qresource>
-</RCC>

dist/license.md

@@ -5,7 +5,6 @@ Icon Name | License | Origin/Author
 qt_themes/default/icons/16x16/checked.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/16x16/failed.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/default/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
 qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
@@ -13,7 +12,6 @@ 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/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
 qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
@@ -21,7 +19,6 @@ 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/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
 qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com

dist/qt_themes/colorful_dark/style.qrc

@@ -2,7 +2,6 @@
     <qresource prefix="icons/colorful_dark">
         <file alias="index.theme">icons/index.theme</file>
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
         <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file>
         <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file>
         <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file>

dist/qt_themes/colorful_midnight_blue/style.qrc

@@ -2,7 +2,6 @@
     <qresource prefix="icons/colorful_midnight_blue">
         <file alias="index.theme">icons/index.theme</file>
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
         <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file>
         <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file>
         <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file>

dist/qt_themes/default/default.qrc

@@ -4,7 +4,6 @@
         <file alias="16x16/checked.png">icons/16x16/checked.png</file>
         <file alias="16x16/failed.png">icons/16x16/failed.png</file>
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
         <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
         <file alias="48x48/chip.png">icons/48x48/chip.png</file>
         <file alias="48x48/folder.png">icons/48x48/folder.png</file>

dist/qt_themes/default/style.qss

@@ -30,250 +30,6 @@ QPushButton#RendererStatusBarButton:checked {
     color: #e85c00;
 }
 
-QPushButton#RendererStatusBarButton:!checked {
+QPushButton#RendererStatusBarButton:!checked{
     color: #0066ff;
 }
-
-QPushButton#buttonRefreshDevices {
-    min-width: 20px;
-    min-height: 20px;
-    max-width: 20px;
-    max-height: 20px;
-}
-
-QWidget#bottomPerGameInput,
-QWidget#topControllerApplet,
-QWidget#bottomControllerApplet,
-QGroupBox#groupPlayer1Connected:checked,
-QGroupBox#groupPlayer2Connected:checked,
-QGroupBox#groupPlayer3Connected:checked,
-QGroupBox#groupPlayer4Connected:checked,
-QGroupBox#groupPlayer5Connected:checked,
-QGroupBox#groupPlayer6Connected:checked,
-QGroupBox#groupPlayer7Connected:checked,
-QGroupBox#groupPlayer8Connected:checked {
-    background-color: #f5f5f5;
-}
-
-QWidget#topControllerApplet {
-    border-bottom: 1px solid #828790
-}
-
-QWidget#bottomPerGameInput,
-QWidget#bottomControllerApplet {
-    border-top: 1px solid #828790
-}
-
-QWidget#topPerGameInput,
-QWidget#middleControllerApplet {
-    background-color: #fff;
-}
-
-QWidget#topPerGameInput QComboBox,
-QWidget#middleControllerApplet QComboBox {
-    width: 123px;
-}
-
-QWidget#connectedControllers {
-    background: transparent;
-}
-
-QWidget#playersSupported,
-QWidget#controllersSupported,
-QWidget#controllerSupported1,
-QWidget#controllerSupported2,
-QWidget#controllerSupported3,
-QWidget#controllerSupported4,
-QWidget#controllerSupported5,
-QWidget#controllerSupported6 {
-    border: none;
-    background: transparent;
-}
-
-QGroupBox#groupPlayer1Connected,
-QGroupBox#groupPlayer2Connected,
-QGroupBox#groupPlayer3Connected,
-QGroupBox#groupPlayer4Connected,
-QGroupBox#groupPlayer5Connected,
-QGroupBox#groupPlayer6Connected,
-QGroupBox#groupPlayer7Connected,
-QGroupBox#groupPlayer8Connected {
-    border: 1px solid #828790;
-    border-radius: 3px;
-    padding: 0px;
-    min-height: 98px;
-    max-height: 98px;
-}
-
-QGroupBox#groupPlayer1Connected:unchecked,
-QGroupBox#groupPlayer2Connected:unchecked,
-QGroupBox#groupPlayer3Connected:unchecked,
-QGroupBox#groupPlayer4Connected:unchecked,
-QGroupBox#groupPlayer5Connected:unchecked,
-QGroupBox#groupPlayer6Connected:unchecked,
-QGroupBox#groupPlayer7Connected:unchecked,
-QGroupBox#groupPlayer8Connected:unchecked {
-    border: 1px solid #d9d9d9;
-}
-
-QGroupBox#groupPlayer1Connected::title,
-QGroupBox#groupPlayer2Connected::title,
-QGroupBox#groupPlayer3Connected::title,
-QGroupBox#groupPlayer4Connected::title,
-QGroupBox#groupPlayer5Connected::title,
-QGroupBox#groupPlayer6Connected::title,
-QGroupBox#groupPlayer7Connected::title,
-QGroupBox#groupPlayer8Connected::title {
-    subcontrol-origin: margin;
-    subcontrol-position: top left;
-    padding-left: 0px;
-    padding-right: 0px;
-    padding-top: 1px;
-    margin-left: 0px;
-    margin-right: -4px;
-    margin-bottom: 4px;
-}
-
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-    spacing: 0px;
-}
-
-QWidget#Player1LEDs QCheckBox,
-QWidget#Player2LEDs QCheckBox,
-QWidget#Player3LEDs QCheckBox,
-QWidget#Player4LEDs QCheckBox,
-QWidget#Player5LEDs QCheckBox,
-QWidget#Player6LEDs QCheckBox,
-QWidget#Player7LEDs QCheckBox,
-QWidget#Player8LEDs QCheckBox {
-    spacing: 0px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator,
-QWidget#Player2LEDs QCheckBox::indicator,
-QWidget#Player3LEDs QCheckBox::indicator,
-QWidget#Player4LEDs QCheckBox::indicator,
-QWidget#Player5LEDs QCheckBox::indicator,
-QWidget#Player6LEDs QCheckBox::indicator,
-QWidget#Player7LEDs QCheckBox::indicator,
-QWidget#Player8LEDs QCheckBox::indicator {
-    width: 6px;
-    height: 6px;
-    margin-left: 0px;
-}
-
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer1Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer2Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer3Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer4Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer5Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer6Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer7Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 12px;
-    height: 12px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator,
-QCheckBox#checkboxPlayer2Connected::indicator,
-QCheckBox#checkboxPlayer3Connected::indicator,
-QCheckBox#checkboxPlayer4Connected::indicator,
-QCheckBox#checkboxPlayer5Connected::indicator,
-QCheckBox#checkboxPlayer6Connected::indicator,
-QCheckBox#checkboxPlayer7Connected::indicator,
-QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 14px;
-    height: 14px;
-}
-
-QGroupBox#groupPlayer1Connected::indicator,
-QGroupBox#groupPlayer2Connected::indicator,
-QGroupBox#groupPlayer3Connected::indicator,
-QGroupBox#groupPlayer4Connected::indicator,
-QGroupBox#groupPlayer5Connected::indicator,
-QGroupBox#groupPlayer6Connected::indicator,
-QGroupBox#groupPlayer7Connected::indicator,
-QGroupBox#groupPlayer8Connected::indicator {
-    width: 16px;
-    height: 16px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:checked,
-QWidget#Player2LEDs QCheckBox::indicator:checked,
-QWidget#Player3LEDs QCheckBox::indicator:checked,
-QWidget#Player4LEDs QCheckBox::indicator:checked,
-QWidget#Player5LEDs QCheckBox::indicator:checked,
-QWidget#Player6LEDs QCheckBox::indicator:checked,
-QWidget#Player7LEDs QCheckBox::indicator:checked,
-QWidget#Player8LEDs QCheckBox::indicator:checked,
-QGroupBox#groupPlayer1Connected::indicator:checked,
-QGroupBox#groupPlayer2Connected::indicator:checked,
-QGroupBox#groupPlayer3Connected::indicator:checked,
-QGroupBox#groupPlayer4Connected::indicator:checked,
-QGroupBox#groupPlayer5Connected::indicator:checked,
-QGroupBox#groupPlayer6Connected::indicator:checked,
-QGroupBox#groupPlayer7Connected::indicator:checked,
-QGroupBox#groupPlayer8Connected::indicator:checked,
-QCheckBox#checkboxPlayer1Connected::indicator:checked,
-QCheckBox#checkboxPlayer2Connected::indicator:checked,
-QCheckBox#checkboxPlayer3Connected::indicator:checked,
-QCheckBox#checkboxPlayer4Connected::indicator:checked,
-QCheckBox#checkboxPlayer5Connected::indicator:checked,
-QCheckBox#checkboxPlayer6Connected::indicator:checked,
-QCheckBox#checkboxPlayer7Connected::indicator:checked,
-QCheckBox#checkboxPlayer8Connected::indicator:checked,
-QGroupBox#groupConnectedController::indicator:checked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: #39ff14;
-    image: none;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:unchecked,
-QWidget#Player2LEDs QCheckBox::indicator:unchecked,
-QWidget#Player3LEDs QCheckBox::indicator:unchecked,
-QWidget#Player4LEDs QCheckBox::indicator:unchecked,
-QWidget#Player5LEDs QCheckBox::indicator:unchecked,
-QWidget#Player6LEDs QCheckBox::indicator:unchecked,
-QWidget#Player7LEDs QCheckBox::indicator:unchecked,
-QWidget#Player8LEDs QCheckBox::indicator:unchecked,
-QGroupBox#groupPlayer1Connected::indicator:unchecked,
-QGroupBox#groupPlayer2Connected::indicator:unchecked,
-QGroupBox#groupPlayer3Connected::indicator:unchecked,
-QGroupBox#groupPlayer4Connected::indicator:unchecked,
-QGroupBox#groupPlayer5Connected::indicator:unchecked,
-QGroupBox#groupPlayer6Connected::indicator:unchecked,
-QGroupBox#groupPlayer7Connected::indicator:unchecked,
-QGroupBox#groupPlayer8Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer1Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer2Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer3Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer4Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer5Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
-QGroupBox#groupConnectedController::indicator:unchecked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: transparent;
-    image: none;
-}
-
-QWidget#controllerPlayer1,
-QWidget#controllerPlayer2,
-QWidget#controllerPlayer3,
-QWidget#controllerPlayer4,
-QWidget#controllerPlayer5,
-QWidget#controllerPlayer6,
-QWidget#controllerPlayer7,
-QWidget#controllerPlayer8 {
-    background: transparent;
-}

dist/qt_themes/qdarkstyle/style.qrc

@@ -2,7 +2,6 @@
   <qresource prefix="icons/qdarkstyle">
     <file alias="index.theme">icons/index.theme</file>
     <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-    <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
     <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
     <file alias="48x48/chip.png">icons/48x48/chip.png</file>
     <file alias="48x48/folder.png">icons/48x48/folder.png</file>
@@ -52,6 +51,6 @@
     <file>rc/radio_unchecked.png</file>
   </qresource>
   <qresource prefix="qdarkstyle">
-    <file>style.qss</file>
+      <file>style.qss</file>
   </qresource>
 </RCC>

dist/qt_themes/qdarkstyle/style.qss

@@ -40,8 +40,8 @@ QCheckBox:disabled {
 
 QCheckBox::indicator,
 QGroupBox::indicator {
-    width: 16px;
-    height: 16px;
+    width: 18px;
+    height: 18px;
 }
 
 QGroupBox::indicator {
@@ -1237,7 +1237,6 @@ QPlainTextEdit:disabled {
     background-color: #2b2e31;
 }
 
-
 QPushButton#TogglableStatusBarButton {
     min-width: 0px;
     color: #656565;
@@ -1272,305 +1271,6 @@ QPushButton#RendererStatusBarButton:checked {
     color: #e85c00;
 }
 
-QPushButton#RendererStatusBarButton:!checked {
-    color: #00ccdd;
-}
-
-QPushButton#buttonRefreshDevices {
-    min-width: 24px;
-    min-height: 24px;
-    max-width: 24px;
-    max-height: 24px;
-    padding: 0px 0px;
-}
-
-QSpinBox#spinboxLStickRange,
-QSpinBox#spinboxRStickRange {
-    padding: 4px 0px 5px 0px;
-    min-width: 63px;
-}
-
-QSpinBox#vibrationSpin {
-    padding: 4px 0px 5px 0px;
-    min-width: 63px;
-}
-
-QSpinBox#spinboxLStickRange:up-button,
-QSpinBox#spinboxRStickRange:up-button,
-QSpinBox#vibrationSpin:up-button {
-    left: -2px;
-}
-
-QSpinBox#spinboxLStickRange:down-button,
-QSpinBox#spinboxRStickRange:down-button,
-QSpinBox#vibrationSpin:down-button {
-    right: -1px;
-}
-
-QGroupBox#motionGroup::indicator,
-QGroupBox#vibrationGroup::indicator {
-    margin-left: 0px;
-}
-
-QGroupBox#motionGroup::title,
-QGroupBox#vibrationGroup::title {
-    spacing: 2px;
-    padding-left: 1px;
-    padding-right: 1px;
-}
-
-QWidget#bottomPerGameInput,
-QWidget#topControllerApplet,
-QWidget#bottomControllerApplet,
-QGroupBox#groupPlayer1Connected:checked,
-QGroupBox#groupPlayer2Connected:checked,
-QGroupBox#groupPlayer3Connected:checked,
-QGroupBox#groupPlayer4Connected:checked,
-QGroupBox#groupPlayer5Connected:checked,
-QGroupBox#groupPlayer6Connected:checked,
-QGroupBox#groupPlayer7Connected:checked,
-QGroupBox#groupPlayer8Connected:checked {
-    background-color: #232629;
-}
-
-QWidget#topPerGameInput,
-QWidget#middleControllerApplet {
-    background-color: #31363b;
-}
-
-QWidget#topPerGameInput QComboBox,
-QWidget#middleControllerApplet QComboBox {
-    width: 119px;
-}
-
-QRadioButton#radioDocked {
-    margin-left: -3px;
-}
-
-
-QRadioButton#radioUndocked {
-    margin-right: 5px;
-}
-
-QWidget#connectedControllers {
-    background: transparent;
-}
-
-QWidget#playersSupported,
-QWidget#controllersSupported,
-QWidget#controllerSupported1,
-QWidget#controllerSupported2,
-QWidget#controllerSupported3,
-QWidget#controllerSupported4,
-QWidget#controllerSupported5,
-QWidget#controllerSupported6 {
-    border: none;
-    background: transparent;
-}
-
-QGroupBox#groupPlayer1Connected,
-QGroupBox#groupPlayer2Connected,
-QGroupBox#groupPlayer3Connected,
-QGroupBox#groupPlayer4Connected,
-QGroupBox#groupPlayer5Connected,
-QGroupBox#groupPlayer6Connected,
-QGroupBox#groupPlayer7Connected,
-QGroupBox#groupPlayer8Connected {
-    border: 1px solid #76797c;
-    border-radius: 3px;
-    padding: 0px;
-    min-height: 98px;
-    max-height: 98px;
-    margin-top: 0px;
-}
-
-QGroupBox#groupPlayer1Connected:unchecked,
-QGroupBox#groupPlayer2Connected:unchecked,
-QGroupBox#groupPlayer3Connected:unchecked,
-QGroupBox#groupPlayer4Connected:unchecked,
-QGroupBox#groupPlayer5Connected:unchecked,
-QGroupBox#groupPlayer6Connected:unchecked,
-QGroupBox#groupPlayer7Connected:unchecked,
-QGroupBox#groupPlayer8Connected:unchecked {
-    border: 1px solid #54575b;
-}
-
-QGroupBox#groupPlayer1Connected::title,
-QGroupBox#groupPlayer2Connected::title,
-QGroupBox#groupPlayer3Connected::title,
-QGroupBox#groupPlayer4Connected::title,
-QGroupBox#groupPlayer5Connected::title,
-QGroupBox#groupPlayer6Connected::title,
-QGroupBox#groupPlayer7Connected::title,
-QGroupBox#groupPlayer8Connected::title {
-    subcontrol-origin: margin;
-    subcontrol-position: top left;
-    padding-left: 0px;
-    padding-right: 0px;
-    padding-top: 1px;
-    margin-left: -2px;
-    margin-right: -4px;
-    margin-bottom: 6px;
-}
-
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-    spacing: 0px;
-}
-
-QWidget#Player1LEDs,
-QWidget#Player2LEDs,
-QWidget#Player3LEDs,
-QWidget#Player4LEDs,
-QWidget#Player5LEDs,
-QWidget#Player6LEDs,
-QWidget#Player7LEDs,
-QWidget#Player8LEDs {
-    background: transparent;
-}
-
-QWidget#Player1LEDs QCheckBox,
-QWidget#Player2LEDs QCheckBox,
-QWidget#Player3LEDs QCheckBox,
-QWidget#Player4LEDs QCheckBox,
-QWidget#Player5LEDs QCheckBox,
-QWidget#Player6LEDs QCheckBox,
-QWidget#Player7LEDs QCheckBox,
-QWidget#Player8LEDs QCheckBox {
-    spacing: 0px;
-    margin-bottom: 0px;
-    margin-right: 0px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator,
-QWidget#Player2LEDs QCheckBox::indicator,
-QWidget#Player3LEDs QCheckBox::indicator,
-QWidget#Player4LEDs QCheckBox::indicator,
-QWidget#Player5LEDs QCheckBox::indicator,
-QWidget#Player6LEDs QCheckBox::indicator,
-QWidget#Player7LEDs QCheckBox::indicator,
-QWidget#Player8LEDs QCheckBox::indicator {
-    width: 6px;
-    height: 6px;
-    margin-left: 0px;
-}
-
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer1Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer2Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer3Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer4Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer5Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer6Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer7Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 12px;
-    height: 12px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator,
-QCheckBox#checkboxPlayer2Connected::indicator,
-QCheckBox#checkboxPlayer3Connected::indicator,
-QCheckBox#checkboxPlayer4Connected::indicator,
-QCheckBox#checkboxPlayer5Connected::indicator,
-QCheckBox#checkboxPlayer6Connected::indicator,
-QCheckBox#checkboxPlayer7Connected::indicator,
-QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 14px;
-    height: 14px;
-}
-
-QGroupBox#groupPlayer1Connected::indicator,
-QGroupBox#groupPlayer2Connected::indicator,
-QGroupBox#groupPlayer3Connected::indicator,
-QGroupBox#groupPlayer4Connected::indicator,
-QGroupBox#groupPlayer5Connected::indicator,
-QGroupBox#groupPlayer6Connected::indicator,
-QGroupBox#groupPlayer7Connected::indicator,
-QGroupBox#groupPlayer8Connected::indicator {
-    width: 16px;
-    height: 16px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:checked,
-QWidget#Player2LEDs QCheckBox::indicator:checked,
-QWidget#Player3LEDs QCheckBox::indicator:checked,
-QWidget#Player4LEDs QCheckBox::indicator:checked,
-QWidget#Player5LEDs QCheckBox::indicator:checked,
-QWidget#Player6LEDs QCheckBox::indicator:checked,
-QWidget#Player7LEDs QCheckBox::indicator:checked,
-QWidget#Player8LEDs QCheckBox::indicator:checked,
-QGroupBox#groupPlayer1Connected::indicator:checked,
-QGroupBox#groupPlayer2Connected::indicator:checked,
-QGroupBox#groupPlayer3Connected::indicator:checked,
-QGroupBox#groupPlayer4Connected::indicator:checked,
-QGroupBox#groupPlayer5Connected::indicator:checked,
-QGroupBox#groupPlayer6Connected::indicator:checked,
-QGroupBox#groupPlayer7Connected::indicator:checked,
-QGroupBox#groupPlayer8Connected::indicator:checked,
-QCheckBox#checkboxPlayer1Connected::indicator:checked,
-QCheckBox#checkboxPlayer2Connected::indicator:checked,
-QCheckBox#checkboxPlayer3Connected::indicator:checked,
-QCheckBox#checkboxPlayer4Connected::indicator:checked,
-QCheckBox#checkboxPlayer5Connected::indicator:checked,
-QCheckBox#checkboxPlayer6Connected::indicator:checked,
-QCheckBox#checkboxPlayer7Connected::indicator:checked,
-QCheckBox#checkboxPlayer8Connected::indicator:checked,
-QGroupBox#groupConnectedController::indicator:checked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: #39ff14;
-    image: none;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:unchecked,
-QWidget#Player2LEDs QCheckBox::indicator:unchecked,
-QWidget#Player3LEDs QCheckBox::indicator:unchecked,
-QWidget#Player4LEDs QCheckBox::indicator:unchecked,
-QWidget#Player5LEDs QCheckBox::indicator:unchecked,
-QWidget#Player6LEDs QCheckBox::indicator:unchecked,
-QWidget#Player7LEDs QCheckBox::indicator:unchecked,
-QWidget#Player8LEDs QCheckBox::indicator:unchecked,
-QGroupBox#groupPlayer1Connected::indicator:unchecked,
-QGroupBox#groupPlayer2Connected::indicator:unchecked,
-QGroupBox#groupPlayer3Connected::indicator:unchecked,
-QGroupBox#groupPlayer4Connected::indicator:unchecked,
-QGroupBox#groupPlayer5Connected::indicator:unchecked,
-QGroupBox#groupPlayer6Connected::indicator:unchecked,
-QGroupBox#groupPlayer7Connected::indicator:unchecked,
-QGroupBox#groupPlayer8Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer1Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer2Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer3Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer4Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer5Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
-QGroupBox#groupConnectedController::indicator:unchecked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: transparent;
-    image: none;
-}
-
-QWidget#controllerPlayer1,
-QWidget#controllerPlayer2,
-QWidget#controllerPlayer3,
-QWidget#controllerPlayer4,
-QWidget#controllerPlayer5,
-QWidget#controllerPlayer6,
-QWidget#controllerPlayer7,
-QWidget#controllerPlayer8 {
-    background: transparent;
-}
-
-/* touchscreen mapping widget */
-TouchScreenPreview {
-    qproperty-dotHighlightColor: #3daee9;
+QPushButton#RendererStatusBarButton:!checked{
+   color: #00ccdd;
 }

dist/qt_themes/qdarkstyle_midnight_blue/style.qrc

@@ -2,7 +2,6 @@
   <qresource prefix="icons/qdarkstyle_midnight_blue">
     <file alias="index.theme">icons/index.theme</file>
     <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-    <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
     <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
     <file alias="48x48/chip.png">icons/48x48/chip.png</file>
     <file alias="48x48/folder.png">icons/48x48/folder.png</file>
@@ -221,6 +220,6 @@
     <file>rc/window_undock_pressed@2x.png</file>
   </qresource>
   <qresource prefix="qdarkstyle_midnight_blue">
-    <file>style.qss</file>
+      <file>style.qss</file>
   </qresource>
 </RCC>

dist/qt_themes/qdarkstyle_midnight_blue/style.qss

@@ -138,6 +138,8 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qstatusbar
 
 --------------------------------------------------------------------------- */
 QStatusBar {
+  border: 1px solid #32414B;
+  /* Fixes Spyder #9120, #9121 */
   background: #32414B;
   /* Fixes #205, white vertical borders separating items */
 }
@@ -159,7 +161,6 @@ QStatusBar QToolTip {
 QStatusBar QLabel {
   /* Fixes Spyder #9120, #9121 */
   background: transparent;
-  padding: 0px;
 }
 
 /* QCheckBox --------------------------------------------------------------
@@ -238,16 +239,18 @@ QGroupBox {
   font-weight: bold;
   border: 1px solid #32414B;
   border-radius: 4px;
-  margin-top: 12px;
   padding: 4px;
+  margin-top: 16px;
 }
 
 QGroupBox::title {
   subcontrol-origin: margin;
   subcontrol-position: top left;
+  left: 3px;
   padding-left: 3px;
   padding-right: 5px;
-  padding-top: 4px;
+  padding-top: 8px;
+  padding-bottom: 16px;
 }
 
 QGroupBox::indicator {
@@ -364,19 +367,28 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar
 --------------------------------------------------------------------------- */
 QMenuBar {
   background-color: #32414B;
+  padding: 2px;
+  border: 1px solid #19232D;
   color: #F0F0F0;
 }
 
+QMenuBar:focus {
+  border: 1px solid #148CD2;
+}
+
 QMenuBar::item {
   background: transparent;
+  padding: 4px;
 }
 
 QMenuBar::item:selected {
+  padding: 4px;
   background: transparent;
   border: 0px solid #32414B;
 }
 
 QMenuBar::item:pressed {
+  padding: 4px;
   border: 0px solid #32414B;
   background-color: #148CD2;
   color: #F0F0F0;
@@ -384,7 +396,6 @@ QMenuBar::item:pressed {
   padding-bottom: 0px;
 }
 
-
 /* QMenu ------------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu
@@ -471,7 +482,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
 
 --------------------------------------------------------------------------- */
 QAbstractItemView {
-  alternate-background-color: #1f2933;
+  alternate-background-color: #19232D;
   color: #F0F0F0;
   border: 1px solid #32414B;
   border-radius: 4px;
@@ -490,13 +501,13 @@ QAbstractScrollArea {
   background-color: #19232D;
   border: 1px solid #32414B;
   border-radius: 4px;
+  padding: 2px;
   /* fix #159 */
   min-height: 1.25em;
   /* fix #159 */
   color: #F0F0F0;
 }
 
-
 QAbstractScrollArea:disabled {
   color: #787878;
 }
@@ -796,22 +807,20 @@ QAbstractSpinBox {
 }
 
 QAbstractSpinBox:up-button {
-  background-color: #505F69;
+  background-color: transparent #19232D;
   subcontrol-origin: border;
   subcontrol-position: top right;
   border-left: 1px solid #32414B;
-  border-top: 1px solid #32414B;
-  border-right: 1px solid #32414B;
-  border-top-right-radius: 4px;
+  border-bottom: 1px solid #32414B;
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
-  margin: 0px;
+  margin: 1px;
   width: 12px;
-  margin-bottom: 0px;
+  margin-bottom: -1px;
 }
 
 QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
-  image: url(":/qss_icons/rc/up_arrow.png");
+  image: url(":/qss_icons/rc/arrow_up_disabled.png");
   height: 8px;
   width: 8px;
 }
@@ -821,23 +830,20 @@ QAbstractSpinBox::up-arrow:hover {
 }
 
 QAbstractSpinBox:down-button {
-  background-color: #505F69;
+  background-color: transparent #19232D;
   subcontrol-origin: border;
   subcontrol-position: bottom right;
   border-left: 1px solid #32414B;
-  border-right: 1px solid #32414B;
-  border-bottom: 1px solid #32414B;
   border-top: 1px solid #32414B;
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
-  border-bottom-right-radius: 4px;
-  margin: 0px;
+  margin: 1px;
   width: 12px;
-  margin-top: 0px;
+  margin-top: -1px;
 }
 
 QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
-  image: url(":/qss_icons/rc/down_arrow.png");
+  image: url(":/qss_icons/rc/arrow_down_disabled.png");
   height: 8px;
   width: 8px;
 }
@@ -1193,7 +1199,6 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
 
 --------------------------------------------------------------------------- */
 QComboBox {
-  background-color: #0f1922;
   border: 1px solid #32414B;
   border-radius: 4px;
   selection-background-color: #1464A0;
@@ -1211,7 +1216,7 @@ QComboBox {
 QComboBox QAbstractItemView {
   border: 1px solid #32414B;
   border-radius: 0;
-  background-color: #0f1922;
+  background-color: #19232D;
   selection-background-color: #1464A0;
 }
 
@@ -1280,12 +1285,7 @@ QComboBox::drop-down {
 }
 
 QComboBox::down-arrow {
-  image: url(":/qss_icons/rc/down_arrow.png");
-  background-color: #505F69;
-  padding: 6px 2px;
-  border: 1px solid #32414B;
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
+  image: url(":/qss_icons/rc/arrow_down_disabled.png");
   height: 8px;
   width: 8px;
 }
@@ -1559,12 +1559,12 @@ QTabBar::tab:right:!selected {
 QTabBar::tab:top {
   background-color: #32414B;
   color: #F0F0F0;
-  min-width: 36px;
   margin-left: 2px;
-  padding-left: 8px;
-  padding-right: 8px;
+  padding-left: 4px;
+  padding-right: 4px;
   padding-top: 2px;
   padding-bottom: 2px;
+  min-width: 5px;
   border-bottom: 3px solid #32414B;
   border-top-left-radius: 3px;
   border-top-right-radius: 3px;
@@ -1588,16 +1588,16 @@ QTabBar::tab:top:!selected:hover {
 
 QTabBar::tab:bottom {
   color: #F0F0F0;
-  min-width: 36px;
   border-top: 3px solid #32414B;
   background-color: #32414B;
   margin-left: 2px;
-  padding-left: 8px;
-  padding-right: 8px;
+  padding-left: 4px;
+  padding-right: 4px;
   padding-top: 2px;
   padding-bottom: 2px;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
+  min-width: 5px;
 }
 
 QTabBar::tab:bottom:selected {
@@ -1752,6 +1752,21 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlistview
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview
 
 --------------------------------------------------------------------------- */
+QTreeView:branch:selected, QTreeView:branch:hover {
+  background: url(":/qss_icons/rc/transparent.png");
+}
+
+QTreeView:branch:has-siblings:!adjoins-item {
+  border-image: url(":/qss_icons/rc/branch_line.png") 0;
+}
+
+QTreeView:branch:has-siblings:adjoins-item {
+  border-image: url(":/qss_icons/rc/branch_more.png") 0;
+}
+
+QTreeView:branch:!has-children:!has-siblings:adjoins-item {
+  border-image: url(":/qss_icons/rc/branch_end.png") 0;
+}
 
 QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings {
   border-image: none;
@@ -1885,21 +1900,21 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview
 
 --------------------------------------------------------------------------- */
 QHeaderView {
-  background-color: #19232D;
-  border: 0px transparent #19232D;
+  background-color: #32414B;
+  border: 0px transparent #32414B;
   padding: 0px;
   margin: 0px;
   border-radius: 0px;
 }
 
 QHeaderView:disabled {
-  background-color: #19232D;
-  border: 1px transparent #19232D;
+  background-color: #32414B;
+  border: 1px transparent #32414B;
   padding: 2px;
 }
 
 QHeaderView::section {
-  background-color: #19232D;
+  background-color: #32414B;
   color: #F0F0F0;
   padding: 2px;
   border-radius: 0px;
@@ -1919,11 +1934,11 @@ QHeaderView::section:checked:disabled {
 QHeaderView::section::horizontal {
   padding-left: 4px;
   padding-right: 4px;
-  border-left: 1px solid #32414B;
+  border-left: 1px solid #19232D;
 }
 
 QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one {
-  border-left: 1px solid #19232D;
+  border-left: 1px solid #32414B;
 }
 
 QHeaderView::section::horizontal:disabled {
@@ -1933,7 +1948,7 @@ QHeaderView::section::horizontal:disabled {
 QHeaderView::section::vertical {
   padding-left: 4px;
   padding-right: 4px;
-  border-top: 1px solid #32414B;
+  border-top: 1px solid #19232D;
 }
 
 QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
@@ -1947,7 +1962,7 @@ QHeaderView::section::vertical:disabled {
 QHeaderView::down-arrow {
   /* Those settings (border/width/height/background-color) solve bug */
   /* transparent arrow background and size */
-  background-color: #19232D;
+  background-color: #32414B;
   border: none;
   height: 12px;
   width: 12px;
@@ -1957,7 +1972,7 @@ QHeaderView::down-arrow {
 }
 
 QHeaderView::up-arrow {
-  background-color: #19232D;
+  background-color: #32414B;
   border: none;
   height: 12px;
   width: 12px;
@@ -2157,348 +2172,3 @@ PlotWidget {
   /* Fix cut labels in plots #134 */
   padding: 0px;
 }
-
-
-QPushButton#TogglableStatusBarButton {
-  min-width: 0px;
-  color: #656565;
-  border: 1px solid transparent;
-  background-color: transparent;
-  padding: 0px 3px 0px 3px;
-  text-align: center;
-}
-
-QPushButton#TogglableStatusBarButton:checked {
-  color: #ffffff;
-}
-
-QPushButton#TogglableStatusBarButton:hover {
-  border: 1px solid #76797C;
-}
-
-QPushButton#RendererStatusBarButton {
-  min-width: 0px;
-  color: #656565;
-  border: 1px solid transparent;
-  background-color: transparent;
-  padding: 0px 3px 0px 3px;
-  text-align: center;
-}
-
-QPushButton#RendererStatusBarButton:hover {
-  border: 1px solid #76797C;
-}
-
-QPushButton#RendererStatusBarButton:checked {
-  color: #e85c00;
-}
-
-QPushButton#RendererStatusBarButton:!checked {
-  color: #00ccdd;
-}
-
-QPushButton#buttonRefreshDevices {
-  min-width: 20px;
-  min-height: 20px;
-  max-width: 20px;
-  max-height: 20px;
-  padding: 0px 0px;
-}
-
-QSpinBox#spinboxLStickRange,
-QSpinBox#spinboxRStickRange {
-  min-width: 38px;
-}
-
-QGroupBox#motionGroup::indicator,
-QGroupBox#vibrationGroup::indicator {
-  margin-left: 0px;
-}
-
-QWidget#bottomPerGameInput QGroupBox#motionGroup,
-QWidget#bottomPerGameInput QGroupBox#vibrationGroup,
-QWidget#bottomPerGameInput QGroupBox#inputConfigGroup {
-  padding: 0px;
-}
-
-QGroupBox#motionGroup::title,
-QGroupBox#vibrationGroup::title {
-  spacing: 2px;
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-QListWidget#selectorList {
-  background-color: #0f1922;
-}
-
-QSpinBox,
-QLineEdit,
-QTreeView#hotkey_list,
-QScrollArea#scrollArea QTreeView {
-  background-color: #0f1922;
-}
-
-QWidget#bottomPerGameInput,
-QWidget#topControllerApplet,
-QWidget#bottomControllerApplet,
-QGroupBox#groupPlayer1Connected:checked,
-QGroupBox#groupPlayer2Connected:checked,
-QGroupBox#groupPlayer3Connected:checked,
-QGroupBox#groupPlayer4Connected:checked,
-QGroupBox#groupPlayer5Connected:checked,
-QGroupBox#groupPlayer6Connected:checked,
-QGroupBox#groupPlayer7Connected:checked,
-QGroupBox#groupPlayer8Connected:checked {
-  background-color: #0f1922;
-}
-
-QWidget#topPerGameInput,
-QWidget#middleControllerApplet {
-  background-color: #19232d;
-}
-
-QWidget#topPerGameInput QComboBox,
-QWidget#middleControllerApplet QComboBox {
-  padding-right: 2px;
-  width: 127px;
-}
-
-QGroupBox#handheldGroup {
-  padding-left: 0px;
-}
-
-QRadioButton#radioDocked {
-  margin-left: -1px;
-  padding-left: 0px;
-}
-
-QRadioButton#radioDocked::indicator {
-  margin-left: 0px;
-}
-
-
-QRadioButton#radioUndocked {
-  margin-right: 2px;
-}
-
-QWidget#connectedControllers {
-  background: transparent;
-}
-
-QWidget#playersSupported,
-QWidget#controllersSupported,
-QWidget#controllerSupported1,
-QWidget#controllerSupported2,
-QWidget#controllerSupported3,
-QWidget#controllerSupported4,
-QWidget#controllerSupported5,
-QWidget#controllerSupported6 {
-  border: none;
-  background: transparent;
-}
-
-QGroupBox#groupPlayer1Connected,
-QGroupBox#groupPlayer2Connected,
-QGroupBox#groupPlayer3Connected,
-QGroupBox#groupPlayer4Connected,
-QGroupBox#groupPlayer5Connected,
-QGroupBox#groupPlayer6Connected,
-QGroupBox#groupPlayer7Connected,
-QGroupBox#groupPlayer8Connected {
-  border: 1px solid #76797c;
-  border-radius: 3px;
-  padding: 0px;
-  min-height: 98px;
-  max-height: 98px;
-  margin-top: 0px;
-}
-
-
-QGroupBox#groupPlayer1Connected:unchecked,
-QGroupBox#groupPlayer2Connected:unchecked,
-QGroupBox#groupPlayer3Connected:unchecked,
-QGroupBox#groupPlayer4Connected:unchecked,
-QGroupBox#groupPlayer5Connected:unchecked,
-QGroupBox#groupPlayer6Connected:unchecked,
-QGroupBox#groupPlayer7Connected:unchecked,
-QGroupBox#groupPlayer8Connected:unchecked {
-  border: 1px solid #32414b;
-}
-
-QGroupBox#groupPlayer1Connected::title,
-QGroupBox#groupPlayer2Connected::title,
-QGroupBox#groupPlayer3Connected::title,
-QGroupBox#groupPlayer4Connected::title,
-QGroupBox#groupPlayer5Connected::title,
-QGroupBox#groupPlayer6Connected::title,
-QGroupBox#groupPlayer7Connected::title,
-QGroupBox#groupPlayer8Connected::title {
-  subcontrol-origin: margin;
-  subcontrol-position: top left;
-  padding-left: 0px;
-  padding-right: 0px;
-  padding-top: 1px;
-  margin-left: -2px;
-  margin-right: -4px;
-  margin-bottom: 6px;
-}
-
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-    spacing: 0px;
-}
-
-QWidget#connectedControllers QLabel {
-  padding: 0px;
-}
-
-QWidget#Player1LEDs,
-QWidget#Player2LEDs,
-QWidget#Player3LEDs,
-QWidget#Player4LEDs,
-QWidget#Player5LEDs,
-QWidget#Player6LEDs,
-QWidget#Player7LEDs,
-QWidget#Player8LEDs {
-  background: transparent;
-}
-
-QWidget#Player1LEDs QCheckBox,
-QWidget#Player2LEDs QCheckBox,
-QWidget#Player3LEDs QCheckBox,
-QWidget#Player4LEDs QCheckBox,
-QWidget#Player5LEDs QCheckBox,
-QWidget#Player6LEDs QCheckBox,
-QWidget#Player7LEDs QCheckBox,
-QWidget#Player8LEDs QCheckBox,
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-  spacing: 0px;
-  padding-top: 0px;
-  padding-bottom: 0px;
-  background: transparent;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator,
-QWidget#Player2LEDs QCheckBox::indicator,
-QWidget#Player3LEDs QCheckBox::indicator,
-QWidget#Player4LEDs QCheckBox::indicator,
-QWidget#Player5LEDs QCheckBox::indicator,
-QWidget#Player6LEDs QCheckBox::indicator,
-QWidget#Player7LEDs QCheckBox::indicator,
-QWidget#Player8LEDs QCheckBox::indicator {
-  width: 6px;
-  height: 6px;
-  margin-left: 0px;
-}
-
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer1Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer2Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer3Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer4Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer5Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer6Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer7Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer8Connected::indicator {
-  width: 12px;
-  height: 12px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator,
-QCheckBox#checkboxPlayer2Connected::indicator,
-QCheckBox#checkboxPlayer3Connected::indicator,
-QCheckBox#checkboxPlayer4Connected::indicator,
-QCheckBox#checkboxPlayer5Connected::indicator,
-QCheckBox#checkboxPlayer6Connected::indicator,
-QCheckBox#checkboxPlayer7Connected::indicator,
-QCheckBox#checkboxPlayer8Connected::indicator {
-  width: 14px;
-  height: 14px;
-  margin-left: 2px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:checked,
-QWidget#Player2LEDs QCheckBox::indicator:checked,
-QWidget#Player3LEDs QCheckBox::indicator:checked,
-QWidget#Player4LEDs QCheckBox::indicator:checked,
-QWidget#Player5LEDs QCheckBox::indicator:checked,
-QWidget#Player6LEDs QCheckBox::indicator:checked,
-QWidget#Player7LEDs QCheckBox::indicator:checked,
-QWidget#Player8LEDs QCheckBox::indicator:checked,
-QGroupBox#groupPlayer1Connected::indicator:checked,
-QGroupBox#groupPlayer2Connected::indicator:checked,
-QGroupBox#groupPlayer3Connected::indicator:checked,
-QGroupBox#groupPlayer4Connected::indicator:checked,
-QGroupBox#groupPlayer5Connected::indicator:checked,
-QGroupBox#groupPlayer6Connected::indicator:checked,
-QGroupBox#groupPlayer7Connected::indicator:checked,
-QGroupBox#groupPlayer8Connected::indicator:checked,
-QCheckBox#checkboxPlayer1Connected::indicator:checked,
-QCheckBox#checkboxPlayer2Connected::indicator:checked,
-QCheckBox#checkboxPlayer3Connected::indicator:checked,
-QCheckBox#checkboxPlayer4Connected::indicator:checked,
-QCheckBox#checkboxPlayer5Connected::indicator:checked,
-QCheckBox#checkboxPlayer6Connected::indicator:checked,
-QCheckBox#checkboxPlayer7Connected::indicator:checked,
-QCheckBox#checkboxPlayer8Connected::indicator:checked,
-QGroupBox#groupConnectedController::indicator:checked {
-  border-radius: 2px;
-  border: 1px solid #929192;
-  background: #39ff14;
-  image: none;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:unchecked,
-QWidget#Player2LEDs QCheckBox::indicator:unchecked,
-QWidget#Player3LEDs QCheckBox::indicator:unchecked,
-QWidget#Player4LEDs QCheckBox::indicator:unchecked,
-QWidget#Player5LEDs QCheckBox::indicator:unchecked,
-QWidget#Player6LEDs QCheckBox::indicator:unchecked,
-QWidget#Player7LEDs QCheckBox::indicator:unchecked,
-QWidget#Player8LEDs QCheckBox::indicator:unchecked,
-QGroupBox#groupPlayer1Connected::indicator:unchecked,
-QGroupBox#groupPlayer2Connected::indicator:unchecked,
-QGroupBox#groupPlayer3Connected::indicator:unchecked,
-QGroupBox#groupPlayer4Connected::indicator:unchecked,
-QGroupBox#groupPlayer5Connected::indicator:unchecked,
-QGroupBox#groupPlayer6Connected::indicator:unchecked,
-QGroupBox#groupPlayer7Connected::indicator:unchecked,
-QGroupBox#groupPlayer8Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer1Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer2Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer3Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer4Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer5Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
-QGroupBox#groupConnectedController::indicator:unchecked {
-  border-radius: 2px;
-  border: 1px solid #929192;
-  background: #19232d;
-  image: none;
-}
-
-QWidget#controllerPlayer1,
-QWidget#controllerPlayer2,
-QWidget#controllerPlayer3,
-QWidget#controllerPlayer4,
-QWidget#controllerPlayer5,
-QWidget#controllerPlayer6,
-QWidget#controllerPlayer7,
-QWidget#controllerPlayer8 {
-  background: transparent;
-}

externals/CMakeLists.txt

@@ -73,29 +73,23 @@ if (NOT LIBZIP_FOUND)
 endif()
 
 if (ENABLE_WEB_SERVICE)
-    find_package(OpenSSL 1.1)
-    if (OPENSSL_FOUND)
-        set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
-    else()
-        # LibreSSL
-        set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
-        set(OPENSSLDIR "/etc/ssl/")
-        add_subdirectory(libressl EXCLUDE_FROM_ALL)
-        target_include_directories(ssl INTERFACE ./libressl/include)
-        target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
-        get_directory_property(OPENSSL_LIBRARIES
-            DIRECTORY libressl
-            DEFINITION OPENSSL_LIBS)
-    endif()
+    # LibreSSL
+    set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
+    add_subdirectory(libressl EXCLUDE_FROM_ALL)
+    target_include_directories(ssl INTERFACE ./libressl/include)
+    target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
+    get_directory_property(OPENSSL_LIBRARIES
+        DIRECTORY libressl
+        DEFINITION OPENSSL_LIBS)
+
+    # lurlparser
+    add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
 
     # httplib
     add_library(httplib INTERFACE)
     target_include_directories(httplib INTERFACE ./httplib)
     target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
     target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
-    if (WIN32)
-        target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32)
-    endif()
 endif()
 
 # Opus

externals/find-modules/FindFFmpeg.cmake

@@ -1,100 +0,0 @@
-# - Try to find ffmpeg libraries (libavcodec, libavformat and libavutil)
-# Once done this will define
-#
-# FFMPEG_FOUND - system has ffmpeg or libav
-# FFMPEG_INCLUDE_DIR - the ffmpeg include directory
-# FFMPEG_LIBRARIES - Link these to use ffmpeg
-# FFMPEG_LIBAVCODEC
-# FFMPEG_LIBAVFORMAT
-# FFMPEG_LIBAVUTIL
-#
-# Copyright (c) 2008 Andreas Schneider <mail@cynapses.org>
-# Modified for other libraries by Lasse Kärkkäinen <tronic>
-# Modified for Hedgewars by Stepik777
-# Modified for FFmpeg-example Tuukka Pasanen 2018
-# Modified for yuzu toastUnlimted 2020
-#
-# Redistribution and use is allowed according to the terms of the New
-# BSD license.
-#
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(FFMPEG
-  FOUND_VAR FFMPEG_FOUND
-  REQUIRED_VARS
-      FFMPEG_LIBRARY
-      FFMPEG_INCLUDE_DIR
-  VERSION_VAR FFMPEG_VERSION
-)
-
-if(FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
-  # in cache already
-  set(FFMPEG_FOUND TRUE)
-else()
-  # use pkg-config to get the directories and then use these values
-  # in the FIND_PATH() and FIND_LIBRARY() calls
-  find_package(PkgConfig)
-  if(PKG_CONFIG_FOUND)
-    pkg_check_modules(_FFMPEG_AVCODEC libavcodec)
-    pkg_check_modules(_FFMPEG_AVUTIL libavutil)
-    pkg_check_modules(_FFMPEG_SWSCALE libswscale)
-  endif()
-
-  find_path(FFMPEG_AVCODEC_INCLUDE_DIR
-    NAMES libavcodec/avcodec.h
-    PATHS ${_FFMPEG_AVCODEC_INCLUDE_DIRS}
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-    PATH_SUFFIXES ffmpeg libav)
-
-  find_library(FFMPEG_LIBAVCODEC
-    NAMES avcodec
-    PATHS ${_FFMPEG_AVCODEC_LIBRARY_DIRS}
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib)
-
-  find_library(FFMPEG_LIBAVUTIL
-    NAMES avutil
-    PATHS ${_FFMPEG_AVUTIL_LIBRARY_DIRS}
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib)
-
-  find_library(FFMPEG_LIBSWSCALE
-    NAMES swscale
-    PATHS ${_FFMPEG_SWSCALE_LIBRARY_DIRS}
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib)
-
-  if(FFMPEG_LIBAVCODEC AND FFMPEG_LIBAVUTIL AND FFMPEG_LIBSWSCALE)
-    set(FFMPEG_FOUND TRUE)
-  endif()
-
-  if(FFMPEG_FOUND)
-    set(FFMPEG_INCLUDE_DIR ${FFMPEG_AVCODEC_INCLUDE_DIR})
-    set(FFMPEG_LIBRARIES
-      ${FFMPEG_LIBAVCODEC}
-      ${FFMPEG_LIBAVUTIL}
-      ${FFMPEG_LIBSWSCALE})
-  endif()
-
-  if(FFMPEG_FOUND)
-    if(NOT FFMPEG_FIND_QUIETLY)
-      message(STATUS
-      "Found FFMPEG or Libav: ${FFMPEG_LIBRARIES}, ${FFMPEG_INCLUDE_DIR}")
-    endif()
-  else()
-    if(FFMPEG_FIND_REQUIRED)
-      message(FATAL_ERROR
-      "Could not find libavcodec or libavutil or libswscale")
-    endif()
-  endif()
-endif()

externals/libusb/CMakeLists.txt

@@ -1,150 +0,0 @@
-add_library(usb STATIC EXCLUDE_FROM_ALL
-    libusb/libusb/core.c
-    libusb/libusb/core.c
-    libusb/libusb/descriptor.c
-    libusb/libusb/hotplug.c
-    libusb/libusb/io.c
-    libusb/libusb/strerror.c
-    libusb/libusb/sync.c
-)
-set_target_properties(usb PROPERTIES VERSION 1.0.23)
-if(WIN32)
-    target_include_directories(usb
-        BEFORE
-        PUBLIC
-          libusb/libusb
-
-        PRIVATE
-          "${CMAKE_CURRENT_BINARY_DIR}"
-    )
-
-    if (NOT MINGW)
-        target_include_directories(usb BEFORE PRIVATE libusb/msvc)
-    endif()
-
-    # Works around other libraries providing their own definition of USB GUIDs (e.g. SDL2)
-    target_compile_definitions(usb PRIVATE "-DGUID_DEVINTERFACE_USB_DEVICE=(GUID){ 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED}}")
-else()
-target_include_directories(usb
-    # turns out other projects also have "config.h", so make sure the
-    # LibUSB one comes first
-    BEFORE
-
-    PUBLIC
-      libusb/libusb
-
-    PRIVATE
-      "${CMAKE_CURRENT_BINARY_DIR}"
-)
-endif()
-
-if(WIN32 OR CYGWIN)
-    target_sources(usb PRIVATE
-      libusb/libusb/os/threads_windows.c
-      libusb/libusb/os/windows_winusb.c
-      libusb/libusb/os/windows_usbdk.c
-      libusb/libusb/os/windows_nt_common.c
-    )
-    set(OS_WINDOWS TRUE)
-elseif(APPLE)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/darwin_usb.c
-    )
-    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-    find_library(IOKIT_LIBRARY IOKit)
-    find_library(OBJC_LIBRARY objc)
-    target_link_libraries(usb PRIVATE
-        ${COREFOUNDATION_LIBRARY}
-        ${IOKIT_LIBRARY}
-        ${OBJC_LIBRARY}
-    )
-    set(OS_DARWIN TRUE)
-elseif(ANDROID)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/linux_usbfs.c
-        libusb/libusb/os/linux_netlink.c
-    )
-    find_library(LOG_LIBRARY log)
-    target_link_libraries(usb PRIVATE ${LOG_LIBRARY})
-    set(OS_LINUX TRUE)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    target_sources(usb PRIVATE
-        libusb/libusb/os/linux_usbfs.c
-    )
-    find_package(Libudev)
-    if(LIBUDEV_FOUND)
-        target_sources(usb PRIVATE
-            libusb/libusb/os/linux_udev.c
-        )
-        target_link_libraries(usb PRIVATE "${LIBUDEV_LIBRARIES}")
-        target_include_directories(usb PRIVATE "${LIBUDEV_INCLUDE_DIR}")
-        set(HAVE_LIBUDEV TRUE)
-        set(USE_UDEV TRUE)
-    else()
-        target_sources(usb PRIVATE
-            libusb/libusb/os/linux_netlink.c
-        )
-    endif()
-    set(OS_LINUX TRUE)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-    target_sources(usb PRIVATE
-        libusb/libusb/os/netbsd_usb.c
-    )
-    set(OS_NETBSD TRUE)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    target_sources(usb PRIVATE
-        libusb/libusb/os/openbsd_usb.c
-    )
-    set(OS_OPENBSD TRUE)
-endif()
-
-if(UNIX)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/poll_posix.c
-        libusb/libusb/os/threads_posix.c
-    )
-    find_package(Threads REQUIRED)
-    if(THREADS_HAVE_PTHREAD_ARG)
-      target_compile_options(usb PUBLIC "-pthread")
-    endif()
-    if(CMAKE_THREAD_LIBS_INIT)
-      target_link_libraries(usb PRIVATE "${CMAKE_THREAD_LIBS_INIT}")
-    endif()
-    set(THREADS_POSIX TRUE)
-elseif(WIN32)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/poll_windows.c
-        libusb/libusb/os/threads_windows.c
-    )
-endif()
-
-include(CheckFunctionExists)
-include(CheckIncludeFiles)
-include(CheckTypeSize)
-check_include_files(asm/types.h HAVE_ASM_TYPES_H)
-check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
-check_include_files(linux/filter.h HAVE_LINUX_FILTER_H)
-check_include_files(linux/netlink.h HAVE_LINUX_NETLINK_H)
-check_include_files(poll.h HAVE_POLL_H)
-check_include_files(signal.h HAVE_SIGNAL_H)
-check_include_files(strings.h HAVE_STRINGS_H)
-check_type_size("struct timespec" STRUCT_TIMESPEC)
-check_function_exists(syslog HAVE_SYSLOG_FUNC)
-check_include_files(syslog.h HAVE_SYSLOG_H)
-check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
-check_include_files(sys/time.h HAVE_SYS_TIME_H)
-check_include_files(sys/types.h HAVE_SYS_TYPES_H)
-
-set(CMAKE_EXTRA_INCLUDE_FILES poll.h)
-check_type_size("nfds_t" nfds_t)
-unset(CMAKE_EXTRA_INCLUDE_FILES)
-if(HAVE_NFDS_T)
-    set(POLL_NFDS_TYPE "nfds_t")
-else()
-    set(POLL_NFDS_TYPE "unsigned int")
-endif()
-
-check_include_files(sys/timerfd.h USBI_TIMERFD_AVAILABLE)
-
-
-configure_file(config.h.in config.h)

externals/libusb/config.h.in

@@ -1,90 +0,0 @@
-/* Default visibility */
-#if defined(__GNUC__) || defined(__clang__)
-  #define DEFAULT_VISIBILITY __attribute__((visibility("default")))
-#elif defined(_MSC_VER)
-  #define DEFAULT_VISIBILITY __declspec(dllexport)
-#endif
-
-/* Start with debug message logging enabled */
-#undef ENABLE_DEBUG_LOGGING
-
-/* Message logging */
-#undef ENABLE_LOGGING
-
-/* Define to 1 if you have the <asm/types.h> header file. */
-#cmakedefine HAVE_ASM_TYPES_H 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#cmakedefine HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `udev' library (-ludev). */
-#cmakedefine HAVE_LIBUDEV 1
-
-/* Define to 1 if you have the <linux/filter.h> header file. */
-#cmakedefine HAVE_LINUX_FILTER_H 1
-
-/* Define to 1 if you have the <linux/netlink.h> header file. */
-#cmakedefine HAVE_LINUX_NETLINK_H 1
-
-/* Define to 1 if you have the <poll.h> header file. */
-#cmakedefine HAVE_POLL_H 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#cmakedefine HAVE_SIGNAL_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H 1
-
-/* Define to 1 if the system has the type `struct timespec'. */
-#cmakedefine HAVE_STRUCT_TIMESPEC 1
-
-/* syslog() function available */
-#cmakedefine HAVE_SYSLOG_FUNC 1
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#cmakedefine HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#cmakedefine HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#cmakedefine HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H 1
-
-/* Darwin backend */
-#cmakedefine OS_DARWIN 1
-
-/* Linux backend */
-#cmakedefine OS_LINUX 1
-
-/* NetBSD backend */
-#cmakedefine OS_NETBSD 1
-
-/* OpenBSD backend */
-#cmakedefine OS_OPENBSD 1
-
-/* Windows backend */
-#cmakedefine OS_WINDOWS 1
-
-/* type of second poll() argument */
-#define POLL_NFDS_TYPE @POLL_NFDS_TYPE@
-
-/* Use POSIX Threads */
-#cmakedefine THREADS_POSIX
-
-/* timerfd headers available */
-#cmakedefine USBI_TIMERFD_AVAILABLE 1
-
-/* Enable output to system log */
-#define USE_SYSTEM_LOGGING_FACILITY 1
-
-/* Use udev for device enumeration/hotplug */
-#cmakedefine USE_UDEV 1
-
-/* Use GNU extensions */
-#define _GNU_SOURCE
-
-/* Oldest Windows version supported */
-#define WINVER 0x0501

externals/lurlparser/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_library(lurlparser
+        LUrlParser.cpp
+        LUrlParser.h
+)
+
+create_target_directory_groups(lurlparser)
+
+target_include_directories(lurlparser INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

externals/lurlparser/LUrlParser.cpp

@@ -0,0 +1,265 @@
+/*
+ * Lightweight URL & URI parser (RFC 1738, RFC 3986)
+ * https://github.com/corporateshark/LUrlParser
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "LUrlParser.h"
+
+#include <algorithm>
+#include <cstring>
+#include <stdlib.h>
+
+// check if the scheme name is valid
+static bool IsSchemeValid( const std::string& SchemeName )
+{
+    for ( auto c : SchemeName  )
+    {
+        if ( !isalpha( c ) && c != '+' && c != '-' && c != '.' ) return false;
+    }
+
+    return true;
+}
+
+bool LUrlParser::clParseURL::GetPort( int* OutPort ) const
+{
+    if ( !IsValid() ) { return false; }
+
+    int Port = atoi( m_Port.c_str() );
+
+    if ( Port <= 0 || Port > 65535 ) { return false; }
+
+    if ( OutPort ) { *OutPort = Port; }
+
+    return true;
+}
+
+// based on RFC 1738 and RFC 3986
+LUrlParser::clParseURL LUrlParser::clParseURL::ParseURL( const std::string& URL )
+{
+    LUrlParser::clParseURL Result;
+
+    const char* CurrentString = URL.c_str();
+
+    /*
+     *	<scheme>:<scheme-specific-part>
+     *	<scheme> := [a-z\+\-\.]+
+     *	For resiliency, programs interpreting URLs should treat upper case letters as equivalent to lower case in scheme names
+     */
+
+    // try to read scheme
+    {
+        const char* LocalString = strchr( CurrentString, ':' );
+
+        if ( !LocalString )
+        {
+            return clParseURL( LUrlParserError_NoUrlCharacter );
+        }
+
+        // save the scheme name
+        Result.m_Scheme = std::string( CurrentString, LocalString - CurrentString );
+
+        if ( !IsSchemeValid( Result.m_Scheme ) )
+        {
+            return clParseURL( LUrlParserError_InvalidSchemeName );
+        }
+
+        // scheme should be lowercase
+        std::transform( Result.m_Scheme.begin(), Result.m_Scheme.end(), Result.m_Scheme.begin(), ::tolower );
+
+        // skip ':'
+        CurrentString = LocalString+1;
+    }
+
+    /*
+     *	//<user>:<password>@<host>:<port>/<url-path>
+     *	any ":", "@" and "/" must be normalized
+     */
+
+    // skip "//"
+    if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
+    if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
+
+    // check if the user name and password are specified
+    bool bHasUserName = false;
+
+    const char* LocalString = CurrentString;
+
+    while ( *LocalString )
+    {
+        if ( *LocalString == '@' )
+        {
+            // user name and password are specified
+            bHasUserName = true;
+            break;
+        }
+        else if ( *LocalString == '/' )
+        {
+            // end of <host>:<port> specification
+            bHasUserName = false;
+            break;
+        }
+
+        LocalString++;
+    }
+
+    // user name and password
+    LocalString = CurrentString;
+
+    if ( bHasUserName )
+    {
+        // read user name
+        while ( *LocalString && *LocalString != ':' && *LocalString != '@' ) LocalString++;
+
+        Result.m_UserName = std::string( CurrentString, LocalString - CurrentString );
+
+        // proceed with the current pointer
+        CurrentString = LocalString;
+
+        if ( *CurrentString == ':' )
+        {
+            // skip ':'
+            CurrentString++;
+
+            // read password
+            LocalString = CurrentString;
+
+            while ( *LocalString && *LocalString != '@' ) LocalString++;
+
+            Result.m_Password = std::string( CurrentString, LocalString - CurrentString );
+
+            CurrentString = LocalString;
+        }
+
+        // skip '@'
+        if ( *CurrentString != '@' )
+        {
+            return clParseURL( LUrlParserError_NoAtSign );
+        }
+
+        CurrentString++;
+    }
+
+    bool bHasBracket = ( *CurrentString == '[' );
+
+    // go ahead, read the host name
+    LocalString = CurrentString;
+
+    while ( *LocalString )
+    {
+        if ( bHasBracket && *LocalString == ']' )
+        {
+            // end of IPv6 address
+            LocalString++;
+            break;
+        }
+        else if ( !bHasBracket && ( *LocalString == ':' || *LocalString == '/' ) )
+        {
+            // port number is specified
+            break;
+        }
+
+        LocalString++;
+    }
+
+    Result.m_Host = std::string( CurrentString, LocalString - CurrentString );
+
+    CurrentString = LocalString;
+
+    // is port number specified?
+    if ( *CurrentString == ':' )
+    {
+        CurrentString++;
+
+        // read port number
+        LocalString = CurrentString;
+
+        while ( *LocalString && *LocalString != '/' ) LocalString++;
+
+        Result.m_Port = std::string( CurrentString, LocalString - CurrentString );
+
+        CurrentString = LocalString;
+    }
+
+    // end of string
+    if ( !*CurrentString )
+    {
+        Result.m_ErrorCode = LUrlParserError_Ok;
+
+        return Result;
+    }
+
+    // skip '/'
+    if ( *CurrentString != '/' )
+    {
+        return clParseURL( LUrlParserError_NoSlash );
+    }
+
+    CurrentString++;
+
+    // parse the path
+    LocalString = CurrentString;
+
+    while ( *LocalString && *LocalString != '#' && *LocalString != '?' ) LocalString++;
+
+    Result.m_Path = std::string( CurrentString, LocalString - CurrentString );
+
+    CurrentString = LocalString;
+
+    // check for query
+    if ( *CurrentString == '?' )
+    {
+        // skip '?'
+        CurrentString++;
+
+        // read query
+        LocalString = CurrentString;
+
+        while ( *LocalString && *LocalString != '#' ) LocalString++;
+
+        Result.m_Query = std::string( CurrentString, LocalString - CurrentString );
+
+        CurrentString = LocalString;
+    }
+
+    // check for fragment
+    if ( *CurrentString == '#' )
+    {
+        // skip '#'
+        CurrentString++;
+
+        // read fragment
+        LocalString = CurrentString;
+
+        while ( *LocalString ) LocalString++;
+
+        Result.m_Fragment = std::string( CurrentString, LocalString - CurrentString );
+
+        CurrentString = LocalString;
+    }
+
+    Result.m_ErrorCode = LUrlParserError_Ok;
+
+    return Result;
+}

externals/lurlparser/LUrlParser.h

@@ -0,0 +1,78 @@
+/*
+ * Lightweight URL & URI parser (RFC 1738, RFC 3986)
+ * https://github.com/corporateshark/LUrlParser
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+
+#include <string>
+
+namespace LUrlParser
+{
+enum LUrlParserError
+{
+    LUrlParserError_Ok = 0,
+    LUrlParserError_Uninitialized = 1,
+    LUrlParserError_NoUrlCharacter = 2,
+    LUrlParserError_InvalidSchemeName = 3,
+    LUrlParserError_NoDoubleSlash = 4,
+    LUrlParserError_NoAtSign = 5,
+    LUrlParserError_UnexpectedEndOfLine = 6,
+    LUrlParserError_NoSlash = 7,
+};
+
+class clParseURL
+{
+public:
+    LUrlParserError m_ErrorCode;
+    std::string m_Scheme;
+    std::string m_Host;
+    std::string m_Port;
+    std::string m_Path;
+    std::string m_Query;
+    std::string m_Fragment;
+    std::string m_UserName;
+    std::string m_Password;
+
+    clParseURL()
+            : m_ErrorCode( LUrlParserError_Uninitialized )
+    {}
+
+    /// return 'true' if the parsing was successful
+    bool IsValid() const { return m_ErrorCode == LUrlParserError_Ok; }
+
+    /// helper to convert the port number to int, return 'true' if the port is valid (within the 0..65535 range)
+    bool GetPort( int* OutPort ) const;
+
+    /// parse the URL
+    static clParseURL ParseURL( const std::string& URL );
+
+private:
+    explicit clParseURL( LUrlParserError ErrorCode )
+            : m_ErrorCode( ErrorCode )
+    {}
+};
+
+} // namespace LUrlParser