MOD GUI tweaks: background & per-band enable LED, update textures

This commit is contained in:
Robin Gareus 2016-06-16 23:57:12 +02:00
parent c8a1644314
commit 2fdcaedde8
9 changed files with 60 additions and 126 deletions

View File

@ -7,109 +7,4 @@
modgui:thumbnail <modgui/thumbnail-x42-eq.png> ;
modgui:brand "x42" ;
modgui:label "x42-eq@NAMESUFFIX@" ;
modgui:port [
lv2:index 0 ;
lv2:symbol "enable" ;
lv2:name "Enable" ;
] , [
lv2:index 1 ;
lv2:symbol "gain" ;
lv2:name "Gain" ;
] , [
lv2:index 2 ;
lv2:symbol "HighPass" ;
lv2:name "Highpass Enable" ;
] , [
lv2:index 3 ;
lv2:symbol "HPfreq" ;
lv2:name "Highpass Frequency" ;
] , [
lv2:index 4 ;
lv2:symbol "HPQ" ;
lv2:name "HighPass Resonance" ;
] , [
lv2:index 5 ;
lv2:symbol "LSfreq" ;
lv2:name "LowShelf Frequency" ;
] , [
lv2:index 6 ;
lv2:symbol "LSq" ;
lv2:name "LowShelf Bandwidth" ;
] , [
lv2:index 7 ;
lv2:symbol "LSgain" ;
lv2:name "LowShelf Gain" ;
] , [
lv2:index 8 ;
lv2:symbol "freq1" ;
lv2:name "Band 1 Frequency" ;
] , [
lv2:index 9 ;
lv2:symbol "q1" ;
lv2:name "Band 1 Bandwidth" ;
] , [
lv2:index 10 ;
lv2:symbol "gain1" ;
lv2:name "Band 1 Gain" ;
] , [
lv2:index 11 ;
lv2:symbol "freq2" ;
lv2:name "Band 2 Frequency" ;
] , [
lv2:index 12 ;
lv2:symbol "q2" ;
lv2:name "Band 2 Bandwidth" ;
] , [
lv2:index 13 ;
lv2:symbol "gain2" ;
lv2:name "Band 2 Gain" ;
] , [
lv2:index 14 ;
lv2:symbol "freq3" ;
lv2:name "Band 3 Frequency" ;
] , [
lv2:index 15 ;
lv2:symbol "q3" ;
lv2:name "Band 3 Bandwidth" ;
] , [
lv2:index 16 ;
lv2:symbol "gain1" ;
lv2:name "Band 3 Gain" ;
] , [
lv2:index 17 ;
lv2:symbol "freq4" ;
lv2:name "Band 4 Frequency" ;
] , [
lv2:index 18 ;
lv2:symbol "q4" ;
lv2:name "Band 1 Bandwidth" ;
] , [
lv2:index 19 ;
lv2:symbol "gain4" ;
lv2:name "Band 4 Gain" ;
] , [
lv2:index 20 ;
lv2:symbol "HSfreq" ;
lv2:name "HighShelf Frequency" ;
] , [
lv2:index 21 ;
lv2:symbol "HSq" ;
lv2:name "HighShelf Bandwidth" ;
] , [
lv2:index 22 ;
lv2:symbol "HSgain" ;
lv2:name "HighShelf Gain" ;
] , [
lv2:index 23 ;
lv2:symbol "LowPass" ;
lv2:name "Lowpass Enable" ;
] , [
lv2:index 24 ;
lv2:symbol "LPfreq" ;
lv2:name "LowPass Frequency" ;
] , [
lv2:index 25 ;
lv2:symbol "LPQ" ;
lv2:name "LowPass Resonance" ;
]
] .

View File

@ -12,6 +12,9 @@
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-freq0">
<div mod-port-symbol="LSfreq" mod-role="input-control-port" class="mod-knob-image"></div>
</div>
<div mod-button-type="knob" mod-role="icon-button" class="mod-led">
<div mod-port-symbol="LSsec" mod-role="input-control-port" class="mod-led-image"></div>
</div>
</div>
<div class="x42-eq-band">
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-gain">
@ -23,6 +26,9 @@
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-freq1">
<div mod-port-symbol="freq1" mod-role="input-control-port" class="mod-knob-image"></div>
</div>
<div mod-button-type="knob" mod-role="icon-button" class="mod-led">
<div mod-port-symbol="sec1" mod-role="input-control-port" class="mod-led-image"></div>
</div>
</div>
<div class="x42-eq-band">
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-gain">
@ -34,6 +40,9 @@
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-freq2">
<div mod-port-symbol="freq2" mod-role="input-control-port" class="mod-knob-image"></div>
</div>
<div mod-button-type="knob" mod-role="icon-button" class="mod-led">
<div mod-port-symbol="sec2" mod-role="input-control-port" class="mod-led-image"></div>
</div>
</div>
<div class="x42-eq-band">
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-gain">
@ -45,6 +54,9 @@
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-freq3">
<div mod-port-symbol="freq3" mod-role="input-control-port" class="mod-knob-image"></div>
</div>
<div mod-button-type="knob" mod-role="icon-button" class="mod-led">
<div mod-port-symbol="sec3" mod-role="input-control-port" class="mod-led-image"></div>
</div>
</div>
<div class="x42-eq-band">
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-gain">
@ -56,6 +68,9 @@
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-freq4">
<div mod-port-symbol="freq4" mod-role="input-control-port" class="mod-knob-image"></div>
</div>
<div mod-button-type="knob" mod-role="icon-button" class="mod-led">
<div mod-port-symbol="sec4" mod-role="input-control-port" class="mod-led-image"></div>
</div>
</div>
<div class="x42-eq-band">
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-gain">
@ -67,6 +82,9 @@
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-left x42-eq-freq5">
<div mod-port-symbol="HSfreq" mod-role="input-control-port" class="mod-knob-image"></div>
</div>
<div mod-button-type="knob" mod-role="icon-button" class="mod-led">
<div mod-port-symbol="HSsec" mod-role="input-control-port" class="mod-led-image"></div>
</div>
</div>
<div class="x42-eq-hpf">
<div mod-button-type="knob" mod-role="icon-button" class="mod-knob x42-eq-freqh">

View File

@ -14,28 +14,27 @@
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq {
background-size:776px 451px;
width:776px;
height:451px;
width:780px;
height:480px;
}
/* = Labels
================================================ */
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .x42-brand {
right:0px;
right: 12px;
position:absolute;
text-align:center;
bottom:0px;
width: 25px;
bottom: 42px;
width: 25px;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .x42-brand h1 {
font-family:"Nexa";
font-size:28px;
padding:0;
margin:0;
color:#aaa;
transform: rotate(270deg);
margin:0;
color:#aaa;
transform: rotate(270deg);
}
.mod-pedal-boxy{{{cns}}} .x42-label {
@ -51,13 +50,13 @@
font-family:"Questrial";
font-size:16px;
line-height:1;
color:#aaa;
color:#aaa;
}
/* = KNOBS
================================================ */
.mod-pedal-boxy{{{cns}}} .mod-control-group {
margin:20px !important;
margin:16px !important;
position:relative;
text-align:center;
z-index:30;
@ -113,6 +112,28 @@
overflow:hidden;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-led .mod-led-image {
background-image:url(/resources/x42-led.png{{{ns}}});
background-position:left center ;
background-repeat:no-repeat;
background-size:48px 24px;
height:24px;
width:24px;
margin:0px auto 0 auto;
cursor:pointer !important;
position:relative;
overflow:hidden;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-led {
position:absolute;
right:0px;
bottom:0px;
width:24px;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-toggle {
display:inline-block;
width:90px;
@ -125,12 +146,13 @@
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .x42-eq-band {
position:relative;
display:inline-block;
width:120px;
border: 1px solid #666;
border-radius: 7px;
padding: 5px 0 0 2px;
margin-bottom: 9px;
padding: 5px 0 0 2px;
margin-bottom: 3px;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .x42-eq-hpf,
@ -141,7 +163,7 @@
width:198px;
border: 1px solid #666;
border-radius: 7px;
padding-top: 5px;
padding-top: 5px;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .x42-eq-global {
@ -151,8 +173,8 @@
border-radius: 7px;
display:inline-block;
width:100px;
margin: 0 70px;
padding-top: 5px;
margin: 0 70px;
padding-top: 5px;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .x42-eq-band .x42-eq-left {
@ -167,7 +189,7 @@
background-position:left center ;
background-repeat:no-repeat;
background-size:93px 75px;
height:75px;
height:75px;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .x42-eq-global .mod-knob,
@ -227,6 +249,5 @@
/* = BACKGROUND IMAGES - Color of the pedal
================================================ */
.mod-pedal-boxy{{{cns}}}.mod-x42-eq {
/* background-image:url(/resources/background.png{{{ns}}}); TODO */
background-color:#222;
background-image:url(/resources/x42-eq-background.png{{{ns}}});
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 650 B

After

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 650 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
modgui/x42-led.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -329,7 +329,7 @@ static void bw_hs_knob (cairo_t* cr)
#define HLX 3 // Hi/Low pass icon x-offset
static void bw_hp_knob (cairo_t* cr)
static void bw_lp_knob (cairo_t* cr)
{
float xlp, ylp;
CairoSetSouerceRGBA(c_dlf);
@ -353,7 +353,7 @@ static void bw_hp_knob (cairo_t* cr)
{ DIALDOTS( 1.0, .0, .5) }
}
static void bw_lp_knob (cairo_t* cr)
static void bw_hp_knob (cairo_t* cr)
{
float xlp, ylp;
CairoSetSouerceRGBA(c_dlf);