Skip to content

Commit

Permalink
Updated UI xml, and updated screenshots, send and return buttons.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bor-T
bor-T committed Dec 9, 2024
1 parent 628a8fa commit 8058acf
Show file tree
Hide file tree
Showing 12 changed files with 222 additions and 171 deletions.
Binary file modified res/doc/screenshots/spectrum_analyzer_x1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/doc/screenshots/spectrum_analyzer_x12.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/doc/screenshots/spectrum_analyzer_x16.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/doc/screenshots/spectrum_analyzer_x2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/doc/screenshots/spectrum_analyzer_x4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/doc/screenshots/spectrum_analyzer_x8.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 21 additions & 34 deletions res/main/ui/analyzer/spectrum/x1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@

<!-- Metering -->
<group text="groups.metering" vexpand="true" bg.color="bg" ipadding="0">
<grid rows="19" cols="1" expand="true" vspacing="2">
<grid rows="21" cols="1" expand="true">
<ui:with bg.color="bg_schema">
<vbox width.min="107" padding="6">
<label text="labels.metering.preamp" pad.b="6"/>
Expand All @@ -215,9 +215,7 @@
</hbox>
</vbox>

<cell expand="false" bg.color="bg">
<hsep/>
</cell>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>

<vbox padding="6">
<label text="labels.metering.reactivity" width="58" pad.b="6"/>
Expand All @@ -227,9 +225,7 @@
</hbox>
</vbox>

<cell expand="false" bg.color="bg" visibility=":mode ile 1">
<hsep/>
</cell>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false" visibility=":mode ile 1"/>

<vbox visibility=":mode ile 1" padding="6">
<label text="labels.metering.selector" width="58" pad.b="6"/>
Expand All @@ -239,9 +235,7 @@
</hbox>
</vbox>

<cell expand="false" bg.color="bg">
<hsep/>
</cell>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>

<vbox padding="6">
<label text="labels.chan.shift" width="58" pad.b="6"/>
Expand All @@ -251,55 +245,48 @@
</hbox>
</vbox>

<cell expand="false" bg.color="bg">
<hsep/>
</cell>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>

<vbox padding="6">
<shmlink id="ret_0" value.maxlen="6" text.clip="true" hfill="true" />
<button ui:inject="Button_cyan" id="frz_0" text="labels.chan.hold" size="16" width="60"/>
<shmlink id="ret_0" value.maxlen="6" text.clip="true" hfill="true"/>
</vbox>

<cell expand="false" bg.color="bg" visibility=":mode ige 2">
<hsep/>
</cell>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>

<vbox padding="6">
<button ui:inject="Button_cyan" id="frz_0" text="labels.chan.hold" height="16" font.size="12" hfill="true"/>
</vbox>

<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false" visibility=":mode ige 2"/>

<vbox visibility=":mode ige 2" padding="6">
<button ui:inject="Button_yellow" text="labels.log_scale" id="splog" size="16"/>
<button ui:inject="Button_yellow" text="labels.log_scale" id="splog" height="16" font.size="12" hfill="true"/>
</vbox>

<cell expand="false" bg.color="bg" visibility=":mode ige 2">
<hsep/>
</cell>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false" visibility=":mode ige 2"/>

<vbox visibility=":mode ige 2" padding="6">
<label text="labels.spectrogram" pad.b="6"/>
<combo id="spm"/>
</vbox>

<cell expand="false" bg.color="bg" visibility=":mode ige 2">
<hsep/>
</cell>

<void height.min="84" visibility=":mode ige 2" padding="6"/>

<cell expand="false" bg.color="bg" visibility=":mode ile 1">
<hsep/>
</cell>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false" visibility=":mode ile 1"/>

<vbox visibility=":mode ile 1" padding="6" vfill="false">
<label text="labels.metering.fft_frequency:hz" pad.b="6"/>
<indicator id="freq" format="f6.1!" tcolor="mono"/>
</vbox>

<cell expand="false" bg.color="bg" visibility=":mode ile 1">
<hsep/>
</cell>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false" visibility=":mode ile 1"/>

<vbox visibility=":mode ile 1" padding="6" vfill="false">
<label text="labels.metering.level:db" pad.b="6"/>
<indicator id="lvl" format="+-f5.1!" tcolor="mono"/>
</vbox>

<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>

<void vexpand="true" height.min="8"/>
</ui:with>
</grid>
</group>
Expand Down
74 changes: 49 additions & 25 deletions res/main/ui/analyzer/spectrum/x12.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<plugin resizable="true">
<vbox spacing="4">
<vbox spacing="4" width.min="1055" height.min="716">
<!-- Head settings -->
<align halign="-1" fill="true">
<hbox pad.l="6" pad.r="6" pad.t="4" pad.b="4" spacing="8" fill="false" bg.color="bg_schema">
Expand Down Expand Up @@ -52,23 +52,32 @@
</ui:with>

<!-- Meshes -->
<mesh xi="0" yi="25"
id="spd" width="1"
color="cyan" fill.color="cyan" fill.color.a="0.9" color.a="0.5"
fill="true" visibility=":mtrack" />
<mesh xi="0" yi="25" id="spd" width="1" color="cyan" fill.color="cyan" fill.color.a="0.9" color.a="0.5" fill="true" visibility=":mtrack"/>
<ui:for id="i" first="0" count="12">
<mesh xi="0" yi="${:i + 13}"
id="spd" width="1"
color="graph_mesh_cycle" color.hue="${i} / 12.0" color.a="0.5"
fill.color="graph_mesh_cycle" fill.color.hue="${i} / 12.0" fill.color.a="0.9"
<mesh
xi="0"
yi="${:i + 13}"
id="spd"
width="1"
color="graph_mesh_cycle"
color.hue="${i} / 12.0"
color.a="0.5"
fill.color="graph_mesh_cycle"
fill.color.hue="${i} / 12.0"
fill.color.a="0.9"
fill="true"
visibility=":ctrack and (((:mode ieq 0) or (:mode ieq 2)) and (:on_${i})) or ((:mode ieq 1) or (:mode ieq 3) and ((:spc0 ieq ${i}) or (:spc1 ieq ${i})))" />
visibility=":ctrack and (((:mode ieq 0) or (:mode ieq 2)) and (:on_${i})) or ((:mode ieq 1) or (:mode ieq 3) and ((:spc0 ieq ${i}) or (:spc1 ieq ${i})))"/>
</ui:for>
<ui:for id="i" first="0" count="12">
<mesh xi="0" yi="${:i + 1}"
id="spd" width=":lthick+1"
color="graph_mesh_cycle" color.hue="${i} / 12.0" color.a="0.2"
visibility="(((:mode ieq 0) or (:mode ieq 2)) and (:on_${i})) or ((:mode ieq 1) or (:mode ieq 3) and ((:spc0 ieq ${i}) or (:spc1 ieq ${i})))" />
<mesh
xi="0"
yi="${:i + 1}"
id="spd"
width=":lthick+1"
color="graph_mesh_cycle"
color.hue="${i} / 12.0"
color.a="0.2"
visibility="(((:mode ieq 0) or (:mode ieq 2)) and (:on_${i})) or ((:mode ieq 1) or (:mode ieq 3) and ((:spc0 ieq ${i}) or (:spc1 ieq ${i})))"/>
</ui:for>

<!-- Axis -->
Expand Down Expand Up @@ -394,8 +403,10 @@

<!-- Channel for metering configuration -->
<group text="groups.channels" visibility="(:mode ieq 0) or (:mode ieq 2)" spacing="4" bg.color="bg" ipadding="0">
<grid rows="8" cols="25" transpose="true" hspacing="2">
<grid rows="10" cols="25" transpose="true" hspacing="2">
<ui:with padding="6" bg.color="bg_schema">
<void/>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>
<void/>
<label text="labels.chan.correlation" pad.v="0"/>
<void padding="0"/>
Expand All @@ -407,16 +418,19 @@
</ui:with>

<ui:for id="i" first="0" count="12">
<cell rows="${8 - (:i % 2) * 3}" cols="1" expand="false" padding="0" bg.color="bg">
<cell rows="${10 - (:i % 2) * 3}" cols="1" expand="false" padding="0" bg.color="bg">
<vsep/>
</cell>

<ui:if test=":i % 2 ieq 0">
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<vbox>
<shmlink id="ret_${:i idiv 2}" value.maxlen="6" text.clip="true" hfill="true" />
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms_${:i idiv 2}" height="19" hfill="true"/>
</vbox>
<shmlink id="ret_${:i idiv 2}" value.maxlen="6" text.clip="true" hfill="true"/>
</cell>
<cell cols="3">
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>
</cell>
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms_${:i idiv 2}" height="19" hfill="true"/>
</cell>
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<hbox>
Expand Down Expand Up @@ -474,8 +488,10 @@
<!-- Channels for mastering -->
<hbox spacing="4" visibility="(:mode ine 0) and (:mode ine 2)">
<group text="groups.channels" expand="true" fill="true" spacing="4" bg.color="bg" ipadding="0">
<grid rows="5" cols="25" transpose="true" fill="true" hspacing="2">
<grid rows="7" cols="25" transpose="true" fill="true" hspacing="2">
<ui:with padding="6" bg.color="bg_schema">
<void/>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>
<label text="labels.channel" width.min="52"/>
<label text="labels.chan.hold"/>
<label text="labels.chan.shift"/>
Expand All @@ -485,15 +501,23 @@
<vbox>
<void bg.color="bg" height="4"/>
<hsep/>
<void bg.color="bg_schema" expand="true"/>
<void bg.color="bg_schema" expand="true" height.min="10"/>
</vbox>
</cell>

<ui:for id="i" first="0" last="11">
<ui:with bg.color="bg_schema" bright="(:spc0 ieq ${i}) or ((:spc1 ieq ${i}) and (:mode ine 4)) ? 1.0 : 0.75" bg.bright="(:spc0 ieq ${i}) or ((:spc1 ieq ${i}) and (:mode ine 4)) ? 1.0 : :const_bg_darken">
<cell rows="4" cols="1" expand="false" padding="0" bg.color="bg">
<vsep/>
<cell rows="${6 - (:i % 2) * 2}" cols="1" expand="false" padding="0" bg.color="bg">
<vsep/>
</cell>
<ui:if test=":i % 2 ieq 0">
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<shmlink id="ret_${:i idiv 2}" value.maxlen="6" text.clip="true" hfill="true"/>
</cell>
<cell cols="3">
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>
</cell>
</ui:if>
<ui:with bg.color="bg_schema" bright="(:spc0 ieq ${i}) or ((:spc1 ieq ${i}) and (:mode ine 4)) ? 1.0 : 0.75" bg.bright="(:spc0 ieq ${i}) or ((:spc1 ieq ${i}) and (:mode ine 4)) ? 1.0 : :const_bg_darken">
<ui:with bg.color="bg_schema">
<label text="labels.specials.idx" text:id="${:i+1}" width="44"/>
<button
Expand Down
39 changes: 27 additions & 12 deletions res/main/ui/analyzer/spectrum/x16.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<plugin resizable="true">
<vbox spacing="4">
<vbox spacing="4" width.min="1065" height.min="716">
<!-- Head settings -->
<align halign="-1" fill="true">
<hbox pad.l="6" pad.r="6" pad.t="4" pad.b="4" spacing="8" fill="false" bg.color="bg_schema">
Expand Down Expand Up @@ -393,8 +393,10 @@

<!-- Channel for metering configuration -->
<group text="groups.channels" visibility="(:mode ieq 0) or (:mode ieq 2)" vspacing="4" bg.color="bg" ipadding="0">
<grid rows="8" cols="33" transpose="true" hspacing="2">
<grid rows="10" cols="33" transpose="true" hspacing="2">
<ui:with padding="6" bg.color="bg_schema">
<void/>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>
<void/>
<label text="labels.chan.correlation" pad.v="0"/>
<void padding="0"/>
Expand All @@ -406,16 +408,19 @@
</ui:with>

<ui:for id="i" first="0" count="16">
<cell rows="${8 - (:i % 2) * 3}" cols="1" expand="false" padding="0" bg.color="bg">
<cell rows="${10 - (:i % 2) * 3}" cols="1" expand="false" padding="0" bg.color="bg">
<vsep/>
</cell>

<ui:if test=":i % 2 ieq 0">
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<vbox>
<shmlink id="ret_${:i idiv 2}" value.maxlen="6" text.clip="true" hfill="true" />
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms_${:i idiv 2}" height="19" hfill="true"/>
</vbox>
<shmlink id="ret_${:i idiv 2}" value.maxlen="6" text.clip="true" hfill="true"/>
</cell>
<cell cols="3">
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>
</cell>
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<button bg.color="bg_schema" text="labels.chan.mid_side" id="ms_${:i idiv 2}" height="19" hfill="true"/>
</cell>
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<hbox>
Expand Down Expand Up @@ -473,8 +478,10 @@
<!-- Channels for mastering -->
<hbox spacing="4" visibility="(:mode ine 0) and (:mode ine 2)">
<group text="groups.channels" expand="true" fill="true" spacing="4" bg.color="bg" ipadding="0">
<grid rows="5" cols="33" transpose="true" fill="true" hspacing="2">
<grid rows="7" cols="33" transpose="true" fill="true" hspacing="2">
<ui:with padding="6" bg.color="bg_schema">
<void/>
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>
<label text="labels.channel"/>
<label text="labels.chan.hold"/>
<label text="labels.chan.shift"/>
Expand All @@ -484,15 +491,23 @@
<vbox>
<void bg.color="bg" height="4"/>
<hsep/>
<void bg.color="bg_schema" expand="true"/>
<void bg.color="bg_schema" expand="true" height.min="10"/>
</vbox>
</cell>

<ui:for id="i" first="0" last="15">
<ui:with bg.color="bg_schema" bright="(:spc0 ieq ${i}) or ((:spc1 ieq ${i}) and (:mode ine 4)) ? 1.0 : 0.75" bg.bright="(:spc0 ieq ${i}) or ((:spc1 ieq ${i}) and (:mode ine 4)) ? 1.0 : :const_bg_darken">
<cell rows="4" cols="1" expand="false" padding="0" bg.color="bg">
<vsep/>
<cell rows="${6 - (:i % 2) * 2}" cols="1" expand="false" padding="0" bg.color="bg">
<vsep/>
</cell>
<ui:if test=":i % 2 ieq 0">
<cell cols="3" pad.h="6" pad.v="4" bg.color="bg_schema">
<shmlink id="ret_${:i idiv 2}" value.maxlen="6" text.clip="true" hfill="true"/>
</cell>
<cell cols="3">
<hsep bg.color="bg" pad.v="2" vreduce="true" vexpand="false"/>
</cell>
</ui:if>
<ui:with bg.color="bg_schema" bright="(:spc0 ieq ${i}) or ((:spc1 ieq ${i}) and (:mode ine 4)) ? 1.0 : 0.75" bg.bright="(:spc0 ieq ${i}) or ((:spc1 ieq ${i}) and (:mode ine 4)) ? 1.0 : :const_bg_darken">
<ui:with bg.color="bg_schema">
<label text="labels.specials.idx" text:id="${:i+1}" width="43"/>
<button
Expand Down
Loading

0 comments on commit 8058acf

Please sign in to comment.