From 4de0e6fb198a60bd09400d64994e7aa8308b1e23 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 10 Jul 2022 02:20:58 +0200
Subject: [PATCH] Revert "[Gui] preferences: add button to switch gradient
 colors"

This reverts commit 25ffc89063de999ab71be5282e92cf553c9e7bd6.
---
 src/Gui/DlgSettingsViewColor.cpp | 12 ----
 src/Gui/DlgSettingsViewColor.h   |  3 -
 src/Gui/DlgSettingsViewColor.ui  | 97 ++++++++++++++++++--------------
 3 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/src/Gui/DlgSettingsViewColor.cpp b/src/Gui/DlgSettingsViewColor.cpp
index 0ecc2c8a13..748559953d 100644
--- a/src/Gui/DlgSettingsViewColor.cpp
+++ b/src/Gui/DlgSettingsViewColor.cpp
@@ -22,10 +22,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#include <QPushButton>
-#endif
-
 #include "DlgSettingsViewColor.h"
 #include "ui_DlgSettingsViewColor.h"
 
@@ -45,7 +41,6 @@ DlgSettingsViewColor::DlgSettingsViewColor(QWidget* parent)
     ui->setupUi(this);
     ui->HighlightColor->setEnabled(ui->checkBoxPreselection->isChecked());
     ui->SelectionColor->setEnabled(ui->checkBoxSelection->isChecked());
-    connect(ui->SwitchGradientColors, &QPushButton::pressed, this, &DlgSettingsViewColor::onSwitchGradientColorsPressed);
 }
 
 /**
@@ -103,12 +98,5 @@ void DlgSettingsViewColor::changeEvent(QEvent *e)
     }
 }
 
-void DlgSettingsViewColor::onSwitchGradientColorsPressed()
-{
-    QColor tempColor = ui->backgroundColorFrom->color();
-    ui->backgroundColorFrom->setColor(ui->backgroundColorTo->color());
-    ui->backgroundColorTo->setColor(tempColor);
-}
-
 #include "moc_DlgSettingsViewColor.cpp"
 
diff --git a/src/Gui/DlgSettingsViewColor.h b/src/Gui/DlgSettingsViewColor.h
index 9f0b8c12d0..f3b52ec8d3 100644
--- a/src/Gui/DlgSettingsViewColor.h
+++ b/src/Gui/DlgSettingsViewColor.h
@@ -50,9 +50,6 @@ public:
 protected:
   void changeEvent(QEvent *e);
 
-protected Q_SLOTS:
-  void onSwitchGradientColorsPressed();
-
 private:
   std::unique_ptr<Ui_DlgSettingsViewColor> ui;
 };
diff --git a/src/Gui/DlgSettingsViewColor.ui b/src/Gui/DlgSettingsViewColor.ui
index 75b851b83b..a6e28a6e25 100644
--- a/src/Gui/DlgSettingsViewColor.ui
+++ b/src/Gui/DlgSettingsViewColor.ui
@@ -6,15 +6,30 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>405</width>
-    <height>400</height>
+    <width>601</width>
+    <height>598</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Colors</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="groupBoxSelection">
      <property name="title">
       <string>Selection</string>
@@ -91,7 +106,7 @@
           <property name="text">
            <string/>
           </property>
-          <property name="color">
+          <property name="color" stdset="0">
            <color>
             <red>225</red>
             <green>225</green>
@@ -125,7 +140,7 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
+       <item row="1" column="1">
          <widget class="Gui::PrefColorButton" name="SelectionColor">
           <property name="enabled">
            <bool>false</bool>
@@ -133,7 +148,7 @@
           <property name="text">
            <string/>
           </property>
-          <property name="color">
+          <property name="color" stdset="0">
            <color>
             <red>28</red>
             <green>173</green>
@@ -148,9 +163,9 @@
           </property>
          </widget>
         </item>
-       </layout>
+        </layout>
       </item>
-      <item row="0" column="1">
+     <item row="0" column="1">
        <spacer name="spacer_4">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -163,10 +178,10 @@
         </property>
        </spacer>
       </item>
-     </layout>
+      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="groupBoxColor">
      <property name="toolTip">
       <string>Background color for the model view</string>
@@ -229,7 +244,7 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="3">
+       <item row="0" column="1">
          <widget class="Gui::PrefColorButton" name="SelectionColor_Background">
           <property name="enabled">
            <bool>false</bool>
@@ -246,7 +261,7 @@
           <property name="text">
            <string/>
           </property>
-          <property name="color">
+          <property name="color" stdset="0">
            <color>
             <red>20</red>
             <green>20</green>
@@ -280,7 +295,7 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="3">
+        <item row="1" column="1">
          <widget class="Gui::PrefColorButton" name="backgroundColorFrom">
           <property name="toolTip">
            <string>Top color</string>
@@ -288,7 +303,7 @@
           <property name="text">
            <string/>
           </property>
-          <property name="color">
+          <property name="color" stdset="0">
            <color>
             <red>51</red>
             <green>51</green>
@@ -303,30 +318,23 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="4">
-         <widget class="QPushButton" name="SwitchGradientColors">
-          <property name="toolTip">
-           <string>Switches the colors of the gradient</string>
-          </property>
-          <property name="text">
-           <string>Switch</string>
-          </property>
-         </widget>
-        </item>
         <item row="2" column="0">
-         <spacer name="horizontalSpacer">
+         <spacer name="spacer_2">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Minimum</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>40</width>
+            <width>171</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
-        <item row="2" column="3">
+        <item row="2" column="1">
          <widget class="Gui::PrefColorButton" name="backgroundColorTo">
           <property name="toolTip">
            <string>Bottom color</string>
@@ -334,7 +342,7 @@
           <property name="text">
            <string/>
           </property>
-          <property name="color">
+          <property name="color" stdset="0">
            <color>
             <red>151</red>
             <green>151</green>
@@ -349,7 +357,7 @@
           </property>
          </widget>
         </item>
-        <item row="6" column="0">
+        <item row="3" column="0">
          <widget class="Gui::PrefCheckBox" name="checkMidColor">
           <property name="toolTip">
            <string>Color gradient will get selected color as middle color</string>
@@ -365,7 +373,7 @@
           </property>
          </widget>
         </item>
-        <item row="6" column="3">
+        <item row="3" column="1">
          <widget class="Gui::PrefColorButton" name="backgroundColorMid">
           <property name="enabled">
            <bool>false</bool>
@@ -376,7 +384,7 @@
           <property name="text">
            <string/>
           </property>
-          <property name="color">
+          <property name="color" stdset="0">
            <color>
             <red>111</red>
             <green>111</green>
@@ -391,9 +399,9 @@
           </property>
          </widget>
         </item>
-       </layout>
+        </layout>
       </item>
-      <item row="0" column="1">
+     <item row="0" column="1">
        <spacer name="spacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -406,10 +414,10 @@
         </property>
        </spacer>
       </item>
-     </layout>
+      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QGroupBox" name="groupBoxTree">
      <property name="title">
       <string>Tree view</string>
@@ -474,7 +482,7 @@
           <property name="toolTip">
            <string>Background color for objects in tree view that are currently edited</string>
           </property>
-          <property name="color">
+          <property name="color" stdset="0">
            <color>
             <red>255</red>
             <green>255</green>
@@ -507,7 +515,7 @@
           <property name="toolTip">
            <string>Background color for active containers in tree view</string>
           </property>
-          <property name="color">
+          <property name="color" stdset="0">
            <color>
             <red>230</red>
             <green>230</green>
@@ -524,7 +532,7 @@
         </item>
        </layout>
       </item>
-      <item row="0" column="1">
+     <item row="0" column="1">
        <spacer name="spacer_5">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -537,10 +545,10 @@
         </property>
        </spacer>
       </item>
-     </layout>
+      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <spacer name="spacer_3">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -548,7 +556,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>20</height>
+       <height>40</height>
       </size>
      </property>
     </spacer>
@@ -576,6 +584,11 @@
    <extends>QCheckBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
+  <customwidget>
+   <class>Gui::PrefDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>Gui/PrefWidgets.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>checkBoxPreselection</tabstop>