From c4aebd92713ae48c51ceb4ffe73a08f876efe2da Mon Sep 17 00:00:00 2001
From: Paddle <PaddleStroke@users.noreply.github.com>
Date: Mon, 3 Apr 2023 18:56:35 +0200
Subject: [PATCH] pref: color: change according to adrianinsaval mockup

---
 src/Gui/DlgSettingsViewColor.ui | 388 ++++++++++++++++----------------
 1 file changed, 195 insertions(+), 193 deletions(-)

diff --git a/src/Gui/DlgSettingsViewColor.ui b/src/Gui/DlgSettingsViewColor.ui
index 6510cad522..5e493a6a65 100644
--- a/src/Gui/DlgSettingsViewColor.ui
+++ b/src/Gui/DlgSettingsViewColor.ui
@@ -190,84 +190,83 @@
       <property name="spacing">
        <number>6</number>
       </property>
+      <item row="2" column="1">
+       <spacer name="spacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="0" column="0">
-       <layout class="QGridLayout" name="_4">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <item row="0" column="0">
-         <widget class="Gui::PrefRadioButton" name="radioButtonSimple">
-          <property name="toolTip">
-           <string>Background will have selected color</string>
-          </property>
-          <property name="text">
-           <string>Simple color</string>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>Simple</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
-          </property>
-         </widget>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="Gui::PrefRadioButton" name="radioButtonSimple">
+            <property name="toolTip">
+             <string>Background will have selected color</string>
+            </property>
+            <property name="text">
+             <string>Simple color</string>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>Simple</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>View</cstring>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="Gui::PrefRadioButton" name="radioButtonGradient">
+            <property name="toolTip">
+             <string>Background will have selected color gradient</string>
+            </property>
+            <property name="text">
+             <string>Linear gradient</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>Gradient</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>View</cstring>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="Gui::PrefRadioButton" name="rbRadialGradient">
+            <property name="toolTip">
+             <string>Background will have selected color gradient</string>
+            </property>
+            <property name="text">
+             <string>Radial gradient</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>RadialGradient</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>View</cstring>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </item>
-        <item row="0" column="1">
-         <widget class="Gui::PrefRadioButton" name="radioButtonGradient">
-          <property name="toolTip">
-           <string>Background will have selected color gradient</string>
-          </property>
-          <property name="text">
-           <string>Linear gradient</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>Gradient</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <widget class="Gui::PrefRadioButton" name="rbRadialGradient">
-          <property name="toolTip">
-           <string>Background will have selected color gradient</string>
-          </property>
-          <property name="text">
-           <string>Radial gradient</string>
-          </property>
-          <property name="checked">
-           <bool>false</bool>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>RadialGradient</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
+        <item>
          <widget class="Gui::PrefColorButton" name="SelectionColor_Background">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
           <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -278,7 +277,7 @@
           <property name="text">
            <string/>
           </property>
-          <property name="color">
+          <property name="color" stdset="0">
            <color>
             <red>20</red>
             <green>20</green>
@@ -293,132 +292,138 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="color1Label">
-          <property name="text">
-           <string>Top:</string>
+        <item>
+         <layout class="QGridLayout" name="_4">
+          <property name="leftMargin">
+           <number>0</number>
           </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="Gui::PrefColorButton" name="backgroundColorFrom">
-          <property name="text">
-           <string/>
+          <property name="topMargin">
+           <number>0</number>
           </property>
-          <property name="color">
-           <color>
-            <red>51</red>
-            <green>51</green>
-            <blue>101</blue>
-           </color>
+          <property name="rightMargin">
+           <number>0</number>
           </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>BackgroundColor2</cstring>
+          <property name="bottomMargin">
+           <number>0</number>
           </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
+          <property name="spacing">
+           <number>6</number>
           </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
+          <item row="1" column="0">
+           <widget class="QToolButton" name="SwitchGradientColors">
+            <property name="toolTip">
+             <string>Switches the colors of the gradient</string>
+            </property>
+            <property name="text">
+             <string>Switch</string>
+            </property>
+            <property name="icon">
+             <iconset>
+              <normaloff>:/icons/button_sort.svg</normaloff>:/icons/button_sort.svg</iconset>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLabel" name="color1Label">
+            <property name="text">
+             <string>Top:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="Gui::PrefColorButton" name="backgroundColorFrom">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="color" stdset="0">
+             <color>
+              <red>51</red>
+              <green>51</green>
+              <blue>101</blue>
+             </color>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>BackgroundColor2</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>View</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
            <widget class="QLabel" name="color2Label">
             <property name="text">
              <string>Middle:</string>
             </property>
            </widget>
-        </item>
-        <item row="3" column="1">
-         <widget class="Gui::PrefColorButton" name="backgroundColorMid">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="color">
-           <color>
-            <red>111</red>
-            <green>111</green>
-            <blue>147</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>BackgroundColor4</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="color3Label">
-          <property name="text">
-           <string>Bottom:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1">
-         <widget class="Gui::PrefColorButton" name="backgroundColorTo">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="color">
-           <color>
-            <red>151</red>
-            <green>151</green>
-            <blue>170</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>BackgroundColor3</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="2">
-         <widget class="QToolButton" name="SwitchGradientColors">
-          <property name="toolTip">
-           <string>Switches the colors of the gradient</string>
-          </property>
-          <property name="text">
-           <string>Switch</string>
-          </property>
-          <property name="icon">
-           <iconset resource="Icons/resource.qrc">
-           <normaloff>:/icons/button_sort.svg</normaloff>:/icons/button_sort.svg</iconset>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="2">
-         <widget class="Gui::PrefCheckBox" name="checkMidColor">
-          <property name="toolTip">
-           <string>Color gradient will get selected color as middle color</string>
-          </property>
-          <property name="text">
-           <string>Middle color</string>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>UseBackgroundColorMid</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
-          </property>
-         </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="Gui::PrefColorButton" name="backgroundColorMid">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="color" stdset="0">
+             <color>
+              <red>111</red>
+              <green>111</green>
+              <blue>147</blue>
+             </color>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>BackgroundColor4</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>View</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="3">
+           <widget class="Gui::PrefCheckBox" name="checkMidColor">
+            <property name="toolTip">
+             <string>Color gradient will get selected color as middle color</string>
+            </property>
+            <property name="text">
+             <string>Middle color</string>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>UseBackgroundColorMid</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>View</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="color3Label">
+            <property name="text">
+             <string>Bottom:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="Gui::PrefColorButton" name="backgroundColorTo">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="color" stdset="0">
+             <color>
+              <red>151</red>
+              <green>151</green>
+              <blue>170</blue>
+             </color>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>BackgroundColor3</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>View</cstring>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </item>
        </layout>
       </item>
-      <item row="0" column="1">
-       <spacer name="spacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
@@ -487,7 +492,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>
@@ -520,7 +525,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>
@@ -595,11 +600,8 @@
   <tabstop>HighlightColor</tabstop>
   <tabstop>checkBoxSelection</tabstop>
   <tabstop>SelectionColor</tabstop>
-  <tabstop>radioButtonSimple</tabstop>
   <tabstop>SelectionColor_Background</tabstop>
-  <tabstop>radioButtonGradient</tabstop>
   <tabstop>backgroundColorFrom</tabstop>
-  <tabstop>rbRadialGradient</tabstop>
   <tabstop>backgroundColorTo</tabstop>
   <tabstop>checkMidColor</tabstop>
   <tabstop>backgroundColorMid</tabstop>