diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/skins/Shade/btn/btn_play_deck_preview.png | bin | 0 -> 1945 bytes | |||
-rw-r--r-- | res/skins/Shade/btn/btn_play_deck_small_preview.png | bin | 0 -> 136 bytes | |||
-rw-r--r-- | res/skins/Shade/btn/btn_play_sampler_preview.png | bin | 0 -> 216 bytes | |||
-rw-r--r-- | res/skins/Shade/btn/btn_preview_deck.png | bin | 0 -> 144 bytes | |||
-rw-r--r-- | res/skins/Shade/deck_small.xml | 22 | ||||
-rw-r--r-- | res/skins/Shade/mixer_panel.xml | 53 | ||||
-rw-r--r-- | res/skins/Shade/sampler.xml | 26 |
7 files changed, 94 insertions, 7 deletions
diff --git a/res/skins/Shade/btn/btn_play_deck_preview.png b/res/skins/Shade/btn/btn_play_deck_preview.png Binary files differnew file mode 100644 index 0000000000..dded482ccd --- /dev/null +++ b/res/skins/Shade/btn/btn_play_deck_preview.png diff --git a/res/skins/Shade/btn/btn_play_deck_small_preview.png b/res/skins/Shade/btn/btn_play_deck_small_preview.png Binary files differnew file mode 100644 index 0000000000..4eaac775de --- /dev/null +++ b/res/skins/Shade/btn/btn_play_deck_small_preview.png diff --git a/res/skins/Shade/btn/btn_play_sampler_preview.png b/res/skins/Shade/btn/btn_play_sampler_preview.png Binary files differnew file mode 100644 index 0000000000..0e1bae5f5c --- /dev/null +++ b/res/skins/Shade/btn/btn_play_sampler_preview.png diff --git a/res/skins/Shade/btn/btn_preview_deck.png b/res/skins/Shade/btn/btn_preview_deck.png Binary files differnew file mode 100644 index 0000000000..64f5f20252 --- /dev/null +++ b/res/skins/Shade/btn/btn_preview_deck.png diff --git a/res/skins/Shade/deck_small.xml b/res/skins/Shade/deck_small.xml index 0282e654c9..e506a8e9ee 100644 --- a/res/skins/Shade/deck_small.xml +++ b/res/skins/Shade/deck_small.xml @@ -179,6 +179,7 @@ <Size>41f,38f</Size> <BackPath>style/style_bg_deck_blank.png</BackPath> <Children> + <!-- Play indicator, blinks depending on Cue mode --> <PushButton> <Pos>5,8</Pos> <NumberStates>2</NumberStates> @@ -196,6 +197,23 @@ <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey> </Connection> </PushButton> + <!-- Preview indicator --> + <PushButton> + <Pos>5,8</Pos> + <NumberStates>2</NumberStates> + <State> + <Number>0</Number> + </State> + <State> + <Number>1</Number> + <Pressed>skin:/btn/btn_play_deck_small_preview.png</Pressed> + <Unpressed>skin:/btn/btn_play_deck_small_preview.png</Unpressed> + </State> + <Connection> + <ConfigKey><Variable name="group"/>,play</ConfigKey> + </Connection> + </PushButton> + <!-- Play --> <PushButton> <TooltipId>play_cue_default</TooltipId> <Pos>5,8</Pos> @@ -218,6 +236,10 @@ <ConfigKey><Variable name="group"/>,cue_default</ConfigKey> <ButtonState>RightButton</ButtonState> </Connection> + <Connection> + <ConfigKey><Variable name="group"/>,play_latched</ConfigKey> + <ConnectValueFromWidget>false</ConnectValueFromWidget> + </Connection> </PushButton> </Children> </WidgetGroup> diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml index fb89cde104..7afaf4a3ba 100644 --- a/res/skins/Shade/mixer_panel.xml +++ b/res/skins/Shade/mixer_panel.xml @@ -86,7 +86,9 @@ **************************************** --> <!-- Play deck 1 --> + <!-- Play indicator, blinks depending on Cue mode --> <PushButton> + <Pos>11,200</Pos> <NumberStates>2</NumberStates> <State> <Number>0</Number> @@ -98,13 +100,30 @@ <Pressed>skin:/btn/btn_play_deck_over.png</Pressed> <Unpressed>skin:/btn/btn_play_deck_over.png</Unpressed> </State> - <Pos>11,200</Pos> <Connection> <ConfigKey>[Channel1],play_indicator</ConfigKey> </Connection> </PushButton> + <!-- Preview indicator --> + <PushButton> + <Pos>11,200</Pos> + <NumberStates>2</NumberStates> + <State> + <Number>0</Number> + </State> + <State> + <Number>1</Number> + <Pressed>skin:/btn/btn_play_deck_preview.png</Pressed> + <Unpressed>skin:/btn/btn_play_deck_preview.png</Unpressed> + </State> + <Connection> + <ConfigKey>[Channel1],play</ConfigKey> + </Connection> + </PushButton> + <!-- Play --> <PushButton> <TooltipId>play_cue_set</TooltipId> + <Pos>11,200</Pos> <NumberStates>2</NumberStates> <State> <Number>0</Number> @@ -116,7 +135,6 @@ <Pressed>skin:/btn/btn_play_deck_overdown.png</Pressed> <Unpressed>skin:/btn/btn_play_deck_over.png</Unpressed> </State> - <Pos>11,200</Pos> <Connection> <ConfigKey>[Channel1],play</ConfigKey> <ButtonState>LeftButton</ButtonState> @@ -125,9 +143,16 @@ <ConfigKey>[Channel1],cue_set</ConfigKey> <ButtonState>RightButton</ButtonState> </Connection> + <Connection> + <ConfigKey>[Channel1],play_latched</ConfigKey> + <ConnectValueFromWidget>false</ConnectValueFromWidget> + </Connection> </PushButton> + <!-- Play deck 2 --> + <!-- Play indicator, blinks depending on Cue mode --> <PushButton> + <Pos>203,200</Pos> <NumberStates>2</NumberStates> <State> <Number>0</Number> @@ -139,13 +164,30 @@ <Pressed>skin:/btn/btn_play_deck_over.png</Pressed> <Unpressed>skin:/btn/btn_play_deck_over.png</Unpressed> </State> - <Pos>203,200</Pos> <Connection> <ConfigKey>[Channel2],play_indicator</ConfigKey> </Connection> </PushButton> + <!-- Preview indicator --> + <PushButton> + <Pos>203,200</Pos> + <NumberStates>2</NumberStates> + <State> + <Number>0</Number> + </State> + <State> + <Number>1</Number> + <Pressed>skin:/btn/btn_deck_preview.png</Pressed> + <Unpressed>skin:/btn/btn_deck_preview.png</Unpressed> + </State> + <Connection> + <ConfigKey>[Channel2],play</ConfigKey> + </Connection> + </PushButton> + <!-- Play --> <PushButton> <TooltipId>play_cue_set</TooltipId> + <Pos>203,200</Pos> <NumberStates>2</NumberStates> <State> <Number>0</Number> @@ -157,7 +199,6 @@ <Pressed>skin:/btn/btn_play_deck_overdown.png</Pressed> <Unpressed>skin:/btn/btn_play_deck_over.png</Unpressed> </State> - <Pos>203,200</Pos> <Connection> <ConfigKey>[Channel2],play</ConfigKey> <ButtonState>LeftButton</ButtonState> @@ -166,6 +207,10 @@ <ConfigKey>[Channel2],cue_set</ConfigKey> <ButtonState>RightButton</ButtonState> </Connection> + <Connection> + <ConfigKey>[Channel2],play_latched</ConfigKey> + <ConnectValueFromWidget>false</ConnectValueFromWidget> + </Connection> </PushButton> <!-- diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml index 749dab03cf..89a1bfacf2 100644 --- a/res/skins/Shade/sampler.xml +++ b/res/skins/Shade/sampler.xml @@ -112,21 +112,41 @@ <Size>27f,36f</Size> <BackPath>style/style_bg_sampler_mid.png</BackPath> <Children> + <!-- Preview indicator --> + <PushButton> + <Pos>3,7</Pos> + <NumberStates>2</NumberStates> + <RightClickIsPushButton>true</RightClickIsPushButton> + <State> + <Number>0</Number> + <Pressed>skin:/btn/btn_play_sampler.png</Pressed> + <Unpressed>skin:/btn/btn_play_sampler.png</Unpressed> + </State> + <State> + <Number>1</Number> + <Pressed>skin:/btn/btn_play_sampler_preview.png</Pressed> + <Unpressed>skin:/btn/btn_play_sampler_preview.png</Unpressed> + </State> + <Connection> + <ConfigKey><Variable name="group"/>,play</ConfigKey> + <ButtonState>LeftButton</ButtonState> + </Connection> + </PushButton> + <!-- Play --> <PushButton> <TooltipId>cue_gotoandplay_cue_default</TooltipId> + <Pos>3,7</Pos> <NumberStates>2</NumberStates> <RightClickIsPushButton>true</RightClickIsPushButton> <State> <Number>0</Number> <Pressed>skin:/btn/btn_play_sampler_down.png</Pressed> - <Unpressed>skin:/btn/btn_play_sampler.png</Unpressed> </State> <State> <Number>1</Number> <Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed> <Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed> </State> - <Pos>3,7</Pos> <Connection> <ConfigKey><Variable name="group"/>,cue_gotoandplay</ConfigKey> <ButtonState>LeftButton</ButtonState> @@ -136,7 +156,7 @@ <ButtonState>RightButton</ButtonState> </Connection> <Connection> - <ConfigKey><Variable name="group"/>,play</ConfigKey> + <ConfigKey><Variable name="group"/>,play_latched</ConfigKey> </Connection> </PushButton> </Children> |