commit 00c0a856bebf73e2cfdf28244b49cae2ed05ed0c
parent 45484dc589a474f05ffc80e328e71cb7145a7ff7
Author: Steven Atkinson <steven@atkinson.mn>
Date: Sat, 21 Sep 2024 11:48:32 -0700
[FEATURE] Settings page (#497)
* Settings gear, rename some things anticipating new usage
* Thicker gear lines
Diffstat:
6 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp
@@ -104,7 +104,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
pGraphics->LoadFont("Roboto-Regular", ROBOTO_FN);
pGraphics->LoadFont("Michroma-Regular", MICHROMA_FN);
- const auto helpSVG = pGraphics->LoadSVG(HELP_FN);
+ const auto gearSVG = pGraphics->LoadSVG(GEAR_FN);
const auto fileSVG = pGraphics->LoadSVG(FILE_FN);
const auto crossSVG = pGraphics->LoadSVG(CLOSE_BUTTON_FN);
const auto rightArrowSVG = pGraphics->LoadSVG(RIGHT_ARROW_FN);
@@ -163,7 +163,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
const auto outputMeterArea = contentArea.GetFromRight(30).GetHShifted(20).GetMidVPadded(100).GetVShifted(-25);
// Misc Areas
- const auto helpButtonArea = mainArea.GetFromTRHC(50, 50).GetCentredInside(20, 20);
+ const auto settingsButtonArea = mainArea.GetFromTRHC(50, 50).GetCentredInside(20, 20);
// Model loader button
auto loadModelCompletionHandler = [&](const WDL_String& fileName, const WDL_String& path) {
@@ -241,15 +241,15 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
pGraphics->AttachControl(new NAMMeterControl(inputMeterArea, meterBackgroundBitmap, style), kCtrlTagInputMeter);
pGraphics->AttachControl(new NAMMeterControl(outputMeterArea, meterBackgroundBitmap, style), kCtrlTagOutputMeter);
- // Help/about box
+ // Settings/help/about box
pGraphics->AttachControl(new NAMCircleButtonControl(
- helpButtonArea,
+ settingsButtonArea,
[pGraphics](IControl* pCaller) {
- pGraphics->GetControlWithTag(kCtrlTagAboutBox)->As<NAMAboutBoxControl>()->HideAnimated(false);
+ pGraphics->GetControlWithTag(kCtrlTagSettingsBox)->As<NAMAboutBoxControl>()->HideAnimated(false);
},
- helpSVG));
+ gearSVG));
- pGraphics->AttachControl(new NAMAboutBoxControl(b, backgroundBitmap, style), kCtrlTagAboutBox)->Hide(true);
+ pGraphics->AttachControl(new NAMAboutBoxControl(b, backgroundBitmap, style), kCtrlTagSettingsBox)->Hide(true);
pGraphics->ForAllControlsFunc([](IControl* pControl) {
pControl->SetMouseEventsWhenDisabled(true);
diff --git a/NeuralAmpModeler/NeuralAmpModeler.h b/NeuralAmpModeler/NeuralAmpModeler.h
@@ -52,7 +52,7 @@ enum ECtrlTags
kCtrlTagIRFileBrowser,
kCtrlTagInputMeter,
kCtrlTagOutputMeter,
- kCtrlTagAboutBox,
+ kCtrlTagSettingsBox,
kCtrlTagOutNorm,
kNumCtrlTags
};
diff --git a/NeuralAmpModeler/config.h b/NeuralAmpModeler/config.h
@@ -59,7 +59,7 @@
#define ROBOTO_FN "Roboto-Regular.ttf"
#define MICHROMA_FN "Michroma-Regular.ttf"
-#define HELP_FN "Help.svg"
+#define GEAR_FN "Gear.svg"
#define FILE_FN "File.svg"
#define CLOSE_BUTTON_FN "Cross.svg"
#define LEFT_ARROW_FN "ArrowLeft.svg"
diff --git a/NeuralAmpModeler/resources/img/Gear.svg b/NeuralAmpModeler/resources/img/Gear.svg
@@ -0,0 +1,18 @@
+<svg width="500" height="500" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="250" cy="250" r="70" fill="none" stroke="white" stroke-width="40"/>
+ <path d="M 250,446
+ L 211,446
+ Q 200,337 100,382
+ L 61,314
+ Q 150,250 61,186
+ L 100,118
+ Q 200,163 211,54
+ L 289,54
+ Q 300,163 400,118
+ L 439,186
+ Q 350,250 439,314
+ L 400,382
+ Q 300,337 289,446
+ L 250,446"
+ fill="none" stroke="white" stroke-width="40" />
+</svg>
diff --git a/NeuralAmpModeler/resources/img/Help.svg b/NeuralAmpModeler/resources/img/Help.svg
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2">
- <path d="M100 0C44.8 0 0 44.8 0 100s44.8 100 100 100 100-44.8 100-100S155.2 0 100 0Zm0 12.812c48.13 0 87.19 39.058 87.19 87.188s-39.06 87.19-87.19 87.19c-48.13 0-87.188-39.06-87.188-87.19 0-48.13 39.058-87.188 87.188-87.188Zm1.47 21.25c-5.45.03-10.653.737-15.282 2.063-4.699 1.346-9.126 3.484-12.876 6.219-3.238 2.362-6.333 5.391-8.687 8.531-4.159 5.549-6.461 11.651-7.063 18.687-.04.468-.07.868-.062.876.016.016 21.702 2.687 21.812 2.687.053 0 .113-.234.282-.937 1.941-8.085 5.486-13.521 10.968-16.813 4.32-2.594 9.808-3.612 15.778-2.969 2.74.295 5.21.96 7.38 2a18.585 18.585 0 0 1 6.94 5.813c1.54 2.156 2.46 4.584 2.75 7.312.08.759.05 2.48-.03 3.219-.23 1.826-.7 3.378-1.5 4.969-.81 1.597-1.48 2.514-2.76 3.812-2.03 2.077-5.18 4.829-10.78 9.407-3.6 2.944-6.04 5.156-8.12 7.343-4.943 5.179-7.191 9.069-8.564 14.719-.905 3.72-1.256 7.55-1.156 13.19.025 1.4.062 2.73.062 2.97v.43h21.598l.03-2.4c.03-3.27.21-5.37.56-7.41.57-3.27 1.43-5 3.94-7.81 1.6-1.8 3.7-3.76 6.93-6.47 4.77-3.991 8.11-6.99 11.26-10.125 4.91-4.907 7.46-8.26 9.28-12.187 1.43-3.092 2.22-6.166 2.46-9.532.06-.816.07-3.03 0-3.968-.45-7.043-3.1-13.253-8.15-19.032-.8-.909-2.78-2.887-3.72-3.718-4.96-4.394-10.69-7.353-17.56-9.094-4.19-1.062-8.23-1.6-13.35-1.75-.78-.023-1.59-.036-2.37-.032Zm-10.908 103.6v22h21.998v-22H90.562Z" style="fill:#fff;fill-rule:nonzero"/>
-</svg>
diff --git a/NeuralAmpModeler/resources/main.rc b/NeuralAmpModeler/resources/main.rc
@@ -152,7 +152,7 @@ BEGIN
"ROBOTO_FN TTF ROBOTO_FN\r\n"
"MICHROMA_FN TTF MICHROMA_FN\r\n"
"FILE_FN SVG FILE_FN\r\n"
- "HELP_FN SVG HELP_FN\r\n"
+ "GEAR_FN SVG GEAR_FN\r\n"
"CLOSE_BUTTON_FN SVG CLOSE_BUTTON_FN\r\n"
"LEFT_ARROW_FN SVG LEFT_ARROW_FN\r\n"
"RIGHT_ARROW_FN SVG RIGHT_ARROW_FN\r\n"
@@ -259,7 +259,7 @@ END
ROBOTO_FN TTF ROBOTO_FN
MICHROMA_FN TTF MICHROMA_FN
FILE_FN SVG FILE_FN
-HELP_FN SVG HELP_FN
+GEAR_FN SVG GEAR_FN
CLOSE_BUTTON_FN SVG CLOSE_BUTTON_FN
LEFT_ARROW_FN SVG LEFT_ARROW_FN
RIGHT_ARROW_FN SVG RIGHT_ARROW_FN
