Skip to content

add WCuebutton: drag onto play button to latch play / + fix: revert to 36 hotcues #14753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 7 commits into from
May 14, 2025
Merged

add WCuebutton: drag onto play button to latch play / + fix: revert to 36 hotcues #14753

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1960803
move NUM_HOT_CUES to util/defs, rename to kMaxNumberOfHotcues
ronso0 May 6, 2025
151cd86
add WCueButton: can be dropped onto a WPlayButton to latch 'play'
ronso0 May 7, 2025
f816012
skins: use WCueButton, switch to WPlayButton in mini decks
ronso0 May 7, 2025
db76c9d
(fix) revert to max 36 hotcues, fix one-off issue
ronso0 May 13, 2025
8bc5fcb
add changelog entry for Cue drag'n'drop onto Play
ronso0 May 13, 2025
18b1eeb
changelog: mention revert to 36 hotcues (was 37 since 2.2 due to one-…
ronso0 May 13, 2025
7757aa5
Merge remote-tracking branch 'mixxx/2.6' into cuebutton-drag-onto-play
ronso0 May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,6 +1571,7 @@ add_library(
src/widget/wcoverartlabel.cpp
src/widget/wcoverartmenu.cpp
src/widget/wcuemenupopup.cpp
src/widget/wcuebutton.cpp
src/widget/wdisplay.cpp
src/widget/weffectbuttonparametername.cpp
src/widget/weffectchain.cpp
Expand Down
48 changes: 35 additions & 13 deletions res/skins/Deere/deck_controls_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,41 @@
<MaximumSize>60, -1</MaximumSize>
<SizePolicy>me,me</SizePolicy>
<Children>
<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
<SetVariable name="ObjectName">DeckCue</SetVariable>
<SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
<SetVariable name="LeftClickIsPushButton">true</SetVariable>
<SetVariable name="state_0_text">CUE</SetVariable>
<SetVariable name="state_1_text">CUE</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,cue_default</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
</Template>
<CueButton>
<TooltipId>cue_default_cue_gotoandstop</TooltipId>
<ObjectName>DeckCue</ObjectName>
<MinimumSize><Variable name="HorizontalStretchButtonMinimumSize"/></MinimumSize>
<MaximumSize><Variable name="HorizontalStretchButtonMaximumSize"/></MaximumSize>
<SizePolicy><Variable name="HorizontalStretchButtonSizePolicy"/></SizePolicy>
<NumberStates>2</NumberStates>
<LeftClickIsPushButton>true</LeftClickIsPushButton>
<RightClickIsPushButton>true</RightClickIsPushButton>
<Group><Variable name="group"/></Group>
<State>
<Number>0</Number>
<Text>CUE</Text>
</State>
<State>
<Number>1</Number>
<Text>CUE</Text>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,cue_default</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
<ConnectValueToWidget>false</ConnectValueToWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,cue_gotoandstop</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>RightButton</ButtonState>
<ConnectValueToWidget>false</ConnectValueToWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,cue_indicator</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
</CueButton>

<WidgetGroup><!-- Play button + play_indicator -->
<Layout>stacked</Layout>
Expand Down
52 changes: 37 additions & 15 deletions res/skins/Deere/deck_small.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,26 +180,48 @@
<Size>32min,46f</Size>
<Children>

<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
<SetVariable name="ObjectName">DeckCue</SetVariable>
<SetVariable name="MinimumSize">30,21</SetVariable>
<SetVariable name="MaximumSize">30,21</SetVariable>
<SetVariable name="SizePolicy">f,f</SetVariable>
<SetVariable name="LeftClickIsPushButton">true</SetVariable>
<SetVariable name="state_0_text">CUE</SetVariable>
<SetVariable name="state_1_text">CUE</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,cue_default</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
</Template>
<CueButton>
<TooltipId>cue_default_cue_gotoandstop</TooltipId>
<ObjectName>DeckCue</ObjectName>
<MinimumSize>30,21</MinimumSize>
<MaximumSize>30,21</MaximumSize>
<SizePolicy>f,f</SizePolicy>
<NumberStates>2</NumberStates>
<LeftClickIsPushButton>true</LeftClickIsPushButton>
<RightClickIsPushButton>true</RightClickIsPushButton>
<Group><Variable name="group"/></Group>
<State>
<Number>0</Number>
<Text>CUE</Text>
</State>
<State>
<Number>1</Number>
<Text>CUE</Text>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,cue_default</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
<ConnectValueToWidget>false</ConnectValueToWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,cue_gotoandstop</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>RightButton</ButtonState>
<ConnectValueToWidget>false</ConnectValueToWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,cue_indicator</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
</CueButton>

<WidgetGroup><!-- Play button + preview indicator + play_indicator -->
<Layout>stacked</Layout>
<SizePolicy>f,me</SizePolicy>
<Children>
<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">play_cue_default</SetVariable>
<Template src="skin:left_right_display_play_2state_button.xml">
<SetVariable name="TooltipId">play_cue_set</SetVariable>
<SetVariable name="ObjectName">PlayToggle</SetVariable>
<SetVariable name="MinimumSize">30,21</SetVariable>
<SetVariable name="MaximumSize">30,21</SetVariable>
Expand Down
53 changes: 37 additions & 16 deletions res/skins/Deere/sampler_text_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,43 @@
<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
<SetVariable name="ObjectName">SamplerPlayButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text"></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_1_text"></SetVariable>
<SetVariable name="state_1_pressed">icon/ic_pause_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_pause_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,cue_gotoandplay</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_default</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,play</SetVariable>
</Template>
<CueButton>
<TooltipId>cue_gotoandplay_cue_default</TooltipId>
<ObjectName>SamplerPlayButton</ObjectName>
<MinimumSize><Variable name="SquareButtonMinimumSize"/></MinimumSize>
<MaximumSize><Variable name="SquareButtonMaximumSize"/></MaximumSize>
<SizePolicy><Variable name="SquareButtonSizePolicy"/></SizePolicy>
<NumberStates>2</NumberStates>
<LeftClickIsPushButton>true</LeftClickIsPushButton>
<RightClickIsPushButton>true</RightClickIsPushButton>
<Group><Variable name="group"/></Group>
<State>
<Number>0</Number>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_play_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_play_48px.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_pause_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_pause_48px.svg</Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,cue_gotoandplay</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>LeftButton</ButtonState>
<ConnectValueToWidget>false</ConnectValueToWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,cue_default</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
<ButtonState>RightButton</ButtonState>
<ConnectValueToWidget>false</ConnectValueToWidget>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,play</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
</CueButton>

</Children>
<Connection>
Expand Down
8 changes: 5 additions & 3 deletions res/skins/LateNight/decks/deck_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@
<Layout>vertical</Layout>
<SizePolicy>min,f</SizePolicy>
<Children>
<PushButton>
<CueButton>
<TooltipId>cue_default_cue_gotoandstop</TooltipId>
<ObjectName>CueDeck</ObjectName>
<Size>42f,26f</Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>true</RightClickIsPushButton>
<Group><Variable name="Group"/></Group>
<DndRectMargin><Variable name="DndRectMarginHotcueBtn"/></DndRectMargin>
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
Expand All @@ -54,13 +56,13 @@
<ConfigKey><Variable name="Group"/>,cue_indicator</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
</PushButton>
</CueButton>

<WidgetGroup><!-- Play + PlayBlink + default grey background -->
<Layout>stacked</Layout>
<Size>42f,26f</Size>
<Children>
<Template src="skins:LateNight/controls/button_2state_right_display.xml">
<Template src="skins:LateNight/controls/button_play_2state_right_display.xml">
<SetVariable name="TooltipId">play_cue_default</SetVariable>
<SetVariable name="ObjectName">PlayDeckMini</SetVariable>
<SetVariable name="Size">42f,26f</SetVariable>
Expand Down
8 changes: 5 additions & 3 deletions res/skins/LateNight/decks/row_5_transportLoopJump.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,18 @@
<Layout>vertical</Layout>
<SizePolicy>max,min</SizePolicy>
<Children>
<WidgetGroup><!-- Reverse | Cue -->
<WidgetGroup><!-- Cue | Reverse -->
<Layout>horizontal</Layout>
<Children>

<PushButton>
<CueButton>
<TooltipId>cue_default_cue_gotoandstop</TooltipId>
<ObjectName>CueDeck</ObjectName>
<Size>42f,26f</Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>true</RightClickIsPushButton>
<Group><Variable name="Group"/></Group>
<DndRectMargin><Variable name="DndRectMarginHotcueBtn"/></DndRectMargin>
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
Expand All @@ -53,7 +55,7 @@
<ConfigKey><Variable name="Group"/>,cue_indicator</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
</PushButton>
</CueButton>

<Template src="skins:LateNight/controls/button_1state_right.xml">
<SetVariable name="TooltipId">reverse</SetVariable>
Expand Down
6 changes: 4 additions & 2 deletions res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,14 @@
</Children>
</WidgetGroup><!-- Play + PlayBlink + default dark background -->

<PushButton>
<CueButton>
<TooltipId>cue_default_cue_gotoandstop</TooltipId>
<ObjectName>CueDeck</ObjectName>
<Size>42f,26f</Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>true</RightClickIsPushButton>
<Group><Variable name="Group"/></Group>
<DndRectMargin><Variable name="DndRectMarginHotcueBtn"/></DndRectMargin>
<State>
<Number>0</Number>
<Text><Variable name="state_0_text"/></Text>
Expand All @@ -78,7 +80,7 @@
<ConfigKey><Variable name="Group"/>,cue_indicator</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
</PushButton>
</CueButton>

<WidgetGroup>
<SizePolicy>me,min</SizePolicy>
Expand Down
15 changes: 9 additions & 6 deletions res/skins/Shade/mixer_panel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,11 @@
<!--
**********************************************
Button- Cue
**********************************************
-->
<PushButton>
********************************************** -->
<!-- Deck 1 -->
<CueButton>
<TooltipId>cue_default_cue_gotoandstop</TooltipId>
<Group>[Channel1]</Group>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
Expand All @@ -247,9 +248,11 @@
<Connection>
<ConfigKey>[Channel1],cue_indicator</ConfigKey>
</Connection>
</PushButton>
<PushButton>
</CueButton>
<!-- Deck 2 -->
<CueButton>
<TooltipId>cue_default_cue_gotoandstop</TooltipId>
<Group>[Channel2]</Group>
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
Expand All @@ -275,7 +278,7 @@
<Connection>
<ConfigKey>[Channel2],cue_indicator</ConfigKey>
</Connection>
</PushButton>
</CueButton>

<!--
**********************************************
Expand Down
40 changes: 29 additions & 11 deletions res/skins/Tango/decks/deck_left_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,34 @@ Variables:
<Size>30f,40f</Size>
<Children>

<Template src="skins:Tango/controls/button_2state_right_display.xml">
<SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
<SetVariable name="ObjectName">CueButton</SetVariable>
<SetVariable name="Size">30f,19f</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>
<CueButton>
<TooltipId>cue_default_cue_gotoandstop</TooltipId>
<ObjectName>CueButton</ObjectName>
<Size>30f,19f</Size>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>true</RightClickIsPushButton>
<Group><Variable name="group"/></Group>
<State>
<Number>0</Number>
<Text>Q</Text>
</State>
<State>
<Number>1</Number>
<Text>Q</Text>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,cue_default</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,cue_gotoandstop</ConfigKey>
<ButtonState>RightButton</ButtonState>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,cue_indicator</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
</CueButton>

<WidgetGroup><Size>1f,1min</Size></WidgetGroup>

Expand All @@ -199,7 +217,7 @@ Variables:
<Size>30f,40f</Size>
<Children>
<!-- Play -->
<Template src="skins:Tango/controls/button_2state_right_display.xml">
<Template src="skins:Tango/controls/button_play_2state_right_display.xml">
<SetVariable name="ObjectName">PlayCue</SetVariable>
<SetVariable name="TooltipId">play_cue_set</SetVariable>
<SetVariable name="Size">30f,20f</SetVariable>
Expand Down
Loading