Skip to content

Commit 00c0a85

Browse files
authored
[FEATURE] Settings page (#497)
* Settings gear, rename some things anticipating new usage * Thicker gear lines
1 parent 45484dc commit 00c0a85

File tree

6 files changed

+29
-14
lines changed

6 files changed

+29
-14
lines changed

NeuralAmpModeler/NeuralAmpModeler.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
104104
pGraphics->LoadFont("Roboto-Regular", ROBOTO_FN);
105105
pGraphics->LoadFont("Michroma-Regular", MICHROMA_FN);
106106

107-
const auto helpSVG = pGraphics->LoadSVG(HELP_FN);
107+
const auto gearSVG = pGraphics->LoadSVG(GEAR_FN);
108108
const auto fileSVG = pGraphics->LoadSVG(FILE_FN);
109109
const auto crossSVG = pGraphics->LoadSVG(CLOSE_BUTTON_FN);
110110
const auto rightArrowSVG = pGraphics->LoadSVG(RIGHT_ARROW_FN);
@@ -163,7 +163,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
163163
const auto outputMeterArea = contentArea.GetFromRight(30).GetHShifted(20).GetMidVPadded(100).GetVShifted(-25);
164164

165165
// Misc Areas
166-
const auto helpButtonArea = mainArea.GetFromTRHC(50, 50).GetCentredInside(20, 20);
166+
const auto settingsButtonArea = mainArea.GetFromTRHC(50, 50).GetCentredInside(20, 20);
167167

168168
// Model loader button
169169
auto loadModelCompletionHandler = [&](const WDL_String& fileName, const WDL_String& path) {
@@ -241,15 +241,15 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
241241
pGraphics->AttachControl(new NAMMeterControl(inputMeterArea, meterBackgroundBitmap, style), kCtrlTagInputMeter);
242242
pGraphics->AttachControl(new NAMMeterControl(outputMeterArea, meterBackgroundBitmap, style), kCtrlTagOutputMeter);
243243

244-
// Help/about box
244+
// Settings/help/about box
245245
pGraphics->AttachControl(new NAMCircleButtonControl(
246-
helpButtonArea,
246+
settingsButtonArea,
247247
[pGraphics](IControl* pCaller) {
248-
pGraphics->GetControlWithTag(kCtrlTagAboutBox)->As<NAMAboutBoxControl>()->HideAnimated(false);
248+
pGraphics->GetControlWithTag(kCtrlTagSettingsBox)->As<NAMAboutBoxControl>()->HideAnimated(false);
249249
},
250-
helpSVG));
250+
gearSVG));
251251

252-
pGraphics->AttachControl(new NAMAboutBoxControl(b, backgroundBitmap, style), kCtrlTagAboutBox)->Hide(true);
252+
pGraphics->AttachControl(new NAMAboutBoxControl(b, backgroundBitmap, style), kCtrlTagSettingsBox)->Hide(true);
253253

254254
pGraphics->ForAllControlsFunc([](IControl* pControl) {
255255
pControl->SetMouseEventsWhenDisabled(true);

NeuralAmpModeler/NeuralAmpModeler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ enum ECtrlTags
5252
kCtrlTagIRFileBrowser,
5353
kCtrlTagInputMeter,
5454
kCtrlTagOutputMeter,
55-
kCtrlTagAboutBox,
55+
kCtrlTagSettingsBox,
5656
kCtrlTagOutNorm,
5757
kNumCtrlTags
5858
};

NeuralAmpModeler/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#define ROBOTO_FN "Roboto-Regular.ttf"
6060
#define MICHROMA_FN "Michroma-Regular.ttf"
6161

62-
#define HELP_FN "Help.svg"
62+
#define GEAR_FN "Gear.svg"
6363
#define FILE_FN "File.svg"
6464
#define CLOSE_BUTTON_FN "Cross.svg"
6565
#define LEFT_ARROW_FN "ArrowLeft.svg"
Lines changed: 18 additions & 0 deletions
Loading

NeuralAmpModeler/resources/img/Help.svg

Lines changed: 0 additions & 3 deletions
This file was deleted.

NeuralAmpModeler/resources/main.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ BEGIN
152152
"ROBOTO_FN TTF ROBOTO_FN\r\n"
153153
"MICHROMA_FN TTF MICHROMA_FN\r\n"
154154
"FILE_FN SVG FILE_FN\r\n"
155-
"HELP_FN SVG HELP_FN\r\n"
155+
"GEAR_FN SVG GEAR_FN\r\n"
156156
"CLOSE_BUTTON_FN SVG CLOSE_BUTTON_FN\r\n"
157157
"LEFT_ARROW_FN SVG LEFT_ARROW_FN\r\n"
158158
"RIGHT_ARROW_FN SVG RIGHT_ARROW_FN\r\n"
@@ -259,7 +259,7 @@ END
259259
ROBOTO_FN TTF ROBOTO_FN
260260
MICHROMA_FN TTF MICHROMA_FN
261261
FILE_FN SVG FILE_FN
262-
HELP_FN SVG HELP_FN
262+
GEAR_FN SVG GEAR_FN
263263
CLOSE_BUTTON_FN SVG CLOSE_BUTTON_FN
264264
LEFT_ARROW_FN SVG LEFT_ARROW_FN
265265
RIGHT_ARROW_FN SVG RIGHT_ARROW_FN

0 commit comments

Comments
 (0)