diff options
author | ronso0 <ronso0@mixxx.org> | 2020-04-01 22:12:24 +0200 |
---|---|---|
committer | ronso0 <ronso0@mixxx.org> | 2020-04-01 23:40:31 +0200 |
commit | 2236a4f3a376d7047286b3512338dfde7f6fad86 (patch) | |
tree | 45951e1d377bfd0a96988faf521e1196d257dabc /res/skins | |
parent | 707cb643ba08dc8e8a657b102cdda1a4d734486a (diff) |
separate play button / play_indicator in decks
This aims to prevent play/play_indicator update issues with various cue modes.
Diffstat (limited to 'res/skins')
-rw-r--r-- | res/skins/Deere/deck_controls_row.xml | 32 | ||||
-rw-r--r-- | res/skins/Deere/deck_small.xml | 13 | ||||
-rw-r--r-- | res/skins/Deere/style.qss | 14 | ||||
-rw-r--r-- | res/skins/LateNight/buttons_classic/btn_elevated_play.svg | 20 | ||||
-rw-r--r-- | res/skins/LateNight/deck_row_5_transportLoopJump.xml | 42 | ||||
-rw-r--r-- | res/skins/LateNight/style.qss | 19 | ||||
-rw-r--r-- | res/skins/Shade/btn/btn_play_deck.png | bin | 287 -> 287 bytes | |||
-rw-r--r-- | res/skins/Shade/deck_small.xml | 22 | ||||
-rw-r--r-- | res/skins/Shade/mixer_panel.xml | 42 | ||||
-rw-r--r-- | res/skins/Tango/deck_left_mini.xml | 30 | ||||
-rw-r--r-- | res/skins/Tango/deck_right_mini.xml | 32 | ||||
-rw-r--r-- | res/skins/Tango/deck_row_transport_left.xml | 129 | ||||
-rw-r--r-- | res/skins/Tango/deck_row_transport_right.xml | 128 | ||||
-rw-r--r-- | res/skins/Tango/size_detector_stars.xml | 13 | ||||
-rw-r--r-- | res/skins/Tango/skin_settings.xml | 11 | ||||
-rw-r--r-- | res/skins/Tango/style.qss | 16 |
16 files changed, 208 insertions, 355 deletions
diff --git a/res/skins/Deere/deck_controls_row.xml b/res/skins/Deere/deck_controls_row.xml index 948f0b557c..b82b1104cd 100644 --- a/res/skins/Deere/deck_controls_row.xml +++ b/res/skins/Deere/deck_controls_row.xml @@ -52,16 +52,28 @@ <!-- Workaround for layout spacing --> <WidgetGroup><Size>0min,2f</Size></WidgetGroup> - <Template src="skin:left_right_display_2state_button.xml"> - <SetVariable name="TooltipId">play_cue_set</SetVariable> - <SetVariable name="ObjectName">PlayToggle</SetVariable> - <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable> - <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable> - <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable> - <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable> - <SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable> - <SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable> - </Template> + <WidgetGroup><!-- Play button + play_indicator --> + <Layout>stacked</Layout> + <SizePolicy>me,me</SizePolicy> + <Children> + <Template src="skin:left_right_2state_button.xml"> + <SetVariable name="TooltipId">play_cue_set</SetVariable> + <SetVariable name="ObjectName">PlayToggle</SetVariable> + <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable> + <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable> + <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable> + <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable> + <SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable> + </Template> + <Template src="skin:left_2state_button.xml"> + <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable> + <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable> + <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable> + <SetVariable name="left_connection_control"><Variable name="group"/>,play_indicator</SetVariable> + </Template> + </Children> + </WidgetGroup> + </Children> </WidgetGroup> </Children> diff --git a/res/skins/Deere/deck_small.xml b/res/skins/Deere/deck_small.xml index cc7fa97387..80b7b240c3 100644 --- a/res/skins/Deere/deck_small.xml +++ b/res/skins/Deere/deck_small.xml @@ -167,12 +167,12 @@ </Children> </WidgetGroup><!-- DeckTextRowSmall --> - <WidgetGroup> + <WidgetGroup><!-- Play button + play_indicator --> <ObjectName>PlayGutterSmall</ObjectName> - <Layout>horizontal</Layout> + <Layout>stacked</Layout> <SizePolicy>f,me</SizePolicy> <Children> - <Template src="skin:left_right_display_2state_button.xml"> + <Template src="skin:left_right_2state_button.xml"> <SetVariable name="TooltipId">play_cue_set</SetVariable> <SetVariable name="ObjectName">PlayToggle</SetVariable> <SetVariable name="MinimumSize">24,30</SetVariable> @@ -180,7 +180,12 @@ <SetVariable name="SizePolicy">f,me</SetVariable> <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable> <SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable> - <SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable> + </Template> + <Template src="skin:left_2state_button.xml"> + <SetVariable name="MinimumSize">24,30</SetVariable> + <SetVariable name="MaximumSize">24,</SetVariable> + <SetVariable name="SizePolicy">f,me</SetVariable> + <SetVariable name="left_connection_control"><Variable name="group"/>,play_indicator</SetVariable> </Template> </Children> </WidgetGroup> diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss index 505d62f51d..f3a3f303af 100644 --- a/res/skins/Deere/style.qss +++ b/res/skins/Deere/style.qss @@ -1523,7 +1523,8 @@ WPushButton { font-weight: bold; } -WPushButton:hover { +WPushButton:hover, +#PlayToggle:hover { color: #D2D2D2; background-color: #5F5F5F; border: 1px solid #5F5F5F; @@ -1531,14 +1532,16 @@ WPushButton:hover { /*"Pressed" state*/ WPushButton[value="1"], -WPushButton[value="2"] { +WPushButton[value="2"], +#PlayToggle[value="1"] { color: #FDFDFD; background-color: #006596; border: 1px solid #006596; } WPushButton[value="1"]:hover, -WPushButton[value="2"]:hover { +WPushButton[value="2"]:hover, +#PlayToggle[value="1"]:hover { color: #FDFDFD; background-color: #0080BE; border: 1px solid #0080BE; @@ -1548,6 +1551,11 @@ WPushButton[value="2"]:hover { color: #1f1e1e; } +#PlayToggle { + background-color: none; + border: 1px solid transparent; +} + #PlayToggle[value="0"] { image: url(skin:/icon/ic_play_48px.svg) no-repeat center center; } diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_play.svg b/res/skins/LateNight/buttons_classic/btn_elevated_play.svg index 3f8ab8d779..d0ed2b031d 100644 --- a/res/skins/LateNight/buttons_classic/btn_elevated_play.svg +++ b/res/skins/LateNight/buttons_classic/btn_elevated_play.svg @@ -1,18 +1,18 @@ -<svg width="68" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"> +<svg width="68" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <defs> - <linearGradient id="a" x1="1.00003" x2="25.000031" y1="-26" y2="-26" gradientTransform="matrix(1 0 0 1.3265306 .80952381 28.220564)" gradientUnits="userSpaceOnUse"> - <stop stop-color="#393939" offset="0"/> - <stop stop-color="#393939" offset=".30102351"/> - <stop stop-color="#141414" offset="1"/> - </linearGradient> - <linearGradient id="b" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652175 0 0 2.7826086 .56518906 -64.608695)" gradientUnits="userSpaceOnUse"> + <linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652175 0 0 2.7826086 .565189 -64.608695)" gradientUnits="userSpaceOnUse"> <stop stop-opacity=".0047619" offset="0"/> <stop stop-opacity="0" offset=".5"/> <stop stop-opacity=".47451" offset="1"/> </linearGradient> + <linearGradient id="b" x1="1.00003" x2="24.190475" y1="-26" y2="-26" gradientTransform="matrix(1 0 0 1.3265306 .8095239 28.220564)" gradientUnits="userSpaceOnUse"> + <stop stop-color="#aeaeae" stop-opacity=".07843138" offset="0"/> + <stop stop-color="#5b5b5b" stop-opacity=".07843138" offset=".30102351"/> + <stop stop-opacity=".39215687" offset="1"/> + </linearGradient> </defs> - <path d="m66.31446 2.17593c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965574-2 1.965572l-61.50001-.00012c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546139 1.8242 1.546141l62.00079 1e-4c1.108 2e-6 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/> - <rect transform="rotate(90)" x="1.50003" y="-66.5" width="23" height="65" rx=".30000001" ry=".3979592" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/> + <path d="m67 2.7070312v21.4921878c0 .261088-.144484.48515-.314453.613281-.16997.12813-.372602.1875-.583985.1875h-64.2031245c-.00405 0-.00767-.0019-.011719-.002.2913743.560297.8039315 1.001998 1.6132815 1.002h62c1.108 2e-6 2-.892 2-2v-20c0-.5008592-.197131-.943691-.5-1.2929688z"/> <rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000000" fill-opacity=".09019608" stroke-width=".99999988"/> - <rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000000" fill="url(#b)" stroke-width=".99999988"/> + <rect transform="rotate(90)" x="1" y="-67" width="24" height="66" rx=".89999998" ry=".89999998" color="#000000" fill="url(#a)" stroke-width=".99999988"/> + <rect transform="rotate(90)" x="1.50003" y="-66.5" width="23" height="65" rx=".30000001" ry=".3979592" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/> </svg> diff --git a/res/skins/LateNight/deck_row_5_transportLoopJump.xml b/res/skins/LateNight/deck_row_5_transportLoopJump.xml index 4a471b149e..e8506e8dc2 100644 --- a/res/skins/LateNight/deck_row_5_transportLoopJump.xml +++ b/res/skins/LateNight/deck_row_5_transportLoopJump.xml @@ -314,15 +314,39 @@ </Children> </WidgetGroup><!-- Reverse | Cue --> - <Template src="skin:button_2state_right_display.xml"> - <SetVariable name="TooltipId">play_cue_set</SetVariable> - <SetVariable name="ObjectName">PlayDeck</SetVariable> - <SetVariable name="Size">68f,26f</SetVariable> - <SetVariable name="btn_format">play</SetVariable> - <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable> - <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_set</SetVariable> - <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable> - </Template> + <WidgetGroup><!-- Play + PlayBlink + default grey background --> + <Layout>stacked</Layout> + <SizePolicy>min,min</SizePolicy> + <Children> + <Template src="skin:button_2state_right.xml"> + <SetVariable name="TooltipId">play_cue_set</SetVariable> + <SetVariable name="ObjectName">PlayDeck</SetVariable> + <SetVariable name="Size">68f,26f</SetVariable> + <SetVariable name="btn_format">play</SetVariable> + <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable> + <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_set</SetVariable> + </Template> + <PushButton> + <ObjectName>PlayIndicator</ObjectName> + <Size>68f,26f</Size> + <NumberStates>2</NumberStates> + <RightClickIsPushButton>false</RightClickIsPushButton> + <State> + <Number>0</Number> + </State> + <State> + <Number>1</Number> + </State> + <Connection> + <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey> + </Connection> + </PushButton> + <WidgetGroup> + <ObjectName>PlayBg</ObjectName> + <Size>68f,26f</Size> + </WidgetGroup> + </Children> + </WidgetGroup><!-- Play + PlayBlink + default grey background --> </Children> </WidgetGroup><!-- /HotCues, Play, Cue, Reverse --> diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index 97c0a547b3..f9c8b835df 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -585,7 +585,7 @@ WEffectSelector:open { } #RateControls WPushButton, #SyncButton, -#DeckRow_5_LoopCuesTransport WPushButton, +#DeckRow_5_LoopCuesTransport WPushButton, #PlayBg, #PflButton, #EQKillButton, #QuickEffectButton, #PlayButtonSampler, #PlayButtonDeckMini, #SamplerButtons WPushButton, @@ -637,7 +637,7 @@ QPushButton#pushButtonAutoDJ:enabled:!checked, /* elevated buttons & embedded buttons in top row & toolbar brighter bg color to enhance contrast in darker containers and with small size respectively */ -#DeckRow_5_LoopCuesTransport WPushButton[value="0"], +#DeckRow_5_LoopCuesTransport WPushButton[value="0"], #PlayBg, #HotcueButton, #FxAssignButton[displayValue="0"], #FxFocusButton[displayValue="0"], #FxToggleButton[displayValue="0"], #FxParameterButton[displayValue="0"], @@ -645,6 +645,14 @@ QPushButton#pushButtonAutoDJ:enabled:!checked, #MicAuxGainPFlContainer WPushButton[displayValue="0"] { background-color: #2c2c2c; } +/* Exception: #PlayDeck is transparent. #PlayIndicator & #PlayBg shine through */ +WPushButton#PlayDeck[value="0"], +WPushButton#PlayDeck[value="1"], +WPushButton#PlayButtonDeckMini[value="0"], +WPushButton#PlayButtonDeckMini[value="1"], +WPushButton#PlayIndicator[value="0"] { + background-color: none; +} /* Green/Lime Fx-related buttons */ #FxToggleButton[displayValue="1"], #QuickEffectButton[displayValue="1"], @@ -666,12 +674,7 @@ QPushButton#pushButtonAutoDJ:enabled:!checked, /* define red buttons in DeckRow_5_LoopCuesTransport indivually, because somehow bg color for #SpecialCueButton can't be overwritten */ #LoopControls WPushButton[value="1"], #BeatjumpControls WPushButton[value="1"], -#CueDeck[value="1"], #Reverse[value="1"], -/* Indicating play_from_cue. Not working 100%, will be fixed later on -#PlayDeck[value="1"][highlight="0"], #PlayDeck[value="1"][highlight="1"], -#PlayButtonDeckMini[value="1"][highlight="0"], #PlayButtonDeckMini[value="1"][highlight="1"], -#PlayButtonSampler[value="1"][highlight="0"], #PlayButtonSampler[value="1"][highlight="1"], */ -#PlayDeck[displayValue="1"], +#CueDeck[value="1"], #Reverse[value="1"], #PlayIndicator[displayValue="1"], #PlayButtonDeckMini[displayValue="1"], #PlayButtonSampler[displayValue="1"], #PflButton[value="1"], diff --git a/res/skins/Shade/btn/btn_play_deck.png b/res/skins/Shade/btn/btn_play_deck.png Binary files differindex d304e8eb69..0b54459e7a 100644 --- a/res/skins/Shade/btn/btn_play_deck.png +++ b/res/skins/Shade/btn/btn_play_deck.png diff --git a/res/skins/Shade/deck_small.xml b/res/skins/Shade/deck_small.xml index 3b080d1daf..0e48855713 100644 --- a/res/skins/Shade/deck_small.xml +++ b/res/skins/Shade/deck_small.xml @@ -190,13 +190,30 @@ <Size>41f,38f</Size> <Children> <PushButton> + <Pos>5,8</Pos> + <NumberStates>2</NumberStates> + <State> + <Number>0</Number> + <Pressed>skin:/btn/btn_play_small_deck.png</Pressed> + <Unpressed>skin:/btn/btn_play_small_deck.png</Unpressed> + </State> + <State> + <Number>1</Number> + <Pressed>skin:/btn/btn_play_small_deck_over.png</Pressed> + <Unpressed>skin:/btn/btn_play_small_deck_over.png</Unpressed> + </State> + <Connection> + <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey> + </Connection> + </PushButton> + <PushButton> <TooltipId>play_cue_set</TooltipId> <Pos>5,8</Pos> <NumberStates>2</NumberStates> <State> <Number>0</Number> <Pressed>skin:/btn/btn_play_deck_small_down.png</Pressed> - <Unpressed>skin:/btn/btn_play_deck_small.png</Unpressed> + <Unpressed></Unpressed> </State> <State> <Number>1</Number> @@ -211,9 +228,6 @@ <ConfigKey><Variable name="group"/>,cue_set</ConfigKey> <ButtonState>RightButton</ButtonState> </Connection> - <Connection> - <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey> - </Connection> </PushButton> </Children> </WidgetGroup> diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml index 6fbd723431..966ca17d0f 100644 --- a/res/skins/Shade/mixer_panel.xml +++ b/res/skins/Shade/mixer_panel.xml @@ -64,13 +64,31 @@ Button- Play **************************************** --> + <!-- Play deck 1 --> + <PushButton> + <NumberStates>2</NumberStates> + <State> + <Number>0</Number> + <Pressed>skin:/btn/btn_play_deck.png</Pressed> + <Unpressed>skin:/btn/btn_play_deck.png</Unpressed> + </State> + <State> + <Number>1</Number> + <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> <PushButton> <TooltipId>play_cue_set</TooltipId> <NumberStates>2</NumberStates> <State> <Number>0</Number> <Pressed>skin:/btn/btn_play_deck_down.png</Pressed> - <Unpressed>skin:/btn/btn_play_deck.png</Unpressed> + <Unpressed></Unpressed> </State> <State> <Number>1</Number> @@ -86,8 +104,23 @@ <ConfigKey>[Channel1],cue_set</ConfigKey> <ButtonState>RightButton</ButtonState> </Connection> + </PushButton> + <!-- Play deck 2 --> + <PushButton> + <NumberStates>2</NumberStates> + <State> + <Number>0</Number> + <Pressed>skin:/btn/btn_play_deck.png</Pressed> + <Unpressed>skin:/btn/btn_play_deck.png</Unpressed> + </State> + <State> + <Number>1</Number> + <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>[Channel1],play_indicator</ConfigKey> + <ConfigKey>[Channel2],play_indicator</ConfigKey> </Connection> </PushButton> <PushButton> @@ -96,7 +129,7 @@ <State> <Number>0</Number> <Pressed>skin:/btn/btn_play_deck_down.png</Pressed> - <Unpressed>skin:/btn/btn_play_deck.png</Unpressed> + <Unpressed></Unpressed> </State> <State> <Number>1</Number> @@ -112,9 +145,6 @@ <ConfigKey>[Channel2],cue_set</ConfigKey> <ButtonState>RightButton</ButtonState> </Connection> - <Connection> - <ConfigKey>[Channel2],play_indicator</ConfigKey> - </Connection> </PushButton> <!-- diff --git a/res/skins/Tango/deck_left_mini.xml b/res/skins/Tango/deck_left_mini.xml index e9f9dd2b31..917ebc74c0 100644 --- a/res/skins/Tango/deck_left_mini.xml +++ b/res/skins/Tango/deck_left_mini.xml @@ -188,21 +188,7 @@ Variables: <Layout>stacked</Layout> <Size>23f,40f</Size> <Children> - <!-- index 0 due to bug --> - <WidgetGroup><Size>0f,0f</Size></WidgetGroup> - - <!-- Block Play button if passthrough is active, - show speaker icon instead --> - <WidgetGroup> - <ObjectName>PassthroughPlayCover</ObjectName> - <Layout>vertical</Layout> - <SizePolicy>me,me</SizePolicy> - <Connection> - <ConfigKey><Variable name="group"/>,passthrough</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> - <!-- Play --> + <!-- Play button --> <Template src="skin:button_2state_right_display.xml"> <SetVariable name="ObjectName">PlayCue</SetVariable> <SetVariable name="TooltipId">play_cue_set</SetVariable> @@ -213,19 +199,11 @@ Variables: <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable> <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable> </Template> - <!-- Play indicator: turns Orange when playing from Cue/HotCue position. - Only visible when play_indicator above is zero0, otherwise it's covered. --> - <Template src="skin:button_2state.xml"> - <SetVariable name="ObjectName">PlayUnderlay</SetVariable> - <SetVariable name="Size">23f,40f</SetVariable> - <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable> - </Template> - <!-- Cue indicator: shows coloured border i.e. if play position is at cue point. - See Cue settings in Preferences > Interface > Deck Options --> + <!-- Play indicator --> <Template src="skin:button_2state.xml"> - <SetVariable name="ObjectName">CueUnderlay</SetVariable> + <SetVariable name="ObjectName">PlayIndicator</SetVariable> <SetVariable name="Size">23f,40f</SetVariable> - <SetVariable name="ConfigKey"><Variable name="group"/>,cue_indicator</SetVariable> + <SetVariable name="ConfigKey"><Variable name="group"/>,play_indicator</SetVariable> </Template> </Children> </WidgetGroup> diff --git a/res/skins/Tango/deck_right_mini.xml b/res/skins/Tango/deck_right_mini.xml index b7e2d2c9d5..9b61af2d26 100644 --- a/res/skins/Tango/deck_right_mini.xml +++ b/res/skins/Tango/deck_right_mini.xml @@ -24,21 +24,7 @@ Variables: <Layout>stacked</Layout> <Size>23f,40f</Size> <Children> - <!-- index 0 due to bug --> - <WidgetGroup><Size>0f,0f</Size></WidgetGroup> - - <!-- Block Play button if passthrough is active, - show speaker icon instead --> - <WidgetGroup> - <ObjectName>PassthroughPlayCover</ObjectName> - <Layout>vertical</Layout> - <SizePolicy>me,me</SizePolicy> - <Connection> - <ConfigKey><Variable name="group"/>,passthrough</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> - <!-- Play --> + <!-- Play button --> <Template src="skin:button_2state_right_display.xml"> <SetVariable name="ObjectName">PlayCue</SetVariable> <SetVariable name="TooltipId">play_cue_set</SetVariable> @@ -49,22 +35,14 @@ Variables: <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable> <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable> </Template> - <!-- Play indicator: turns Orange when playing from Cue/HotCue position. - Only visible when play_indicator above is zero0, otherwise it's covered. --> + <!-- Play indicator --> <Template src="skin:button_2state.xml"> - <SetVariable name="ObjectName">PlayUnderlay</SetVariable> + <SetVariable name="ObjectName">PlayIndicator</SetVariable> <SetVariable name="Size">23f,40f</SetVariable> - <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable> - </Template> - <!-- Cue indicator: shows coloured border i.e. if play position is at cue point. - See Cue settings in Preferences > Interface > Deck Options --> - <Template src="skin:button_2state.xml"> - <SetVariable name="ObjectName">CueUnderlay</SetVariable> - <SetVariable name="Size">23f,40f</SetVariable> - <SetVariable name="ConfigKey"><Variable name="group"/>,cue_indicator</SetVariable> + <SetVariable name="ConfigKey"><Variable name="group"/>,play_indicator</SetVariable> </Template> </Children> - </WidgetGroup><!-- Play/Pause with underlays --> + </WidgetGroup> <WidgetGroup> <Size>1f,1min</Size> diff --git a/res/skins/Tango/deck_row_transport_left.xml b/res/skins/Tango/deck_row_transport_left.xml index 1210b6c247..5b6d6f8f4b 100644 --- a/res/skins/Tango/deck_row_transport_left.xml +++ b/res/skins/Tango/deck_row_transport_left.xml @@ -200,132 +200,43 @@ Variables: <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup> - <WidgetGroup><!-- Play button incl. Cue (right click) --> + <!-- Cue button --> + <Template src="skin:button_2state_right_display.xml"> + <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable> + <SetVariable name="ObjectName">CueButton</SetVariable> + <SetVariable name="Size">24f,24f</SetVariable> + <SetVariable name="state_0_text">Q</SetVariable> + <SetVariable name="state_1_text">Q</SetVariable> + <SetVariable name="ConfigKey"><Variable name="group"/>,cue_default</SetVariable> + <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_gotoandstop</SetVariable> + <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,cue_indicator</SetVariable> + </Template> + + <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup> + + <WidgetGroup> <ObjectName>Spacer0f</ObjectName> <Layout>stacked</Layout> <Size>50f,24f</Size> <Children> - <!-- index 0 due to bug --> - <WidgetGroup><Size>0f,0f</Size></WidgetGroup> - - <!-- Block Play button if passthrough is active, - show speaker icon instead --> - <WidgetGroup> - <ObjectName>PassthroughPlayCover</ObjectName> - <Layout>vertical</Layout> - <SizePolicy>me,me</SizePolicy> - <Connection> - <ConfigKey><Variable name="group"/>,passthrough</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> <!-- Play --> - <Template src="skin:button_2state_right_display.xml"> + <Template src="skin:button_2state_right.xml"> <SetVariable name="ObjectName">PlayCue</SetVariable> <SetVariable name="TooltipId">play_cue_set</SetVariable> <SetVariable name="Size">50f,24f</SetVariable> <SetVariable name="state_0_icon">play_deck.svg</SetVariable> <SetVariable name="state_1_icon">pause_deck.svg</SetVariable> <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable> - <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable> - <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable> </Template> - <!-- Play indicator: turns Orange when playing from Cue/HotCue position. - Only visible when play_indicator above is zero0, otherwise it's covered. --> + <!-- Play indicator, blinks depending on Cue mode --> <Template src="skin:button_2state.xml"> - <SetVariable name="ObjectName">PlayUnderlay</SetVariable> + <SetVariable name="ObjectName">PlayIndicator</SetVariable> <SetVariable name="Size">50f,24f</SetVariable> - <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable> - </Template> - <!-- Cue indicator: shows coloured border i.e. if play position is at cue point. - See Cue settings in Preferences > Interface > Deck Options --> - <Template src="skin:button_2state.xml"> - <SetVariable name="ObjectName">CueUnderlay</SetVariable> - <SetVariable name="Size">50f,24f</SetVariable> - <SetVariable name="ConfigKey"><Variable name="group"/>,cue_indicator</SetVariable> + <SetVariable name="ConfigKey"><Variable name="group"/>,play_indicator</SetVariable> </Template> </Children> - <Connection> - <ConfigKey persist="true">[Tango],separate_cue_button</ConfigKey> - <Transform><Not/></Transform> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup><!-- /Play button incl. Cue (right click) --> + </WidgetGroup><!-- Play button --> - <WidgetGroup><!-- Play button, separate Cue button --> - <ObjectName>Spacer0f</ObjectName> - <Layout>horizontal</Layout> - <Size>75f,24f</Size> - <Children> - <!-- Cue button --> - <Template src="skin:button_2state_right_display.xml"> - <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable> - <SetVariable name="ObjectName">CueButton</SetVariable> - <SetVariable name="Size">24f,24f</SetVariable> - <SetVariable name="state_0_text">Q</SetVariable> - <SetVariable name="state_1_text">Q</SetVariable> - <SetVariable name="ConfigKey"><Variable name="group"/>,cue_default</SetVariable> - <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_gotoandstop</SetVariable> - <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,cue_indicator</SetVariable> - </Template> - <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup> - <WidgetGroup><!-- Play button with playFromCue underlay --> - <ObjectName>Spacer0f</ObjectName> - <Layout>stacked</Layout> - <Size>50f,24f</Size> - <Children> - <!-- index 0 due to bug --> - <WidgetGroup><Size>0f,0f</Size></WidgetGroup> - <!-- Block Play button if passthrough is active, - show speaker icon instead --> - <WidgetGroup> - <ObjectName>PassthroughPlayCover</ObjectName> - <Layout>vertical</Layout> - |