diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-10-15 23:32:16 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-10-15 23:32:16 +0200 |
| commit | 18b624fcaeb6ccb3cb159910d898b5c5d2d1afce (patch) | |
| tree | 27ec3251fb9a1d3a3d6c54a3ea848a1f41522153 | |
| parent | db7ae56032efc51efcce1cbd1e6ac653f3bd8c54 (diff) | |
| parent | 79d0136a2aa3e5027684e094f7179aa0380e5e36 (diff) | |
Merge branch '2.3' of github.com:mixxxdj/mixxx into master
111 files changed, 1966 insertions, 1171 deletions
diff --git a/res/skins/Deere/beatjump.xml b/res/skins/Deere/deck_beatjump_controls.xml index 594efa23f8..594efa23f8 100644 --- a/res/skins/Deere/beatjump.xml +++ b/res/skins/Deere/deck_beatjump_controls.xml diff --git a/res/skins/Deere/deck_controls_row.xml b/res/skins/Deere/deck_controls_row.xml index b82b1104cd..99c6899948 100644 --- a/res/skins/Deere/deck_controls_row.xml +++ b/res/skins/Deere/deck_controls_row.xml @@ -11,30 +11,15 @@ <Layout>horizontal</Layout> <SizePolicy>me,max</SizePolicy> <Children> - <!-- Expanding spacers in between control contexts --> - <WidgetGroup><Size>0min,1min</Size></WidgetGroup> - <Template src="skin:loop.xml"/> - <WidgetGroup><Size>3min,1min</Size></WidgetGroup> - <Template src="skin:beatjump.xml"/> - <WidgetGroup><Size>3min,1min</Size></WidgetGroup> - <Template src="skin:special_cues.xml"/> - <WidgetGroup> - <Size>3min,1min</Size> - <MaximumSize>12,-1</MaximumSize> - </WidgetGroup> - <Template src="skin:hotcues.xml"/> - <WidgetGroup> - <Size>3min,1min</Size> - <MaximumSize>12,-1</MaximumSize> - </WidgetGroup> + <!-- Play / Cue --> <WidgetGroup> + <ObjectName>PlayCueContainer</ObjectName> <Layout>vertical</Layout> <MinimumSize>32,42</MinimumSize> <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> @@ -49,9 +34,6 @@ <SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable> </Template> - <!-- Workaround for layout spacing --> - <WidgetGroup><Size>0min,2f</Size></WidgetGroup> - <WidgetGroup><!-- Play button + play_indicator --> <Layout>stacked</Layout> <SizePolicy>me,me</SizePolicy> @@ -73,9 +55,34 @@ </Template> </Children> </WidgetGroup> - </Children> </WidgetGroup> + + <WidgetGroup> + <Size>3min,1min</Size> + <MaximumSize>12,-1</MaximumSize> + </WidgetGroup> + + <Template src="skin:hotcues.xml"/> + + <WidgetGroup> + <Size>3min,1min</Size> + <MaximumSize>12,-1</MaximumSize> + </WidgetGroup> + + <Template src="skin:special_cues.xml"/> + + <!-- Expanding spacers in between control contexts --> + <WidgetGroup><Size>3min,1min</Size></WidgetGroup> + + <Template src="skin:deck_looping_controls.xml"/> + + <WidgetGroup><Size>3min,1min</Size></WidgetGroup> + + <Template src="skin:deck_beatjump_controls.xml"/> + + <WidgetGroup><Size>0min,1min</Size></WidgetGroup> + </Children> </WidgetGroup> </Template> diff --git a/res/skins/Deere/loop.xml b/res/skins/Deere/deck_looping_controls.xml index a175244c85..a175244c85 100644 --- a/res/skins/Deere/loop.xml +++ b/res/skins/Deere/deck_looping_controls.xml diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml index 315d1f3070..9de9f45ee2 100644 --- a/res/skins/Deere/mixer.xml +++ b/res/skins/Deere/mixer.xml @@ -70,9 +70,9 @@ <WidgetGroup><!-- CrossfaderContainer --> <ObjectName>CrossfaderContainer</ObjectName> <Layout>horizontal</Layout> - <SizePolicy>me,min</SizePolicy> - <MaximumSize>-1,40</MaximumSize> + <Size>-1me,44f</Size> <Children> + <WidgetGroup><Size>2f,0f</Size></WidgetGroup> <WidgetGroup> <Layout>vertical</Layout> |