From c5d0f04a211e20e2793ecb58a4a74f1e1a390072 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Thu, 27 Jan 2022 23:13:06 -0800 Subject: [PATCH] user presets can now be loaded --- src/main/base/store.ts | 3 +- src/renderer/style.less | 10 ++ src/renderer/views/components/equalizer.ejs | 118 +++++++++++--------- 3 files changed, 80 insertions(+), 51 deletions(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 29fa354e..35aa6f5d 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -61,7 +61,8 @@ export class ConfigStore { 'Q' : [1,1,1,1,1,1,1,1,1,1], 'preamp' : 0, 'mix' : 1, - 'presets': [] + 'presets': [], + 'userGenerated': false } }, "visual": { diff --git a/src/renderer/style.less b/src/renderer/style.less index c2193328..9d71b5c0 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -118,6 +118,11 @@ body.notransparency::before { box-shadow: inset 0px 0px 10px 10px rgb(200 200 200 / 80%); } +[disabled] { + pointer-events: none; + opacity: 0.5; +} + #app { --color1: rgba(30, 30, 30, 30%); --color2: rgba(15, 15, 15, 30%); @@ -5801,6 +5806,11 @@ body.no-gpu { opacity: 0; } } + + .modal-lowercontent { + padding: 16px; + background-color: var(--modalBackground); + } } } diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs index 72346e48..d9604dcf 100644 --- a/src/renderer/views/components/equalizer.ejs +++ b/src/renderer/views/components/equalizer.ejs @@ -5,9 +5,9 @@
{{$root.getLz('term.equalizer')}}
- - + @@ -19,13 +19,13 @@
- - + + Preamp
- {{app.cfg.audio.equalizer.mix}} - + {{$root.cfg.audio.equalizer.mix}} + Mix
@@ -35,76 +35,78 @@
Q
- - - - + + + +
- - - - + + + +
- - - - + + + +
- - - - + + + +
- - - - + + + +
- - - - + + + +
- - - - + + + +
- - - - + + + +
- - - - + + + +
- - - - + + + +
-
+ +
+
- +
-
+ @@ -250,6 +252,9 @@ 'preamp': 0, 'mix': 1, }) + if(app.cfg.audio.equalizer.userGenerated) { + this.saveSelectedPreset() + } }, addPreset() { let self = this @@ -268,6 +273,19 @@ } }) }, + saveSelectedPreset() { + // Save the current settings to the selected preset + let self = this + //let preset = app.cfg.audio.equalizer.presets[app.cfg.audio.equalizer.preset] + // find the preset by its id (preset) + let preset = app.cfg.audio.equalizer.presets.find(p => p.preset == app.cfg.audio.equalizer.preset) + preset.frequencies = app.cfg.audio.equalizer.frequencies + preset.gain = app.cfg.audio.equalizer.gain + preset.Q = app.cfg.audio.equalizer.Q + preset.preamp = app.cfg.audio.equalizer.preamp + preset.mix = app.cfg.audio.equalizer.mix + notyf.success("Saved Preset") + }, applyPreset(preset) { Object.assign(this.app.cfg.audio.equalizer, preset) for (var i = 0; i < 10; i++) { @@ -278,7 +296,7 @@ }, changePreset(id) { let userPresets = app.cfg.audio.equalizer.presets - let defaultPresets = this.defaultPresets + let defaultPresets = Clone(this.defaultPresets) let presets = defaultPresets.concat(userPresets) console.log(presets)