diff options
author | Be <be@mixxx.org> | 2020-11-02 17:10:43 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-02 17:10:43 -0600 |
commit | 0e0c72ededdeb7520cd09b63731b4b05f8421db1 (patch) | |
tree | 65912fec6d743fa1f5804697de9f83cc7dc17b9d /res | |
parent | 39c7faa31570f61eff984136425d47ef8f146e02 (diff) | |
parent | 3fa06a385fbecef02dcbe449fbd3b0cc8c6b7d84 (diff) |
Merge pull request #3144 from ronso0/skin-change-crash-fix
work around skin change crash on Linux
Diffstat (limited to 'res')
-rw-r--r-- | res/skins/Deere (64 Samplers)/skin.xml | 177 | ||||
-rw-r--r-- | res/skins/Deere/deck.xml | 46 | ||||
-rw-r--r-- | res/skins/Deere/deck_coverart.xml (renamed from res/skins/Deere/coverart.xml) | 0 | ||||
-rw-r--r-- | res/skins/Deere/deck_singletons.xml | 32 | ||||
-rw-r--r-- | res/skins/Deere/deck_spinny.xml | 34 | ||||
-rw-r--r-- | res/skins/Deere/deck_waveform.xml (renamed from res/skins/Deere/deck_visual_row.xml) | 12 | ||||
-rw-r--r-- | res/skins/Deere/parallel_waveforms.xml | 131 | ||||
-rw-r--r-- | res/skins/Deere/skin.xml | 225 | ||||
-rw-r--r-- | res/skins/Deere/spinny.xml | 196 | ||||
-rw-r--r-- | res/skins/Shade/deck.xml | 4 | ||||
-rw-r--r-- | res/skins/Shade/skin.xml | 34 |
11 files changed, 309 insertions, 582 deletions
diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml index b24013cd65..41e4c8e9e0 100644 --- a/res/skins/Deere (64 Samplers)/skin.xml +++ b/res/skins/Deere (64 Samplers)/skin.xml @@ -136,141 +136,37 @@ main_decks.xml, left_deck.xml, and right_deck.xml, so define them in singletons. This makes toggling between 2/4 decks and stacked/split waveforms slower, but it makes Mixxx startup and shutdown much faster and saves a lot of memory.--> - <SingletonDefinition> - <ObjectName>DeckVisualRow1</ObjectName> - <Children> - <Template src="skin:../Deere/deck_visual_row.xml"> - <SetVariable name="i">1</SetVariable> - <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> - <!-- Traditional Blue --> - <SetVariable name="DeckSignalColor">#007BCD</SetVariable> - <SetVariable name="DeckBackgroundColor">#333333</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckVisualRow2</ObjectName> - <Children> - <Template src="skin:../Deere/deck_visual_row.xml"> - <SetVariable name="i">2</SetVariable> - <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> - <!-- Traditional Orange --> - <SetVariable name="DeckSignalColor">#E67A00</SetVariable> - <SetVariable name="DeckBackgroundColor">#333333</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckVisualRow3</ObjectName> - <Children> - <Template src="skin:../Deere/deck_visual_row.xml"> - <SetVariable name="i">3</SetVariable> - <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> - <!-- Violet --> - <SetVariable name="DeckSignalColor">#B500B5</SetVariable> - <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckVisualRow4</ObjectName> - <Children> - <Template src="skin:../Deere/deck_visual_row.xml"> - <SetVariable name="i">4</SetVariable> - <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> - <!-- Lime --> - <SetVariable name="DeckSignalColor">#AABD00</SetVariable> - <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckCoverArt1</ObjectName> - <Children> - <Template src="skin:../Deere/coverart.xml"> - <SetVariable name="group">[Channel1]</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckCoverArt2</ObjectName> - <Children> - <Template src="skin:../Deere/coverart.xml"> - <SetVariable name="group">[Channel2]</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckCoverArt3</ObjectName> - <Children> - <Template src="skin:../Deere/coverart.xml"> - <SetVariable name="group">[Channel3]</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckCoverArt4</ObjectName> - <Children> - <Template src="skin:../Deere/coverart.xml"> - <SetVariable name="group">[Channel4]</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckOverview1</ObjectName> - <Children> - <Template src="skin:../Deere/deck_overview.xml"> - <SetVariable name="group">[Channel1]</SetVariable> - <SetVariable name="DeckSignalColor">#007BCD</SetVariable> - <SetVariable name="DeckBackgroundColor">#333333</SetVariable> - <SetVariable name="PlayedOverlayColor">#88000000</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckOverview2</ObjectName> - <Children> - <Template src="skin:../Deere/deck_overview.xml"> - <SetVariable name="group">[Channel2]</SetVariable> - <SetVariable name="DeckSignalColor">#E67A00</SetVariable> - <SetVariable name="DeckBackgroundColor">#333333</SetVariable> - <SetVariable name="PlayedOverlayColor">#88000000</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckOverview3</ObjectName> - <Children> - <Template src="skin:../Deere/deck_overview.xml"> - <SetVariable name="group">[Channel3]</SetVariable> - <SetVariable name="DeckSignalColor">#B500B5</SetVariable> - <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> - <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckOverview4</ObjectName> - <Children> - <Template src="skin:../Deere/deck_overview.xml"> - <SetVariable name="group">[Channel4]</SetVariable> - <SetVariable name="DeckSignalColor">#AABD00</SetVariable> - <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> - <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> - </Template> - </Children> - </SingletonDefinition> + <Template src="skin:../Deere/deck_singletons.xml"> + <SetVariable name="i">1</SetVariable> + <!-- Traditional Blue --> + <SetVariable name="DeckSignalColor">#007BCD</SetVariable> + <SetVariable name="DeckBackgroundColor">#333333</SetVariable> + <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> + </Template> + + <Template src="skin:../Deere/deck_singletons.xml"> + <SetVariable name="i">2</SetVariable> + <!-- Traditional Orange --> + <SetVariable name="DeckSignalColor">#E67A00</SetVariable> + <SetVariable name="DeckBackgroundColor">#333333</SetVariable> + <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> + </Template> + + <Template src="skin:../Deere/deck_singletons.xml"> + <SetVariable name="i">3</SetVariable> + <!-- Violet --> + <SetVariable name="DeckSignalColor">#B500B5</SetVariable> + <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> + <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> + </Template> + + <Template src="skin:../Deere/deck_singletons.xml"> + <SetVariable name="i">4</SetVariable> + <!-- Lime --> + <SetVariable name="DeckSignalColor">#AABD00</SetVariable> + <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> + <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> + </Template> <SingletonDefinition> <ObjectName>Library</ObjectName> @@ -297,11 +193,6 @@ <SplitSizesConfigKey>[Skin],stackedWaveforms_splitSize</SplitSizesConfigKey> <SplitSizes>90,540</SplitSizes> <Size>-1me,-1me</Size> - <Connection> - <ConfigKey>[Master],maximize_library</ConfigKey> - <BindProperty>visible</BindProperty> - <Transform><Not/></Transform> - </Connection> <Children> <WidgetGroup><!-- Parallel Waveforms --> @@ -368,13 +259,9 @@ </Splitter><!-- regular library with decks etc. --> <!-- maximized Library with minimal decks --> - <WidgetGroup> + <WidgetGroup trigger="[Master],maximize_library" on_hide_select="0"> <Layout>vertical</Layout> <SizePolicy>me,me</SizePolicy> - <Connection> - <ConfigKey>[Master],maximize_library</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> <Children> <Template src="skin:../Deere/decks_small.xml"/> <SingletonContainer> diff --git a/res/skins/Deere/deck.xml b/res/skins/Deere/deck.xml index 4fc363fa48..9c2a55513a 100644 --- a/res/skins/Deere/deck.xml +++ b/res/skins/Deere/deck.xml @@ -19,26 +19,56 @@ <SizePolicy>me,me</SizePolicy> <Children> <Template src="skin:deck_text_row.xml"/> - <!--Hides if the stacked waveforms option is activated in the skin settings --> + + <!-- Hides if the 'Parallel Waveforms' option is activated in the skin settings --> <WidgetGroup> - <Layout>vertical</Layout> + <Layout>horizontal</Layout> <Children> + <WidgetGroup> - <ObjectName>Spacer22</ObjectName> - <Size>0me,1f</Size> + <Layout>horizontal</Layout> + <Children> + <WidgetGroup> + <Layout>horizontal</Layout> + <Connection> + <ConfigKey>[Skin],show_coverart</ConfigKey> + <BindProperty>visible</BindProperty> + <Transform><Not/></Transform> + </Connection> + <Children> + <Template src="skin:../Deere/deck_spinny.xml"> + <SetVariable name="cover">true</SetVariable> + <SetVariable name="Size">55f,55f</SetVariable> + </Template> + </Children> + </WidgetGroup> + <WidgetGroup> + <Layout>horizontal</Layout> + <Connection> + <ConfigKey>[Skin],show_coverart</ConfigKey> + <BindProperty>visible</BindProperty> + </Connection> + <Children> + <Template src="skin:../Deere/deck_spinny.xml"> + <SetVariable name="cover">false</SetVariable> + <SetVariable name="Size">55f,55f</SetVariable> + </Template> + </Children> + </WidgetGroup> + </Children> </WidgetGroup> + <SingletonContainer> - <ObjectName>DeckVisualRow<Variable name="i" /></ObjectName> + <ObjectName>DeckWaveform<Variable name="i"/></ObjectName> </SingletonContainer> </Children> <Connection> <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey> + <Transform><Not/></Transform> <BindProperty>visible</BindProperty> - <Transform> - <Not/> - </Transform> </Connection> </WidgetGroup> + <Template src="skin:deck_overview_row.xml"/> <Template src="skin:deck_controls_row.xml"/> </Children> diff --git a/res/skins/Deere/coverart.xml b/res/skins/Deere/deck_coverart.xml index 4ef0f8012a..4ef0f8012a 100644 --- a/res/skins/Deere/coverart.xml +++ b/res/skins/Deere/deck_coverart.xml diff --git a/res/skins/Deere/deck_singletons.xml b/res/skins/Deere/deck_singletons.xml new file mode 100644 index 0000000000..d44420765e --- /dev/null +++ b/res/skins/Deere/deck_singletons.xml @@ -0,0 +1,32 @@ +<!DOCTYPE template> +<!-- + Description: + Some widgets and containers that are used in multiple places, + depending on skin configuration. + Variables: + i: the deck number (1-4) +--> +<Template> + <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> + + <SingletonDefinition> + <ObjectName>DeckWaveform<Variable name="i"/></ObjectName> + <Children> + <Template src="skin:../Deere/deck_waveform.xml"/> + </Children> + </SingletonDefinition> + + <SingletonDefinition> + <ObjectName>DeckCoverArt<Variable name="i"/></ObjectName> + <Children> + <Template src="skin:../Deere/deck_coverart.xml"/> + </Children> + </SingletonDefinition> + + <SingletonDefinition> + <ObjectName>DeckOverview<Variable name="i"/></ObjectName> + <Children> + <Template src="skin:../Deere/deck_overview.xml"/> + </Children> + </SingletonDefinition> +</Template> diff --git a/res/skins/Deere/deck_spinny.xml b/res/skins/Deere/deck_spinny.xml new file mode 100644 index 0000000000..66cd9901d7 --- /dev/null +++ b/res/skins/Deere/deck_spinny.xml @@ -0,0 +1,34 @@ +<!-- +Spinny template + +Stacked waveforms: always show cover art in spinny + +Split waveforms: show cover art in spinny when it is not showing in deck text row, +but do not show cover art in spinny when the cover art is showing right above it +in the deck text row. +--> +<Template> + <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> + + <WidgetGroup> + <Layout>horizontal</Layout> + <Size><Variable name="Size"/></Size> + <Children> + <Spinny> + <TooltipId>spinny</TooltipId> + <ObjectName>Spinny<Variable name="i"/></ObjectName> + <Size><Variable name="Size"/></Size> + <Group><Variable name="group"/></Group> + <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground> + <PathForeground scalemode="STRETCH">image/vinyl_spinny_foreground.svg</PathForeground> + <PathGhost scalemode="STRETCH">image/vinyl_spinny_foreground_ghost.svg</PathGhost> + <PathMask scalemode="STRETCH">image/vinyl_spinny_cover_mask.svg</PathMask> + <ShowCover><Variable name="cover"/></ShowCover> + </Spinny> + </Children> + <Connection> + <ConfigKey>[Skin],show_spinnies</ConfigKey> + <BindProperty>visible</BindProperty> + </Connection> + </WidgetGroup> +</Template> diff --git a/res/skins/Deere/deck_visual_row.xml b/res/skins/Deere/deck_waveform.xml index ee788fb7bf..52a290eb3f 100644 --- a/res/skins/Deere/deck_visual_row.xml +++ b/res/skins/Deere/deck_waveform.xml @@ -2,7 +2,9 @@ <!-- Description: Deck visual row (waveform and spinny). + Use smaller spinny sizes for 4 decks than 2 decks. Variables: + i: deck number, used for to construct group name group: the group to connect to --> <Template> @@ -14,8 +16,6 @@ <Template src="skin:vinylcontrol.xml"/> - <Template src="skin:spinny.xml"/> - <Visual> <TooltipId>waveform_display</TooltipId> <Group><Variable name="group"/></Group> @@ -168,14 +168,6 @@ <SetVariable name="left_connection_control"><Variable name="group"/>,waveform_zoom_up</SetVariable> </Template> </Children> - <!--The zoom buttons shift the center line off center in stacked waveform mode.--> - <Connection> - <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey> - <BindProperty>visible</BindProperty> - <Transform> - <Not/> - </Transform> - </Connection> </WidgetGroup> </Children> 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 50aea9e547..a03d276450 100644 --- a/res/skins/Deere/skin.xml +++ b/res/skins/Deere/skin.xml @@ -136,141 +136,37 @@ main_decks.xml, left_deck.xml, and right_deck.xml, so define them in singletons. This makes toggling between 2/4 decks and stacked/split waveforms slower, but it makes Mixxx startup and shutdown much faster and saves a lot of memory.--> - <SingletonDefinition> - <ObjectName>DeckVisualRow1</ObjectName> - <Children> - <Template src="skin:../Deere/deck_visual_row.xml"> - <SetVariable name="i">1</SetVariable> - <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> - <!-- Traditional Blue --> - <SetVariable name="DeckSignalColor">#007BCD</SetVariable> - <SetVariable name="DeckBackgroundColor">#333333</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckVisualRow2</ObjectName> - <Children> - <Template src="skin:../Deere/deck_visual_row.xml"> - <SetVariable name="i">2</SetVariable> - <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> - <!-- Traditional Orange --> - <SetVariable name="DeckSignalColor">#E67A00</SetVariable> - <SetVariable name="DeckBackgroundColor">#333333</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckVisualRow3</ObjectName> - <Children> - <Template src="skin:../Deere/deck_visual_row.xml"> - <SetVariable name="i">3</SetVariable> - <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> - <!-- Violet --> - <SetVariable name="DeckSignalColor">#B500B5</SetVariable> - <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckVisualRow4</ObjectName> - <Children> - <Template src="skin:../Deere/deck_visual_row.xml"> - <SetVariable name="i">4</SetVariable> - <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable> - <!-- Lime --> - <SetVariable name="DeckSignalColor">#AABD00</SetVariable> - <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckCoverArt1</ObjectName> - <Children> - <Template src="skin:../Deere/coverart.xml"> - <SetVariable name="group">[Channel1]</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckCoverArt2</ObjectName> - <Children> - <Template src="skin:../Deere/coverart.xml"> - <SetVariable name="group">[Channel2]</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckCoverArt3</ObjectName> - <Children> - <Template src="skin:../Deere/coverart.xml"> - <SetVariable name="group">[Channel3]</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckCoverArt4</ObjectName> - <Children> - <Template src="skin:../Deere/coverart.xml"> - <SetVariable name="group">[Channel4]</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckOverview1</ObjectName> - <Children> - <Template src="skin:../Deere/deck_overview.xml"> - <SetVariable name="group">[Channel1]</SetVariable> - <SetVariable name="DeckSignalColor">#007BCD</SetVariable> - <SetVariable name="DeckBackgroundColor">#333333</SetVariable> - <SetVariable name="PlayedOverlayColor">#88000000</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckOverview2</ObjectName> - <Children> - <Template src="skin:../Deere/deck_overview.xml"> - <SetVariable name="group">[Channel2]</SetVariable> - <SetVariable name="DeckSignalColor">#E67A00</SetVariable> - <SetVariable name="DeckBackgroundColor">#333333</SetVariable> - <SetVariable name="PlayedOverlayColor">#88000000</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckOverview3</ObjectName> - <Children> - <Template src="skin:../Deere/deck_overview.xml"> - <SetVariable name="group">[Channel3]</SetVariable> - <SetVariable name="DeckSignalColor">#B500B5</SetVariable> - <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> - <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> - </Template> - </Children> - </SingletonDefinition> - - <SingletonDefinition> - <ObjectName>DeckOverview4</ObjectName> - <Children> - <Template src="skin:../Deere/deck_overview.xml"> - <SetVariable name="group">[Channel4]</SetVariable> - <SetVariable name="DeckSignalColor">#AABD00</SetVariable> - <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> - <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> - </Template> - </Children> - </SingletonDefinition> + <Template src="skin:../Deere/deck_singletons.xml"> + <SetVariable name="i">1</SetVariable> + <!-- Traditional Blue --> + <SetVariable name="DeckSignalColor">#007BCD</SetVariable> + <SetVariable name="DeckBackgroundColor">#333333</SetVariable> + <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> + </Template> + + <Template src="skin:../Deere/deck_singletons.xml"> + <SetVariable name="i">2</SetVariable> + <!-- Traditional Orange --> + <SetVariable name="DeckSignalColor">#E67A00</SetVariable> + <SetVariable name="DeckBackgroundColor">#333333</SetVariable> + <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> + </Template> + + <Template src="skin:../Deere/deck_singletons.xml"> + <SetVariable name="i">3</SetVariable> + <!-- Violet --> + <SetVariable name="DeckSignalColor">#B500B5</SetVariable> + <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> + <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> + </Template> + + <Template src="skin:../Deere/deck_singletons.xml"> + <SetVariable name="i">4</SetVariable> + <!-- Lime --> + <SetVariable name="DeckSignalColor">#AABD00</SetVariable> + <SetVariable name="DeckBackgroundColor">#35335a</SetVariable> + <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable> + </Template> <SingletonDefinition> <ObjectName>Library</ObjectName> @@ -297,58 +193,11 @@ <SplitSizesConfigKey>[Skin],stackedWaveforms_splitSize</SplitSizesConfigKey> <SplitSizes>90,540</SplitSizes> <Size>-1me,-1me</Size> - <Connection> - <ConfigKey>[Master],maximize_library</ConfigKey> - <BindProperty>visible</BindProperty> - <Transform><Not/></Transform> - </Connection> <Children> - <WidgetGroup><!-- Parallel Waveforms --> - <ObjectName>Waveforms</ObjectName> - <Layout>vertical</Layout> - <Connection> - <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - <Children> - - <WidgetGroup> - <Connection> - <ConfigKey>[Skin],show_4decks</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - <Layout>vertical</Layout> - <Children> - <SingletonContainer> - <ObjectName>DeckVisualRow3</ObjectName> - </SingletonContainer> - </Children> - </WidgetGroup> - - <SingletonContainer> - <ObjectName>DeckVisualRow1</ObjectName> - </SingletonContainer> - - <SingletonContainer> - <ObjectName>DeckVisualRow2</ObjectName> - </SingletonContainer> - - <WidgetGroup> - <Connection> - <ConfigKey>[Skin],show_4decks</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - <Layout>vertical</Layout> - <Children> - <SingletonContainer> - <ObjectName>DeckVisualRow4</ObjectName> - </SingletonContainer> - </Children> - </WidgetGroup> - - </Children> - </WidgetGroup><!-- /Parallel Waveforms --> + <!-- Waveforms & spinnies are shown here as stack or + |