Changed "Set All Devices"

* Changed `Apply Colors` to contextual * Changed `Set All Devices` to `Apply To All Devices` * Added a tooltip to `Apply to All` * Added Black and White quick colour swatches and left them "not flat" to ensure visibility in Light and Dark mode. Commit amended to fix display issues on Windows and to group buttons in layout by Adam Honse <[email protected]>
Add device type string for virtual device
2021-04-23 08:16:44 -05:00 · 2021-04-22 16:24:48 -05:00 · 2021-04-22 19:44:17 +00:00 · 2021-04-22 00:08:17 -05:00 · 2021-04-22 00:11:22 +00:00 · 2021-04-21 16:05:48 -07:00
24 changed files with 583 additions and 280 deletions
@@ -29,7 +29,7 @@ before_script:
 #-----------------------------------------------------------------------#
 # Linux (AppImage) 32-bit Build Target                                  #
 #-----------------------------------------------------------------------#
-build_linux_32:
+"Linux 32 AppImage":
  <<: *ccache_init
  image: i386/ubuntu:bionic
  stage: build
@@ -38,6 +38,7 @@ build_linux_32:
  - ./scripts/build-appimage.sh
  
  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_32_${CI_COMMIT_SHORT_SHA}"
    paths:
    - OpenRGB-i386.AppImage
    - 60-openrgb.rules
@@ -47,7 +48,7 @@ build_linux_32:
 #-----------------------------------------------------------------------#
 # Linux (AppImage) 64-bit Build Target                                  #
 #-----------------------------------------------------------------------#
-build_linux_64:
+"Linux 64 AppImage":
  <<: *ccache_init
  image: ubuntu:bionic
  stage: build
@@ -56,6 +57,7 @@ build_linux_64:
  - ./scripts/build-appimage.sh
  
  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_64_${CI_COMMIT_SHORT_SHA}"
    paths:
    - OpenRGB-x86_64.AppImage
    - 60-openrgb.rules
@@ -65,7 +67,7 @@ build_linux_64:
 #-----------------------------------------------------------------------#
 # Linux (.deb) 32-bit Build Target                                      #
 #-----------------------------------------------------------------------#
-build_linux_deb32:
+"Linux 32 deb":
  <<: *ccache_init
  image: i386/ubuntu:bionic
  stage: build
@@ -77,6 +79,7 @@ build_linux_deb32:
  - mv -v ../openrgb*.deb ./

  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_32_deb_${CI_COMMIT_SHORT_SHA}"
    paths:
    - openrgb*.deb
    exclude:
@@ -86,7 +89,7 @@ build_linux_deb32:
 #-----------------------------------------------------------------------#
 # Linux (.deb) 64-bit Build Target                                      #
 #-----------------------------------------------------------------------#
-build_linux_deb64:
+"Linux 64 deb":
  <<: *ccache_init
  image: ubuntu:bionic
  stage: build
@@ -98,6 +101,7 @@ build_linux_deb64:
  - mv -v ../openrgb*.deb ./

  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_64_deb_${CI_COMMIT_SHORT_SHA}"
    paths:
    - openrgb*.deb
    exclude:
@@ -107,7 +111,7 @@ build_linux_deb64:
 #-----------------------------------------------------------------------#
 # Windows (32-bit) Build Target                                         #
 #-----------------------------------------------------------------------#
-build_windows_32:
+"Windows 32":
  extends:
  - .shared_windows_runners
  stage: build
@@ -160,26 +164,23 @@ build_windows_32:
  - ..\_qt\5.15.0\msvc2019\bin\windeployqt --no-angle --no-translations --no-opengl-sw --no-system-d3d-compiler --no-compiler-runtime --no-webkit2 .\release\
  - _fold_final_
  
-  - _fold_start_ 'compressing the release folder so that we can upload it as artifact'
-  - mv release 'OpenRGB Windows 32-bit'
-  - ${datetime} = Get-Date ([datetime]::UtcNow) -Format "yyyy-MM-ddTHH-mm-ss"
-  - ${revision} = ((git rev-parse --short HEAD) | Out-String).Trim()
-  - ${rversion} = (((Get-Content '..\OpenRGB.pro' | Select-String -Pattern "VERSION     =") | Out-String).Trim().Split("="))[1].Trim()
-  - 7z a -mx9 -r -y "OpenRGB_${rversion}_32_${revision}_nightly_${datetime}.7z" 'OpenRGB Windows 32-bit'
+  - _fold_start_ 'Moving results for upload'
+  - mv release ../'OpenRGB Windows 32-bit'
  - _fold_final_
 #  cache:
 #    key: same-key
 #    paths:
 #    - C:\vcpkg\installed\
  artifacts:
+    name: "${CI_PROJECT_NAME}_Windows_32_${CI_COMMIT_SHORT_SHA}"
    paths:
-    - _build/*.7z
+    - 'OpenRGB Windows 32-bit'
    expire_in: 30 days

 #-----------------------------------------------------------------------#
 # Windows (64-bit) Build Target                                         #
 #-----------------------------------------------------------------------#
-build_windows_64:
+"Windows 64":
  extends:
  - .shared_windows_runners
  stage: build
@@ -232,26 +233,23 @@ build_windows_64:
  - ..\_qt\5.15.0\msvc2019_64\bin\windeployqt --no-angle --no-translations --no-opengl-sw --no-system-d3d-compiler --no-compiler-runtime --no-webkit2 .\release\
  - _fold_final_
  
-  - _fold_start_ 'compressing the release folder so that we can upload it as artifact'
-  - mv release 'OpenRGB Windows 64-bit'
-  - ${datetime} = Get-Date ([datetime]::UtcNow) -Format "yyyy-MM-ddTHH-mm-ss"
-  - ${revision} = ((git rev-parse --short HEAD) | Out-String).Trim()
-  - ${rversion} = (((Get-Content '..\OpenRGB.pro' | Select-String -Pattern "VERSION     =") | Out-String).Trim().Split("="))[1].Trim()
-  - 7z a -mx9 -r -y "OpenRGB_${rversion}_64_${revision}_nightly_${datetime}.7z" 'OpenRGB Windows 64-bit'
+  - _fold_start_ 'Moving results for upload'
+  - mv release ../'OpenRGB Windows 64-bit'
  - _fold_final_
 #  cache:
 #    key: same-key
 #    paths:
 #    - C:\vcpkg\installed\
  artifacts:
+    name: "${CI_PROJECT_NAME}_Windows_64_${CI_COMMIT_SHORT_SHA}"
    paths:
-    - _build/*.7z
+    - 'OpenRGB Windows 64-bit'
    expire_in: 30 days

 #-----------------------------------------------------------------------#
 # MacOS Build Target                                                    #
 #-----------------------------------------------------------------------#
-build_macos_arm64:
+"MacOS ARM64":
  tags:
  - macos
  stage: build
@@ -262,6 +260,7 @@ build_macos_arm64:
  - macdeployqt OpenRGB.app -codesign=OpenRGB

  artifacts:
+    name: "${CI_PROJECT_NAME}_MacOS_ARM64_${CI_COMMIT_SHORT_SHA}"
    paths:
    - OpenRGB.app
    expire_in: 30 days
@@ -272,7 +271,7 @@ build_macos_arm64:
  - if: '$BUILD_MACOS =~ /.+/'
    when: on_success

-build_macos_intel:
+"MacOS Intel":
  tags:
  - macos
  stage: build
@@ -283,6 +282,7 @@ build_macos_intel:
  - arch -x86_64 macdeployqt OpenRGB.app -codesign=OpenRGB

  artifacts:
+    name: "${CI_PROJECT_NAME}_MacOS_Intel_${CI_COMMIT_SHORT_SHA}"
    paths:
    - OpenRGB.app
    expire_in: 30 days
@@ -291,4 +291,4 @@ build_macos_intel:
  - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
    when: on_success
  - if: '$BUILD_MACOS =~ /.+/'
-    when: on_success
+    when: on_success
@@ -140,7 +140,7 @@ void RGBController_CMR6000Controller::UpdateSingleLED(int /*led*/)

 void RGBController_CMR6000Controller::SetCustomMode()
 {
-    
+    active_mode = 1;
 }

 void RGBController_CMR6000Controller::DeviceUpdateMode()
@@ -0,0 +1,30 @@
+#include "CreativeSoundBlasterXG6Controller.h"
+#include "RGBController_CreativeSoundBlasterXG6.h"
+#include "Detector.h"
+#include <hidapi/hidapi.h>
+
+/*-----------------------------------------------------*\
+| Creative vendor ID                                    |
+\*-----------------------------------------------------*/
+#define CREATIVE_VID                            0x041E
+/*-----------------------------------------------------*\
+| SoundCards                                            |
+\*-----------------------------------------------------*/
+#define CREATIVE_SOUNDBLASTERX_G6_PID           0x3256
+
+void DetectCreativeDevice(hid_device_info* info, const std::string& name)
+{
+    hid_device* dev = hid_open_path(info->path);
+    if(dev)
+    {
+        CreativeSoundBlasterXG6Controller*     controller     = new CreativeSoundBlasterXG6Controller(dev, info->path);
+        RGBController_CreativeSoundBlasterXG6* rgb_controller = new RGBController_CreativeSoundBlasterXG6(controller);
+        rgb_controller->name = name;
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
+    }
+}
+
+/*-------------------------------------------------------------------------------------------------------------------------------------------------*\
+| Sound Cards                                                                                                                                       |
+\*-------------------------------------------------------------------------------------------------------------------------------------------------*/
+REGISTER_HID_DETECTOR_I("Creative SoundBlasterX G6",               DetectCreativeDevice,         CREATIVE_VID,     CREATIVE_SOUNDBLASTERX_G6_PID, 4);
@@ -0,0 +1,82 @@
+#include "CreativeSoundBlasterXG6Controller.h"
+
+CreativeSoundBlasterXG6Controller::CreativeSoundBlasterXG6Controller(hid_device* dev_handle, const char* path)
+{
+    dev         = dev_handle;
+    location    = path;
+}
+
+CreativeSoundBlasterXG6Controller::~CreativeSoundBlasterXG6Controller()
+{
+    hid_close(dev);
+}
+
+std::string CreativeSoundBlasterXG6Controller::GetDeviceLocation()
+{
+    return("HID " + location);
+}
+
+void CreativeSoundBlasterXG6Controller::SetLedColor (unsigned char red, unsigned char green, unsigned char blue)
+{
+    unsigned char usb_buf[64];
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    //5A 3A 02 06 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    usb_buf[0x01]           = 0x5A;
+    usb_buf[0x02]           = 0x3A;
+    usb_buf[0x03]           = 0x02;
+    usb_buf[0x04]           = 0x06;
+    usb_buf[0x05]           = 0x01;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 64);
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    //5A 3A 06 04 00 03 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    usb_buf[0x01]           = 0x5A;
+    usb_buf[0x02]           = 0x3A;
+    usb_buf[0x03]           = 0x06;
+    usb_buf[0x04]           = 0x04;
+    usb_buf[0x06]           = 0x03;
+    usb_buf[0x07]           = 0x01;
+    usb_buf[0x09]           = 0x01;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 64);
+
+    /*-----------------------------------------------------*\
+    | Zero out buffer                                       |
+    \*-----------------------------------------------------*/
+    memset(usb_buf, 0x00, sizeof(usb_buf));
+
+    //5A 3A 09 0A 00 03 01 01 FF BB GG RR
+    usb_buf[0x01]           = 0x5A;
+    usb_buf[0x02]           = 0x3A;
+    usb_buf[0x03]           = 0x09;
+    usb_buf[0x04]           = 0x0A;
+    usb_buf[0x06]           = 0x03;
+    usb_buf[0x07]           = 0x01;
+    usb_buf[0x08]           = 0x01;
+    usb_buf[0x09]           = 0x0FF;
+
+    usb_buf[0x0A]           = blue;
+    usb_buf[0x0B]           = green;
+    usb_buf[0x0C]           = red;
+
+    /*-----------------------------------------------------*\
+    | Send packet                                           |
+    \*-----------------------------------------------------*/
+    hid_write(dev, (unsigned char *)usb_buf, 64);
+}
@@ -0,0 +1,20 @@
+#include "RGBController.h"
+#include <cstring>
+#include <hidapi/hidapi.h>
+
+#pragma once
+
+class CreativeSoundBlasterXG6Controller
+{
+public:
+    CreativeSoundBlasterXG6Controller(hid_device* dev_handle, const char* path);
+    ~CreativeSoundBlasterXG6Controller();
+    void            SetLedColor (unsigned char red, unsigned char green, unsigned char blue);
+
+    std::string GetDeviceLocation();
+    std::string GetSerialString();
+
+private:
+    hid_device*             dev;
+    std::string             location;
+};
@@ -0,0 +1,81 @@
+#include "RGBController_CreativeSoundBlasterXG6.h"
+
+RGBController_CreativeSoundBlasterXG6::RGBController_CreativeSoundBlasterXG6(CreativeSoundBlasterXG6Controller* creative_device)
+{
+    creative    = creative_device;
+
+    name        = "Creative SoundBlasterX G6 Device";
+    vendor      = "Creative";
+    type        = DEVICE_TYPE_HEADSET;
+    description = "Creative SoundBlasterX G6 Device";
+    location    = creative_device->GetDeviceLocation();
+    serial      = "";
+
+    mode Static;
+    Static.name                     = "Direct";
+    Static.value                    = 0;
+    Static.flags                    = MODE_COLORS_PER_LED;
+    Static.color_mode               = MODE_COLORS_PER_LED;
+    modes.push_back(Static);
+
+    SetupZones();
+}
+
+RGBController_CreativeSoundBlasterXG6::~RGBController_CreativeSoundBlasterXG6()
+{
+    delete creative;
+}
+
+void RGBController_CreativeSoundBlasterXG6::SetupZones()
+{
+    zone logo_zone;
+    logo_zone.name                  = "Logo";
+    logo_zone.type                  = ZONE_TYPE_SINGLE;
+    logo_zone.leds_min              = 1;
+    logo_zone.leds_max              = 1;
+    logo_zone.leds_count            = 1;
+    logo_zone.matrix_map            = NULL;
+    zones.push_back(logo_zone);
+
+    led logo_led;
+    logo_led.name = "Logo";
+    leds.push_back(logo_led);
+
+    SetupColors();
+}
+
+void RGBController_CreativeSoundBlasterXG6::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+    /*---------------------------------------------------------*\
+    | This device does not support resizing zones               |
+    \*---------------------------------------------------------*/
+}
+
+void RGBController_CreativeSoundBlasterXG6::DeviceUpdateLEDs()
+{
+    unsigned char red = RGBGetRValue(colors[0]);
+    unsigned char grn = RGBGetGValue(colors[0]);
+    unsigned char blu = RGBGetBValue(colors[0]);
+
+    creative->SetLedColor(red, grn, blu);
+}
+
+void RGBController_CreativeSoundBlasterXG6::UpdateZoneLEDs(int /*zone*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_CreativeSoundBlasterXG6::UpdateSingleLED(int /*led*/)
+{
+    DeviceUpdateLEDs();
+}
+
+void RGBController_CreativeSoundBlasterXG6::SetCustomMode()
+{
+    active_mode = 0;
+}
+
+void RGBController_CreativeSoundBlasterXG6::DeviceUpdateMode()
+{
+    DeviceUpdateLEDs();
+}
@@ -0,0 +1,24 @@
+#pragma once
+#include "RGBController.h"
+#include "CreativeSoundBlasterXG6Controller.h"
+
+class RGBController_CreativeSoundBlasterXG6: public RGBController
+{
+public:
+    RGBController_CreativeSoundBlasterXG6(CreativeSoundBlasterXG6Controller* creative_device);
+    ~RGBController_CreativeSoundBlasterXG6();
+
+    void        SetupZones();
+
+    void        ResizeZone(int zone, int new_size);
+
+    void        DeviceUpdateLEDs();
+    void        UpdateZoneLEDs(int zone);
+    void        UpdateSingleLED(int led);
+
+    void        SetCustomMode();
+    void        DeviceUpdateMode();
+
+private:
+    CreativeSoundBlasterXG6Controller*   creative;
+};
@@ -41,6 +41,7 @@ static const gpu_pci_device device_list[] =
    { NVIDIA_VEN,   NVIDIA_RTX2080_A_DEV,     EVGA_SUB_VEN,   EVGA_RTX2080_XC_GAMING_SUB_DEV,         EVGA_RGB_V2,    "EVGA GeForce RTX 2080 XC Gaming"         },
    { NVIDIA_VEN,   NVIDIA_RTX2080_A_DEV,     EVGA_SUB_VEN,   EVGA_RTX2080_XC_ULTRA_GAMING_SUB_DEV,   EVGA_RGB_V2,    "EVGA GeForce RTX 2080 XC Ultra Gaming"   },
    { NVIDIA_VEN,   NVIDIA_RTX2080TI_DEV,     EVGA_SUB_VEN,   EVGA_RTX2080TI_XC_ULTRA_GAMING_SUB_DEV, EVGA_RGB_V2,    "EVGA GeForce RTX 2080Ti XC Ultra"        },
+    { NVIDIA_VEN,   NVIDIA_RTX2080TI_DEV,     EVGA_SUB_VEN,   EVGA_RTX2080TI_FTW3_ULTRA_SUB_DEV     , EVGA_RGB_V2,    "EVGA GeForce RTX 2080Ti FTW3 Ultra"      },

 };

@@ -182,7 +182,7 @@ void RGBController_EVGAGPUv2::UpdateSingleLED(int /*led*/)

 void RGBController_EVGAGPUv2::SetCustomMode()
 {
-    active_mode = getModeIndex(EVGA_GPU_V2_MODE_DIRECT);
+    active_mode = getModeIndex(EVGA_GPU_V2_RGB_MODE_DIRECT);
 }

 void RGBController_EVGAGPUv2::DeviceUpdateMode()
@@ -33,7 +33,11 @@
 #define STEELSERIES_RIVAL_300_DOTA_PID              0x1392
 #define STEELSERIES_RIVAL_300_HP_PID                0x1718
 #define STEELSERIES_RIVAL_300_BLACKOPS_PID          0x1710
+#define STEELSERIES_RIVAL_310_PID                   0x1720
+#define STEELSERIES_RIVAL_310_CSGO_HOWL_PID         0x171e
+#define STEELSERIES_RIVAL_310_PUBG_PID              0x1736
 #define STEELSERIES_SENSEI_TEN_PID                  0x1832
+#define STEELSERIES_SENSEI_TEN_CSGO_NEON_RIDER_PID  0x1834
 #define STEELSERIES_SENSEI_310_PID                  0x1722
 /*-----------------------------------------------------*\
 | Headset product IDs                                   |
@@ -161,7 +165,11 @@ REGISTER_HID_DETECTOR_I("SteelSeries Rival 300 CS:GO Hyperbeast Edition",   Dete
 REGISTER_HID_DETECTOR_I("SteelSeries Rival 300 Dota 2 Edition",             DetectSteelSeriesRival300,  STEELSERIES_VID, STEELSERIES_RIVAL_300_DOTA_PID,            0  );
 REGISTER_HID_DETECTOR_I("SteelSeries Rival 300 HP Omen Edition",            DetectSteelSeriesRival300,  STEELSERIES_VID, STEELSERIES_RIVAL_300_HP_PID,              0  );
 REGISTER_HID_DETECTOR_I("SteelSeries Rival 300 Black Ops Edition",          DetectSteelSeriesRival300,  STEELSERIES_VID, STEELSERIES_RIVAL_300_BLACKOPS_PID,        0  );
+REGISTER_HID_DETECTOR_I("SteelSeries Rival 310",                            DetectSteelSeriesSensei,    STEELSERIES_VID, STEELSERIES_RIVAL_310_PID,                 0  );
+REGISTER_HID_DETECTOR_I("SteelSeries Rival 310 CS:GO Howl Edition",         DetectSteelSeriesSensei,    STEELSERIES_VID, STEELSERIES_RIVAL_310_CSGO_HOWL_PID,       0  );
+REGISTER_HID_DETECTOR_I("SteelSeries Rival 310 PUBG Edition",               DetectSteelSeriesSensei,    STEELSERIES_VID, STEELSERIES_RIVAL_310_PUBG_PID,            0  );
 REGISTER_HID_DETECTOR_I("SteelSeries Sensei TEN",                           DetectSteelSeriesSensei,    STEELSERIES_VID, STEELSERIES_SENSEI_TEN_PID,                0  );
+REGISTER_HID_DETECTOR_I("SteelSeries Sensei TEN CS:GO Neon Rider Edition",  DetectSteelSeriesSensei,    STEELSERIES_VID, STEELSERIES_SENSEI_TEN_CSGO_NEON_RIDER_PID,0  );
 REGISTER_HID_DETECTOR_I("SteelSeries Sensei 310",                           DetectSteelSeriesSensei,    STEELSERIES_VID, STEELSERIES_SENSEI_310_PID,                0  );
 /*---------------------------------------------------------------------------------------------------------------------------------------------------------------------*\
 | Headsets                                                                                                                                                              |
@@ -67,6 +67,7 @@ INCLUDEPATH +=
    Controllers/CorsairLightingNodeController/                                                  \
    Controllers/CorsairVengeanceController/                                                     \
    Controllers/CorsairVengeanceProController/                                                  \
+    Controllers/CreativeController/                                                             \
    Controllers/CrucialController/                                                              \
    Controllers/DasKeyboardController/                                                          \
    Controllers/DebugController/                                                                \
@@ -195,6 +196,8 @@ HEADERS +=
    Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h                     \
    Controllers/CorsairVengeanceProController/CorsairVengeanceProController.h                   \
    Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h               \
+    Controllers/CreativeController/CreativeSoundBlasterXG6Controller.h                          \
+    Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.h                      \
    Controllers/CrucialController/CrucialController.h                                           \
    Controllers/CrucialController/RGBController_Crucial.h                                       \
    Controllers/DasKeyboardController/DasKeyboardController.h                                   \
@@ -441,6 +444,9 @@ SOURCES +=
    Controllers/CorsairVengeanceProController/CorsairVengeanceProController.cpp                 \
    Controllers/CorsairVengeanceProController/CorsairVengeanceProControllerDetect.cpp           \
    Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp             \
+    Controllers/CreativeController/CreativeSoundBlasterXG6Controller.cpp                        \
+    Controllers/CreativeController/CreativeControllerDetect.cpp                                 \
+    Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp                    \
    Controllers/CrucialController/CrucialController.cpp                                         \
    Controllers/CrucialController/CrucialControllerDetect.cpp                                   \
    Controllers/CrucialController/RGBController_Crucial.cpp                                     \
@@ -178,6 +178,7 @@ There have been two instances of hardware damage in OpenRGB's development and we
  * OpenRGB E1.31 Receiver Plugin (by me): https://gitlab.com/CalcProgrammer1/OpenRGBE131ReceiverPlugin
  * Auto Updates Plugin (by herosilas12): https://gitlab.com/herosilas12/OpenRGB-Plugins/-/tree/Updates
  * Effects Engine Plugin (by herosilas12): https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectPlugin
+  * OpenRGB Visual Map Plugin (by morg): https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin
  
 ## Projects Used

@@ -1369,6 +1369,12 @@ void RGBController::UnregisterUpdateCallback(void * callback_arg)
    }
 }

+void RGBController::ClearCallbacks()
+{
+    UpdateCallbacks.clear();
+    UpdateCallbackArgs.clear();
+}
+
 void RGBController::SignalUpdate()
 {
    UpdateMutex.lock();
@@ -1459,6 +1465,8 @@ std::string device_type_to_str(device_type type)
        return "Light";
    case DEVICE_TYPE_SPEAKER:
        return "Speaker";
+    case DEVICE_TYPE_VIRTUAL:
+        return "Virtual";
    default:
        return "Unknown";
    }
@@ -118,6 +118,7 @@ enum
    DEVICE_TYPE_GAMEPAD,
    DEVICE_TYPE_LIGHT,
    DEVICE_TYPE_SPEAKER,
+    DEVICE_TYPE_VIRTUAL,
    DEVICE_TYPE_UNKNOWN
 };

@@ -175,6 +176,7 @@ public:

    virtual void            RegisterUpdateCallback(RGBControllerCallback new_callback, void * new_callback_arg) = 0;
    virtual void            UnregisterUpdateCallback(void * callback_arg)                                       = 0;
+    virtual void            ClearCallbacks()                                                                    = 0;
    virtual void            SignalUpdate()                                                                      = 0;

    virtual void            UpdateLEDs()                                                                        = 0;
@@ -253,6 +255,7 @@ public:

    void                    RegisterUpdateCallback(RGBControllerCallback new_callback, void * new_callback_arg);
    void                    UnregisterUpdateCallback(void * callback_arg);
+    void                    ClearCallbacks();
    void                    SignalUpdate();

    void                    UpdateLEDs();
@@ -91,6 +91,38 @@ void ResourceManager::RegisterRGBController(RGBController *rgb_controller)
    DeviceListChanged();
 }

+void ResourceManager::UnregisterRGBController(RGBController *rgb_controller)
+{
+    LOG_NOTICE("Unregistering RGB controller: %s", rgb_controller->name.c_str());
+
+    /*-------------------------------------------------------------------------*\
+    | Clear callbacks from the controller before removal                        |
+    \*-------------------------------------------------------------------------*/
+    rgb_controller->ClearCallbacks();
+
+    /*-------------------------------------------------------------------------*\
+    | Find the controller to remove and remove it from the hardware list        |
+    \*-------------------------------------------------------------------------*/
+    std::vector<RGBController*>::iterator hw_it = std::find(rgb_controllers_hw.begin(), rgb_controllers_hw.end(), rgb_controller);
+
+    if (hw_it != rgb_controllers_hw.end())
+    {
+        rgb_controllers_hw.erase(hw_it);
+    }
+
+    /*-------------------------------------------------------------------------*\
+    | Find the controller to remove and remove it from the master list          |
+    \*-------------------------------------------------------------------------*/
+    std::vector<RGBController*>::iterator rgb_it = std::find(rgb_controllers.begin(), rgb_controllers.end(), rgb_controller);
+
+    if (rgb_it != rgb_controllers.end())
+    {
+        rgb_controllers.erase(rgb_it);
+    }
+
+    DeviceListChanged();
+}
+
 std::vector<RGBController*> & ResourceManager::GetRGBControllers()
 {
    return rgb_controllers;
@@ -56,6 +56,7 @@ public:
    virtual std::vector<i2c_smbus_interface*> & GetI2CBusses()                                                                                      = 0;

    virtual void                                RegisterRGBController(RGBController *rgb_controller)                                                = 0;
+    virtual void                                UnregisterRGBController(RGBController *rgb_controller)                                              = 0;

    virtual void                                RegisterDeviceListChangeCallback(DeviceListChangeCallback new_callback, void * new_callback_arg)    = 0;
    virtual void                                RegisterDetectionProgressCallback(DetectionProgressCallback new_callback, void * new_callback_arg)  = 0;
@@ -92,6 +93,7 @@ public:
    std::vector<i2c_smbus_interface*> & GetI2CBusses();
    
    void RegisterRGBController(RGBController *rgb_controller);
+    void UnregisterRGBController(RGBController *rgb_controller);

    std::vector<RGBController*> & GetRGBControllers();
    
@@ -98,6 +98,7 @@
 #define EVGA_RTX2080_XC_GAMING_SUB_DEV                  0x2182
 #define EVGA_RTX2080_XC_ULTRA_GAMING_SUB_DEV            0x2183
 #define EVGA_RTX2080TI_XC_ULTRA_GAMING_SUB_DEV          0x2383
+#define EVGA_RTX2080TI_FTW3_ULTRA_SUB_DEV               0x2487

 /*-----------------------------------------------------*\
 | Gainward Sub-Device IDs                               |
@@ -72,80 +72,45 @@ OpenRGBDevicePage::OpenRGBDevicePage(RGBController *dev, QWidget *parent) :
    /*-----------------------------------------------------*\
    | Set up the color palette buttons                      |
    \*-----------------------------------------------------*/
-#ifdef _WIN32
-    if(((OpenRGBDialog2 *)parent)->IsDarkTheme())
-    {
-        ui->ButtonRed->setStyleSheet("QPushButton {background-color: rgb(255,0,0); color: rgb(255,0,0);}");
-        ui->ButtonRed->setFlat(true);
-        ui->ButtonRed->update();
+    ui->ButtonBlack->setStyleSheet("QPushButton {background-color: rgb(0,0,0); color: rgb(0,0,0); border: 1px solid rgb(128, 128, 128); padding-top: 1px; padding-bottom: 1px;}");
+    ui->ButtonBlack->setFlat(true);
+    ui->ButtonBlack->setMinimumWidth(20);
+    ui->ButtonBlack->update();

-        ui->ButtonYellow->setStyleSheet("QPushButton {background-color: rgb(255,255,0); color: rgb(255,255,0);}");
-        ui->ButtonYellow->setFlat(true);
-        ui->ButtonYellow->update();
+    ui->ButtonRed->setStyleSheet("QPushButton {background-color: rgb(255,0,0); color: rgb(255,0,0); border: 1px solid rgb(128, 128, 128); padding-top: 1px; padding-bottom: 1px;}");
+    ui->ButtonRed->setFlat(true);
+    ui->ButtonRed->setMinimumWidth(20);
+    ui->ButtonRed->update();

-        ui->ButtonGreen->setStyleSheet("QPushButton {background-color: rgb(0,255,0); color: rgb(0,255,0);}");
-        ui->ButtonGreen->setFlat(true);
-        ui->ButtonGreen->update();
+    ui->ButtonYellow->setStyleSheet("QPushButton {background-color: rgb(255,255,0); color: rgb(255,255,0); border: 1px solid rgb(128, 128, 128); padding-top: 1px; padding-bottom: 1px;}");
+    ui->ButtonYellow->setFlat(true);
+    ui->ButtonYellow->setMinimumWidth(20);
+    ui->ButtonYellow->update();

-        ui->ButtonCyan->setStyleSheet("QPushButton {background-color: rgb(0,255,255); color: rgb(0,255,255);}");
-        ui->ButtonCyan->setFlat(true);
-        ui->ButtonCyan->update();
+    ui->ButtonGreen->setStyleSheet("QPushButton {background-color: rgb(0,255,0); color: rgb(0,255,0); border: 1px solid rgb(128, 128, 128); padding-top: 1px; padding-bottom: 1px;}");
+    ui->ButtonGreen->setFlat(true);
+    ui->ButtonGreen->setMinimumWidth(20);
+    ui->ButtonGreen->update();

-        ui->ButtonBlue->setStyleSheet("QPushButton {background-color: rgb(0,0,255); color: rgb(0,0,255);}");
-        ui->ButtonBlue->setFlat(true);
-        ui->ButtonBlue->update();
+    ui->ButtonCyan->setStyleSheet("QPushButton {background-color: rgb(0,255,255); color: rgb(0,255,255); border: 1px solid rgb(128, 128, 128); padding-top: 1px; padding-bottom: 1px;}");
+    ui->ButtonCyan->setFlat(true);
+    ui->ButtonCyan->setMinimumWidth(20);
+    ui->ButtonCyan->update();

-        ui->ButtonMagenta->setStyleSheet("QPushButton {background-color: rgb(255,0,255); color: rgb(255,0,255);}");
-        ui->ButtonMagenta->setFlat(true);
-        ui->ButtonMagenta->update();
-    }
-    else
-#endif
-    {
-        QPalette pal;
+    ui->ButtonBlue->setStyleSheet("QPushButton {background-color: rgb(0,0,255); color: rgb(0,0,255); border: 1px solid rgb(128, 128, 128); padding-top: 1px; padding-bottom: 1px;}");
+    ui->ButtonBlue->setFlat(true);
+    ui->ButtonBlue->setMinimumWidth(20);
+    ui->ButtonBlue->update();

-        pal = ui->ButtonRed->palette();
-        pal.setColor(QPalette::Button, QColor(255, 0, 0));
-        ui->ButtonRed->setAutoFillBackground(true);
-        ui->ButtonRed->setPalette(pal);
-        ui->ButtonRed->setFlat(true);
-        ui->ButtonRed->update();
+    ui->ButtonMagenta->setStyleSheet("QPushButton {background-color: rgb(255,0,255); color: rgb(255,0,255); border: 1px solid rgb(128, 128, 128); padding-top: 1px; padding-bottom: 1px;}");
+    ui->ButtonMagenta->setFlat(true);
+    ui->ButtonMagenta->setMinimumWidth(20);
+    ui->ButtonMagenta->update();

-        pal = ui->ButtonYellow->palette();
-        pal.setColor(QPalette::Button, QColor(255, 255, 0));
-        ui->ButtonYellow->setAutoFillBackground(true);
-        ui->ButtonYellow->setPalette(pal);
-        ui->ButtonYellow->setFlat(true);
-        ui->ButtonYellow->update();
-
-        pal = ui->ButtonGreen->palette();
-        pal.setColor(QPalette::Button, QColor(0, 255, 0));
-        ui->ButtonGreen->setAutoFillBackground(true);
-        ui->ButtonGreen->setPalette(pal);
-        ui->ButtonGreen->setFlat(true);
-        ui->ButtonGreen->update();
-
-        pal = ui->ButtonCyan->palette();
-        pal.setColor(QPalette::Button, QColor(0, 255, 255));
-        ui->ButtonCyan->setAutoFillBackground(true);
-        ui->ButtonCyan->setPalette(pal);
-        ui->ButtonCyan->setFlat(true);
-        ui->ButtonCyan->update();
-
-        pal = ui->ButtonBlue->palette();
-        pal.setColor(QPalette::Button, QColor(0, 0, 255));
-        ui->ButtonBlue->setAutoFillBackground(true);
-        ui->ButtonBlue->setPalette(pal);
-        ui->ButtonBlue->setFlat(true);
-        ui->ButtonBlue->update();
-
-        pal = ui->ButtonMagenta->palette();
-        pal.setColor(QPalette::Button, QColor(255, 0, 255));
-        ui->ButtonMagenta->setAutoFillBackground(true);
-        ui->ButtonMagenta->setPalette(pal);
-        ui->ButtonMagenta->setFlat(true);
-        ui->ButtonMagenta->update();
-    }
+    ui->ButtonWhite->setStyleSheet("QPushButton {background-color: rgb(255,255,255); color: rgb(255,255,255); border: 1px solid rgb(128, 128, 128); padding-top: 1px; padding-bottom: 1px;}");
+    ui->ButtonWhite->setFlat(true);
+    ui->ButtonWhite->setMinimumWidth(20);
+    ui->ButtonWhite->update();

    /*-----------------------------------------------------*\
    | Fill in the mode selection box                        |
@@ -245,6 +210,12 @@ void Ui::OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int /*index*/)
                            ui->DeviceViewBox->clearSelection();
                            ui->DeviceViewBox->blockSignals(false);
                        }
+                        ui->ApplyColorsButton->setText("Apply Colors To This Device");
+                    }
+                    else
+                    {
+                        //If the index has been changed and there is more than one zone change the "Apply" text
+                        ui->ApplyColorsButton->setText("Apply Colors To The Selection");
                    }
                    selected_zone = selected_zone - 1;
                }
@@ -325,6 +296,12 @@ void Ui::OpenRGBDevicePage::on_LEDBox_currentIndexChanged(int index)
                                    ui->DeviceViewBox->clearSelection();
                                    ui->DeviceViewBox->blockSignals(false);
                                }
+                                ui->ApplyColorsButton->setText("Apply Colors To This Device");
+                            }
+                            else
+                            {
+                                //If the index has been changed and there is more than one zone change the "Apply" text
+                                ui->ApplyColorsButton->setText("Apply Colors To The Selection");
                            }
                            index = index - 1;
                        }
@@ -397,17 +374,17 @@ void Ui::OpenRGBDevicePage::on_LEDBox_currentIndexChanged(int index)

        case MODE_COLORS_MODE_SPECIFIC:
            {
-            /*-----------------------------------------------------*\
-            | Update color picker with color of selected mode       |
-            \*-----------------------------------------------------*/
-            RGBColor color = device->modes[selected_mode].colors[index];
-            UpdatingColor = true;
-            ui->RedSpinBox->setValue(RGBGetRValue(color));
-            ui->GreenSpinBox->setValue(RGBGetGValue(color));
-            ui->BlueSpinBox->setValue(RGBGetBValue(color));
-            UpdatingColor = false;
-            updateHSV();
-            updateWheel();
+                /*-----------------------------------------------------*\
+                | Update color picker with color of selected mode       |
+                \*-----------------------------------------------------*/
+                RGBColor color = device->modes[selected_mode].colors[index];
+                UpdatingColor = true;
+                ui->RedSpinBox->setValue(RGBGetRValue(color));
+                ui->GreenSpinBox->setValue(RGBGetGValue(color));
+                ui->BlueSpinBox->setValue(RGBGetBValue(color));
+                UpdatingColor = false;
+                updateHSV();
+                updateWheel();
            }
            break;
    }
@@ -952,6 +929,11 @@ void Ui::OpenRGBDevicePage::SetCustomMode(unsigned char red, unsigned char green
    UpdateMode();
 }

+void Ui::OpenRGBDevicePage::on_ButtonBlack_clicked()
+{
+    SetDevice(0, 0, 0);
+}
+
 void Ui::OpenRGBDevicePage::on_ButtonRed_clicked()
 {
    SetDevice(255, 0, 0);
@@ -982,6 +964,11 @@ void Ui::OpenRGBDevicePage::on_ButtonMagenta_clicked()
    SetDevice(255, 0, 255);
 }

+void Ui::OpenRGBDevicePage::on_ButtonWhite_clicked()
+{
+    SetDevice(255, 255, 255);
+}
+
 void Ui::OpenRGBDevicePage::on_ColorWheelBox_colorChanged(const QColor color)
 {
    if(UpdatingColor)
@@ -45,12 +45,15 @@ private slots:
    void on_ValSpinBox_valueChanged(int arg1);
    void on_DeviceViewBox_selectionChanged(QVector<int>);

+    void on_ButtonBlack_clicked();
    void on_ButtonRed_clicked();
    void on_ButtonYellow_clicked();
    void on_ButtonGreen_clicked();
    void on_ButtonCyan_clicked();
    void on_ButtonBlue_clicked();
    void on_ButtonMagenta_clicked();
+    void on_ButtonWhite_clicked();
+
    void on_SetAllButton_clicked();
    void on_RandomCheck_clicked();
    void on_PerLEDCheck_clicked();
@@ -6,7 +6,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>875</width>
+    <width>800</width>
    <height>374</height>
   </rect>
  </property>
@@ -14,58 +14,10 @@
   <string>Frame</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <item row="12" column="8">
-    <widget class="QPushButton" name="ButtonCyan">
+   <item row="2" column="4">
+    <widget class="QPushButton" name="SelectAllLEDsButton">
     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1" colspan="4">
-    <widget class="QComboBox" name="ModeBox"/>
-   </item>
-   <item row="7" column="5">
-    <widget class="QLabel" name="RedLabel">
-     <property name="text">
-      <string>R:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0">
-    <widget class="QLabel" name="ColorLabel">
-     <property name="text">
-      <string>Colors:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="1" colspan="4">
-    <widget class="QComboBox" name="DirectionBox"/>
-   </item>
-   <item row="12" column="9">
-    <widget class="QPushButton" name="ButtonBlue">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="6" colspan="2">
-    <widget class="QSpinBox" name="RedSpinBox">
-     <property name="maximum">
-      <number>255</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1" colspan="4">
-    <widget class="QPushButton" name="ApplyColorsButton">
-     <property name="text">
-      <string>Apply Colors</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="6">
-    <widget class="QPushButton" name="ButtonYellow">
-     <property name="text">
-      <string/>
+      <string>Select All</string>
     </property>
    </widget>
   </item>
@@ -85,49 +37,141 @@
     </property>
    </widget>
   </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="ModeLabel">
+   <item row="1" column="4">
+    <widget class="QPushButton" name="ResizeButton">
     <property name="text">
-      <string>Mode:</string>
+      <string>Resize</string>
     </property>
    </widget>
   </item>
-   <item row="9" column="1" colspan="4">
-    <widget class="QSlider" name="SpeedSlider">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="8">
-    <widget class="QLabel" name="SatLabel">
+   <item row="6" column="0">
+    <widget class="QLabel" name="SpeedLabel">
     <property name="text">
-      <string>S:</string>
+      <string>Speed:</string>
     </property>
    </widget>
   </item>
-   <item row="5" column="1" colspan="4">
-    <widget class="QPushButton" name="SetAllButton">
+   <item row="5" column="1">
+    <widget class="QRadioButton" name="PerLEDCheck">
     <property name="text">
-      <string>Set All Devices</string>
+      <string>Per-LED</string>
     </property>
    </widget>
   </item>
-   <item row="3" column="0">
+   <item row="5" column="0">
+    <widget class="QLabel" name="ColorLabel">
+     <property name="text">
+      <string>Colors:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
    <widget class="QLabel" name="LEDLabel">
     <property name="text">
      <string>LED:</string>
     </property>
    </widget>
   </item>
-   <item row="12" column="5">
-    <widget class="QPushButton" name="ButtonRed">
+   <item row="4" column="0">
+    <widget class="QLabel" name="ModeLabel">
     <property name="text">
-      <string/>
+      <string>Mode:</string>
     </property>
    </widget>
   </item>
-   <item row="8" column="6" colspan="2">
+   <item row="2" column="1" colspan="3">
+    <widget class="QComboBox" name="LEDBox"/>
+   </item>
+   <item row="3" column="1" colspan="3">
+    <widget class="QPushButton" name="ApplyColorsButton">
+     <property name="text">
+      <string>Apply Colors To Selection</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="4">
+    <widget class="QRadioButton" name="RandomCheck">
+     <property name="text">
+      <string>Random</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1" colspan="4">
+    <widget class="QSlider" name="SpeedSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="4">
+    <widget class="QPushButton" name="SetAllButton">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Sets all devices to&lt;br/&gt;&lt;b&gt;Static&lt;/b&gt; mode and&lt;br/&gt;applies the selected color.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Apply All Devices</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="ZoneLabel">
+     <property name="text">
+      <string>Zone:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="3">
+    <widget class="QComboBox" name="ZoneBox"/>
+   </item>
+   <item row="4" column="1" colspan="4">
+    <widget class="QComboBox" name="ModeBox"/>
+   </item>
+   <item row="9" column="1" colspan="4">
+    <widget class="QComboBox" name="DirectionBox"/>
+   </item>
+   <item row="9" column="0">
+    <widget class="QLabel" name="DirectionLabel">
+     <property name="text">
+      <string>Dir:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="2" colspan="2">
+    <widget class="QRadioButton" name="ModeSpecificCheck">
+     <property name="text">
+      <string>Mode-Specific</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="5">
+    <widget class="QLabel" name="BlueLabel">
+     <property name="text">
+      <string>B:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="5">
+    <widget class="QLabel" name="GreenLabel">
+     <property name="text">
+      <string>G:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="5">
+    <widget class="QLabel" name="RedLabel">
+     <property name="text">
+      <string>R:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="6" colspan="2">
+    <widget class="QSpinBox" name="RedSpinBox">
+     <property name="maximum">
+      <number>255</number>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="6" colspan="2">
    <widget class="QSpinBox" name="GreenSpinBox">
     <property name="maximum">
      <number>255</number>
@@ -148,80 +192,31 @@
     </property>
    </widget>
   </item>
-   <item row="12" column="0">
-    <widget class="QLabel" name="DirectionLabel">
+   <item row="6" column="8">
+    <widget class="QLabel" name="SatLabel">
     <property name="text">
-      <string>Dir:</string>
+      <string>S:</string>
     </property>
    </widget>
   </item>
-   <item row="8" column="2" colspan="2">
-    <widget class="QRadioButton" name="ModeSpecificCheck">
-     <property name="text">
-      <string>Mode-Specific</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="10">
-    <widget class="QPushButton" name="ButtonMagenta">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="9" colspan="2">
-    <widget class="QSpinBox" name="SatSpinBox">
-     <property name="maximum">
-      <number>255</number>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="8">
+   <item row="5" column="8">
    <widget class="QLabel" name="HueLabel">
     <property name="text">
      <string>H:</string>
     </property>
    </widget>
   </item>
-   <item row="8" column="5">
-    <widget class="QLabel" name="GreenLabel">
-     <property name="text">
-      <string>G:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="9" colspan="2">
+   <item row="5" column="9" colspan="2">
    <widget class="QSpinBox" name="HueSpinBox">
     <property name="maximum">
      <number>359</number>
     </property>
    </widget>
   </item>
-   <item row="8" column="4">
-    <widget class="QRadioButton" name="RandomCheck">
-     <property name="text">
-      <string>Random</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="0">
-    <widget class="QLabel" name="SpeedLabel">
-     <property name="text">
-      <string>Speed:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1">
-    <widget class="QRadioButton" name="PerLEDCheck">
-     <property name="text">
-      <string>Per-LED</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="7">
-    <widget class="QPushButton" name="ButtonGreen">
-     <property name="text">
-      <string/>
+   <item row="6" column="9" colspan="2">
+    <widget class="QSpinBox" name="SatSpinBox">
+     <property name="maximum">
+      <number>255</number>
     </property>
    </widget>
   </item>
@@ -232,41 +227,67 @@
     </property>
    </widget>
   </item>
-   <item row="9" column="5">
-    <widget class="QLabel" name="BlueLabel">
-     <property name="text">
-      <string>B:</string>
-     </property>
-    </widget>
+   <item row="4" column="5" colspan="6">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="ButtonBlack">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ButtonRed">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ButtonYellow">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ButtonGreen">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ButtonCyan">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ButtonBlue">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ButtonMagenta">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ButtonWhite">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
   </item>
-   <item row="3" column="1" colspan="3">
-    <widget class="QComboBox" name="LEDBox"/>
-   </item>
-   <item row="3" column="4">
-    <widget class="QPushButton" name="SelectAllLEDsButton">
-     <property name="text">
-      <string>Select All</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="4">
-    <widget class="QPushButton" name="ResizeButton">
-     <property name="text">
-      <string>Resize</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="ZoneLabel">
-     <property name="text">
-      <string>Zone:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1" colspan="3">
-    <widget class="QComboBox" name="ZoneBox"/>
-   </item>
-   <item row="2" column="5" rowspan="4" colspan="6">
+   <item row="1" column="5" rowspan="3" colspan="6">
    <widget class="ColorWheel" name="ColorWheelBox" native="true">
     <property name="sizePolicy">
      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -304,18 +325,6 @@
  <tabstop>RandomCheck</tabstop>
  <tabstop>SpeedSlider</tabstop>
  <tabstop>DirectionBox</tabstop>
-  <tabstop>RedSpinBox</tabstop>
-  <tabstop>GreenSpinBox</tabstop>
-  <tabstop>BlueSpinBox</tabstop>
-  <tabstop>HueSpinBox</tabstop>
-  <tabstop>SatSpinBox</tabstop>
-  <tabstop>ValSpinBox</tabstop>
-  <tabstop>ButtonRed</tabstop>
-  <tabstop>ButtonYellow</tabstop>
-  <tabstop>ButtonGreen</tabstop>
-  <tabstop>ButtonCyan</tabstop>
-  <tabstop>ButtonBlue</tabstop>
-  <tabstop>ButtonMagenta</tabstop>
 </tabstops>
 <resources/>
 <connections/>
@@ -65,6 +65,9 @@ static QString GetIconString(device_type type, bool dark)
    case DEVICE_TYPE_SPEAKER:
        filename = "speaker";
        break;
+    case DEVICE_TYPE_VIRTUAL:
+        filename = "virtual";
+        break;
    default:
        filename = "unknown";
        break;
@@ -36,5 +36,7 @@
        <file>plugin_dark.png</file>
        <file>speaker.png</file>
        <file>speaker_dark.png</file>
+        <file>virtual.png</file>
+        <file>virtual_dark.png</file>
    </qresource>
 </RCC>
Author	SHA1	Message	Date
Chris	dbdf5eab0b	Changed "Set All Devices" * Changed `Apply Colors` to contextual * Changed `Set All Devices` to `Apply To All Devices` * Added a tooltip to `Apply to All` * Added Black and White quick colour swatches and left them "not flat" to ensure visibility in Light and Dark mode. Commit amended to fix display issues on Windows and to group buttons in layout by Adam Honse <[email protected]>	2021-04-23 08:16:44 -05:00
Adam Honse	be1fbc27ca	Add device type string for virtual device	2021-04-22 16:24:48 -05:00
TheRogueZeta	95f40039eb	Correct errant hyphen with underscore and update CI names	2021-04-22 19:44:17 +00:00
TheRogueZeta	cd8e455b79	Update CI config to rename artifacts.zip with build info	2021-04-22 00:08:17 -05:00
morg	57db50f642	Fix VisualMap plugin URL in README	2021-04-22 00:11:22 +00:00
TheRogueZeta	9789ac0fde	Remove 7z compression on Windows builds	2021-04-21 16:05:48 -07:00
morg	c45f864977	Add virtual device type	2021-04-21 21:37:50 +02:00
Gareth Hancock	28af2da1c2	Added support for EVGA 2080Ti FTW3 Ultra	2021-04-21 15:44:44 +00:00
Cheerpipe	b32ef76121	Creative Sound BlasterX G6 support Commits squashed and amended for code style by Adam Honse <[email protected]>	2021-04-21 00:03:46 -05:00
edbgon	a300e80f47	AMD Reference 6800 cards custom mode set to static	2021-04-21 04:15:32 +00:00
Boothin	e098bb5c41	Added Rival 310 and compatible special editions to detector	2021-04-20 22:25:17 -04:00
Adam Honse	f06b0ee952	Use NULL (shared) libusb context	2021-04-20 20:30:58 -05:00
Luca Lovisa	0da484bffc	Add support for the Lian Li Uni Hub Commits squashed and amended for code style by Adam Honse <[email protected]>	2021-04-20 20:30:57 -05:00
Adam Honse	bea2ae2fdc	Add OpenRGB Visual Map plugin link to README	2021-04-20 12:07:19 -05:00
morg	2a6b457324	Add UnregisterRGBController method to ResourceManager Commit amended by Adam Honse <[email protected]>	2021-04-20 09:21:24 -05:00
TheRogueZeta	50adf9ab51	Correct SetCustomMode() to use virtual mode.	2021-04-18 21:42:54 +00:00