commit b6fb6ea6bddb81f96747d97aeeb485fbfdcf63d7 parent b6f4c52224b10b7a73a3e39ecc08fd48de4b423b Author: Oli Larkin <[email protected]> Date: Sat, 1 Jul 2023 02:49:29 +0200 Rework bitmap controls (#270) * Replace background control * Implement title using IVLabelControl * Update NAMSwitchControl for single bitmap * Update NAMKnobControl for new background * Add NAMAboutBoxControl * NAMFileBrowserControl takes an image * Add SVG based IR/Model icons * Add lines bitmap * Update iPlug2 * Fix for KnobControl bitmap scaling * Update images, svgs and code for controls * Introduce NAMMeterControl * Tidy up variable naming * Tidy up the layout code, naming "Areas" etc --------- Co-authored-by: Steven Atkinson <[email protected]> Diffstat:
51 files changed, 778 insertions(+), 673 deletions(-)
diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp @@ -5,7 +5,6 @@ #include <utility> #include "Colors.h" -#include "IControls.h" #include "NeuralAmpModelerCore/NAM/activations.h" // clang-format off // These includes need to happen in this order or else the latter won't know @@ -49,6 +48,12 @@ const IVStyle style = DEFAULT_WIDGET_FRAC, DEFAULT_WIDGET_ANGLE}; +const IVStyle titleStyle = +DEFAULT_STYLE +.WithValueText(IText(24, COLOR_WHITE, "Ronduit-Light")) +.WithDrawFrame(false) +.WithShadowOffset(2.f); + NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info) : Plugin(info, MakeConfig(kNumParams, kNumPresets)) { @@ -80,93 +85,72 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info) mLayoutFunc = [&](IGraphics* pGraphics) { pGraphics->AttachCornerResizer(EUIResizerMode::Scale, false); pGraphics->AttachTextEntryControl(); - pGraphics->AttachPanelBackground(COLOR_BLACK); pGraphics->EnableMouseOver(true); pGraphics->EnableTooltips(true); - auto helpSVG = pGraphics->LoadSVG(HELP_FN); - auto fileSVG = pGraphics->LoadSVG(FILE_FN); - auto closeButtonSVG = pGraphics->LoadSVG(CLOSE_BUTTON_FN); - auto rightArrowSVG = pGraphics->LoadSVG(RIGHT_ARROW_FN); - auto leftArrowSVG = pGraphics->LoadSVG(LEFT_ARROW_FN); - const IBitmap irSwitchBitmap = pGraphics->LoadBitmap((TOGGLEIR_FN), 2, true); - const IBitmap switchBitmap = pGraphics->LoadBitmap((TOGGLE_FN), true); - const IBitmap switchHandleBitmap = pGraphics->LoadBitmap((TOGGLE_HANDLE_FN), true); - const IBitmap knobRotateBitmap = pGraphics->LoadBitmap(KNOB_FN); + pGraphics->LoadFont("Roboto-Regular", ROBOTO_FN); - const IRECT b = pGraphics->GetBounds(); - const IRECT mainArea = b.GetPadded(-20); - const auto content = mainArea.GetPadded(-10); - const float titleHeight = 50.0f; - - // Area for the Noise gate knob - const float allKnobsHalfPad = 10.0f; - const float allKnobsPad = 2.0f * allKnobsHalfPad; + pGraphics->LoadFont("Ronduit-Light", RONDUIT_FN); + + const auto helpSVG = pGraphics->LoadSVG(HELP_FN); + const auto fileSVG = pGraphics->LoadSVG(FILE_FN); + const auto crossSVG = pGraphics->LoadSVG(CLOSE_BUTTON_FN); + const auto rightArrowSVG = pGraphics->LoadSVG(RIGHT_ARROW_FN); + const auto leftArrowSVG = pGraphics->LoadSVG(LEFT_ARROW_FN); + const auto modelIconSVG = pGraphics->LoadSVG(MODEL_ICON_FN); + const auto irIconOnSVG = pGraphics->LoadSVG(IR_ICON_ON_FN); + const auto irIconOffSVG = pGraphics->LoadSVG(IR_ICON_OFF_FN); + + const auto backgroundBitmap = pGraphics->LoadBitmap(BACKGROUND_FN); + const auto fileBackgroundBitmap = pGraphics->LoadBitmap(FILEBACKGROUND_FN); + const auto linesBitmap = pGraphics->LoadBitmap(LINES_FN); + const auto knobBackgroundBitmap = pGraphics->LoadBitmap(KNOBBACKGROUND_FN); + const auto switchHandleBitmap = pGraphics->LoadBitmap(SLIDESWITCHHANDLE_FN); + const auto meterBackgroundBitmap = pGraphics->LoadBitmap(METERBACKGROUND_FN); + + const auto b = pGraphics->GetBounds(); + const auto mainArea = b.GetPadded(-20); + const auto contentArea = mainArea.GetPadded(-10); + const auto titleHeight = 50.0f; + const auto titleArea = contentArea.GetFromTop(titleHeight); // Areas for knobs - const float knobsExtraSpaceBelowTitle = 25.0f; - const float knobHalfHeight = 70.0f; - const float knobHeight = 2.0f * knobHalfHeight; - const float singleKnobPad = 12.0f; - const auto knobs = content.GetFromTop(knobHeight) - .GetReducedFromLeft(allKnobsPad) - .GetReducedFromRight(allKnobsPad) - .GetTranslated(0.0f, titleHeight + knobsExtraSpaceBelowTitle); - const IRECT inputKnobArea = knobs.GetGridCell(0, kInputLevel, 1, numKnobs).GetPadded(-singleKnobPad); - const IRECT noiseGateArea = knobs.GetGridCell(0, kNoiseGateThreshold, 1, numKnobs).GetPadded(-singleKnobPad); - const IRECT bassKnobArea = knobs.GetGridCell(0, kToneBass, 1, numKnobs).GetPadded(-singleKnobPad); - const IRECT middleKnobArea = knobs.GetGridCell(0, kToneMid, 1, numKnobs).GetPadded(-singleKnobPad); - const IRECT trebleKnobArea = knobs.GetGridCell(0, kToneTreble, 1, numKnobs).GetPadded(-singleKnobPad); - const IRECT outputKnobArea = knobs.GetGridCell(0, kOutputLevel, 1, numKnobs).GetPadded(-singleKnobPad); - - const float toggleHeight = 40.0f; - // Area for noise gate toggle - const float ngAreaHeight = toggleHeight; - const IRECT ngToggleArea = - noiseGateArea.GetFromBottom(ngAreaHeight).GetTranslated(-10.f, ngAreaHeight + singleKnobPad - 14.f); - // Area for EQ toggle - const float eqAreaHeight = toggleHeight; - const float eqAreaHalfWidth = 0.5f * middleKnobArea.W(); - const IRECT eqToggleArea = middleKnobArea.GetFromBottom(eqAreaHeight) - .GetTranslated(-10.f, eqAreaHeight + singleKnobPad - 14.f) - .GetMidHPadded(eqAreaHalfWidth); - - // Area for output normalization toggle - const float outNormAreaHeight = toggleHeight; - const float outNormAreaHalfWidth = 0.5f * outputKnobArea.W(); - const IRECT outNormToggleArea = outputKnobArea.GetFromBottom(outNormAreaHeight) - .GetTranslated(-10.f, outNormAreaHeight + singleKnobPad - 14.f) - .GetMidHPadded(outNormAreaHalfWidth); - - // Area for IR bypass toggle - const float irBypassToggleX = 46.f; - const float irBypassToggleY = 343.f; - const IRECT irBypassToggleArea = IRECT(irBypassToggleX, irBypassToggleY, irSwitchBitmap); + const auto knobsPad = 20.0f; + const auto knobsExtraSpaceBelowTitle = 25.0f; + const auto knobHeight = 120.f; + const auto singleKnobPad = -2.0f; + const auto knobsArea = contentArea.GetFromTop(knobHeight) + .GetReducedFromLeft(knobsPad) + .GetReducedFromRight(knobsPad) + .GetVShifted(titleHeight + knobsExtraSpaceBelowTitle); + const auto inputKnobArea = knobsArea.GetGridCell(0, kInputLevel, 1, numKnobs).GetPadded(-singleKnobPad); + const auto noiseGateArea = knobsArea.GetGridCell(0, kNoiseGateThreshold, 1, numKnobs).GetPadded(-singleKnobPad); + const auto bassKnobArea = knobsArea.GetGridCell(0, kToneBass, 1, numKnobs).GetPadded(-singleKnobPad); + const auto midKnobArea = knobsArea.GetGridCell(0, kToneMid, 1, numKnobs).GetPadded(-singleKnobPad); + const auto trebleKnobArea = knobsArea.GetGridCell(0, kToneTreble, 1, numKnobs).GetPadded(-singleKnobPad); + const auto outputKnobArea = knobsArea.GetGridCell(0, kOutputLevel, 1, numKnobs).GetPadded(-singleKnobPad); + + const auto ngToggleArea = noiseGateArea.GetVShifted(noiseGateArea.H()).SubRectVertical(2, 0).GetReducedFromTop(10.0f); + const auto eqToggleArea = midKnobArea.GetVShifted(midKnobArea.H()).SubRectVertical(2, 0).GetReducedFromTop(10.0f); + const auto outNormToggleArea = outputKnobArea.GetVShifted(midKnobArea.H()).SubRectVertical(2, 0).GetReducedFromTop(10.0f); // Areas for model and IR - const float fileWidth = 200.0f; - const float fileHeight = 30.0f; - const float fileYSpace = 8.0f; - const float irYOffset = 38.0f; - const IRECT modelArea = content.GetFromBottom((2.0f * fileHeight) + fileYSpace) + const auto fileWidth = 200.0f; + const auto fileHeight = 30.0f; + const auto irYOffset = 38.0f; + const auto modelArea = contentArea.GetFromBottom((2.0f * fileHeight)) .GetFromTop(fileHeight) .GetMidHPadded(fileWidth) - .GetTranslated(0.0f, -1); - const IRECT irArea = modelArea.GetTranslated(0.0f, irYOffset); - + .GetVShifted(-1); + const auto modelIconArea = modelArea.GetFromLeft(30).GetTranslated(-40, 10); + const auto irArea = modelArea.GetVShifted(irYOffset); + const auto irSwitchArea = irArea.GetFromLeft(30).GetHShifted(-40).GetScaledAboutCentre(0.6); + // Areas for meters - const float meterHalfHeight = 0.5f * 385.0f; - const IRECT inputMeterArea = inputKnobArea.GetFromLeft(allKnobsHalfPad) - .GetMidHPadded(allKnobsHalfPad) - .GetMidVPadded(meterHalfHeight) - .GetTranslated(-allKnobsPad - 18.f, 0.0f); - const IRECT outputMeterArea = outputKnobArea.GetFromRight(allKnobsHalfPad) - .GetMidHPadded(allKnobsHalfPad) - .GetMidVPadded(meterHalfHeight) - .GetTranslated(allKnobsPad + 18.f, 0.0f); - - auto themeBG = pGraphics->LoadBitmap(EH_SKIN_FN); - pGraphics->AttachControl(new IBitmapControl(pGraphics->GetBounds(), themeBG, kNoParameter)) - ->SetBlend(IBlend(EBlend::Default, 1.0)); + const auto inputMeterArea = contentArea.GetFromLeft(30).GetHShifted(-20).GetMidVPadded(100).GetVShifted(-25); + const auto outputMeterArea = contentArea.GetFromRight(30).GetHShifted(20).GetMidVPadded(100).GetVShifted(-25); + + // Misc Areas + const auto helpButtonArea = mainArea.GetFromTRHC(50, 50).GetCentredInside(20, 20); // Model loader button auto loadModelCompletionHandler = [&](const WDL_String& fileName, const WDL_String& path) { @@ -207,6 +191,11 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info) } }; + pGraphics->AttachBackground(BACKGROUND_FN); + pGraphics->AttachControl(new IBitmapControl(b, linesBitmap)); + pGraphics->AttachControl(new IVLabelControl(titleArea, "Neural Amp Modeler", titleStyle)); + pGraphics->AttachControl(new ISVGControl(modelIconArea, modelIconSVG)); + #ifdef NAM_PICK_DIRECTORY const std::string defaultNamFileString = "Select model directory..."; const std::string defaultIRString = "Select IR directory..."; @@ -216,125 +205,45 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info) #endif pGraphics->AttachControl(new NAMFileBrowserControl(modelArea, kMsgTagClearModel, defaultNamFileString.c_str(), "nam", loadModelCompletionHandler, style, fileSVG, - closeButtonSVG, leftArrowSVG, rightArrowSVG), + crossSVG, leftArrowSVG, rightArrowSVG, fileBackgroundBitmap), kCtrlTagModelFileBrowser); - pGraphics->AttachControl( - new NAMFileBrowserControl(irArea, kMsgTagClearIR, defaultIRString.c_str(), "wav", loadIRCompletionHandler, style, - fileSVG, closeButtonSVG, leftArrowSVG, rightArrowSVG), - kCtrlTagIRFileBrowser); - - // TODO all these magic numbers - pGraphics->AttachControl(new NAMSwitchControl( - ngToggleArea.GetFromTop(60.f).GetPadded(-20.f), kNoiseGateActive, "", style, switchBitmap, switchHandleBitmap)); - pGraphics->AttachControl(new NAMSwitchControl( - eqToggleArea.GetFromTop(60.f).GetPadded(-20.f), kEQActive, "", style, switchBitmap, switchHandleBitmap)); - pGraphics->AttachControl(new NAMSwitchControl(outNormToggleArea.GetFromTop(32.f).GetPadded(-20.f), kOutNorm, "", - style, switchBitmap, switchHandleBitmap), - kCtrlTagOutNorm); - // Get those labels on - { - const float labelNudgeX = 11.f; - const float labelNudgeY = 15.f; - pGraphics->AttachControl( - new ITextControl(eqToggleArea.GetFromTop(70.f).GetTranslated(labelNudgeX, labelNudgeY), "EQ", style.labelText)); - pGraphics->AttachControl(new ITextControl( - outNormToggleArea.GetFromTop(70.f).GetTranslated(labelNudgeX, labelNudgeY), "Normalize", style.labelText)); - } + pGraphics->AttachControl(new ISVGSwitchControl(irSwitchArea, { irIconOffSVG, irIconOnSVG}, kIRToggle)); + pGraphics->AttachControl(new NAMFileBrowserControl(irArea, kMsgTagClearModel, defaultIRString.c_str(), "wav", + loadIRCompletionHandler, style, + fileSVG, crossSVG, leftArrowSVG, rightArrowSVG, fileBackgroundBitmap), + kCtrlTagIRFileBrowser); + pGraphics->AttachControl(new NAMSwitchControl(ngToggleArea, kNoiseGateActive, " ", style, switchHandleBitmap)); + pGraphics->AttachControl(new NAMSwitchControl(eqToggleArea, kEQActive, "EQ", style, switchHandleBitmap)); + pGraphics->AttachControl(new NAMSwitchControl(outNormToggleArea, kOutNorm, "Normalize", style, switchHandleBitmap), kCtrlTagOutNorm); // The knobs - pGraphics->AttachControl(new NAMKnobControl(inputKnobArea, kInputLevel, "", style, knobRotateBitmap)); - pGraphics->AttachControl(new NAMKnobControl(noiseGateArea, kNoiseGateThreshold, "", style, knobRotateBitmap)); - pGraphics->AttachControl(new NAMKnobControl(bassKnobArea, kToneBass, "", style, knobRotateBitmap), -1, "EQ_KNOBS"); - pGraphics->AttachControl(new NAMKnobControl(middleKnobArea, kToneMid, "", style, knobRotateBitmap), -1, "EQ_KNOBS"); - pGraphics->AttachControl( - new NAMKnobControl(trebleKnobArea, kToneTreble, "", style, knobRotateBitmap), -1, "EQ_KNOBS"); - pGraphics->AttachControl(new NAMKnobControl(outputKnobArea, kOutputLevel, "", style, knobRotateBitmap)); - - // toggle IR on / off - pGraphics->AttachControl(new IBSwitchControl(irBypassToggleArea, irSwitchBitmap, kIRToggle)); + pGraphics->AttachControl(new NAMKnobControl(inputKnobArea, kInputLevel, "", style, knobBackgroundBitmap)); + pGraphics->AttachControl(new NAMKnobControl(noiseGateArea, kNoiseGateThreshold, "", style, knobBackgroundBitmap)); + pGraphics->AttachControl(new NAMKnobControl(bassKnobArea, kToneBass, "", style, knobBackgroundBitmap), -1, "EQ_KNOBS"); + pGraphics->AttachControl(new NAMKnobControl(midKnobArea, kToneMid, "", style, knobBackgroundBitmap), -1, "EQ_KNOBS"); + pGraphics->AttachControl(new NAMKnobControl(trebleKnobArea, kToneTreble, "", style, knobBackgroundBitmap), -1, "EQ_KNOBS"); + pGraphics->AttachControl(new NAMKnobControl(outputKnobArea, kOutputLevel, "", style, knobBackgroundBitmap)); // The meters - const float meterMin = -90.0f; - const float meterMax = -0.01f; - pGraphics - ->AttachControl( - new IVPeakAvgMeterControl(inputMeterArea, "", - style.WithWidgetFrac(0.5).WithShowValue(false).WithDrawFrame(false).WithColor( - kFG, PluginColors::NAM_THEMECOLOR.WithOpacity(0.4f)), - EDirection::Vertical, {}, 0, meterMin, meterMax, {}), - kCtrlTagInputMeter) - ->As<IVPeakAvgMeterControl<>>() - ->SetPeakSize(2.0f); - pGraphics - ->AttachControl( - new IVPeakAvgMeterControl(outputMeterArea, "", - style.WithWidgetFrac(0.5).WithShowValue(false).WithDrawFrame(false).WithColor( - kFG, PluginColors::NAM_THEMECOLOR.WithOpacity(0.4f)), - EDirection::Vertical, {}, 0, meterMin, meterMax, {}), - kCtrlTagOutputMeter) - ->As<IVPeakAvgMeterControl<>>() - ->SetPeakSize(2.0f); - - // Help/about box - pGraphics->AttachControl(new NAMCircleButtonControl( - mainArea.GetFromTRHC(50, 50).GetCentredInside(20, 20), + pGraphics->AttachControl(new NAMMeterControl(inputMeterArea, meterBackgroundBitmap, style), kCtrlTagInputMeter); + pGraphics->AttachControl(new NAMMeterControl(outputMeterArea, meterBackgroundBitmap, style), kCtrlTagOutputMeter); + + // Help/about box + pGraphics->AttachControl(new NAMCircleButtonControl(helpButtonArea, [pGraphics](IControl* pCaller) { - pGraphics->GetControlWithTag(kCtrlTagAboutBox)->As<IAboutBoxControl>()->HideAnimated(false); + pGraphics->GetControlWithTag(kCtrlTagAboutBox)->As<NAMAboutBoxControl>()->HideAnimated(false); }, helpSVG)); - pGraphics - ->AttachControl( - new IAboutBoxControl( - b, COLOR_GRAY, - // AttachFunc - [](IContainerBase* pParent, const IRECT& r) { - pParent->AddChildControl(new IPanelControl( - IRECT(), - IPattern::CreateLinearGradient( - r, EDirection::Vertical, {{PluginColors::NAM_THEMEFONTCOLOR, 0.f}, {PluginColors::NAM_0, 1.f}}))); - - pParent->AddChildControl(new IVPanelControl(IRECT(), "", - style.WithColor(kFR, PluginColors::NAM_1.WithOpacity(0.9f)) - .WithColor(kFG, PluginColors::NAM_1.WithOpacity(0.9f)))); - - pParent->AddChildControl(new IVLabelControl( - IRECT(), "Neural Amp Modeler", - style.WithDrawFrame(false).WithValueText({30, EAlign::Center, PluginColors::HELP_TEXT}))); - - WDL_String versionStr{"Version "}; - versionStr.Append(PLUG_VERSION_STR); - pParent->AddChildControl(new IVLabelControl( - IRECT(), versionStr.Get(), - style.WithDrawFrame(false).WithValueText({DEFAULT_TEXT_SIZE, EAlign::Center, PluginColors::HELP_TEXT}))); - pParent->AddChildControl(new IVLabelControl( - IRECT(), "By Steven Atkinson", - style.WithDrawFrame(false).WithValueText({DEFAULT_TEXT_SIZE, EAlign::Center, PluginColors::HELP_TEXT}))); - pParent->AddChildControl(new IURLControl(IRECT(), "Train your own model", - "https://github.com/sdatkinson/neural-amp-modeler", - {DEFAULT_TEXT_SIZE, PluginColors::HELP_TEXT})); - }, - // ResizeFunc - [](IContainerBase* pParent, const IRECT& r) { - const IRECT mainArea = r.GetPadded(-20); - const auto content = mainArea.GetPadded(-10); - const auto titleLabel = content.GetFromTop(50); - pParent->GetChild(0)->SetTargetAndDrawRECTs(r); - pParent->GetChild(1)->SetTargetAndDrawRECTs(mainArea); - pParent->GetChild(2)->SetTargetAndDrawRECTs(titleLabel); - pParent->GetChild(3)->SetTargetAndDrawRECTs(titleLabel.GetVShifted(titleLabel.H())); - pParent->GetChild(4)->SetTargetAndDrawRECTs(titleLabel.GetVShifted(titleLabel.H() + 20)); - pParent->GetChild(5)->SetTargetAndDrawRECTs(titleLabel.GetVShifted(titleLabel.H() + 40)); - }, - // Animation Time - 0), - kCtrlTagAboutBox) - ->Hide(true); + pGraphics->AttachControl(new NAMAboutBoxControl(b, backgroundBitmap, style), kCtrlTagAboutBox)->Hide(true); pGraphics->ForAllControlsFunc([](IControl* pControl) { pControl->SetMouseEventsWhenDisabled(true); pControl->SetMouseOverWhenDisabled(true); }); + + pGraphics->GetControlWithTag(kCtrlTagOutNorm)->SetMouseEventsWhenDisabled(false); + }; } @@ -526,6 +435,29 @@ bool NeuralAmpModeler::OnMessage(int msgTag, int ctrlTag, int dataSize, const vo { case kMsgTagClearModel: mShouldRemoveModel = true; return true; case kMsgTagClearIR: mShouldRemoveIR = true; return true; + case kMsgTagHighlightColor: + { + mHighLightColor.Set((const char*) pData); + + if (GetUI()) + { + GetUI()->ForStandardControlsFunc([&](IControl* pControl){ + + if (auto* pVectorBase = pControl->As<IVectorBase>()) + { + IColor color = IColor::FromColorCodeStr(mHighLightColor.Get()); + + pVectorBase->SetColor(kX1, color); + pVectorBase->SetColor(kPR, color.WithOpacity(0.3f)); + pVectorBase->SetColor(kFR, color.WithOpacity(0.4f)); + pVectorBase->SetColor(kX3, color.WithContrast(0.1f)); + } + pControl->GetUI()->SetAllControlsDirty(); + }); + } + + return true; + } default: return false; } } diff --git a/NeuralAmpModeler/NeuralAmpModeler.h b/NeuralAmpModeler/NeuralAmpModeler.h @@ -51,6 +51,7 @@ enum EMsgTags // These tags are used from UI -> DSP kMsgTagClearModel = 0, kMsgTagClearIR, + kMsgTagHighlightColor, // The following tags are from DSP -> UI kMsgTagLoadFailed, kMsgTagLoadedModel, @@ -155,6 +156,8 @@ private: WDL_String mNAMPath; // Path to IR (.wav file) WDL_String mIRPath; + + WDL_String mHighLightColor; std::unordered_map<std::string, double> mNAMParams = {{"Input", 0.0}, {"Output", 0.0}}; diff --git a/NeuralAmpModeler/NeuralAmpModelerControls.h b/NeuralAmpModeler/NeuralAmpModelerControls.h @@ -2,6 +2,8 @@ #include "IControls.h" +#define PLUG() static_cast<PLUG_CLASS_NAME*>(GetDelegate()) + using namespace iplug; using namespace igraphics; @@ -46,19 +48,21 @@ public: : IVKnobControl(bounds, paramIdx, label, style, true) , IBitmapBase(bitmap) { - mInnerPointerFrac = 0.6; + mInnerPointerFrac = 0.55; } + void OnRescale() override { mBitmap = GetUI()->GetScaledBitmap(mBitmap); } + void DrawWidget(IGraphics& g) override { - float widgetRadius = GetRadius(); - const float cx = mWidgetBounds.MW(), cy = mWidgetBounds.MH(); - IRECT knobHandleBounds = mWidgetBounds.GetCentredInside((widgetRadius - mTrackToHandleDistance) * 2.5f); + float widgetRadius = GetRadius() * 0.73; + auto knobRect = mWidgetBounds.GetCentredInside(mWidgetBounds.W(), mWidgetBounds.W()); + const float cx = knobRect.MW(), cy = knobRect.MH(); const float angle = mAngle1 + (static_cast<float>(GetValue()) * (mAngle2 - mAngle1)); - DrawIndicatorTrack(g, angle, cx, cy, widgetRadius); - g.DrawBitmap(mBitmap, knobHandleBounds.GetTranslated(4, 3), 0, 0); + DrawIndicatorTrack(g, angle, cx+0.5, cy, widgetRadius); + g.DrawFittedBitmap(mBitmap, knobRect); float data[2][2]; - RadialPoints(angle, cx + 1, cy, mInnerPointerFrac * widgetRadius, mInnerPointerFrac * widgetRadius, 2, data); + RadialPoints(angle, cx, cy, mInnerPointerFrac * widgetRadius, mInnerPointerFrac * widgetRadius, 2, data); g.PathCircle(data[1][0], data[1][1], 3); g.PathFill(IPattern::CreateRadialGradient(data[1][0], data[1][1], 4.0f, {{GetColor(mMouseIsOver ? kX3 : kX1), 0.f}, @@ -72,36 +76,87 @@ public: class NAMSwitchControl : public IVSlideSwitchControl, public IBitmapBase { public: - NAMSwitchControl(const IRECT& bounds, int paramIdx, const char* label, const IVStyle& style, IBitmap bitmap, - IBitmap handleBitmap) - : IVSlideSwitchControl( - {bounds.L, bounds.T, bitmap}, paramIdx, label, style.WithRoundness(5.f).WithShowLabel(false).WithShowValue(false)) + NAMSwitchControl(const IRECT& bounds, int paramIdx, const char* label, const IVStyle& style, IBitmap bitmap) + : IVSlideSwitchControl(bounds, paramIdx, label, style + .WithRoundness(0.666f) + .WithShowValue(false) + .WithEmboss(true) + .WithShadowOffset(1.5f) + .WithDrawShadows(false) + .WithColor(kFR, COLOR_BLACK) + .WithFrameThickness(0.5f) + .WithWidgetFrac(0.5f) + .WithLabelOrientation(EOrientation::South)) , IBitmapBase(bitmap) - , mHandleBitmap(handleBitmap) { } void DrawWidget(IGraphics& g) override { - // OL: arg, pixels :-( - if (GetValue() > 0.5f) - g.FillRoundRect(GetColor(kFG), mRECT.GetPadded(-2.7f).GetTranslated(0.0, 1.f), 9.f, &mBlend); - else - g.FillRoundRect(COLOR_BLACK, mRECT.GetPadded(-2.7f).GetTranslated(0.0, 1.f), 9.f, &mBlend); - DrawTrack(g, mWidgetBounds); DrawHandle(g, mHandleBounds); } - void DrawTrack(IGraphics& g, const IRECT& filledArea) override { g.DrawBitmap(mBitmap, mRECT, 0, &mBlend); } + void DrawTrack(IGraphics& g, const IRECT& bounds) override + { + IRECT handleBounds = GetAdjustedHandleBounds(bounds); + handleBounds = IRECT(handleBounds.L, handleBounds.T, handleBounds.R, handleBounds.T + mBitmap.H()); + IRECT centreBounds = handleBounds.GetPadded(-mStyle.shadowOffset); + IRECT shadowBounds = handleBounds.GetTranslated(mStyle.shadowOffset, mStyle.shadowOffset); +// const float contrast = mDisabled ? -GRAYED_ALPHA : 0.f; + float cR = 7.f; + const float tlr = cR; + const float trr = cR; + const float blr = cR; + const float brr = cR; + + // outer shadow + if (mStyle.drawShadows) + g.FillRoundRect(GetColor(kSH), shadowBounds, tlr, trr, blr, brr, &mBlend); + + // Embossed style unpressed + if (mStyle.emboss) + { + // Positive light + g.FillRoundRect(GetColor(kPR), handleBounds, tlr, trr, blr, brr/*, &blend*/); + + // Negative light + g.FillRoundRect(GetColor(kSH), shadowBounds, tlr, trr, blr, brr/*, &blend*/); + + // Fill in foreground + g.FillRoundRect(GetValue() > 0.5 ? GetColor(kX1) : COLOR_BLACK, centreBounds, tlr, trr, blr, brr, &mBlend); + + // Shade when hovered + if (mMouseIsOver) + g.FillRoundRect(GetColor(kHL), centreBounds, tlr, trr, blr, brr, &mBlend); + } + else + { + g.FillRoundRect(GetValue() > 0.5 ? GetColor(kX1) : COLOR_BLACK, handleBounds, tlr, trr, blr, brr/*, &blend*/); + + // Shade when hovered + if (mMouseIsOver) + g.FillRoundRect(GetColor(kHL), handleBounds, tlr, trr, blr, brr, &mBlend); + } + + if (mStyle.drawFrame) + g.DrawRoundRect(GetColor(kFR), handleBounds, tlr, trr, blr, brr, &mBlend, mStyle.frameThickness); + } void DrawHandle(IGraphics& g, const IRECT& filledArea) override { - g.DrawBitmap(mHandleBitmap, filledArea.GetTranslated(2.0, 3.0), 0, &mBlend); + IRECT r; + if (GetSelectedIdx() == 0) + { + r = filledArea.GetFromLeft(mBitmap.W()); + } + else + { + r = filledArea.GetFromRight(mBitmap.W()); + } + + g.DrawBitmap(mBitmap, r, 0, 0, nullptr); } - -private: - IBitmap mHandleBitmap; }; class NAMFileNameControl : public IVButtonControl @@ -146,12 +201,13 @@ class NAMFileBrowserControl : public IDirBrowseControlBase public: NAMFileBrowserControl(const IRECT& bounds, int clearMsgTag, const char* labelStr, const char* fileExtension, IFileDialogCompletionHandlerFunc ch, const IVStyle& style, const ISVG& loadSVG, - const ISVG& clearSVG, const ISVG& leftSVG, const ISVG& rightSVG) + const ISVG& clearSVG, const ISVG& leftSVG, const ISVG& rightSVG, const IBitmap& bitmap) : IDirBrowseControlBase(bounds, fileExtension, false, false) , mClearMsgTag(clearMsgTag) , mDefaultLabelStr(labelStr) , mCompletionHandlerFunc(ch) , mStyle(style.WithColor(kFG, COLOR_TRANSPARENT).WithDrawFrame(false)) + , mBitmap(bitmap) , mLoadSVG(loadSVG) , mClearSVG(clearSVG) , mLeftSVG(leftSVG) @@ -159,9 +215,10 @@ public: { mIgnoreMouse = true; } - + void Draw(IGraphics& g) override - { /* NO-OP */ + { + g.DrawFittedBitmap(mBitmap, mRECT); } void OnPopupMenuSelection(IPopupMenu* pSelectedMenu, int valIdx) override @@ -253,7 +310,7 @@ public: } }; - IRECT padded = mRECT.GetPadded(-5.f); + IRECT padded = mRECT.GetPadded(-6.f).GetHPadded(-2.f); const auto buttonWidth = padded.H(); const auto loadFileButtonBounds = padded.ReduceFromLeft(buttonWidth); const auto clearButtonBounds = padded.ReduceFromRight(buttonWidth); @@ -331,6 +388,181 @@ private: IFileDialogCompletionHandlerFunc mCompletionHandlerFunc; NAMFileNameControl* mFileNameControl = nullptr; IVStyle mStyle; + IBitmap mBitmap; ISVG mLoadSVG, mClearSVG, mLeftSVG, mRightSVG; int mClearMsgTag; }; + +class NAMMeterControl : public IVPeakAvgMeterControl<>, public IBitmapBase +{ + static constexpr float KMeterMin = -70.0f; + static constexpr float KMeterMax = -0.01f; + +public: + NAMMeterControl(const IRECT& bounds, const IBitmap& bitmap, const IVStyle& style) + : IVPeakAvgMeterControl<>(bounds, "", + style.WithShowValue(false).WithDrawFrame(false).WithWidgetFrac(0.8), + EDirection::Vertical, {}, 0, KMeterMin, KMeterMax, {}) + , IBitmapBase(bitmap) + { + SetPeakSize(1.0f); + } + + void OnRescale() override { mBitmap = GetUI()->GetScaledBitmap(mBitmap); } + + virtual void OnResize() override + { + SetTargetRECT(MakeRects(mRECT)); + mWidgetBounds = mWidgetBounds.GetMidHPadded(5).GetVPadded(10); + MakeTrackRects(mWidgetBounds); + MakeStepRects(mWidgetBounds, mNSteps); + SetDirty(false); + } + + void DrawBackground(IGraphics& g, const IRECT& r) override + { + g.DrawFittedBitmap(mBitmap, r); + } + + void DrawTrackHandle(IGraphics& g, const IRECT& r, int chIdx, bool aboveBaseValue) override + { + if (r.H() > 2) + g.FillRect(GetColor(kX1), r, &mBlend); + } + + void DrawPeak(IGraphics& g, const IRECT& r, int chIdx, bool aboveBaseValue) override + { + g.DrawGrid(COLOR_BLACK, mTrackBounds.Get()[chIdx], 10, 2); + g.FillRect(GetColor(kX3), r, &mBlend); + } +}; + +class NAMAboutBoxControl : public IContainerBase +{ +public: + NAMAboutBoxControl(const IRECT& bounds, const IBitmap& bitmap, const IVStyle& style) + : IContainerBase(bounds) + , mAnimationTime(0) + , mBitmap(bitmap) + , mStyle(style) + { + mIgnoreMouse = false; + } + + bool OnKeyDown(float x, float y, const IKeyPress& key) override + { + if (key.VK == kVK_ESCAPE) + { + HideAnimated(true); + return true; + } + + return false; + } + + void OnMouseDown(float x, float y, const IMouseMod& mod) override + { + HideAnimated(true); + } + + void HideAnimated(bool hide) + { + mWillHide = hide; + + if (hide == false) + { + mHide = false; + } + else // hide subcontrols immediately + { + ForAllChildrenFunc([hide](int childIdx, IControl* pChild) { + pChild->Hide(hide); + }); + } + + SetAnimation([&](IControl* pCaller) { + auto progress = static_cast<float>(pCaller->GetAnimationProgress()); + + if (mWillHide) + SetBlend(IBlend(EBlend::Default, 1.0f-progress)); + else + SetBlend(IBlend(EBlend::Default, progress)); + + if (progress > 1.0f) + { + pCaller->OnEndAnimation(); + IContainerBase::Hide(mWillHide); + GetUI()->SetAllControlsDirty(); + return; + } + + }, mAnimationTime); + + SetDirty(true); + } + + void OnAttached() override + { + AddChildControl(new IBitmapControl(IRECT(), mBitmap))->SetIgnoreMouse(true); + + const IVStyle titleStyle = + DEFAULT_STYLE + .WithValueText(IText(24, COLOR_WHITE, "Ronduit-Light")) + .WithDrawFrame(false) + .WithShadowOffset(2.f); + + AddChildControl(new IVLabelControl(IRECT(), "Neural Amp Modeler", titleStyle)); + + WDL_String verStr, buildInfoStr; + PLUG()->GetPluginVersionStr(verStr); + + buildInfoStr.SetFormatted(100, "Version %s %s %s", verStr.Get(), PLUG()->GetArchStr(), PLUG()->GetAPIStr()); + + AddChildControl(new IVLabelControl( + IRECT(), "By Steven Atkinson", + mStyle.WithDrawFrame(false).WithValueText({DEFAULT_TEXT_SIZE, EAlign::Center, PluginColors::HELP_TEXT}))); + AddChildControl(new IVLabelControl( + IRECT(), buildInfoStr.Get(), + mStyle.WithDrawFrame(false).WithValueText({DEFAULT_TEXT_SIZE, EAlign::Center, PluginColors::HELP_TEXT}))); + AddChildControl(new IVLabelControl( + IRECT(), "Plug-in developed using iPlug2 with some help from Oli Larkin", + mStyle.WithDrawFrame(false).WithValueText({DEFAULT_TEXT_SIZE, EAlign::Center, PluginColors::HELP_TEXT}))); + AddChildControl(new IURLControl(IRECT(), "www.neuralampmodeler.com", "https://www.neuralampmodeler.com", + {DEFAULT_TEXT_SIZE, PluginColors::HELP_TEXT})); + + AddChildControl(new IVColorSwatchControl(IRECT() , "Highlight", [&](int idx, IColor color){ + + WDL_String colorCodeStr; + color.ToColorCodeStr(colorCodeStr, false); + this->GetDelegate()->SendArbitraryMsgFromUI(kMsgTagHighlightColor, kNoTag, colorCodeStr.GetLength(), colorCodeStr.Get()); + + }, mStyle, IVColorSwatchControl::ECellLayout::kHorizontal, {kFG}, {""})); + + OnResize(); + } + + void OnResize() override + { + if (NChildren()) + { + const IRECT mainArea = mRECT.GetPadded(-20); + const auto content = mainArea.GetPadded(-10); + const auto titleLabel = content.GetFromTop(50); + GetChild(0)->SetTargetAndDrawRECTs(mRECT); + GetChild(1)->SetTargetAndDrawRECTs(titleLabel); + GetChild(2)->SetTargetAndDrawRECTs(titleLabel.GetVShifted(titleLabel.H())); + GetChild(3)->SetTargetAndDrawRECTs(titleLabel.GetVShifted(titleLabel.H() + 20).GetMidVPadded(5)); + GetChild(4)->SetTargetAndDrawRECTs(titleLabel.GetVShifted(titleLabel.H() + 40).GetMidVPadded(5)); + GetChild(5)->SetTargetAndDrawRECTs(titleLabel.GetVShifted(titleLabel.H() + 60).GetMidVPadded(7)); + GetChild(6)->SetTargetAndDrawRECTs(content.GetFromBRHC(100, 50)); + } + } + + +private: + IBitmap mBitmap; + IVStyle mStyle; + int mAnimationTime = 200; + bool mWillHide = false; +}; + diff --git a/NeuralAmpModeler/config.h b/NeuralAmpModeler/config.h @@ -57,22 +57,36 @@ #define APP_SIGNAL_VECTOR_SIZE 64 #define ROBOTO_FN "Roboto-Regular.ttf" -#define HELP_FN "help.svg" -#define FILE_FN "SkinEHeritage_File.svg" -#define FOLDER_FN "folder.svg" -#define CLOSE_BUTTON_FN "SkinEHeritage_Close-button.svg" -#define LEFT_ARROW_FN "SkinEHeritage_ArrowLeft.svg" -#define RIGHT_ARROW_FN "SkinEHeritage_ArrowRight.svg" -#define EH_SKIN_FN "SkinEHeritage_BG.jpeg" -#define EH_SKIN2X_FN "[email protected]" -#define KNOB_FN "SkinEHeritage_Knob.png" -#define KNOB2X_FN "[email protected]" -#define TOGGLE_FN "SkinEHeritage_Toggle.png" -#define TOGGLE2X_FN "[email protected]" -#define TOGGLEIR_FN "SkinEHeritage_IR_Toggle.png" -#define TOGGLEIR2X_FN "[email protected]" -#define TOGGLE_HANDLE_FN "SkinEHeritage_ToggleHandle.png" -#define TOGGLE_HANDLE2X_FN "[email protected]" +#define RONDUIT_FN "RonduitCapitals-Light.ttf" + +#define HELP_FN "Help.svg" +#define FILE_FN "File.svg" +#define CLOSE_BUTTON_FN "Cross.svg" +#define LEFT_ARROW_FN "ArrowLeft.svg" +#define RIGHT_ARROW_FN "ArrowRight.svg" +#define MODEL_ICON_FN "ModelIcon.svg" +#define IR_ICON_ON_FN "IRIconOn.svg" +#define IR_ICON_OFF_FN "IRIconOff.svg" + +#define BACKGROUND_FN "Background.jpg" +#define BACKGROUND2X_FN "[email protected]" +#define BACKGROUND3X_FN "[email protected]" +#define KNOBBACKGROUND_FN "KnobBackground.png" +#define KNOBBACKGROUND2X_FN "[email protected]" +#define KNOBBACKGROUND3X_FN "[email protected]" +#define FILEBACKGROUND_FN "FileBackground.png" +#define FILEBACKGROUND2X_FN "[email protected]" +#define FILEBACKGROUND3X_FN "[email protected]" +#define LINES_FN "Lines.png" +#define LINES2X_FN "[email protected]" +#define LINES3X_FN "[email protected]" +#define SLIDESWITCHHANDLE_FN "SlideSwitchHandle.png" +#define SLIDESWITCHHANDLE2X_FN "[email protected]" +#define SLIDESWITCHHANDLE3X_FN "[email protected]" + +#define METERBACKGROUND_FN "MeterBackground.png" +#define METERBACKGROUND2X_FN "[email protected]" +#define METERBACKGROUND3X_FN "[email protected]" // Issue 291 // On the macOS standalone, we might not have permissions to traverse the file directory, so we have the app ask the diff --git a/NeuralAmpModeler/resources/fonts/Ronduit-Capitals-Light-License.txt b/NeuralAmpModeler/resources/fonts/Ronduit-Capitals-Light-License.txt @@ -0,0 +1,41 @@ +Preamble +In this license, 'the given typeface' refers to the given .zip file, which may contain one or numerous fonts. These fonts can be of any type (.ttf, .otf, ...) and together they form a 'font family' or in short a 'typeface'. + +1. Copyright +The given typeface is the intellectual property of +Ivan Filipov +Neogrey Ltd +Plovdiv, Bulgaria + +provided it is original, and is protected by copyright laws in many parts of the world. + +2. Personal Use +The given typeface may be downloaded and used free of charge for personal use, as long as the usage is not racist or illegal. Personal use refers to all usage that does not generate financial income in a business manner, for instance: + +- personal scrapbooking for yourself +- recreational websites and blogs for friends and family +- prints such as flyers, posters, t-shirts for churches, charities, and non-profit organizations + +3. Commercial Use +Commercial use is not allowed without prior written permission from the respective author. Please contact the author to ask for commercial licensing. Commercial use refers to usage in a business environment, including: + +- business cards, logos, advertising, websites, mobile apps for companies +- t-shirts, books, apparel that will be sold for money +- flyers, posters for events that charge admission +- freelance graphic design work +- anything that will generate direct or indirect income + +4. Modification +The given typeface may not be modified, altered, adapted or built upon without written permission by its respective author. This pertains all files within the downloadable font zip-file. + +5. Conversion +The given typeface may be converted to other formats such as WOFF, SVG or EOT webfonts, as long as the font is not modified in any other way, such as changing names or altering individual glyphs. + +6. Distribution +While the given typeface may freely be copied and passed along to other individuals for private use as its original downloadable zip-file, it may not be sold or published without written permission by its respective author. + +7. Embedding +The given typeface may be embedded into an application such as a web- or mobile app, as long as the application is of personal use and does not distribute the given typeface, such as offering it as a download. + +8. Disclaimer +The given typeface is offered 'as is' without any warranty. Neogrey Ltd and Ivan Filipov shall not be liable for any damage derived from using this typeface. By using the given typeface you agree to the terms of this license. +\ No newline at end of file diff --git a/NeuralAmpModeler/resources/fonts/RonduitCapitals-Light.ttf b/NeuralAmpModeler/resources/fonts/RonduitCapitals-Light.ttf Binary files differ. diff --git a/NeuralAmpModeler/resources/img/ArrowLeft.svg b/NeuralAmpModeler/resources/img/ArrowLeft.svg @@ -0,0 +1,3 @@ +<svg viewBox="0 0 800 800" 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="m540.098 614.105-27.599 31.067L259.902 400l252.597-245.172 27.599 31.067L319.513 400l220.585 214.105Z" style="fill:#999;fill-rule:nonzero"/> +</svg> diff --git a/NeuralAmpModeler/resources/img/ArrowRight.svg b/NeuralAmpModeler/resources/img/ArrowRight.svg @@ -0,0 +1,3 @@ +<svg viewBox="0 0 800 800" 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="m259.902 614.105 27.599 31.067L540.098 400 287.501 154.828l-27.599 31.067L480.487 400 259.902 614.105Z" style="fill:#999;fill-rule:nonzero"/> +</svg> diff --git a/NeuralAmpModeler/resources/img/Background.jpg b/NeuralAmpModeler/resources/img/Background.jpg Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/Cross.svg b/NeuralAmpModeler/resources/img/Cross.svg @@ -0,0 +1,3 @@ +<svg width="800" height="800" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> + <path fill-rule="evenodd" clip-rule="evenodd" d="M19.207 6.207a1 1 0 0 0-1.414-1.414L12 10.586 6.207 4.793a1 1 0 0 0-1.414 1.414L10.586 12l-5.793 5.793a1 1 0 1 0 1.414 1.414L12 13.414l5.793 5.793a1 1 0 0 0 1.414-1.414L13.414 12l5.793-5.793z" fill="#999"/> +</svg> diff --git a/NeuralAmpModeler/resources/img/File.svg b/NeuralAmpModeler/resources/img/File.svg @@ -0,0 +1,6 @@ +<svg width="800" height="800" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"> + <g stroke-width="1.296" fill="none" fill-rule="evenodd"> + <path d="M0 0h24v24H0z"/> + <path d="M3 7h17a1 1 0 0 1 1 1v11a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V7ZM3 4.5a.5.5 0 0 1 .5-.5h6.293a.5.5 0 0 1 .353.146L13 7H3V4.5Z" stroke="#999" stroke-linecap="round"/> + </g> +</svg> diff --git a/NeuralAmpModeler/resources/img/FileBackground.png b/NeuralAmpModeler/resources/img/FileBackground.png Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/Help.svg b/NeuralAmpModeler/resources/img/Help.svg @@ -0,0 +1,3 @@ +<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/img/IRIconOff.svg b/NeuralAmpModeler/resources/img/IRIconOff.svg @@ -0,0 +1,3 @@ +<svg viewBox="0 0 63 62" 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="M5.932 22.583a2.82 2.82 0 0 0-2.82-2.82h-.013a2.82 2.82 0 0 0-2.82 2.82v16.976a2.82 2.82 0 0 0 2.82 2.82h.013a2.82 2.82 0 0 0 2.82-2.82V22.583ZM22.038 22.689a2.927 2.927 0 0 0-2.926-2.926H19.1a2.927 2.927 0 0 0-2.926 2.926v16.764a2.927 2.927 0 0 0 2.926 2.926h.013a2.927 2.927 0 0 0 2.926-2.926V22.689ZM54.669 23.002a3.24 3.24 0 0 0-3.239-3.239h-.015a3.24 3.24 0 0 0-3.239 3.239V39.14a3.24 3.24 0 0 0 3.24 3.239h.014a3.24 3.24 0 0 0 3.239-3.239V23.002ZM38.675 14.043a3.24 3.24 0 0 0-3.238-3.24h-.015a3.24 3.24 0 0 0-3.24 3.24v34.71a3.24 3.24 0 0 0 3.24 3.239h.015a3.24 3.24 0 0 0 3.238-3.239v-34.71ZM46.749 25.55a3.24 3.24 0 0 0-3.239-3.238h-.015a3.24 3.24 0 0 0-3.239 3.239v10.996a3.24 3.24 0 0 0 3.239 3.24h.015a3.24 3.24 0 0 0 3.239-3.24V25.551ZM30.793 3.386a3.24 3.24 0 0 0-3.239-3.24h-.015a3.24 3.24 0 0 0-3.239 3.24V58.64a3.24 3.24 0 0 0 3.239 3.24h.015a3.24 3.24 0 0 0 3.239-3.24V3.386ZM63.09 29.513a3.24 3.24 0 0 0-3.24-3.239h-.015a3.24 3.24 0 0 0-3.238 3.24v1.74a3.24 3.24 0 0 0 3.238 3.24h.015a3.24 3.24 0 0 0 3.24-3.24v-1.74ZM14.278 14.409a3.165 3.165 0 0 0-3.162-3.164h-.02a3.165 3.165 0 0 0-3.163 3.164v33.554a3.165 3.165 0 0 0 3.162 3.164h.02a3.165 3.165 0 0 0 3.163-3.164V14.41Z"/> +</svg> diff --git a/NeuralAmpModeler/resources/img/IRIconOn.svg b/NeuralAmpModeler/resources/img/IRIconOn.svg @@ -0,0 +1,10 @@ +<svg viewBox="0 0 63 62" 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="M5.478 22.583c0-1.556-1.06-2.82-2.367-2.82H3.1c-1.307 0-2.367 1.264-2.367 2.82v16.976c0 1.557 1.06 2.82 2.367 2.82h.011c1.307 0 2.367-1.263 2.367-2.82V22.583Z" style="fill:#fff" transform="matrix(1.19122 0 0 1 -.594 0)"/> + <path d="M5.478 22.689c0-1.615-1.06-2.926-2.367-2.926H3.1c-1.307 0-2.367 1.311-2.367 2.926v16.764c0 1.615 1.06 2.926 2.367 2.926h.011c1.307 0 2.367-1.311 2.367-2.926V22.689Z" style="fill:#fff" transform="matrix(1.23596 0 0 1 15.267 0)"/> + <path d="M5.478 23.002c0-1.788-1.06-3.239-2.367-3.239H3.1c-1.307 0-2.367 1.451-2.367 3.239V39.14c0 1.788 1.06 3.239 2.367 3.239h.011c1.307 0 2.367-1.451 2.367-3.239V23.002Z" style="fill:#fff" transform="matrix(1.3683 0 0 1 47.173 0)"/> + <path d="M5.478 21.542c0-.982-1.06-1.779-2.367-1.779H3.1c-1.307 0-2.367.797-2.367 1.779v19.059c0 .981 1.06 1.778 2.367 1.778h.011c1.307 0 2.367-.797 2.367-1.778V21.542Z" style="fill:#fff" transform="matrix(1.3683 0 0 1.82121 31.18 -25.19)"/> + <path d="M5.478 23.955c0-2.314-1.06-4.192-2.367-4.192H3.1c-1.307 0-2.367 1.878-2.367 4.192v14.232c0 2.314 1.06 4.192 2.367 4.192h.011c1.307 0 2.367-1.878 2.367-4.192V23.955Z" style="fill:#fff" transform="matrix(1.3683 0 0 .77268 39.253 7.041)"/> + <path d="M5.478 20.95c0-.655-1.06-1.187-2.367-1.187H3.1c-1.307 0-2.367.532-2.367 1.187v20.242c0 .655 1.06 1.187 2.367 1.187h.011c1.307 0 2.367-.532 2.367-1.187V20.95Z" style="fill:#fff" transform="matrix(1.3683 0 0 2.72972 23.297 -53.802)"/> + <path d="M5.478 28.676c0-4.919-1.06-8.913-2.367-8.913H3.1c-1.307 0-2.367 3.994-2.367 8.913v4.79c0 4.919 1.06 8.913 2.367 8.913h.011c1.307 0 2.367-3.994 2.367-8.913v-4.79Z" style="fill:#fff" transform="matrix(1.3683 0 0 .36342 55.594 19.092)"/> + <path d="M5.478 21.557c0-.99-1.06-1.794-2.365-1.794h-.015c-1.305 0-2.365.804-2.365 1.794v19.028c0 .99 1.06 1.794 2.365 1.794h.015c1.305 0 2.365-.804 2.365-1.794V21.557Z" style="fill:#fff" transform="matrix(1.33725 0 0 1.76341 6.953 -23.605)"/> +</svg> diff --git a/NeuralAmpModeler/resources/img/KnobBackground.png b/NeuralAmpModeler/resources/img/KnobBackground.png Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/Lines.png b/NeuralAmpModeler/resources/img/Lines.png Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/MeterBackground.png b/NeuralAmpModeler/resources/img/MeterBackground.png Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/ModelIcon.svg b/NeuralAmpModeler/resources/img/ModelIcon.svg @@ -0,0 +1,9 @@ +<svg viewBox="0 0 121 36" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"> + <path style="fill:none;stroke:#fff;stroke-width:3.03px" d="M3.993 4.082h113.712v28.919H3.993z" transform="matrix(1 0 0 .97746 0 .092)"/> + <circle cx="20.214" cy="18.598" r="6.251" style="fill:none;stroke:#fff;stroke-width:4px" transform="translate(2.17 -.234)"/> + <circle cx="20.214" cy="18.598" r="6.251" style="fill:none;stroke:#fff;stroke-width:4px" transform="translate(24.782 -.198)"/> + <circle cx="20.214" cy="18.598" r="6.251" style="fill:none;stroke:#fff;stroke-width:4px" transform="translate(47.174 -.49)"/> + <path style="fill:#fff" d="M85.209 12.495h4.355v12.262h-4.355z" transform="translate(-1.1)"/> + <path style="fill:#fff" d="M85.209 12.495h4.355v12.262h-4.355z" transform="translate(9.223)"/> + <path style="fill:#fff" d="M85.209 12.495h4.355v12.262h-4.355z" transform="translate(19.961)"/> +</svg> diff --git a/NeuralAmpModeler/resources/img/SkinEHeritage_ArrowLeft.svg b/NeuralAmpModeler/resources/img/SkinEHeritage_ArrowLeft.svg @@ -1 +0,0 @@ -<?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 800 800" 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 id="SVGRepo_iconCarrier"><path d="M540.098,614.105l-27.599,31.067l-252.597,-245.172l252.597,-245.172l27.599,31.067l-220.585,214.105l220.585,214.105Z" style="fill:#999;fill-rule:nonzero;"/></g></svg> -\ No newline at end of file diff --git a/NeuralAmpModeler/resources/img/SkinEHeritage_ArrowRight.svg b/NeuralAmpModeler/resources/img/SkinEHeritage_ArrowRight.svg @@ -1 +0,0 @@ -<?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 800 800" 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 id="SVGRepo_iconCarrier"><path d="M259.902,614.105l27.599,31.067l252.597,-245.172l-252.597,-245.172l-27.599,31.067l220.585,214.105l-220.585,214.105Z" style="fill:#999;fill-rule:nonzero;"/></g></svg> -\ No newline at end of file diff --git a/NeuralAmpModeler/resources/img/SkinEHeritage_BG.jpeg b/NeuralAmpModeler/resources/img/SkinEHeritage_BG.jpeg Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/SkinEHeritage_Close-button.svg b/NeuralAmpModeler/resources/img/SkinEHeritage_Close-button.svg @@ -1,9 +0,0 @@ -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools --> -<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> -<g id="SVGRepo_bgCarrier" stroke-width="0"/> -<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/> -<g id="SVGRepo_iconCarrier"> -<path fill-rule="evenodd" clip-rule="evenodd" d="M19.207 6.207a1 1 0 0 0-1.414-1.414L12 10.586 6.207 4.793a1 1 0 0 0-1.414 1.414L10.586 12l-5.793 5.793a1 1 0 1 0 1.414 1.414L12 13.414l5.793 5.793a1 1 0 0 0 1.414-1.414L13.414 12l5.793-5.793z" fill="#999999"/> -</g> -</svg> -\ No newline at end of file diff --git a/NeuralAmpModeler/resources/img/SkinEHeritage_File.svg b/NeuralAmpModeler/resources/img/SkinEHeritage_File.svg @@ -1,7 +0,0 @@ -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools --> -<svg width="800px" height="800px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000"> -<g id="SVGRepo_bgCarrier" stroke-width="0"/> -<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/> -<g id="SVGRepo_iconCarrier"> <title>Folder</title> <g id="Page-1" stroke-width="1.296" fill="none" fill-rule="evenodd"> <g id="Folder"> <rect id="Rectangle" fill-rule="nonzero" x="0" y="0" width="24" height="24"> </rect> <path d="M3,7 L20,7 C20.5523,7 21,7.44772 21,8 L21,19 C21,19.5523 20.5523,20 20,20 L4,20 C3.44772,20 3,19.5523 3,19 L3,7 Z" id="Path" stroke="#999999" stroke-width="1.296" stroke-linecap="round"> </path> <path d="M3,4.5 C3,4.22386 3.22386,4 3.5,4 L9.79289,4 C9.9255,4 10.0527,4.05268 10.1464,4.14645 L13,7 L3,7 L3,4.5 Z" id="Path" stroke="#999999" stroke-width="1.296" stroke-linecap="round"> </path> </g> </g> </g> -</svg> -\ No newline at end of file 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/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/SkinEHeritage_Knob.png b/NeuralAmpModeler/resources/img/SkinEHeritage_Knob.png Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/SkinEHeritage_Toggle.png b/NeuralAmpModeler/resources/img/SkinEHeritage_Toggle.png Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/SkinEHeritage_ToggleHandle.png b/NeuralAmpModeler/resources/img/SkinEHeritage_ToggleHandle.png Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/SlideSwitchHandle.png b/NeuralAmpModeler/resources/img/SlideSwitchHandle.png Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/[email protected] b/NeuralAmpModeler/resources/img/[email protected] Binary files differ. diff --git a/NeuralAmpModeler/resources/img/close-button.svg b/NeuralAmpModeler/resources/img/close-button.svg @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - id="svg2" - viewBox="0 0 750.00003 754.197" - version="1.1" - sodipodi:docname="close-button.svg" - width="699.979" - height="703.89606" - inkscape:version="1.2.2 (732a01da63, 2022-12-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/"> - <defs - id="defs24" /> - <sodipodi:namedview - id="namedview22" - pagecolor="#ffffff" - bordercolor="#000000" - borderopacity="0.25" - inkscape:showpageshadow="2" - inkscape:pageopacity="0.0" - inkscape:pagecheckerboard="0" - inkscape:deskcolor="#d1d1d1" - showgrid="false" - inkscape:zoom="0.97586467" - inkscape:cx="194.69913" - inkscape:cy="369.92834" - inkscape:window-width="3840" - inkscape:window-height="2097" - inkscape:window-x="-8" - inkscape:window-y="-8" - inkscape:window-maximized="1" - inkscape:current-layer="svg2" /> - <g - id="layer1" - transform="translate(1.0553132,-130.49579)"> - <path - id="path2989" - d="m 814.29,606.65 a 314.29,314.29 0 1 1 -628.57,0 314.29,314.29 0 1 1 628.57,0 z" - stroke="#000000" - stroke-width="5" - transform="matrix(1.1048,0,0,1.1048,-179.21,-162.53)" /> - <g - id="g3763" - transform="matrix(0.91837,0,0,0.91837,47.587,10.944)" - stroke="#ffffff" - stroke-linecap="round" - stroke-width="133.87" - fill="none"> - <path - id="path2991" - d="M 176.51,362.87 532.64,719" /> - <path - id="path2993" - d="M 532.64,362.87 176.51,719" /> - </g> - </g> - <metadata - id="metadata19"> - <rdf:RDF> - <cc:Work> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <cc:license - rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> - <dc:publisher> - <cc:Agent - rdf:about="http://openclipart.org/"> - <dc:title>Openclipart</dc:title> - </cc:Agent> - </dc:publisher> - <dc:title>Close Button</dc:title> - <dc:date>2013-09-18T11:23:45</dc:date> - <dc:description>A round black close button with a white, thick, X in the center.</dc:description> - <dc:source>https://openclipart.org/detail/183568/close-button-by-henrikhoff-183568</dc:source> - <dc:creator> - <cc:Agent> - <dc:title>henrikhoff</dc:title> - </cc:Agent> - </dc:creator> - <dc:subject> - <rdf:Bag> - <rdf:li>black</rdf:li> - <rdf:li>close button</rdf:li> - <rdf:li>cross</rdf:li> - <rdf:li>icon</rdf:li> - <rdf:li>white</rdf:li> - <rdf:li>x</rdf:li> - </rdf:Bag> - </dc:subject> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> - <cc:permits - rdf:resource="http://creativecommons.org/ns#Reproduction" /> - <cc:permits - rdf:resource="http://creativecommons.org/ns#Distribution" /> - <cc:permits - rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> - </cc:License> - </rdf:RDF> - </metadata> -</svg> diff --git a/NeuralAmpModeler/resources/img/file.svg b/NeuralAmpModeler/resources/img/file.svg @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - width="24" - height="24" - viewBox="0 0 24 24" - version="1.1" - id="svg141" - sodipodi:docname="file.svg" - inkscape:version="1.2.2 (732a01da63, 2022-12-09)" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> - <defs - id="defs145" /> - <sodipodi:namedview - id="namedview143" - pagecolor="#ffffff" - bordercolor="#000000" - borderopacity="0.25" - inkscape:showpageshadow="2" - inkscape:pageopacity="0.0" - inkscape:pagecheckerboard="0" - inkscape:deskcolor="#d1d1d1" - showgrid="false" - inkscape:zoom="42.791667" - inkscape:cx="12.12853" - inkscape:cy="12.011685" - inkscape:window-width="2550" - inkscape:window-height="1443" - inkscape:window-x="168" - inkscape:window-y="370" - inkscape:window-maximized="0" - inkscape:current-layer="svg141" /> - <path - d="m 13.842843,5.9454723 v 3.0389483 h 3.038949 V 18.101266 H 7.1571568 V 5.9454723 Z m 0.60779,-1.2155794 H 5.9415774 V 19.316845 H 18.097371 V 8.376631 Z" - id="path139" - style="fill:#ffffff;stroke-width:0.607789" /> -</svg> diff --git a/NeuralAmpModeler/resources/img/folder.svg b/NeuralAmpModeler/resources/img/folder.svg @@ -1,21 +0,0 @@ -<?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 64 64" 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 id="Layer_1"> - <g transform="matrix(1,0,0,1,0,-1)"> - <g opacity="0.2"> - <g> - <path d="M52,22.9L14.5,22.9C13.1,22.9 12,24 12,25.3L12,47.5C12,48.9 13.1,50 14.5,50L49.5,50C50.9,50 52,48.9 52,47.5L52,22.9Z" style="fill:rgb(35,31,32);fill-rule:nonzero;"/> - </g> - </g> - </g> - <g> - <g> - <path d="M52,20.9L14.5,20.9C13.1,20.9 12,22 12,23.3L12,45.5C12,46.9 13.1,48 14.5,48L49.5,48C50.9,48 52,46.9 52,45.5L52,20.9Z" style="fill:white;fill-rule:nonzero;"/> - </g> - </g> - <g> - <path d="M52,18.5C52,17.1 50.9,16 49.5,16L37,16C35.6,16 34.5,17.1 34.5,18.5C34.5,18.5 34.2,20.8 32,21L52,21L52,18.5Z" style="fill:rgb(224,224,209);fill-rule:nonzero;"/> - </g> - </g> -</svg> diff --git a/NeuralAmpModeler/resources/img/help.svg b/NeuralAmpModeler/resources/img/help.svg @@ -1,7 +0,0 @@ -<?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 200 200" 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 id="layer1"> - <path id="path2413" d="M100,0C44.8,0 0,44.8 0,100C-0,155.2 44.8,200 100,200C155.2,200 200,155.2 200,100C200,44.8 155.2,0 100,0ZM100,12.812C148.13,12.812 187.19,51.87 187.19,100C187.19,148.13 148.13,187.19 100,187.19C51.87,187.19 12.812,148.13 12.812,100C12.812,51.87 51.87,12.812 100,12.812ZM101.47,34.062C96.02,34.092 90.817,34.799 86.188,36.125C81.489,37.471 77.062,39.609 73.312,42.344C70.074,44.706 66.979,47.735 64.625,50.875C60.466,56.424 58.164,62.526 57.562,69.562C57.522,70.03 57.492,70.43 57.5,70.438C57.516,70.454 79.202,73.125 79.312,73.125C79.365,73.125 79.425,72.891 79.594,72.188C81.535,64.103 85.08,58.667 90.562,55.375C94.882,52.781 100.37,51.763 106.34,52.406C109.08,52.701 111.55,53.366 113.72,54.406C116.43,55.707 118.9,57.767 120.66,60.219C122.2,62.375 123.12,64.803 123.41,67.531C123.49,68.29 123.46,70.011 123.38,70.75C123.15,72.576 122.68,74.128 121.88,75.719C121.07,77.316 120.4,78.233 119.12,79.531C117.09,81.608 113.94,84.36 108.34,88.938C104.74,91.882 102.3,94.094 100.22,96.281C95.277,101.46 93.029,105.35 91.656,111C90.751,114.72 90.4,118.55 90.5,124.19C90.525,125.59 90.562,126.92 90.562,127.16L90.562,127.59L112.16,127.59L112.19,125.19C112.22,121.92 112.4,119.82 112.75,117.78C113.32,114.51 114.18,112.78 116.69,109.97C118.29,108.17 120.39,106.21 123.62,103.5C128.39,99.509 131.73,96.51 134.88,93.375C139.79,88.468 142.34,85.115 144.16,81.188C145.59,78.096 146.38,75.022 146.62,71.656C146.68,70.84 146.69,68.626 146.62,67.688C146.17,60.645 143.52,54.435 138.47,48.656C137.67,47.747 135.69,45.769 134.75,44.938C129.79,40.544 124.06,37.585 117.19,35.844C113,34.782 108.96,34.244 103.84,34.094C103.06,34.071 102.25,34.058 101.47,34.062ZM90.562,137.662L90.562,159.662L112.56,159.662L112.56,137.662L90.562,137.662Z" style="fill:white;fill-rule:nonzero;"/> - </g> -</svg> diff --git a/NeuralAmpModeler/resources/main.rc b/NeuralAmpModeler/resources/main.rc @@ -1,250 +1,289 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United Kingdom) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_DIALOG_PREF DIALOG 0, 0, 223, 309 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Preferences" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,110,285,50,14 - PUSHBUTTON "Apply",IDAPPLY,54,285,50,14 - PUSHBUTTON "Cancel",IDCANCEL,166,285,50,14 - COMBOBOX IDC_COMBO_AUDIO_DRIVER,20,35,100,100,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Driver Type",IDC_STATIC,22,25,38,8 - COMBOBOX IDC_COMBO_AUDIO_IN_DEV,20,65,100,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Input Device",IDC_STATIC,20,55,42,8 - COMBOBOX IDC_COMBO_AUDIO_OUT_DEV,20,95,100,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Output Device",IDC_STATIC,20,85,47,8 - COMBOBOX IDC_COMBO_AUDIO_BUF_SIZE,135,35,65,100,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Buffer Size",IDC_STATIC,137,25,46,8 - COMBOBOX IDC_COMBO_AUDIO_SR,135,95,65,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Sampling Rate",IDC_STATIC,135,85,47,8 - GROUPBOX "Audio Device Settings",IDC_STATIC,5,10,210,170 - PUSHBUTTON "Config...",IDC_BUTTON_OS_DEV_SETTINGS,135,155,65,14 - COMBOBOX IDC_COMBO_AUDIO_IN_L,20,125,40,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Input 1 (L)",IDC_STATIC,20,115,33,8 - COMBOBOX IDC_COMBO_AUDIO_IN_R,65,126,40,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Input 2 (R)",IDC_STATIC,65,115,34,8 - COMBOBOX IDC_COMBO_AUDIO_OUT_L,20,155,40,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Output 1 (L)",IDC_STATIC,20,145,38,8 - COMBOBOX IDC_COMBO_AUDIO_OUT_R,65,155,40,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Output 2 (R)",IDC_STATIC,65,145,40,8 - GROUPBOX "MIDI Device Settings",IDC_STATIC,5,190,210,85 - COMBOBOX IDC_COMBO_MIDI_OUT_DEV,15,250,100,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Output Device",IDC_STATIC,15,240,47,8 - COMBOBOX IDC_COMBO_MIDI_IN_DEV,15,220,100,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Input Device",IDC_STATIC,15,210,42,8 - LTEXT "Input Channel",IDC_STATIC,125,210,45,8 - COMBOBOX IDC_COMBO_MIDI_IN_CHAN,125,220,50,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "Output Channel",IDC_STATIC,125,240,50,8 - COMBOBOX IDC_COMBO_MIDI_OUT_CHAN,125,250,50,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS -END - -IDD_DIALOG_MAIN DIALOG 0, 0, 500, 300 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "NeuralAmpModeler" -MENU IDR_MENU1 -FONT 8, "MS Sans Serif" -BEGIN -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_MENU1 MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&Preferences...\tCtrl+,", ID_PREFERENCES - MENUITEM "&Quit", ID_QUIT - END - POPUP "&Debug" - BEGIN - MENUITEM "&Live Edit Mode\tCtrl+E", ID_LIVE_EDIT - MENUITEM "&Show Control Bounds\tCtrl+B", ID_SHOW_BOUNDS - MENUITEM "&Show Drawn Area\tCtrl+D", ID_SHOW_DRAWN - MENUITEM "&Show FPS\tCtrl+F", ID_SHOW_FPS - END - POPUP "&Help" - BEGIN - MENUITEM "&About", ID_ABOUT - MENUITEM "&Read Manual", ID_HELP - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_DIALOG_PREF, DIALOG - BEGIN - END - - IDD_DIALOG_MAIN, DIALOG - BEGIN - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// AFX_DIALOG_LAYOUT -// - -IDD_DIALOG1 AFX_DIALOG_LAYOUT -BEGIN - 0 -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "#include ""..\\config.h""\r\n" - "ROBOTO_FN TTF ROBOTO_FN\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "NeuralAmpModeler.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDR_ACCELERATOR1 ACCELERATORS -BEGIN - VK_OEM_COMMA, ID_PREFERENCES, VIRTKEY, CONTROL, NOINVERT - "B", ID_SHOW_BOUNDS, VIRTKEY, CONTROL, NOINVERT - "D", ID_SHOW_DRAWN, VIRTKEY, CONTROL, NOINVERT - "F", ID_SHOW_FPS, VIRTKEY, CONTROL, NOINVERT - "E", ID_LIVE_EDIT, VIRTKEY, CONTROL, NOINVERT -END - -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO -FILEVERSION 0,0,1,0 -PRODUCTVERSION 0,0,1,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040004e4" - BEGIN - VALUE "FileVersion", "0.0.1" - VALUE "ProductVersion", "0.0.1" - VALUE "FileDescription", "NeuralAmpModeler" - VALUE "InternalName", "NeuralAmpModeler" - VALUE "ProductName", "NeuralAmpModeler" - VALUE "CompanyName", "StevenAtkinson" - VALUE "LegalCopyright", "Copyright 2020 Acme Inc" - VALUE "LegalTrademarks", "VST is a trademark of Steinberg Media Technologies GmbH, Audio Unit is a trademark of Apple, Inc." - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x400, 1252 - END -END - -#endif // English (United Kingdom) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#include "..\config.h" -ROBOTO_FN TTF ROBOTO_FN -FILE_FN SVG FILE_FN -FOLDER_FN SVG FOLDER_FN -CLOSE_BUTTON_FN SVG CLOSE_BUTTON_FN -HELP_FN SVG HELP_FN -LEFT_ARROW_FN SVG LEFT_ARROW_FN -RIGHT_ARROW_FN SVG RIGHT_ARROW_FN -EH_SKIN_FN JPEG EH_SKIN_FN -EH_SKIN2X_FN JPEG EH_SKIN2X_FN -KNOB_FN PNG KNOB_FN -KNOB2X_FN PNG KNOB2X_FN -TOGGLE_FN PNG TOGGLE_FN -TOGGLE2X_FN PNG TOGGLE2X_FN -TOGGLEIR_FN PNG TOGGLEIR_FN -TOGGLEIR2X_FN PNG TOGGLEIR2X_FN -TOGGLE_HANDLE_FN PNG TOGGLE_HANDLE_FN -TOGGLE_HANDLE2X_FN PNG TOGGLE_HANDLE2X_FN -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United Kingdom) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK +#pragma code_page(1252) + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_DIALOG_PREF DIALOG 0, 0, 223, 309 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Preferences" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,110,285,50,14 + PUSHBUTTON "Apply",IDAPPLY,54,285,50,14 + PUSHBUTTON "Cancel",IDCANCEL,166,285,50,14 + COMBOBOX IDC_COMBO_AUDIO_DRIVER,20,35,100,100,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Driver Type",IDC_STATIC,22,25,38,8 + COMBOBOX IDC_COMBO_AUDIO_IN_DEV,20,65,100,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Input Device",IDC_STATIC,20,55,42,8 + COMBOBOX IDC_COMBO_AUDIO_OUT_DEV,20,95,100,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Output Device",IDC_STATIC,20,85,47,8 + COMBOBOX IDC_COMBO_AUDIO_BUF_SIZE,135,35,65,100,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Buffer Size",IDC_STATIC,137,25,46,8 + COMBOBOX IDC_COMBO_AUDIO_SR,135,95,65,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Sampling Rate",IDC_STATIC,135,85,47,8 + GROUPBOX "Audio Device Settings",IDC_STATIC,5,10,210,170 + PUSHBUTTON "Config...",IDC_BUTTON_OS_DEV_SETTINGS,135,155,65,14 + COMBOBOX IDC_COMBO_AUDIO_IN_L,20,125,40,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Input 1 (L)",IDC_STATIC,20,115,33,8 + COMBOBOX IDC_COMBO_AUDIO_IN_R,65,126,40,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Input 2 (R)",IDC_STATIC,65,115,34,8 + COMBOBOX IDC_COMBO_AUDIO_OUT_L,20,155,40,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Output 1 (L)",IDC_STATIC,20,145,38,8 + COMBOBOX IDC_COMBO_AUDIO_OUT_R,65,155,40,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Output 2 (R)",IDC_STATIC,65,145,40,8 + GROUPBOX "MIDI Device Settings",IDC_STATIC,5,190,210,85 + COMBOBOX IDC_COMBO_MIDI_OUT_DEV,15,250,100,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Output Device",IDC_STATIC,15,240,47,8 + COMBOBOX IDC_COMBO_MIDI_IN_DEV,15,220,100,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Input Device",IDC_STATIC,15,210,42,8 + LTEXT "Input Channel",IDC_STATIC,125,210,45,8 + COMBOBOX IDC_COMBO_MIDI_IN_CHAN,125,220,50,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Output Channel",IDC_STATIC,125,240,50,8 + COMBOBOX IDC_COMBO_MIDI_OUT_CHAN,125,250,50,200,CBS_DROPDOWNLIST | CBS_HASSTRINGS +END + +IDD_DIALOG_MAIN DIALOG 0, 0, 500, 300 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "NeuralAmpModeler" +MENU IDR_MENU1 +FONT 8, "MS Sans Serif" +BEGIN +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_MENU1 MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Preferences...\tCtrl+,", ID_PREFERENCES + MENUITEM "&Quit", ID_QUIT + END + POPUP "&Debug" + BEGIN + MENUITEM "&Live Edit Mode\tCtrl+E", ID_LIVE_EDIT + MENUITEM "&Show Control Bounds\tCtrl+B", ID_SHOW_BOUNDS + MENUITEM "&Show Drawn Area\tCtrl+D", ID_SHOW_DRAWN + MENUITEM "&Show FPS\tCtrl+F", ID_SHOW_FPS + END + POPUP "&Help" + BEGIN + MENUITEM "&About", ID_ABOUT + MENUITEM "&Read Manual", ID_HELP + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_DIALOG_PREF, DIALOG + BEGIN + END + + IDD_DIALOG_MAIN, DIALOG + BEGIN + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// AFX_DIALOG_LAYOUT +// + +IDD_DIALOG1 AFX_DIALOG_LAYOUT +BEGIN + 0 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "#include ""..\\config.h""\r\n" + "ROBOTO_FN TTF ROBOTO_FN\r\n" + "RONDUIT_FN TTF RONDUIT_FN\r\n" + "FILE_FN SVG FILE_FN\r\n" + "HELP_FN SVG HELP_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" + "MODEL_ICON_FN SVG MODEL_ICON_FN\r\n" + "IR_ICON_ON_FN SVG IR_ICON_ON_FN\r\n" + "IR_ICON_OFF_FN SVG IR_ICON_OFF_FN\r\n" + "BACKGROUND_FN JPG BACKGROUND_FN\r\n" + "BACKGROUND2X_FN JPG BACKGROUND2X_FN\r\n" + "BACKGROUND3X_FN JPG BACKGROUND3X_FN\r\n" + "KNOBBACKGROUND_FN PNG KNOBBACKGROUND_FN\r\n" + "KNOBBACKGROUND2X_FN PNG KNOBBACKGROUND2X_FN\r\n" + "KNOBBACKGROUND3X_FN PNG KNOBBACKGROUND3X_FN\r\n" + "FILEBACKGROUND_FN PNG FILEBACKGROUND_FN\r\n" + "FILEBACKGROUND2X_FN PNG FILEBACKGROUND2X_FN\r\n" + "FILEBACKGROUND3X_FN PNG FILEBACKGROUND3X_FN\r\n" + "LINES_FN PNG LINES_FN\r\n" + "LINES2X_FN PNG LINES2X_FN\r\n" + "LINES3X_FN PNG LINES3X_FN\r\n" + "SLIDESWITCHHANDLE_FN PNG SLIDESWITCHHANDLE_FN\r\n" + "SLIDESWITCHHANDLE2X_FN PNG SLIDESWITCHHANDLE2X_FN\r\n" + "SLIDESWITCHHANDLE3X_FN PNG SLIDESWITCHHANDLE3X_FN\r\n" + "METERBACKGROUND_FN PNG METERBACKGROUND_FN\r\n" + "METERBACKGROUND2X_FN PNG METERBACKGROUND2X_FN\r\n" + "METERBACKGROUND3X_FN PNG METERBACKGROUND3X_FN\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON "NeuralAmpModeler.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_ACCELERATOR1 ACCELERATORS +BEGIN + VK_OEM_COMMA, ID_PREFERENCES, VIRTKEY, CONTROL, NOINVERT + "B", ID_SHOW_BOUNDS, VIRTKEY, CONTROL, NOINVERT + "D", ID_SHOW_DRAWN, VIRTKEY, CONTROL, NOINVERT + "F", ID_SHOW_FPS, VIRTKEY, CONTROL, NOINVERT + "E", ID_LIVE_EDIT, VIRTKEY, CONTROL, NOINVERT +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,0,1,0 + PRODUCTVERSION 0,0,1,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040004e4" + BEGIN + VALUE "FileVersion", "0.0.1" + VALUE "ProductVersion", "0.0.1" + VALUE "FileDescription", "NeuralAmpModeler" + VALUE "InternalName", "NeuralAmpModeler" + VALUE "ProductName", "NeuralAmpModeler" + VALUE "CompanyName", "StevenAtkinson" + VALUE "LegalCopyright", "Copyright 2020 Acme Inc" + VALUE "LegalTrademarks", "VST is a trademark of Steinberg Media Technologies GmbH, Audio Unit is a trademark of Apple, Inc." + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x400, 1252 + END +END + +#endif // English (United Kingdom) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#include "..\config.h" +ROBOTO_FN TTF ROBOTO_FN +RONDUIT_FN TTF RONDUIT_FN +FILE_FN SVG FILE_FN +HELP_FN SVG HELP_FN +CLOSE_BUTTON_FN SVG CLOSE_BUTTON_FN +LEFT_ARROW_FN SVG LEFT_ARROW_FN +RIGHT_ARROW_FN SVG RIGHT_ARROW_FN +MODEL_ICON_FN SVG MODEL_ICON_FN +IR_ICON_ON_FN SVG IR_ICON_ON_FN +IR_ICON_OFF_FN SVG IR_ICON_OFF_FN +BACKGROUND_FN JPG BACKGROUND_FN +BACKGROUND2X_FN JPG BACKGROUND2X_FN +BACKGROUND3X_FN JPG BACKGROUND3X_FN +KNOBBACKGROUND_FN PNG KNOBBACKGROUND_FN +KNOBBACKGROUND2X_FN PNG KNOBBACKGROUND2X_FN +KNOBBACKGROUND3X_FN PNG KNOBBACKGROUND3X_FN +FILEBACKGROUND_FN PNG FILEBACKGROUND_FN +FILEBACKGROUND2X_FN PNG FILEBACKGROUND2X_FN +FILEBACKGROUND3X_FN PNG FILEBACKGROUND3X_FN +LINES_FN PNG LINES_FN +LINES2X_FN PNG LINES2X_FN +LINES3X_FN PNG LINES3X_FN +SLIDESWITCHHANDLE_FN PNG SLIDESWITCHHANDLE_FN +SLIDESWITCHHANDLE2X_FN PNG SLIDESWITCHHANDLE2X_FN +SLIDESWITCHHANDLE3X_FN PNG SLIDESWITCHHANDLE3X_FN +METERBACKGROUND_FN PNG METERBACKGROUND_FN +METERBACKGROUND2X_FN PNG METERBACKGROUND2X_FN +METERBACKGROUND3X_FN PNG METERBACKGROUND3X_FN +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED +
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/Background%402x.jpg.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/Background%403x.jpg.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/FileBackground%402x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/FileBackground%403x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/KnobBackground%402x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/KnobBackground%403x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/Lines%402x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/Lines%403x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/MeterBackground%402x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/MeterBackground%403x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/SkinEHeritage_BG%402x.jpeg.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/SkinEHeritage_IR_Toggle%402x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/SkinEHeritage_Knob%402x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/SkinEHeritage_Toggle%402x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/SkinEHeritage_ToggleHandle%402x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/SlideSwitchHandle%402x.png.html){kind=link}
![NeuralAmpModeler/resources/img/[email protected]](../file/NeuralAmpModeler/resources/img/SlideSwitchHandle%403x.png.html){kind=link}
