From 38d2c9d0e907bc556f5098f6f34e62e7a10f1214 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 9 Nov 2021 09:59:40 -0500 Subject: [PATCH] Add Befaco component redesigns from Pyer. --- include/componentlibrary.hpp | 148 +++++---- ...acoBigKnob-bg.svg => BefacoBigKnob_bg.svg} | 0 res/ComponentLibrary/BefacoPush_0.svg | 144 ++++---- res/ComponentLibrary/BefacoPush_1.svg | 150 ++++----- res/ComponentLibrary/BefacoSlidePot.svg | 86 +---- res/ComponentLibrary/BefacoSlidePotHandle.svg | 46 ++- res/ComponentLibrary/BefacoSwitch_0.svg | 217 ++++++------ res/ComponentLibrary/BefacoSwitch_1.svg | 181 +++++----- res/ComponentLibrary/BefacoSwitch_2.svg | 222 +++++++------ res/ComponentLibrary/BefacoTinyKnob.svg | 86 ----- .../BefacoTinyKnobWhite_bg.svg | 111 +++++++ res/ComponentLibrary/BefacoTinyPointBlack.svg | 62 ++++ res/ComponentLibrary/Davies1900hBlack.svg | 266 +++++++++------ res/ComponentLibrary/Davies1900hBlack_bg.svg | 19 ++ .../Davies1900hLargeBlack.svg | 234 +++++++------ .../Davies1900hLargeBlack_bg.svg | 21 ++ res/ComponentLibrary/Davies1900hLargeRed.svg | 235 +++++++------ .../Davies1900hLargeRed_bg.svg | 21 ++ .../Davies1900hLargeWhite.svg | 235 +++++++------ .../Davies1900hLargeWhite_bg.svg | 21 ++ res/ComponentLibrary/Davies1900hRed.svg | 309 ++++++++++++------ res/ComponentLibrary/Davies1900hRed_bg.svg | 19 ++ res/ComponentLibrary/Davies1900hWhite.svg | 266 +++++++++------ res/ComponentLibrary/Davies1900hWhite_bg.svg | 24 ++ ...{Rogan1PBlue-fg.svg => Rogan1PBlue_fg.svg} | 0 ...ogan1PGreen-fg.svg => Rogan1PGreen_fg.svg} | 0 .../{Rogan1PRed-fg.svg => Rogan1PRed_fg.svg} | 0 ...ogan1PSBlue-fg.svg => Rogan1PSBlue_fg.svg} | 0 ...an1PSGreen-fg.svg => Rogan1PSGreen_fg.svg} | 0 ...{Rogan1PSRed-fg.svg => Rogan1PSRed_fg.svg} | 0 ...an1PSWhite-fg.svg => Rogan1PSWhite_fg.svg} | 0 .../{Rogan1PS-bg.svg => Rogan1PS_bg.svg} | 0 ...ogan1PWhite-fg.svg => Rogan1PWhite_fg.svg} | 0 .../{Rogan1P-bg.svg => Rogan1P_bg.svg} | 0 ...{Rogan2PBlue-fg.svg => Rogan2PBlue_fg.svg} | 0 ...ogan2PGreen-fg.svg => Rogan2PGreen_fg.svg} | 0 .../{Rogan2PRed-fg.svg => Rogan2PRed_fg.svg} | 0 ...ogan2PSBlue-fg.svg => Rogan2PSBlue_fg.svg} | 0 ...an2PSGreen-fg.svg => Rogan2PSGreen_fg.svg} | 0 ...{Rogan2PSRed-fg.svg => Rogan2PSRed_fg.svg} | 0 ...an2PSWhite-fg.svg => Rogan2PSWhite_fg.svg} | 0 .../{Rogan2PS-bg.svg => Rogan2PS_bg.svg} | 0 ...ogan2PWhite-fg.svg => Rogan2PWhite_fg.svg} | 0 .../{Rogan2P-bg.svg => Rogan2P_bg.svg} | 0 ...{Rogan2SGray-fg.svg => Rogan2SGray_fg.svg} | 0 .../{Rogan2S-bg.svg => Rogan2S_bg.svg} | 0 ...{Rogan3PBlue-fg.svg => Rogan3PBlue_fg.svg} | 0 ...ogan3PGreen-fg.svg => Rogan3PGreen_fg.svg} | 0 .../{Rogan3PRed-fg.svg => Rogan3PRed_fg.svg} | 0 ...ogan3PSBlue-fg.svg => Rogan3PSBlue_fg.svg} | 0 ...an3PSGreen-fg.svg => Rogan3PSGreen_fg.svg} | 0 ...{Rogan3PSRed-fg.svg => Rogan3PSRed_fg.svg} | 0 ...an3PSWhite-fg.svg => Rogan3PSWhite_fg.svg} | 0 .../{Rogan3PS-bg.svg => Rogan3PS_bg.svg} | 0 ...ogan3PWhite-fg.svg => Rogan3PWhite_fg.svg} | 0 .../{Rogan3P-bg.svg => Rogan3P_bg.svg} | 0 ...ogan5PSGray-fg.svg => Rogan5PSGray_fg.svg} | 0 .../{Rogan5PS-bg.svg => Rogan5PS_bg.svg} | 0 ...an6PSWhite-fg.svg => Rogan6PSWhite_fg.svg} | 0 .../{Rogan6PS-bg.svg => Rogan6PS_bg.svg} | 0 ...ckKnob-bg.svg => RoundBigBlackKnob_bg.svg} | 0 ...BlackKnob-bg.svg => RoundBlackKnob_bg.svg} | 0 ...kKnob-bg.svg => RoundHugeBlackKnob_bg.svg} | 0 ...Knob-bg.svg => RoundLargeBlackKnob_bg.svg} | 0 ...Knob-bg.svg => RoundSmallBlackKnob_bg.svg} | 0 ...thTechAlco-bg.svg => SynthTechAlco_bg.svg} | 0 ...thTechAlco-fg.svg => SynthTechAlco_fg.svg} | 0 .../{Trimpot-bg.svg => Trimpot_bg.svg} | 0 res/ComponentLibrary/{USB-B.svg => USB_B.svg} | 0 69 files changed, 1797 insertions(+), 1326 deletions(-) rename res/ComponentLibrary/{BefacoBigKnob-bg.svg => BefacoBigKnob_bg.svg} (100%) delete mode 100644 res/ComponentLibrary/BefacoTinyKnob.svg create mode 100644 res/ComponentLibrary/BefacoTinyKnobWhite_bg.svg create mode 100644 res/ComponentLibrary/BefacoTinyPointBlack.svg create mode 100644 res/ComponentLibrary/Davies1900hBlack_bg.svg create mode 100644 res/ComponentLibrary/Davies1900hLargeBlack_bg.svg create mode 100644 res/ComponentLibrary/Davies1900hLargeRed_bg.svg create mode 100644 res/ComponentLibrary/Davies1900hLargeWhite_bg.svg create mode 100644 res/ComponentLibrary/Davies1900hRed_bg.svg create mode 100644 res/ComponentLibrary/Davies1900hWhite_bg.svg rename res/ComponentLibrary/{Rogan1PBlue-fg.svg => Rogan1PBlue_fg.svg} (100%) rename res/ComponentLibrary/{Rogan1PGreen-fg.svg => Rogan1PGreen_fg.svg} (100%) rename res/ComponentLibrary/{Rogan1PRed-fg.svg => Rogan1PRed_fg.svg} (100%) rename res/ComponentLibrary/{Rogan1PSBlue-fg.svg => Rogan1PSBlue_fg.svg} (100%) rename res/ComponentLibrary/{Rogan1PSGreen-fg.svg => Rogan1PSGreen_fg.svg} (100%) rename res/ComponentLibrary/{Rogan1PSRed-fg.svg => Rogan1PSRed_fg.svg} (100%) rename res/ComponentLibrary/{Rogan1PSWhite-fg.svg => Rogan1PSWhite_fg.svg} (100%) rename res/ComponentLibrary/{Rogan1PS-bg.svg => Rogan1PS_bg.svg} (100%) rename res/ComponentLibrary/{Rogan1PWhite-fg.svg => Rogan1PWhite_fg.svg} (100%) rename res/ComponentLibrary/{Rogan1P-bg.svg => Rogan1P_bg.svg} (100%) rename res/ComponentLibrary/{Rogan2PBlue-fg.svg => Rogan2PBlue_fg.svg} (100%) rename res/ComponentLibrary/{Rogan2PGreen-fg.svg => Rogan2PGreen_fg.svg} (100%) rename res/ComponentLibrary/{Rogan2PRed-fg.svg => Rogan2PRed_fg.svg} (100%) rename res/ComponentLibrary/{Rogan2PSBlue-fg.svg => Rogan2PSBlue_fg.svg} (100%) rename res/ComponentLibrary/{Rogan2PSGreen-fg.svg => Rogan2PSGreen_fg.svg} (100%) rename res/ComponentLibrary/{Rogan2PSRed-fg.svg => Rogan2PSRed_fg.svg} (100%) rename res/ComponentLibrary/{Rogan2PSWhite-fg.svg => Rogan2PSWhite_fg.svg} (100%) rename res/ComponentLibrary/{Rogan2PS-bg.svg => Rogan2PS_bg.svg} (100%) rename res/ComponentLibrary/{Rogan2PWhite-fg.svg => Rogan2PWhite_fg.svg} (100%) rename res/ComponentLibrary/{Rogan2P-bg.svg => Rogan2P_bg.svg} (100%) rename res/ComponentLibrary/{Rogan2SGray-fg.svg => Rogan2SGray_fg.svg} (100%) rename res/ComponentLibrary/{Rogan2S-bg.svg => Rogan2S_bg.svg} (100%) rename res/ComponentLibrary/{Rogan3PBlue-fg.svg => Rogan3PBlue_fg.svg} (100%) rename res/ComponentLibrary/{Rogan3PGreen-fg.svg => Rogan3PGreen_fg.svg} (100%) rename res/ComponentLibrary/{Rogan3PRed-fg.svg => Rogan3PRed_fg.svg} (100%) rename res/ComponentLibrary/{Rogan3PSBlue-fg.svg => Rogan3PSBlue_fg.svg} (100%) rename res/ComponentLibrary/{Rogan3PSGreen-fg.svg => Rogan3PSGreen_fg.svg} (100%) rename res/ComponentLibrary/{Rogan3PSRed-fg.svg => Rogan3PSRed_fg.svg} (100%) rename res/ComponentLibrary/{Rogan3PSWhite-fg.svg => Rogan3PSWhite_fg.svg} (100%) rename res/ComponentLibrary/{Rogan3PS-bg.svg => Rogan3PS_bg.svg} (100%) rename res/ComponentLibrary/{Rogan3PWhite-fg.svg => Rogan3PWhite_fg.svg} (100%) rename res/ComponentLibrary/{Rogan3P-bg.svg => Rogan3P_bg.svg} (100%) rename res/ComponentLibrary/{Rogan5PSGray-fg.svg => Rogan5PSGray_fg.svg} (100%) rename res/ComponentLibrary/{Rogan5PS-bg.svg => Rogan5PS_bg.svg} (100%) rename res/ComponentLibrary/{Rogan6PSWhite-fg.svg => Rogan6PSWhite_fg.svg} (100%) rename res/ComponentLibrary/{Rogan6PS-bg.svg => Rogan6PS_bg.svg} (100%) rename res/ComponentLibrary/{RoundBigBlackKnob-bg.svg => RoundBigBlackKnob_bg.svg} (100%) rename res/ComponentLibrary/{RoundBlackKnob-bg.svg => RoundBlackKnob_bg.svg} (100%) rename res/ComponentLibrary/{RoundHugeBlackKnob-bg.svg => RoundHugeBlackKnob_bg.svg} (100%) rename res/ComponentLibrary/{RoundLargeBlackKnob-bg.svg => RoundLargeBlackKnob_bg.svg} (100%) rename res/ComponentLibrary/{RoundSmallBlackKnob-bg.svg => RoundSmallBlackKnob_bg.svg} (100%) rename res/ComponentLibrary/{SynthTechAlco-bg.svg => SynthTechAlco_bg.svg} (100%) rename res/ComponentLibrary/{SynthTechAlco-fg.svg => SynthTechAlco_fg.svg} (100%) rename res/ComponentLibrary/{Trimpot-bg.svg => Trimpot_bg.svg} (100%) rename res/ComponentLibrary/{USB-B.svg => USB_B.svg} (100%) diff --git a/include/componentlibrary.hpp b/include/componentlibrary.hpp index 74ce6e5e..3eb3ca48 100644 --- a/include/componentlibrary.hpp +++ b/include/componentlibrary.hpp @@ -292,35 +292,35 @@ struct RoundKnob : app::SvgKnob { struct RoundBlackKnob : RoundKnob { RoundBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBlackKnob.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBlackKnob-bg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBlackKnob_bg.svg"))); } }; struct RoundSmallBlackKnob : RoundKnob { RoundSmallBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundSmallBlackKnob.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundSmallBlackKnob-bg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundSmallBlackKnob_bg.svg"))); } }; struct RoundLargeBlackKnob : RoundKnob { RoundLargeBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundLargeBlackKnob.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundLargeBlackKnob-bg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundLargeBlackKnob_bg.svg"))); } }; struct RoundBigBlackKnob : RoundKnob { RoundBigBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBigBlackKnob.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBigBlackKnob-bg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBigBlackKnob_bg.svg"))); } }; struct RoundHugeBlackKnob : RoundKnob { RoundHugeBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundHugeBlackKnob.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundHugeBlackKnob-bg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundHugeBlackKnob_bg.svg"))); } }; @@ -332,45 +332,56 @@ struct RoundBlackSnapKnob : RoundBlackKnob { struct Davies1900hKnob : app::SvgKnob { + widget::SvgWidget* bg; + Davies1900hKnob() { minAngle = -0.83 * M_PI; maxAngle = 0.83 * M_PI; + + bg = new widget::SvgWidget; + fb->addChildBelow(bg, tw); } }; struct Davies1900hWhiteKnob : Davies1900hKnob { Davies1900hWhiteKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hWhite.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hWhite_bg.svg"))); } }; struct Davies1900hBlackKnob : Davies1900hKnob { Davies1900hBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hBlack.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hBlack_bg.svg"))); } }; struct Davies1900hRedKnob : Davies1900hKnob { Davies1900hRedKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hRed.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hRed_bg.svg"))); } }; struct Davies1900hLargeWhiteKnob : Davies1900hKnob { Davies1900hLargeWhiteKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeWhite.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeWhite_bg.svg"))); } }; struct Davies1900hLargeBlackKnob : Davies1900hKnob { Davies1900hLargeBlackKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeBlack.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeBlack_bg.svg"))); } }; struct Davies1900hLargeRedKnob : Davies1900hKnob { Davies1900hLargeRedKnob() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeRed.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeRed_bg.svg"))); } }; @@ -394,216 +405,216 @@ struct Rogan : app::SvgKnob { struct Rogan6PSWhite : Rogan { Rogan6PSWhite() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan6PSWhite.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan6PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan6PSWhite-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan6PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan6PSWhite_fg.svg"))); } }; struct Rogan5PSGray : Rogan { Rogan5PSGray() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan5PSGray.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan5PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan5PSGray-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan5PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan5PSGray_fg.svg"))); } }; struct Rogan3PSBlue : Rogan { Rogan3PSBlue() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSBlue.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSBlue-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSBlue_fg.svg"))); } }; struct Rogan3PSRed : Rogan { Rogan3PSRed() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSRed.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSRed-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSRed_fg.svg"))); } }; struct Rogan3PSGreen : Rogan { Rogan3PSGreen() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSGreen.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSGreen-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSGreen_fg.svg"))); } }; struct Rogan3PSWhite : Rogan { Rogan3PSWhite() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSWhite.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSWhite-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSWhite_fg.svg"))); } }; struct Rogan3PBlue : Rogan { Rogan3PBlue() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PBlue.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PBlue-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PBlue_fg.svg"))); } }; struct Rogan3PRed : Rogan { Rogan3PRed() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PRed.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PRed-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PRed_fg.svg"))); } }; struct Rogan3PGreen : Rogan { Rogan3PGreen() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PGreen.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PGreen-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PGreen_fg.svg"))); } }; struct Rogan3PWhite : Rogan { Rogan3PWhite() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PWhite.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PWhite-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PWhite_fg.svg"))); } }; struct Rogan2SGray : Rogan { Rogan2SGray() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2SGray.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2S-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2SGray-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2S_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2SGray_fg.svg"))); } }; struct Rogan2PSBlue : Rogan { Rogan2PSBlue() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSBlue.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSBlue-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSBlue_fg.svg"))); } }; struct Rogan2PSRed : Rogan { Rogan2PSRed() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSRed.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSRed-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSRed_fg.svg"))); } }; struct Rogan2PSGreen : Rogan { Rogan2PSGreen() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSGreen.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSGreen-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSGreen_fg.svg"))); } }; struct Rogan2PSWhite : Rogan { Rogan2PSWhite() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSWhite.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSWhite-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSWhite_fg.svg"))); } }; struct Rogan2PBlue : Rogan { Rogan2PBlue() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PBlue.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PBlue-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PBlue_fg.svg"))); } }; struct Rogan2PRed : Rogan { Rogan2PRed() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PRed.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PRed-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PRed_fg.svg"))); } }; struct Rogan2PGreen : Rogan { Rogan2PGreen() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PGreen.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PGreen-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PGreen_fg.svg"))); } }; struct Rogan2PWhite : Rogan { Rogan2PWhite() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PWhite.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PWhite-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PWhite_fg.svg"))); } }; struct Rogan1PSBlue : Rogan { Rogan1PSBlue() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSBlue.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSBlue-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSBlue_fg.svg"))); } }; struct Rogan1PSRed : Rogan { Rogan1PSRed() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSRed.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSRed-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSRed_fg.svg"))); } }; struct Rogan1PSGreen : Rogan { Rogan1PSGreen() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSGreen.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSGreen-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSGreen_fg.svg"))); } }; struct Rogan1PSWhite : Rogan { Rogan1PSWhite() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSWhite.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSWhite-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSWhite_fg.svg"))); } }; struct Rogan1PBlue : Rogan { Rogan1PBlue() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PBlue.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PBlue-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PBlue_fg.svg"))); } }; struct Rogan1PRed : Rogan { Rogan1PRed() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PRed.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PRed-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PRed_fg.svg"))); } }; struct Rogan1PGreen : Rogan { Rogan1PGreen() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PGreen.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PGreen-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PGreen_fg.svg"))); } }; struct Rogan1PWhite : Rogan { Rogan1PWhite() { setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PWhite.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PWhite-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PWhite_fg.svg"))); } }; @@ -622,8 +633,8 @@ struct SynthTechAlco : app::SvgKnob { minAngle = -0.82 * M_PI; maxAngle = 0.82 * M_PI; setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco-bg.svg"))); - fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco-fg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco_bg.svg"))); + fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco_fg.svg"))); } }; @@ -638,7 +649,7 @@ struct Trimpot : app::SvgKnob { fb->addChildBelow(bg, tw); setSvg(Svg::load(asset::system("res/ComponentLibrary/Trimpot.svg"))); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Trimpot-bg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Trimpot_bg.svg"))); } }; @@ -652,15 +663,22 @@ struct BefacoBigKnob : app::SvgKnob { bg = new widget::SvgWidget; fb->addChildBelow(bg, tw); - bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/BefacoBigKnob-bg.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/BefacoBigKnob_bg.svg"))); } }; struct BefacoTinyKnob : app::SvgKnob { + widget::SvgWidget* bg; + BefacoTinyKnob() { minAngle = -0.75 * M_PI; maxAngle = 0.75 * M_PI; - setSvg(Svg::load(asset::system("res/ComponentLibrary/BefacoTinyKnob.svg"))); + + bg = new widget::SvgWidget; + fb->addChildBelow(bg, tw); + + setSvg(Svg::load(asset::system("res/ComponentLibrary/BefacoTinyPointBlack.svg"))); + bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/BefacoTinyKnobWhite_bg.svg"))); } }; @@ -1020,7 +1038,7 @@ struct AudioButton_ADAT : app::AudioButton { struct AudioButton_USB_B : app::AudioButton { AudioButton_USB_B() { - addFrame(Svg::load(asset::system("res/ComponentLibrary/USB-B.svg"))); + addFrame(Svg::load(asset::system("res/ComponentLibrary/USB_B.svg"))); shadow->opacity = 0.0; } }; diff --git a/res/ComponentLibrary/BefacoBigKnob-bg.svg b/res/ComponentLibrary/BefacoBigKnob_bg.svg similarity index 100% rename from res/ComponentLibrary/BefacoBigKnob-bg.svg rename to res/ComponentLibrary/BefacoBigKnob_bg.svg diff --git a/res/ComponentLibrary/BefacoPush_0.svg b/res/ComponentLibrary/BefacoPush_0.svg index 2f666ae1..c9a42037 100644 --- a/res/ComponentLibrary/BefacoPush_0.svg +++ b/res/ComponentLibrary/BefacoPush_0.svg @@ -1,82 +1,62 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/BefacoPush_1.svg b/res/ComponentLibrary/BefacoPush_1.svg index 114bf0ea..a1898377 100644 --- a/res/ComponentLibrary/BefacoPush_1.svg +++ b/res/ComponentLibrary/BefacoPush_1.svg @@ -1,82 +1,68 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/BefacoSlidePot.svg b/res/ComponentLibrary/BefacoSlidePot.svg index 6f226e76..c2644335 100644 --- a/res/ComponentLibrary/BefacoSlidePot.svg +++ b/res/ComponentLibrary/BefacoSlidePot.svg @@ -1,75 +1,11 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + diff --git a/res/ComponentLibrary/BefacoSlidePotHandle.svg b/res/ComponentLibrary/BefacoSlidePotHandle.svg index 9d56b7ea..1d35f955 100644 --- a/res/ComponentLibrary/BefacoSlidePotHandle.svg +++ b/res/ComponentLibrary/BefacoSlidePotHandle.svg @@ -1,10 +1,36 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/BefacoSwitch_0.svg b/res/ComponentLibrary/BefacoSwitch_0.svg index 403bb97e..1f8e096f 100644 --- a/res/ComponentLibrary/BefacoSwitch_0.svg +++ b/res/ComponentLibrary/BefacoSwitch_0.svg @@ -1,102 +1,115 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/BefacoSwitch_1.svg b/res/ComponentLibrary/BefacoSwitch_1.svg index 7c1d70bb..81a80352 100644 --- a/res/ComponentLibrary/BefacoSwitch_1.svg +++ b/res/ComponentLibrary/BefacoSwitch_1.svg @@ -1,87 +1,94 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/BefacoSwitch_2.svg b/res/ComponentLibrary/BefacoSwitch_2.svg index 03252858..e7fe8bbc 100644 --- a/res/ComponentLibrary/BefacoSwitch_2.svg +++ b/res/ComponentLibrary/BefacoSwitch_2.svg @@ -1,101 +1,121 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/BefacoTinyKnob.svg b/res/ComponentLibrary/BefacoTinyKnob.svg deleted file mode 100644 index b3db71a3..00000000 --- a/res/ComponentLibrary/BefacoTinyKnob.svg +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/res/ComponentLibrary/BefacoTinyKnobWhite_bg.svg b/res/ComponentLibrary/BefacoTinyKnobWhite_bg.svg new file mode 100644 index 00000000..84e4eedf --- /dev/null +++ b/res/ComponentLibrary/BefacoTinyKnobWhite_bg.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/BefacoTinyPointBlack.svg b/res/ComponentLibrary/BefacoTinyPointBlack.svg new file mode 100644 index 00000000..a2feb9c2 --- /dev/null +++ b/res/ComponentLibrary/BefacoTinyPointBlack.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hBlack.svg b/res/ComponentLibrary/Davies1900hBlack.svg index 492f5a44..85f30596 100644 --- a/res/ComponentLibrary/Davies1900hBlack.svg +++ b/res/ComponentLibrary/Davies1900hBlack.svg @@ -1,106 +1,160 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hBlack_bg.svg b/res/ComponentLibrary/Davies1900hBlack_bg.svg new file mode 100644 index 00000000..55f155eb --- /dev/null +++ b/res/ComponentLibrary/Davies1900hBlack_bg.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hLargeBlack.svg b/res/ComponentLibrary/Davies1900hLargeBlack.svg index 20c574a5..1c28b07a 100644 --- a/res/ComponentLibrary/Davies1900hLargeBlack.svg +++ b/res/ComponentLibrary/Davies1900hLargeBlack.svg @@ -1,106 +1,128 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hLargeBlack_bg.svg b/res/ComponentLibrary/Davies1900hLargeBlack_bg.svg new file mode 100644 index 00000000..1bbd8cbd --- /dev/null +++ b/res/ComponentLibrary/Davies1900hLargeBlack_bg.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hLargeRed.svg b/res/ComponentLibrary/Davies1900hLargeRed.svg index dbefb649..936e2c8b 100644 --- a/res/ComponentLibrary/Davies1900hLargeRed.svg +++ b/res/ComponentLibrary/Davies1900hLargeRed.svg @@ -1,106 +1,129 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hLargeRed_bg.svg b/res/ComponentLibrary/Davies1900hLargeRed_bg.svg new file mode 100644 index 00000000..45aa6fc0 --- /dev/null +++ b/res/ComponentLibrary/Davies1900hLargeRed_bg.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hLargeWhite.svg b/res/ComponentLibrary/Davies1900hLargeWhite.svg index d03288c0..fc466add 100644 --- a/res/ComponentLibrary/Davies1900hLargeWhite.svg +++ b/res/ComponentLibrary/Davies1900hLargeWhite.svg @@ -1,106 +1,129 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hLargeWhite_bg.svg b/res/ComponentLibrary/Davies1900hLargeWhite_bg.svg new file mode 100644 index 00000000..59c27c7b --- /dev/null +++ b/res/ComponentLibrary/Davies1900hLargeWhite_bg.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hRed.svg b/res/ComponentLibrary/Davies1900hRed.svg index 26f7e3b7..dbbe6b1a 100644 --- a/res/ComponentLibrary/Davies1900hRed.svg +++ b/res/ComponentLibrary/Davies1900hRed.svg @@ -1,106 +1,203 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hRed_bg.svg b/res/ComponentLibrary/Davies1900hRed_bg.svg new file mode 100644 index 00000000..5f24e4cf --- /dev/null +++ b/res/ComponentLibrary/Davies1900hRed_bg.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hWhite.svg b/res/ComponentLibrary/Davies1900hWhite.svg index 16219f4f..cb0b28d4 100644 --- a/res/ComponentLibrary/Davies1900hWhite.svg +++ b/res/ComponentLibrary/Davies1900hWhite.svg @@ -1,106 +1,160 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Davies1900hWhite_bg.svg b/res/ComponentLibrary/Davies1900hWhite_bg.svg new file mode 100644 index 00000000..1d716bca --- /dev/null +++ b/res/ComponentLibrary/Davies1900hWhite_bg.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/res/ComponentLibrary/Rogan1PBlue-fg.svg b/res/ComponentLibrary/Rogan1PBlue_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan1PBlue-fg.svg rename to res/ComponentLibrary/Rogan1PBlue_fg.svg diff --git a/res/ComponentLibrary/Rogan1PGreen-fg.svg b/res/ComponentLibrary/Rogan1PGreen_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan1PGreen-fg.svg rename to res/ComponentLibrary/Rogan1PGreen_fg.svg diff --git a/res/ComponentLibrary/Rogan1PRed-fg.svg b/res/ComponentLibrary/Rogan1PRed_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan1PRed-fg.svg rename to res/ComponentLibrary/Rogan1PRed_fg.svg diff --git a/res/ComponentLibrary/Rogan1PSBlue-fg.svg b/res/ComponentLibrary/Rogan1PSBlue_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan1PSBlue-fg.svg rename to res/ComponentLibrary/Rogan1PSBlue_fg.svg diff --git a/res/ComponentLibrary/Rogan1PSGreen-fg.svg b/res/ComponentLibrary/Rogan1PSGreen_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan1PSGreen-fg.svg rename to res/ComponentLibrary/Rogan1PSGreen_fg.svg diff --git a/res/ComponentLibrary/Rogan1PSRed-fg.svg b/res/ComponentLibrary/Rogan1PSRed_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan1PSRed-fg.svg rename to res/ComponentLibrary/Rogan1PSRed_fg.svg diff --git a/res/ComponentLibrary/Rogan1PSWhite-fg.svg b/res/ComponentLibrary/Rogan1PSWhite_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan1PSWhite-fg.svg rename to res/ComponentLibrary/Rogan1PSWhite_fg.svg diff --git a/res/ComponentLibrary/Rogan1PS-bg.svg b/res/ComponentLibrary/Rogan1PS_bg.svg similarity index 100% rename from res/ComponentLibrary/Rogan1PS-bg.svg rename to res/ComponentLibrary/Rogan1PS_bg.svg diff --git a/res/ComponentLibrary/Rogan1PWhite-fg.svg b/res/ComponentLibrary/Rogan1PWhite_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan1PWhite-fg.svg rename to res/ComponentLibrary/Rogan1PWhite_fg.svg diff --git a/res/ComponentLibrary/Rogan1P-bg.svg b/res/ComponentLibrary/Rogan1P_bg.svg similarity index 100% rename from res/ComponentLibrary/Rogan1P-bg.svg rename to res/ComponentLibrary/Rogan1P_bg.svg diff --git a/res/ComponentLibrary/Rogan2PBlue-fg.svg b/res/ComponentLibrary/Rogan2PBlue_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2PBlue-fg.svg rename to res/ComponentLibrary/Rogan2PBlue_fg.svg diff --git a/res/ComponentLibrary/Rogan2PGreen-fg.svg b/res/ComponentLibrary/Rogan2PGreen_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2PGreen-fg.svg rename to res/ComponentLibrary/Rogan2PGreen_fg.svg diff --git a/res/ComponentLibrary/Rogan2PRed-fg.svg b/res/ComponentLibrary/Rogan2PRed_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2PRed-fg.svg rename to res/ComponentLibrary/Rogan2PRed_fg.svg diff --git a/res/ComponentLibrary/Rogan2PSBlue-fg.svg b/res/ComponentLibrary/Rogan2PSBlue_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2PSBlue-fg.svg rename to res/ComponentLibrary/Rogan2PSBlue_fg.svg diff --git a/res/ComponentLibrary/Rogan2PSGreen-fg.svg b/res/ComponentLibrary/Rogan2PSGreen_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2PSGreen-fg.svg rename to res/ComponentLibrary/Rogan2PSGreen_fg.svg diff --git a/res/ComponentLibrary/Rogan2PSRed-fg.svg b/res/ComponentLibrary/Rogan2PSRed_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2PSRed-fg.svg rename to res/ComponentLibrary/Rogan2PSRed_fg.svg diff --git a/res/ComponentLibrary/Rogan2PSWhite-fg.svg b/res/ComponentLibrary/Rogan2PSWhite_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2PSWhite-fg.svg rename to res/ComponentLibrary/Rogan2PSWhite_fg.svg diff --git a/res/ComponentLibrary/Rogan2PS-bg.svg b/res/ComponentLibrary/Rogan2PS_bg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2PS-bg.svg rename to res/ComponentLibrary/Rogan2PS_bg.svg diff --git a/res/ComponentLibrary/Rogan2PWhite-fg.svg b/res/ComponentLibrary/Rogan2PWhite_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2PWhite-fg.svg rename to res/ComponentLibrary/Rogan2PWhite_fg.svg diff --git a/res/ComponentLibrary/Rogan2P-bg.svg b/res/ComponentLibrary/Rogan2P_bg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2P-bg.svg rename to res/ComponentLibrary/Rogan2P_bg.svg diff --git a/res/ComponentLibrary/Rogan2SGray-fg.svg b/res/ComponentLibrary/Rogan2SGray_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2SGray-fg.svg rename to res/ComponentLibrary/Rogan2SGray_fg.svg diff --git a/res/ComponentLibrary/Rogan2S-bg.svg b/res/ComponentLibrary/Rogan2S_bg.svg similarity index 100% rename from res/ComponentLibrary/Rogan2S-bg.svg rename to res/ComponentLibrary/Rogan2S_bg.svg diff --git a/res/ComponentLibrary/Rogan3PBlue-fg.svg b/res/ComponentLibrary/Rogan3PBlue_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan3PBlue-fg.svg rename to res/ComponentLibrary/Rogan3PBlue_fg.svg diff --git a/res/ComponentLibrary/Rogan3PGreen-fg.svg b/res/ComponentLibrary/Rogan3PGreen_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan3PGreen-fg.svg rename to res/ComponentLibrary/Rogan3PGreen_fg.svg diff --git a/res/ComponentLibrary/Rogan3PRed-fg.svg b/res/ComponentLibrary/Rogan3PRed_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan3PRed-fg.svg rename to res/ComponentLibrary/Rogan3PRed_fg.svg diff --git a/res/ComponentLibrary/Rogan3PSBlue-fg.svg b/res/ComponentLibrary/Rogan3PSBlue_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan3PSBlue-fg.svg rename to res/ComponentLibrary/Rogan3PSBlue_fg.svg diff --git a/res/ComponentLibrary/Rogan3PSGreen-fg.svg b/res/ComponentLibrary/Rogan3PSGreen_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan3PSGreen-fg.svg rename to res/ComponentLibrary/Rogan3PSGreen_fg.svg diff --git a/res/ComponentLibrary/Rogan3PSRed-fg.svg b/res/ComponentLibrary/Rogan3PSRed_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan3PSRed-fg.svg rename to res/ComponentLibrary/Rogan3PSRed_fg.svg diff --git a/res/ComponentLibrary/Rogan3PSWhite-fg.svg b/res/ComponentLibrary/Rogan3PSWhite_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan3PSWhite-fg.svg rename to res/ComponentLibrary/Rogan3PSWhite_fg.svg diff --git a/res/ComponentLibrary/Rogan3PS-bg.svg b/res/ComponentLibrary/Rogan3PS_bg.svg similarity index 100% rename from res/ComponentLibrary/Rogan3PS-bg.svg rename to res/ComponentLibrary/Rogan3PS_bg.svg diff --git a/res/ComponentLibrary/Rogan3PWhite-fg.svg b/res/ComponentLibrary/Rogan3PWhite_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan3PWhite-fg.svg rename to res/ComponentLibrary/Rogan3PWhite_fg.svg diff --git a/res/ComponentLibrary/Rogan3P-bg.svg b/res/ComponentLibrary/Rogan3P_bg.svg similarity index 100% rename from res/ComponentLibrary/Rogan3P-bg.svg rename to res/ComponentLibrary/Rogan3P_bg.svg diff --git a/res/ComponentLibrary/Rogan5PSGray-fg.svg b/res/ComponentLibrary/Rogan5PSGray_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan5PSGray-fg.svg rename to res/ComponentLibrary/Rogan5PSGray_fg.svg diff --git a/res/ComponentLibrary/Rogan5PS-bg.svg b/res/ComponentLibrary/Rogan5PS_bg.svg similarity index 100% rename from res/ComponentLibrary/Rogan5PS-bg.svg rename to res/ComponentLibrary/Rogan5PS_bg.svg diff --git a/res/ComponentLibrary/Rogan6PSWhite-fg.svg b/res/ComponentLibrary/Rogan6PSWhite_fg.svg similarity index 100% rename from res/ComponentLibrary/Rogan6PSWhite-fg.svg rename to res/ComponentLibrary/Rogan6PSWhite_fg.svg diff --git a/res/ComponentLibrary/Rogan6PS-bg.svg b/res/ComponentLibrary/Rogan6PS_bg.svg similarity index 100% rename from res/ComponentLibrary/Rogan6PS-bg.svg rename to res/ComponentLibrary/Rogan6PS_bg.svg diff --git a/res/ComponentLibrary/RoundBigBlackKnob-bg.svg b/res/ComponentLibrary/RoundBigBlackKnob_bg.svg similarity index 100% rename from res/ComponentLibrary/RoundBigBlackKnob-bg.svg rename to res/ComponentLibrary/RoundBigBlackKnob_bg.svg diff --git a/res/ComponentLibrary/RoundBlackKnob-bg.svg b/res/ComponentLibrary/RoundBlackKnob_bg.svg similarity index 100% rename from res/ComponentLibrary/RoundBlackKnob-bg.svg rename to res/ComponentLibrary/RoundBlackKnob_bg.svg diff --git a/res/ComponentLibrary/RoundHugeBlackKnob-bg.svg b/res/ComponentLibrary/RoundHugeBlackKnob_bg.svg similarity index 100% rename from res/ComponentLibrary/RoundHugeBlackKnob-bg.svg rename to res/ComponentLibrary/RoundHugeBlackKnob_bg.svg diff --git a/res/ComponentLibrary/RoundLargeBlackKnob-bg.svg b/res/ComponentLibrary/RoundLargeBlackKnob_bg.svg similarity index 100% rename from res/ComponentLibrary/RoundLargeBlackKnob-bg.svg rename to res/ComponentLibrary/RoundLargeBlackKnob_bg.svg diff --git a/res/ComponentLibrary/RoundSmallBlackKnob-bg.svg b/res/ComponentLibrary/RoundSmallBlackKnob_bg.svg similarity index 100% rename from res/ComponentLibrary/RoundSmallBlackKnob-bg.svg rename to res/ComponentLibrary/RoundSmallBlackKnob_bg.svg diff --git a/res/ComponentLibrary/SynthTechAlco-bg.svg b/res/ComponentLibrary/SynthTechAlco_bg.svg similarity index 100% rename from res/ComponentLibrary/SynthTechAlco-bg.svg rename to res/ComponentLibrary/SynthTechAlco_bg.svg diff --git a/res/ComponentLibrary/SynthTechAlco-fg.svg b/res/ComponentLibrary/SynthTechAlco_fg.svg similarity index 100% rename from res/ComponentLibrary/SynthTechAlco-fg.svg rename to res/ComponentLibrary/SynthTechAlco_fg.svg diff --git a/res/ComponentLibrary/Trimpot-bg.svg b/res/ComponentLibrary/Trimpot_bg.svg similarity index 100% rename from res/ComponentLibrary/Trimpot-bg.svg rename to res/ComponentLibrary/Trimpot_bg.svg diff --git a/res/ComponentLibrary/USB-B.svg b/res/ComponentLibrary/USB_B.svg similarity index 100% rename from res/ComponentLibrary/USB-B.svg rename to res/ComponentLibrary/USB_B.svg