diff options
| author | ronso0 <ronso0@mixxx.org> | 2020-11-02 15:01:22 +0100 |
|---|---|---|
| committer | ronso0 <ronso0@mixxx.org> | 2020-11-02 15:01:22 +0100 |
| commit | b13f6bbae3f5167f0ab9241ef4d3fb76c8d3e443 (patch) | |
| tree | 7a40bec21dc5cf62e42656edf1ad40ce02903b17 /res | |
| parent | de0e8b637a033513d9292a02185e99f1d897b997 (diff) | |
Deere: move waveform/spinny row from skin.xml to separate template
Diffstat (limited to 'res')
| -rw-r--r-- | res/skins/Deere/parallel_waveforms.xml | 131 | ||||
| -rw-r--r-- | res/skins/Deere/skin.xml | 126 |
2 files changed, 134 insertions, 123 deletions
diff --git a/res/skins/Deere/parallel_waveforms.xml b/res/skins/Deere/parallel_waveforms.xml new file mode 100644 index 0000000000..001f2ae543 --- /dev/null +++ b/res/skins/Deere/parallel_waveforms.xml @@ -0,0 +1,131 @@ +<!DOCTYPE template> +<!-- +--> +<Template> + <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> + + + <WidgetGroup><!-- Parallel Waveforms --> + <ObjectName>Waveforms</ObjectName> + <Layout>vertical</Layout> + <Children> + + <WidgetGroup> + <Layout>horizontal</Layout> + <Children> + <Template src="skin:../Deere/deck_spinny.xml"> + <SetVariable name="cover">true</SetVariable> + <SetVariable name="Size">55f,55f</SetVariable> + <SetVariable name="i">3</SetVariable> + </Template> + <SingletonContainer> + <ObjectName>DeckWaveform3</ObjectName> + </SingletonContainer> + </Children> + <Connection> + <ConfigKey>[Skin],show_4decks</ConfigKey> + <BindProperty>visible</BindProperty> + </Connection> + </WidgetGroup> + + <WidgetGroup> + <Layout>horizontal</Layout> + <Children> + <WidgetGroup> + <Layout>horizontal</Layout> + <Children> + <Template src="skin:../Deere/deck_spinny.xml"> + <SetVariable name="cover">true</SetVariable> + <SetVariable name="Size">55f,55f</SetVariable> + <SetVariable name="i">1</SetVariable> + </Template> + </Children> + <Connection> + <ConfigKey>[Skin],show_4decks</ConfigKey> + <BindProperty>visible</BindProperty> + </Connection> + </WidgetGroup> + <WidgetGroup> + <Layout>horizontal</Layout> + <Children> + <Template src="skin:../Deere/deck_spinny.xml"> + <SetVariable name="cover">true</SetVariable> + <SetVariable name="Size">75f,75f</SetVariable> + <SetVariable name="i">1</SetVariable> + </Template> + </Children> + <Connection> + <ConfigKey>[Skin],show_4decks</ConfigKey> + <Transform><Not/></Transform> + <BindProperty>visible</BindProperty> + </Connection> + </WidgetGroup> + <SingletonContainer> + <ObjectName>DeckWaveform1</ObjectName> + </SingletonContainer> + </Children> + </WidgetGroup> + + <WidgetGroup> + <Layout>horizontal</Layout> + <Children> + <WidgetGroup> + <Layout>horizontal</Layout> + <Children> + <Template src="skin:../Deere/deck_spinny.xml"> + <SetVariable name="cover">true</SetVariable> + <SetVariable name="Size">55f,55f</SetVariable> + <SetVariable name="i">2</SetVariable> + </Template> + </Children> + <Connection> + <ConfigKey>[Skin],show_4decks</ConfigKey> + <BindProperty>visible</BindProperty> + </Connection> + </WidgetGroup> + <WidgetGroup> + <Layout>horizontal</Layout> + <Children> + <Template src="skin:../Deere/deck_spinny.xml"> + <SetVariable name="cover">true</SetVariable> + <SetVariable name="Size">75f,75f</SetVariable> + <SetVariable name="i">2</SetVariable> + </Template> + </Children> + <Connection> + <ConfigKey>[Skin],show_4decks</ConfigKey> + <Transform><Not/></Transform> + <BindProperty>visible</BindProperty> + </Connection> + </WidgetGroup> + <SingletonContainer> + <ObjectName>DeckWaveform2</ObjectName> + </SingletonContainer> + </Children> + </WidgetGroup> + + <WidgetGroup> + <Layout>horizontal</Layout> + <Children> + <Template src="skin:../Deere/deck_spinny.xml"> + <SetVariable name="cover">true</SetVariable> + <SetVariable name="Size">55f,55f</SetVariable> + <SetVariable name="i">4</SetVariable> + </Template> + <SingletonContainer> + <ObjectName>DeckWaveform4</ObjectName> + </SingletonContainer> + </Children> + <Connection> + <ConfigKey>[Skin],show_4decks</ConfigKey> + <BindProperty>visible</BindProperty> + </Connection> + </WidgetGroup> + + </Children> + <Connection> + <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey> + <BindProperty>visible</BindProperty> + </Connection>y + </WidgetGroup><!-- /Parallel Waveforms --> +</Template> diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml index a311c4e81f..a03d276450 100644 --- a/res/skins/Deere/skin.xml +++ b/res/skins/Deere/skin.xml @@ -195,129 +195,9 @@ <Size>-1me,-1me</Size> <Children> - <WidgetGroup><!-- Parallel Waveforms --> - <ObjectName>Waveforms</ObjectName> - <Layout>vertical</Layout> - <Connection> - <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - <Children> - - <WidgetGroup> - <Layout>horizontal</Layout> - <Children> - <Template src="skin:../Deere/deck_spinny.xml"> - <SetVariable name="cover">true</SetVariable> - <SetVariable name="Size">55f,55f</SetVariable> - <SetVariable name="i">3</SetVariable> - </Template> - <SingletonContainer> - <ObjectName>DeckWaveform3</ObjectName> - </SingletonContainer> - </Children> - <Connection> - <ConfigKey>[Skin],show_4decks</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> - - <WidgetGroup> - <Layout>horizontal</Layout> - <Children> - <WidgetGroup> - <Layout>horizontal</Layout> - <Children> - <Template src="skin:../Deere/deck_spinny.xml"> - <SetVariable name="cover">true</SetVariable> - <SetVariable name="Size">55f,55f</SetVariable> - <SetVariable name="i">1</SetVariable> - </Template> - </Children> - <Connection> - <ConfigKey>[Skin],show_4decks</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> - <WidgetGroup> - <Layout>horizontal</Layout> - <Children> - <Template src="skin:../Deere/deck_spinny.xml"> - <SetVariable name="cover">true</SetVariable> - <SetVariable name="Size">75f,75f</SetVariable> - <SetVariable name="i">1</SetVariable> - </Template> - </Children> - <Connection> - <ConfigKey>[Skin],show_4decks</ConfigKey> - <Transform><Not/></Transform> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> - <SingletonContainer> - <ObjectName>DeckWaveform1</ObjectName> - </SingletonContainer> - </Children> - </WidgetGroup> - - <WidgetGroup> - <Layout>horizontal</Layout> - <Children> - <WidgetGroup> - <Layout>horizontal</Layout> - <Children> - <Template src="skin:../Deere/deck_spinny.xml"> - <SetVariable name="cover">true</SetVariable> - <SetVariable name="Size">55f,55f</SetVariable> - <SetVariable name="i">2</SetVariable> - </Template> - </Children> - <Connection> - <ConfigKey>[Skin],show_4decks</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> - <WidgetGroup> - <Layout>horizontal</Layout> - <Children> - <Template src="skin:../Deere/deck_spinny.xml"> - <SetVariable name="cover">true</SetVariable> - <SetVariable name="Size">75f,75f</SetVariable> - <SetVariable name="i">2</SetVariable> - </Template> - </Children> - <Connection> - <ConfigKey>[Skin],show_4decks</ConfigKey> - <Transform><Not/></Transform> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> - <SingletonContainer> - <ObjectName>DeckWaveform2</ObjectName> - </SingletonContainer> - </Children> - </WidgetGroup> - - <WidgetGroup> - <Layout>horizontal</Layout> - <Children> - <Template src="skin:../Deere/deck_spinny.xml"> - <SetVariable name="cover">true</SetVariable> - <SetVariable name="Size">55f,55f</SetVariable> - <SetVariable name="i">4</SetVariable> - </Template> - <SingletonContainer> - <ObjectName>DeckWaveform4</ObjectName> - </SingletonContainer> - </Children> - <Connection> - <ConfigKey>[Skin],show_4decks</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> - - </Children> - </WidgetGroup><!-- /Parallel Waveforms --> + <!-- Waveforms & spinnies are shown here as stack or + separatley in each deck --> + <Template src="skin:../Deere/parallel_waveforms.xml"/> <WidgetGroup><!-- Main section --> <Layout>vertical</Layout> |