From 9b8d2c38d3148b982207caaf97eb395eafe045a0 Mon Sep 17 00:00:00 2001
From: Chris <galdarian@gmail.com>
Date: Tue, 20 Apr 2021 23:31:29 +1000
Subject: [PATCH] Changed "Set All Devices"

* 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 <calcprogrammer1@gmail.com>
---
 qt/OpenRGBDevicePage.cpp | 131 ++++++---------
 qt/OpenRGBDevicePage.h   |   3 +
 qt/OpenRGBDevicePage.ui  | 353 +++++++++++++++++++++------------------
 3 files changed, 244 insertions(+), 243 deletions(-)

diff --git a/qt/OpenRGBDevicePage.cpp b/qt/OpenRGBDevicePage.cpp
index fa2e5de4..e303dd5b 100644
--- a/qt/OpenRGBDevicePage.cpp
+++ b/qt/OpenRGBDevicePage.cpp
@@ -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                        |
@@ -397,17 +362,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 +917,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 +952,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)
diff --git a/qt/OpenRGBDevicePage.h b/qt/OpenRGBDevicePage.h
index cdb351e2..bbc6d50e 100644
--- a/qt/OpenRGBDevicePage.h
+++ b/qt/OpenRGBDevicePage.h
@@ -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();
diff --git a/qt/OpenRGBDevicePage.ui b/qt/OpenRGBDevicePage.ui
index 5acbed14..93ae55d3 100644
--- a/qt/OpenRGBDevicePage.ui
+++ b/qt/OpenRGBDevicePage.ui
@@ -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">
@@ -310,12 +331,14 @@
   <tabstop>HueSpinBox</tabstop>
   <tabstop>SatSpinBox</tabstop>
   <tabstop>ValSpinBox</tabstop>
+  <tabstop>ButtonBlack</tabstop>
   <tabstop>ButtonRed</tabstop>
   <tabstop>ButtonYellow</tabstop>
   <tabstop>ButtonGreen</tabstop>
   <tabstop>ButtonCyan</tabstop>
   <tabstop>ButtonBlue</tabstop>
   <tabstop>ButtonMagenta</tabstop>
+  <tabstop>ButtonWhite</tabstop>
  </tabstops>
  <resources/>
  <connections/>