commit 44a314c67ce0c8bcfc5804b6d2e4f9cf00728a10
parent 325adfbaa2ba7ecc95c5ff5c8e4fdefee562ea64
Author: Oli Larkin <olilarkin@googlemail.com>
Date: Mon, 29 May 2023 22:45:13 +0200
Add SVG based IR/Model icons
Diffstat:
7 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp
@@ -97,7 +97,10 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
auto closeButtonSVG = pGraphics->LoadSVG(CLOSE_BUTTON_FN);
auto rightArrowSVG = pGraphics->LoadSVG(RIGHT_ARROW_FN);
auto leftArrowSVG = pGraphics->LoadSVG(LEFT_ARROW_FN);
-
+ auto modelIconSVG = pGraphics->LoadSVG(MODEL_ICON_FN);
+ auto irIconOnSVG = pGraphics->LoadSVG(IR_ICON_ON_FN);
+ auto irIconOffSVG = pGraphics->LoadSVG(IR_ICON_OFF_FN);
+
const IBitmap fileControlBackground = pGraphics->LoadBitmap(FILECONTROLBACKGROUND_FN);
const IBitmap bgBitmap = pGraphics->LoadBitmap(BACKGROUND_FN);
const IBitmap irSwitchBitmap = pGraphics->LoadBitmap((TOGGLEIR_FN), 2, true);
@@ -199,6 +202,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
pGraphics->AttachBackground(BACKGROUND_FN);
pGraphics->AttachControl(new IVLabelControl(titleArea, "NEURAL AMP MODELER", titleStyle));
+ pGraphics->AttachControl(new ISVGControl(modelArea.GetFromLeft(30).GetTranslated(-40, 10), modelIconSVG));
#ifdef NAM_PICK_DIRECTORY
const std::string defaultNamFileString = "Select model directory...";
diff --git a/NeuralAmpModeler/config.h b/NeuralAmpModeler/config.h
@@ -65,6 +65,10 @@
#define CLOSE_BUTTON_FN "SkinEHeritage_Close-button.svg"
#define LEFT_ARROW_FN "SkinEHeritage_ArrowLeft.svg"
#define RIGHT_ARROW_FN "SkinEHeritage_ArrowRight.svg"
+#define MODEL_ICON_FN "ModelIcon.svg"
+#define IR_ICON_ON_FN "IRIconOn.svg"
+#define IR_ICON_OFF_FN "IRIconOff.svg"
+
#define EH_SKIN_FN "SkinEHeritage_BG.jpeg"
#define EH_SKIN2X_FN "SkinEHeritage_BG@2x.jpeg"
#define KNOB_FN "SkinEHeritage_Knob.png"
diff --git a/NeuralAmpModeler/resources/img/IRIconOff.svg b/NeuralAmpModeler/resources/img/IRIconOff.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 63 62" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+ <g transform="matrix(1.19122,0,0,1,-0.59384,0)">
+ <path d="M5.478,22.583C5.478,21.027 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,21.027 0.733,22.583L0.733,39.559C0.733,41.116 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,41.116 5.478,39.559L5.478,22.583Z"/>
+ </g>
+ <g transform="matrix(1.23596,0,0,1,15.2672,0)">
+ <path d="M5.478,22.689C5.478,21.074 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,21.074 0.733,22.689L0.733,39.453C0.733,41.068 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,41.068 5.478,39.453L5.478,22.689Z"/>
+ </g>
+ <g transform="matrix(1.3683,0,0,1,47.1734,0)">
+ <path d="M5.478,23.002C5.478,21.214 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,21.214 0.733,23.002L0.733,39.14C0.733,40.928 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,40.928 5.478,39.14L5.478,23.002Z"/>
+ </g>
+ <g transform="matrix(1.3683,0,0,1.82121,31.1798,-25.1895)">
+ <path d="M5.478,21.542C5.478,20.56 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,20.56 0.733,21.542L0.733,40.601C0.733,41.582 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,41.582 5.478,40.601L5.478,21.542Z"/>
+ </g>
+ <g transform="matrix(1.3683,0,0,0.772678,39.2533,7.0412)">
+ <path d="M5.478,23.955C5.478,21.641 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,21.641 0.733,23.955L0.733,38.187C0.733,40.501 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,40.501 5.478,38.187L5.478,23.955Z"/>
+ </g>
+ <g transform="matrix(1.3683,0,0,2.72972,23.2972,-53.8018)">
+ <path d="M5.478,20.95C5.478,20.295 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,20.295 0.733,20.95L0.733,41.192C0.733,41.847 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,41.847 5.478,41.192L5.478,20.95Z"/>
+ </g>
+ <g transform="matrix(1.3683,0,0,0.363416,55.5937,19.0919)">
+ <path d="M5.478,28.676C5.478,23.757 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,23.757 0.733,28.676L0.733,33.466C0.733,38.385 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,38.385 5.478,33.466L5.478,28.676Z"/>
+ </g>
+ <g transform="matrix(1.33725,0,0,1.76341,6.95266,-23.6049)">
+ <path d="M5.478,21.557C5.478,20.567 4.418,19.763 3.113,19.763L3.098,19.763C1.793,19.763 0.733,20.567 0.733,21.557L0.733,40.585C0.733,41.575 1.793,42.379 3.098,42.379L3.113,42.379C4.418,42.379 5.478,41.575 5.478,40.585L5.478,21.557Z"/>
+ </g>
+</svg>
diff --git a/NeuralAmpModeler/resources/img/IRIconOn.svg b/NeuralAmpModeler/resources/img/IRIconOn.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 63 62" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+ <g transform="matrix(1.19122,0,0,1,-0.59384,0)">
+ <path d="M5.478,22.583C5.478,21.027 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,21.027 0.733,22.583L0.733,39.559C0.733,41.116 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,41.116 5.478,39.559L5.478,22.583Z" style="fill:white;"/>
+ </g>
+ <g transform="matrix(1.23596,0,0,1,15.2672,0)">
+ <path d="M5.478,22.689C5.478,21.074 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,21.074 0.733,22.689L0.733,39.453C0.733,41.068 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,41.068 5.478,39.453L5.478,22.689Z" style="fill:white;"/>
+ </g>
+ <g transform="matrix(1.3683,0,0,1,47.1734,0)">
+ <path d="M5.478,23.002C5.478,21.214 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,21.214 0.733,23.002L0.733,39.14C0.733,40.928 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,40.928 5.478,39.14L5.478,23.002Z" style="fill:white;"/>
+ </g>
+ <g transform="matrix(1.3683,0,0,1.82121,31.1798,-25.1895)">
+ <path d="M5.478,21.542C5.478,20.56 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,20.56 0.733,21.542L0.733,40.601C0.733,41.582 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,41.582 5.478,40.601L5.478,21.542Z" style="fill:white;"/>
+ </g>
+ <g transform="matrix(1.3683,0,0,0.772678,39.2533,7.0412)">
+ <path d="M5.478,23.955C5.478,21.641 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,21.641 0.733,23.955L0.733,38.187C0.733,40.501 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,40.501 5.478,38.187L5.478,23.955Z" style="fill:white;"/>
+ </g>
+ <g transform="matrix(1.3683,0,0,2.72972,23.2972,-53.8018)">
+ <path d="M5.478,20.95C5.478,20.295 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,20.295 0.733,20.95L0.733,41.192C0.733,41.847 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,41.847 5.478,41.192L5.478,20.95Z" style="fill:white;"/>
+ </g>
+ <g transform="matrix(1.3683,0,0,0.363416,55.5937,19.0919)">
+ <path d="M5.478,28.676C5.478,23.757 4.418,19.763 3.111,19.763L3.1,19.763C1.793,19.763 0.733,23.757 0.733,28.676L0.733,33.466C0.733,38.385 1.793,42.379 3.1,42.379L3.111,42.379C4.418,42.379 5.478,38.385 5.478,33.466L5.478,28.676Z" style="fill:white;"/>
+ </g>
+ <g transform="matrix(1.33725,0,0,1.76341,6.95266,-23.6049)">
+ <path d="M5.478,21.557C5.478,20.567 4.418,19.763 3.113,19.763L3.098,19.763C1.793,19.763 0.733,20.567 0.733,21.557L0.733,40.585C0.733,41.575 1.793,42.379 3.098,42.379L3.113,42.379C4.418,42.379 5.478,41.575 5.478,40.585L5.478,21.557Z" style="fill:white;"/>
+ </g>
+</svg>
diff --git a/NeuralAmpModeler/resources/img/ModelIcon.svg b/NeuralAmpModeler/resources/img/ModelIcon.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 121 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
+ <g transform="matrix(1,0,0,0.97746,0,0.0920055)">
+ <rect x="3.993" y="4.082" width="113.712" height="28.919" style="fill:none;stroke:white;stroke-width:3.03px;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,2.17013,-0.233583)">
+ <circle cx="20.214" cy="18.598" r="6.251" style="fill:none;stroke:white;stroke-width:4px;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,24.7818,-0.198146)">
+ <circle cx="20.214" cy="18.598" r="6.251" style="fill:none;stroke:white;stroke-width:4px;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,47.1738,-0.490624)">
+ <circle cx="20.214" cy="18.598" r="6.251" style="fill:none;stroke:white;stroke-width:4px;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,-1.09954,0)">
+ <rect x="85.209" y="12.495" width="4.355" height="12.262" style="fill:white;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,9.22254,0)">
+ <rect x="85.209" y="12.495" width="4.355" height="12.262" style="fill:white;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,19.9614,0)">
+ <rect x="85.209" y="12.495" width="4.355" height="12.262" style="fill:white;"/>
+ </g>
+</svg>
diff --git a/NeuralAmpModeler/resources/img/SkinEHeritage_IR_Toggle.png b/NeuralAmpModeler/resources/img/SkinEHeritage_IR_Toggle.png
Binary files differ.
diff --git a/NeuralAmpModeler/resources/img/SkinEHeritage_IR_Toggle@2x.png b/NeuralAmpModeler/resources/img/SkinEHeritage_IR_Toggle@2x.png
Binary files differ.
