From ff00263b78994827be8c2d19d5f5b17289643bcd Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 15 Aug 2021 12:17:45 +0100
Subject: [PATCH] Replace canvas.png with svg version

Signed-off-by: falkTX <falktx@falktx.com>
---
 resources/resources.qrc        |   2 +-
 resources/scalable/canvas.svg  | 159 ++++++++++++++++++++++
 resources/ui/carla_about.ui    |   5 +-
 resources/ui/carla_settings.ui | 233 +++++++++++++++++++++++++++++----
 4 files changed, 375 insertions(+), 24 deletions(-)
 create mode 100644 resources/scalable/canvas.svg

diff --git a/resources/resources.qrc b/resources/resources.qrc
index 643690341..74ace3905 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -38,13 +38,13 @@
         <file>48x48/carla.png</file>
         <file>48x48/carla-control.png</file>
 
-        <file>48x48/canvas.png</file>
         <file>48x48/jack.png</file>
         <file>48x48/juce.png</file>
 
         <file>scalable/carla.svg</file>
         <file>scalable/carla-control.svg</file>
 
+        <file>scalable/canvas.svg</file>
         <file>scalable/folder.svgz</file>
         <file>scalable/osc.svgz</file>
         <file>scalable/warning.svgz</file>
diff --git a/resources/scalable/canvas.svg b/resources/scalable/canvas.svg
new file mode 100644
index 000000000..9f50ba62e
--- /dev/null
+++ b/resources/scalable/canvas.svg
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   id="svg4555"
+   version="1.1"
+   viewBox="0 0 12.7 12.7"
+   height="48"
+   width="48">
+  <defs
+     id="defs4549">
+    <filter
+       height="1.306"
+       y="-0.153"
+       width="1.272"
+       x="-0.13600001"
+       id="filter6286-5"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur6288-9"
+         stdDeviation="4.08" />
+    </filter>
+    <filter
+       height="1.306"
+       y="-0.153"
+       width="1.272"
+       x="-0.13600001"
+       id="filter6286">
+      <feGaussianBlur
+         id="feGaussianBlur6288"
+         stdDeviation="4.08" />
+    </filter>
+    <linearGradient
+       y2="839.50507"
+       x2="331.42856"
+       y1="946.64789"
+       x1="375.71429"
+       gradientTransform="matrix(0.0654273,0,0,0.06542387,-20.794247,230.25304)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4069"
+       xlink:href="#linearGradient6187" />
+    <linearGradient
+       id="linearGradient6187">
+      <stop
+         id="stop6189"
+         offset="0"
+         style="stop-color:#1a1a1a;stop-opacity:1;" />
+      <stop
+         id="stop6191"
+         offset="1"
+         style="stop-color:#202020;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4552">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29998)"
+     id="layer1">
+    <rect
+       y="285.15799"
+       x="0.91826785"
+       height="6.9536171"
+       width="3.0283444"
+       id="rect26451"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4069);fill-opacity:1;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.29793224;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="289.34744"
+       x="8.7695503"
+       height="6.9536171"
+       width="3.0283444"
+       id="rect26451-2"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.29793224;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <g
+       transform="matrix(0.0654273,0,0,0.06542387,-20.794247,230.51474)"
+       id="g6296"
+       style="display:inline">
+      <path
+         style="fill:none;stroke:#3f5a7e;stroke-width:3.15240955;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 375.99999,860.36218 c 34.50466,0 43.13083,64 77.63549,64"
+         id="path6227" />
+      <path
+         style="display:inline;opacity:0.74703555;fill:none;stroke:#cccccc;stroke-width:3.03583884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6286)"
+         d="m 376,860.36218 c 32,0 40,64 72,64"
+         id="path6227-0"
+         transform="matrix(1.0782707,0,0,1,-29.429791,0)" />
+    </g>
+    <g
+       id="g6296-4"
+       style="display:inline"
+       transform="matrix(0.0654273,0,0,0.06542387,-20.771023,234.07635)">
+      <path
+         style="fill:none;stroke:#3f5a7e;stroke-width:3.15240955;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 375.99999,860.36218 c 34.50466,0 43.13083,64 77.63549,64"
+         id="path6227-8" />
+      <path
+         style="display:inline;opacity:0.74703555;fill:none;stroke:#cccccc;stroke-width:3.03583884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6286-5)"
+         d="m 376,860.36218 c 32,0 40,64 72,64"
+         id="path6227-0-4"
+         transform="matrix(1.0782707,0,0,1,-29.429791,0)" />
+    </g>
+    <g
+       style="display:inline;stroke-width:2.27687907;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.0654273,0,0,0.06542387,-20.794247,230.55991)"
+       id="g6156">
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#385680;fill-opacity:1;fill-rule:evenodd;stroke:#677b94;stroke-width:2.27687907;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 357.12454,852.99332 -7.49485,7.49488 7.49485,7.49485 h 18.62473 v -14.98973 z"
+         id="rect4969" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#385680;fill-opacity:1;fill-rule:evenodd;stroke:#677b94;stroke-width:2.27687907;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 357.12454,907.3603 -7.49485,7.49488 7.49485,7.49485 h 18.62473 V 907.3603 Z"
+         id="rect4969-7" />
+    </g>
+    <text
+       transform="scale(1.0000262,0.9999738)"
+       id="text6152"
+       y="288.95883"
+       x="1.3940001"
+       style="font-style:normal;font-weight:bold;font-size:0.59586447px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.04965537"
+       xml:space="preserve"><tspan
+         style="font-size:0.86941904px;line-height:1.25;font-family:sans-serif;stroke-width:0.04965537"
+         y="288.95883"
+         x="1.3940001"
+         id="tspan6154">OUT</tspan></text>
+    <path
+       id="rect4969-6"
+       d="m 10.137199,290.55548 0.490362,0.49035 -0.490362,0.49033 H 8.9186211 v -0.98068 z"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#385680;fill-opacity:1;fill-rule:evenodd;stroke:#677b94;stroke-width:0.14896612;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <path
+       id="rect4969-7-3"
+       d="m 10.137199,294.11238 0.490362,0.49033 -0.490362,0.49035 H 8.9186211 v -0.98068 z"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#385680;fill-opacity:1;fill-rule:evenodd;stroke:#677b94;stroke-width:0.14896612;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <text
+       transform="scale(1.0000262,0.9999738)"
+       id="text6152-9"
+       y="293.1488"
+       x="9.7574692"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:0.59586447px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.04965537"
+       xml:space="preserve"><tspan
+         style="font-size:0.86941904px;line-height:1.25;font-family:sans-serif;stroke-width:0.04965537"
+         y="293.1488"
+         x="9.7574692"
+         id="tspan6205">IN</tspan></text>
+  </g>
+</svg>
diff --git a/resources/ui/carla_about.ui b/resources/ui/carla_about.ui
index 792525310..2eb2f0a7e 100644
--- a/resources/ui/carla_about.ui
+++ b/resources/ui/carla_about.ui
@@ -582,7 +582,10 @@
             <enum>Qt::PlainText</enum>
            </property>
            <property name="pixmap">
-            <pixmap resource="../resources.qrc">:/48x48/canvas.png</pixmap>
+            <pixmap resource="../resources.qrc">:/scalable/canvas.svg</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
diff --git a/resources/ui/carla_settings.ui b/resources/ui/carla_settings.ui
index 17d339605..42104c523 100644
--- a/resources/ui/carla_settings.ui
+++ b/resources/ui/carla_settings.ui
@@ -141,7 +141,7 @@
         </property>
         <property name="icon">
          <iconset resource="../resources.qrc">
-          <normaloff>:/48x48/canvas.png</normaloff>:/48x48/canvas.png</iconset>
+          <normaloff>:/scalable/canvas.svg</normaloff>:/scalable/canvas.svg</iconset>
         </property>
         <property name="flags">
          <set>ItemIsSelectable|ItemIsEnabled</set>
@@ -273,7 +273,16 @@
        </property>
        <widget class="QWidget" name="page_main">
         <layout class="QVBoxLayout" name="verticalLayout_5">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="topMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <property name="bottomMargin">
           <number>2</number>
          </property>
          <item>
@@ -531,7 +540,16 @@
        </widget>
        <widget class="QWidget" name="page_canvas">
         <layout class="QVBoxLayout" name="verticalLayout_8">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="topMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <property name="bottomMargin">
           <number>2</number>
          </property>
          <item>
@@ -561,11 +579,20 @@
            </item>
            <item>
             <widget class="QLabel" name="label_10">
+             <property name="maximumSize">
+              <size>
+               <width>48</width>
+               <height>48</height>
+              </size>
+             </property>
              <property name="text">
               <string notr="true"/>
              </property>
              <property name="pixmap">
-              <pixmap resource="../resources.qrc">:/48x48/canvas.png</pixmap>
+              <pixmap resource="../resources.qrc">:/scalable/canvas.svg</pixmap>
+             </property>
+             <property name="scaledContents">
+              <bool>true</bool>
              </property>
              <property name="alignment">
               <set>Qt::AlignHCenter|Qt::AlignTop</set>
@@ -785,7 +812,16 @@
        </widget>
        <widget class="QWidget" name="page_engine">
         <layout class="QVBoxLayout" name="verticalLayout_6">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="topMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <property name="bottomMargin">
           <number>2</number>
          </property>
          <item>
@@ -850,7 +886,16 @@
                 <property name="sizeConstraint">
                  <enum>QLayout::SetMinimumSize</enum>
                 </property>
-                <property name="margin">
+                <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>
                 <item>
@@ -887,7 +932,16 @@
                 <property name="sizeConstraint">
                  <enum>QLayout::SetMinimumSize</enum>
                 </property>
-                <property name="margin">
+                <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>
                 <item>
@@ -1171,7 +1225,16 @@
        </widget>
        <widget class="QWidget" name="page_osc">
         <layout class="QVBoxLayout" name="verticalLayout_22">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="topMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <property name="bottomMargin">
           <number>2</number>
          </property>
          <item>
@@ -1684,7 +1747,16 @@
        </widget>
        <widget class="QWidget" name="page_filepaths">
         <layout class="QVBoxLayout" name="verticalLayout_30">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="topMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <property name="bottomMargin">
           <number>2</number>
          </property>
          <item>
@@ -1777,7 +1849,16 @@
                <property name="spacing">
                 <number>0</number>
                </property>
-               <property name="margin">
+               <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>
                <item>
@@ -1794,7 +1875,16 @@
                <property name="spacing">
                 <number>0</number>
                </property>
-               <property name="margin">
+               <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>
                <item>
@@ -1835,7 +1925,16 @@
                <property name="spacing">
                 <number>0</number>
                </property>
-               <property name="margin">
+               <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>
                <item>
@@ -1848,7 +1947,16 @@
                <property name="spacing">
                 <number>0</number>
                </property>
-               <property name="margin">
+               <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>
                <item>
@@ -1930,7 +2038,16 @@
        </widget>
        <widget class="QWidget" name="page_pluginpaths">
         <layout class="QVBoxLayout" name="verticalLayout_19">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="topMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <property name="bottomMargin">
           <number>2</number>
          </property>
          <item>
@@ -2059,7 +2176,16 @@
                <property name="spacing">
                 <number>0</number>
                </property>
-               <property name="margin">
+               <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>
                <item>
@@ -2072,7 +2198,16 @@
                <property name="spacing">
                 <number>0</number>
                </property>
-               <property name="margin">
+               <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>
                <item>
@@ -2133,7 +2268,16 @@
                <property name="spacing">
                 <number>0</number>
                </property>
-               <property name="margin">
+               <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>
                <item>
@@ -2146,7 +2290,16 @@
                <property name="spacing">
                 <number>0</number>
                </property>
-               <property name="margin">
+               <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>
                <item>
@@ -2159,7 +2312,16 @@
                <property name="spacing">
                 <number>0</number>
                </property>
-               <property name="margin">
+               <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>
                <item>
@@ -2172,7 +2334,16 @@
                <property name="spacing">
                 <number>0</number>
                </property>
-               <property name="margin">
+               <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>
                <item>
@@ -2254,7 +2425,16 @@
        </widget>
        <widget class="QWidget" name="page_wine">
         <layout class="QVBoxLayout" name="verticalLayout_25">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="topMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <property name="bottomMargin">
           <number>2</number>
          </property>
          <item>
@@ -2560,7 +2740,16 @@
        </widget>
        <widget class="QWidget" name="page_experimental">
         <layout class="QVBoxLayout" name="verticalLayout_21">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="topMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <property name="bottomMargin">
           <number>2</number>
          </property>
          <item>