Skip to content
/ mixxx Public
forked from mixxxdj/mixxx
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

Intro outro markers skin settings #2

Merged
merged 7 commits into from
Feb 5, 2019
Merged

Intro outro markers skin settings #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a8d66a7
intro/outro markers Shade
ronso0 Feb 1, 2019
e9923a6
intro/outro markers Tango
ronso0 Feb 1, 2019
2913cdd
intro/outro markers LateNight
ronso0 Feb 1, 2019
f345515
intro/outro markers Deere
ronso0 Feb 1, 2019
bd5a5a4
tweak Deere, clean up
ronso0 Feb 1, 2019
58565ee
fix LateNight overview marker
ronso0 Feb 1, 2019
2a75438
"AutoDJ Cue Buttons" -> "Intro & Outro Cues"
Be-ing Feb 1, 2019
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
6 changes: 6 additions & 0 deletions res/skins/Deere (64 Samplers)/skin_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@
<SetVariable name="skinsetting">[Skin],show_8_hotcues</SetVariable>
</Template>

<Template src="skin:skinsettings_button.xml">
<SetVariable name="TooltipId">intro_outro_cue_toggle</SetVariable>
<SetVariable name="text">Intro &amp; Outro Cues</SetVariable>
<SetVariable name="skinsetting">[Skin],show_intro_outro_cues</SetVariable>
</Template>

<Template src="skin:skinsettings_button.xml">
<SetVariable name="TooltipId">how_vinylcontrol</SetVariable>
<SetVariable name="text">Vinyl Control Options</SetVariable>
Expand Down
73 changes: 0 additions & 73 deletions res/skins/Deere/autodj.xml
View file
Open in desktop

This file was deleted.

19 changes: 11 additions & 8 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 @@ -12,22 +12,25 @@
<SizePolicy>me,max</SizePolicy>
<Children>
<!-- Expanding spacers in between control contexts -->
<WidgetGroup><Size>3me,1min</Size></WidgetGroup>
<Template src="skin:autodj.xml"/>
<WidgetGroup><Size>3me,1min</Size></WidgetGroup>
<WidgetGroup><Size>0min,1min</Size></WidgetGroup>
<Template src="skin:loop.xml"/>
<WidgetGroup><Size>3me,1min</Size></WidgetGroup>
<WidgetGroup><Size>3min,1min</Size></WidgetGroup>
<Template src="skin:beatjump.xml"/>
<WidgetGroup><Size>3me,1min</Size></WidgetGroup>
<Template src="skin:hotcue.xml"/>
<WidgetGroup><Size>3min,1min</Size></WidgetGroup>
<Template src="skin:special_cues.xml"/>
<WidgetGroup>
<Size>3me,1min</Size>
<Size>3min,1min</Size>
<MaximumSize>12,-1</MaximumSize>
</WidgetGroup>
<Template src="skin:hotcues.xml"/>
<WidgetGroup>
<Size>3min,1min</Size>
<MaximumSize>12,-1</MaximumSize>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<MinimumSize>40,42</MinimumSize>
<MinimumSize>32,42</MinimumSize>
<MaximumSize>60, -1</MaximumSize>
<SizePolicy>me,me</SizePolicy>
<Children>
Expand Down
16 changes: 8 additions & 8 deletions res/skins/Deere/deck_overview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,31 @@
</MarkRange>
<Mark>
<Control>intro_start_position</Control>
<Align>bottom|right</Align>
<Text></Text>
<Align>top|right</Align>
<Color>#0000FF</Color>
<TextColor>#FFFFFF</TextColor>
<Text>IS</Text>
</Mark>
<Mark>
<Control>intro_end_position</Control>
<Align>bottom|right</Align>
<Text>&#9698;</Text>
<Align>top|left</Align>
<Color>#0000FF</Color>
<TextColor>#FFFFFF</TextColor>
<Text>IE</Text>
</Mark>
<Mark>
<Control>outro_start_position</Control>
<Align>bottom|left</Align>
<Text>&#9699;</Text>
<Align>top|left</Align>
<Color>#0000FF</Color>
<TextColor>#FFFFFF</TextColor>
<Text>OS</Text>
</Mark>
<Mark>
<Control>outro_end_position</Control>
<Align>bottom|left</Align>
<Text></Text>
<Align>top|left</Align>
<Color>#0000FF</Color>
<TextColor>#FFFFFF</TextColor>
<Text>OE</Text>
</Mark>
<Mark>
<Control>cue_point</Control>
Expand Down
12 changes: 6 additions & 6 deletions res/skins/Deere/hotcue.xml → res/skins/Deere/hotcues.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
<!--Default grid Hotcue 1-4 -->
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<MinimumSize>40,48</MinimumSize>
<MaximumSize>48,48</MaximumSize>
<SizePolicy>me,min</SizePolicy>
<Children>
<WidgetGroup>
<ObjectName>HotcueGrid</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:hotcue_button.xml">
<SetVariable name="hotcue">1</SetVariable>
Expand All @@ -28,7 +29,6 @@
<WidgetGroup>
<ObjectName>HotcueGrid</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:hotcue_button.xml">
<SetVariable name="hotcue">3</SetVariable>
Expand All @@ -51,12 +51,13 @@
<!--Extended grid Hotcue 1-8 -->
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<MinimumSize>76,48</MinimumSize>
<MaximumSize>96,48</MaximumSize>
<SizePolicy>me,min</SizePolicy>
<Children>
<WidgetGroup>
<ObjectName>HotcueGrid</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:hotcue_button.xml">
<SetVariable name="hotcue">1</SetVariable>
Expand All @@ -76,7 +77,6 @@
<WidgetGroup>
<ObjectName>HotcueGrid</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:hotcue_button.xml">
<SetVariable name="hotcue">5</SetVariable>
Expand Down
1 change: 1 addition & 0 deletions res/skins/Deere/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<!-- Decks -->
<attribute persist="true" config_key="[Skin],show_4decks">0</attribute>
<attribute persist="true" config_key="[Skin],show_8_hotcues">0</attribute>
<attribute persist="true" config_key="[Skin],show_intro_outro_cues">0</attribute>
<attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
<attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
<attribute persist="true" config_key="[Skin],show_starrating">1</attribute>
Expand Down
8 changes: 7 additions & 1 deletion res/skins/Deere/skin_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,13 @@
</Template>

<Template src="skin:skinsettings_button.xml">
<SetVariable name="TooltipId">how_vinylcontrol</SetVariable>
<SetVariable name="TooltipId">intro_outro_cue_toggle</SetVariable>
<SetVariable name="text">Intro &amp; Outro Cues</SetVariable>
<SetVariable name="skinsetting">[Skin],show_intro_outro_cues</SetVariable>
</Template>

<Template src="skin:skinsettings_button.xml">
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="text">Vinyl Control Options</SetVariable>
<SetVariable name="skinsetting">[VinylControl],show_vinylcontrol</SetVariable>
</Template>
Expand Down
45 changes: 45 additions & 0 deletions res/skins/Deere/special_cue_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<!--
Description:
A special cue button to mark intro and outro sections in a track
Variables:
group: The group for the controls.
cue_type: Prefix for COs.
label: Button text.
-->
<Template>
<PushButton>
<TooltipId><Variable name="cue_type"/></TooltipId>
<ObjectName>SpecialCueButton</ObjectName>
<MinimumSize>18,22</MinimumSize>
<MaximumSize>22,22</MaximumSize>
<SizePolicy>me,f</SizePolicy>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>true</RightClickIsPushButton>
<State>
<Number>0</Number>
<Text><Variable name="label"/></Text>
<Alignment><Variable name="Align"/></Alignment>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
</State>
<State>
<Number>1</Number>
<Text><Variable name="label"/></Text>
<Alignment><Variable name="Align"/></Alignment>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_set</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_clear</ConfigKey>
<ButtonState>RightButton</ButtonState>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_enabled</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
</PushButton>
</Template>
52 changes: 52 additions & 0 deletions res/skins/Deere/special_cues.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<!DOCTYPE template>
<!--
Description:
A grid of hotcue controls.
Variables:
group: The group for the controls.
-->
<Template>
<!--Default grid Hotcue 1-4 -->
<WidgetGroup>
<Layout>vertical</Layout>
<MinimumSize>40,48</MinimumSize>
<MaximumSize>48,48</MaximumSize>
<SizePolicy>me,min</SizePolicy>
<Children>
<WidgetGroup>
<ObjectName>HotcueGrid</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:special_cue_button.xml">
<SetVariable name="cue_type">intro_start</SetVariable>
<SetVariable name="label">|&#9698;</SetVariable>
</Template>
<Template src="skin:special_cue_button.xml">
<SetVariable name="cue_type">intro_end</SetVariable>
<SetVariable name="label">&#9698;|</SetVariable>
</Template>
</Children>
</WidgetGroup>
<WidgetGroup>
<ObjectName>HotcueGrid</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:special_cue_button.xml">
<SetVariable name="cue_type">outro_start</SetVariable>
<SetVariable name="label">|&#9699;</SetVariable>
</Template>
<Template src="skin:special_cue_button.xml">
<SetVariable name="cue_type">outro_end</SetVariable>
<SetVariable name="label">&#9699;|</SetVariable>
</Template>
</Children>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey>[Skin],show_intro_outro_cues</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Template>
45 changes: 45 additions & 0 deletions res/skins/LateNight/button_special_cue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<!--
Description:
A special cue button to mark intro and outro sections in a track
Variables:
group: The group for the controls.
cue_type: Prefix for COs.
label: Button text.
-->
<Template>
<PushButton>
<TooltipId>cue_type</TooltipId>
<ObjectName>SpecialCueButton</ObjectName>
<MinimumSize>16,26</MinimumSize>
<MaximumSize>26,26</MaximumSize>
<SizePolicy>me,f</SizePolicy>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>true</RightClickIsPushButton>
<State>
<Number>0</Number>
<Text><Variable name="label"/></Text>
<Alignment><Variable name="Align"/></Alignment>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
</State>
<State>
<Number>1</Number>
<Text><Variable name="label"/></Text>
<Alignment><Variable name="Align"/></Alignment>
<Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
<Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
</State>
<Connection>
<ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_set</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_clear</ConfigKey>
<ButtonState>RightButton</ButtonState>
</Connection>
<Connection>
<ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_enabled</ConfigKey>
<ConnectValueFromWidget>false</ConnectValueFromWidget>
</Connection>
</PushButton>
</Template>
Loading