From 354497c074389aebf7c20dc58ec26e15857381a4 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 9 Feb 2017 00:41:06 +0100
Subject: [PATCH 1/2] fresh view: smaller EQ knobs

---
 .../Deere/equalizer_rack_parameter_left.xml   |  8 ++---
 .../Deere/equalizer_rack_parameter_right.xml  |  8 ++---
 res/skins/Deere/knob_bg.svg                   | 36 ++++++++++++-------
 res/skins/Deere/knob_blue.svg                 | 32 ++++++++++-------
 res/skins/Deere/knob_red.svg                  | 26 ++++++++------
 res/skins/Deere/knob_yellow.svg               | 26 ++++++++------
 6 files changed, 82 insertions(+), 54 deletions(-)

diff --git a/res/skins/Deere/equalizer_rack_parameter_left.xml b/res/skins/Deere/equalizer_rack_parameter_left.xml
index 5cc2f31b543b..ddfe03d20be3 100644
--- a/res/skins/Deere/equalizer_rack_parameter_left.xml
+++ b/res/skins/Deere/equalizer_rack_parameter_left.xml
@@ -72,8 +72,8 @@
 
           <WidgetGroup>
             <ObjectName>EQKnobNoLabel</ObjectName>
-            <MinimumSize>40,34</MinimumSize>
-            <MaximumSize>40,41</MaximumSize>
+            <MinimumSize>40,30</MinimumSize>
+            <MaximumSize>40,35</MaximumSize>
             <Layout>vertical</Layout>
             <Children>
               <Template src="skin:knob.xml">
@@ -86,8 +86,8 @@
 
           <WidgetGroup>
             <ObjectName>EQKnobWithLabel</ObjectName>
-            <MinimumSize>40,42</MinimumSize>
-            <MaximumSize>40,45</MaximumSize>
+            <MinimumSize>40,36</MinimumSize>
+            <MaximumSize>40,39</MaximumSize>
             <Layout>vertical</Layout>
             <Children>
               <Template src="skin:knob.xml">
diff --git a/res/skins/Deere/equalizer_rack_parameter_right.xml b/res/skins/Deere/equalizer_rack_parameter_right.xml
index b5d455718018..142445b957e5 100644
--- a/res/skins/Deere/equalizer_rack_parameter_right.xml
+++ b/res/skins/Deere/equalizer_rack_parameter_right.xml
@@ -24,8 +24,8 @@
 
           <WidgetGroup>
             <ObjectName>EQKnobNoLabel</ObjectName>
-            <MinimumSize>40,34</MinimumSize>
-            <MaximumSize>40,41</MaximumSize>
+            <MinimumSize>40,30</MinimumSize>
+            <MaximumSize>40,35</MaximumSize>
             <Layout>vertical</Layout>
             <Children>
               <Template src="skin:knob.xml">
@@ -38,8 +38,8 @@
 
           <WidgetGroup>
             <ObjectName>EQKnobWithLabel</ObjectName>
-            <MinimumSize>40,42</MinimumSize>
-            <MaximumSize>40,45</MaximumSize>
+            <MinimumSize>40,36</MinimumSize>
+            <MaximumSize>40,39</MaximumSize>
             <Layout>vertical</Layout>
             <Children>
               <Template src="skin:knob.xml">
diff --git a/res/skins/Deere/knob_bg.svg b/res/skins/Deere/knob_bg.svg
index c1784f5dac4c..52d59944f186 100644
--- a/res/skins/Deere/knob_bg.svg
+++ b/res/skins/Deere/knob_bg.svg
@@ -10,9 +10,9 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    id="svg2"
-   height="34"
+   height="30"
    width="40"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="knob_bg.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -24,14 +24,14 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="746"
      id="namedview17"
      showgrid="false"
-     inkscape:zoom="13.882353"
-     inkscape:cx="-9.5352971"
-     inkscape:cy="14.406656"
+     inkscape:zoom="9.8163059"
+     inkscape:cx="7.0510767"
+     inkscape:cy="6.2465058"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <defs
@@ -94,15 +94,25 @@
     </rdf:RDF>
   </metadata>
   <ellipse
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+     style="opacity:0;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
      id="path4202"
      cx="-13.524048"
      cy="0.45841381"
      rx="2.5876327"
-     ry="2.4899862" />
+     ry="2.4899862"
+     sodipodi:cx="-13.524048"
+     sodipodi:cy="0.45841381"
+     sodipodi:rx="2.5876327"
+     sodipodi:ry="2.4899862"
+     transform="translate(0,-4)" />
   <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#d2d2d2;stroke-width:1.85;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4204"
-     d="m 9.12797,29.49882 a 15.375,15.375 0 0 1 0,-21.74353 15.375,15.375 0 0 1 21.74354,0 15.375,15.375 0 0 1 0,21.74353" />
+     sodipodi:type="arc"
+     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path3197"
+     sodipodi:cx="9.346693"
+     sodipodi:cy="27.504152"
+     sodipodi:rx="1.0696489"
+     sodipodi:ry="1.0696489"
+     d="m 10.416342,27.504152 a 1.0696489,1.0696489 0 1 1 -2.1392978,0 1.0696489,1.0696489 0 1 1 2.1392978,0 z"
+     transform="translate(10.653307,-1.6737343)" />
 </svg>
diff --git a/res/skins/Deere/knob_blue.svg b/res/skins/Deere/knob_blue.svg
index 71439a042137..82bd2173d2cf 100644
--- a/res/skins/Deere/knob_blue.svg
+++ b/res/skins/Deere/knob_blue.svg
@@ -10,9 +10,9 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    id="svg2"
-   height="34"
+   height="30"
    width="40"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="knob_blue.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -24,14 +24,14 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="746"
      id="namedview17"
      showgrid="false"
-     inkscape:zoom="9.8163059"
-     inkscape:cx="-25.211427"
-     inkscape:cy="13.493928"
+     inkscape:zoom="13.882353"
+     inkscape:cx="11.477539"
+     inkscape:cy="18.003266"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <defs
@@ -94,27 +94,33 @@
     </rdf:RDF>
   </metadata>
   <ellipse
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+     style="opacity:0;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
      id="path4202"
      cx="-13.524048"
      cy="0.45841381"
      rx="2.5876327"
-     ry="2.4899862" />
+     ry="2.4899862"
+     sodipodi:cx="-13.524048"
+     sodipodi:cy="0.45841381"
+     sodipodi:rx="2.5876327"
+     sodipodi:ry="2.4899862"
+     transform="translate(0,-4)" />
   <g
      id="g4718"
-     transform="translate(-24.11028,5.718031)">
+     transform="translate(-24.11028,3.647906)">
     <path
        inkscape:connector-curvature="0"
        id="path4256"
        d="M 40.26067,2.0182965 A 11.539,11.539 0 0 0 32.571217,12.883531 11.539,11.539 0 0 0 44.11028,24.422594 11.539,11.539 0 0 0 55.649342,12.883531 11.539,11.539 0 0 0 47.959889,2.0202496 l 0,10.8632814 c 0,2.091956 -1.757654,3.84961 -3.849609,3.84961 -2.091955,0 -3.84961,-1.757654 -3.84961,-3.84961 l 0,-10.8652345 z"
-       style="opacity:1;fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:#d2d2d2;fill-opacity:1;stroke:none" />
     <rect
-       style="opacity:1;fill:#489aff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#489aff;fill-opacity:1;stroke:none"
        id="rect4263"
        width="3"
        height="14"
        x="42.610279"
        y="0.38396862"
-       ry="1.5" />
+       ry="1.5"
+       rx="1.5" />
   </g>
 </svg>
diff --git a/res/skins/Deere/knob_red.svg b/res/skins/Deere/knob_red.svg
index a40cedddf56a..9b55e867a746 100644
--- a/res/skins/Deere/knob_red.svg
+++ b/res/skins/Deere/knob_red.svg
@@ -10,9 +10,9 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    id="svg2"
-   height="34"
+   height="30"
    width="40"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="knob_red.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -24,14 +24,14 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="746"
      id="namedview17"
      showgrid="false"
      inkscape:zoom="13.882353"
      inkscape:cx="13.87809"
      inkscape:cy="15.308707"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <defs
@@ -94,23 +94,29 @@
     </rdf:RDF>
   </metadata>
   <ellipse
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+     style="opacity:0;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
      id="path4202"
      cx="-13.524048"
      cy="0.45841381"
      rx="2.5876327"
-     ry="2.4899862" />
+     ry="2.4899862"
+     sodipodi:cx="-13.524048"
+     sodipodi:cy="0.45841381"
+     sodipodi:rx="2.5876327"
+     sodipodi:ry="2.4899862"
+     transform="translate(0,-4)" />
   <path
-     style="opacity:1;fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 16.150391,7.7363275 A 11.539,11.539 0 0 0 8.460938,18.601562 11.539,11.539 0 0 0 20.000001,30.140625 11.539,11.539 0 0 0 31.539063,18.601562 11.539,11.539 0 0 0 23.84961,7.7382806 l 0,10.8632814 c 0,2.091956 -1.757654,3.84961 -3.849609,3.84961 -2.091955,0 -3.84961,-1.757654 -3.84961,-3.84961 l 0,-10.8652345 z"
+     style="fill:#d2d2d2;fill-opacity:1;stroke:none"
+     d="M 16.150391,5.6662025 A 11.539,11.539 0 0 0 8.460938,16.531437 11.539,11.539 0 0 0 20.000001,28.0705 11.539,11.539 0 0 0 31.539063,16.531437 11.539,11.539 0 0 0 23.84961,5.6681556 l 0,10.8632814 c 0,2.091956 -1.757654,3.84961 -3.849609,3.84961 -2.091955,0 -3.84961,-1.757654 -3.84961,-3.84961 l 0,-10.8652345 z"
      id="path4256"
      inkscape:connector-curvature="0" />
   <rect
      ry="1.5"
-     y="6.1019998"
+     y="4.0318747"
      x="18.5"
      height="14"
      width="3"
      id="rect4263"
-     style="opacity:1;fill:#e80808;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:#e80808;fill-opacity:1;stroke:none"
+     rx="1.5" />
 </svg>
diff --git a/res/skins/Deere/knob_yellow.svg b/res/skins/Deere/knob_yellow.svg
index 83209e56a51e..8bc34ce363d4 100644
--- a/res/skins/Deere/knob_yellow.svg
+++ b/res/skins/Deere/knob_yellow.svg
@@ -10,9 +10,9 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    id="svg2"
-   height="34"
+   height="30"
    width="40"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="knob_yellow.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -24,14 +24,14 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="746"
      id="namedview17"
      showgrid="false"
      inkscape:zoom="13.882353"
      inkscape:cx="0.76792018"
      inkscape:cy="15.452775"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <defs
@@ -94,23 +94,29 @@
     </rdf:RDF>
   </metadata>
   <ellipse
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+     style="opacity:0;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
      id="path4202"
      cx="-13.524048"
      cy="0.45841381"
      rx="2.5876327"
-     ry="2.4899862" />
+     ry="2.4899862"
+     sodipodi:cx="-13.524048"
+     sodipodi:cy="0.45841381"
+     sodipodi:rx="2.5876327"
+     sodipodi:ry="2.4899862"
+     transform="translate(0,-4)" />
   <path
-     style="opacity:1;fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 16.15039,7.7363283 A 11.539,11.539 0 0 0 8.460938,18.601562 11.539,11.539 0 0 0 20.000001,30.140625 11.539,11.539 0 0 0 31.539063,18.601562 11.539,11.539 0 0 0 23.84961,7.7382814 l 0,10.8632806 c 0,2.091956 -1.757654,3.84961 -3.849609,3.84961 -2.091956,0 -3.849611,-1.757654 -3.849611,-3.84961 l 0,-10.8652337 z"
+     style="fill:#d2d2d2;fill-opacity:1;stroke:none"
+     d="M 16.15039,5.6662033 A 11.539,11.539 0 0 0 8.460938,16.531437 11.539,11.539 0 0 0 20.000001,28.0705 11.539,11.539 0 0 0 31.539063,16.531437 11.539,11.539 0 0 0 23.84961,5.6681564 l 0,10.8632806 c 0,2.091956 -1.757654,3.84961 -3.849609,3.84961 -2.091956,0 -3.849611,-1.757654 -3.849611,-3.84961 l 0,-10.8652337 z"
      id="path4256"
      inkscape:connector-curvature="0" />
   <rect
      ry="1.5"
-     y="6.1020002"
+     y="4.0318756"
      x="18.499998"
      height="14"
      width="3"
      id="rect4263"
-     style="opacity:1;fill:#d6e20e;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:#d6e20e;fill-opacity:1;stroke:none"
+     rx="1.5" />
 </svg>

From fd344c90727b0b7ebf338baa0276cc7f96f451f6 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 9 Feb 2017 00:43:23 +0100
Subject: [PATCH 2/2] fresh view: Pitch container rearranged

---
 res/skins/Deere/deck_inner_column.xml | 74 +++++++++++++--------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/res/skins/Deere/deck_inner_column.xml b/res/skins/Deere/deck_inner_column.xml
index 545b6a509db0..40bf8daf4faf 100644
--- a/res/skins/Deere/deck_inner_column.xml
+++ b/res/skins/Deere/deck_inner_column.xml
@@ -17,8 +17,8 @@
           <Template src="skin:left_2state_button.xml">
             <SetVariable name="TooltipId">sync_enabled</SetVariable>
             <SetVariable name="ObjectName">DeckSync</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
+            <SetVariable name="MinimumSize">-1,18</SetVariable>
+            <SetVariable name="MaximumSize">-1,18</SetVariable>
             <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
             <SetVariable name="state_0_text">Sync</SetVariable>
             <SetVariable name="state_0_pressed"></SetVariable>
@@ -38,36 +38,6 @@
         </Connection>
       </WidgetGroup>
 
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <SliderComposed>
-            <TooltipId>rate</TooltipId>
-            <Size>40f,-1me</Size>
-            <MaximumSize>40,200</MaximumSize>
-            <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-            <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,rate</ConfigKey>
-            </Connection>
-          </SliderComposed>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>RateDisplay<Variable name="i"/></ObjectName>
-        <Layout>vertical</Layout>
-        <Children>
-          <NumberRate>
-            <TooltipId>rate_display</TooltipId>
-            <Channel>
-                <Variable name="i"/>
-            </Channel>
-            <NumberOfDigits>2</NumberOfDigits>
-          </NumberRate>
-        </Children>
-      </WidgetGroup>
-
       <WidgetGroup>
         <ObjectName>RateTempButtons</ObjectName>
         <Layout>horizontal</Layout>
@@ -75,8 +45,8 @@
           <Template src="skin:left_right_1state_button.xml">
             <SetVariable name="ObjectName">TempRateDown</SetVariable>
             <SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+            <SetVariable name="MinimumSize">22,18</SetVariable>
+            <SetVariable name="MaximumSize">22,18</SetVariable>
             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
             <SetVariable name="state_0_text"></SetVariable>
             <SetVariable name="state_0_pressed">icon/ic_remove_48px.svg</SetVariable>
@@ -88,8 +58,8 @@
           <Template src="skin:left_right_1state_button.xml">
             <SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
             <SetVariable name="ObjectName">TempRateUp</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+            <SetVariable name="MinimumSize">22,18</SetVariable>
+            <SetVariable name="MaximumSize">22,18</SetVariable>
             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
             <SetVariable name="state_0_text"></SetVariable>
             <SetVariable name="state_0_pressed">icon/ic_add_48px.svg</SetVariable>
@@ -100,11 +70,41 @@
         </Children>
       </WidgetGroup>
 
+      <WidgetGroup>
+        <ObjectName>RateDisplay<Variable name="i"/></ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+          <NumberRate>
+            <TooltipId>rate_display</TooltipId>
+            <Channel>
+                <Variable name="i"/>
+            </Channel>
+            <NumberOfDigits>2</NumberOfDigits>
+          </NumberRate>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <SliderComposed>
+            <TooltipId>rate</TooltipId>
+            <Size>40f,-1me</Size>
+            <MaximumSize>40,200</MaximumSize>
+            <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,rate</ConfigKey>
+            </Connection>
+          </SliderComposed>
+        </Children>
+      </WidgetGroup>
+
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
           <Template src="skin:spacer_vx.xml">
-            <SetVariable name="height">8</SetVariable>
+            <SetVariable name="height">2</SetVariable>
           </Template>
 
           <Template src="skin:left_right_display_2state_button.xml">