Skip to content

Commit

Permalink
Tango: ugly proof-of-concept for cue timing shift buttons
Browse files Browse the repository at this point in the history
for correcting timing offsets when importing from other software
  • Loading branch information
Be-ing committed Apr 30, 2020
1 parent d890dce commit 312e2b3
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 4 deletions.
8 changes: 7 additions & 1 deletion res/skins/Tango/skin_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Description:
<SetVariable name="Setting">[Skin],show_intro_outro_cues</SetVariable>
</Template>


<Template src="skin:../Tango/skin_settings_button_2state.xml">
<SetVariable name="text">Loop / Beatjump Buttons</SetVariable>
<SetVariable name="Setting">[Skin],show_loop_beatjump_controls</SetVariable>
Expand Down Expand Up @@ -455,6 +455,12 @@ Description:
</WidgetGroup><!-- /small/BIG selector, hidden mixer -->
</Children>
</WidgetGroup><!-- /small/BIG selector -->

<Template src="skin:../Tango/skin_settings_button_2state.xml">
<SetVariable name="text">Cue Timing Correction Buttons</SetVariable>
<SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
</Template>

<!-- /Decks -->

<WidgetGroup>
Expand Down
15 changes: 12 additions & 3 deletions res/skins/Tango/style.qss
Original file line number Diff line number Diff line change
Expand Up @@ -457,14 +457,18 @@ WWidgetGroup {
#BeatgridSlower,
#BeatgridFaster,
#BeatgridEarlier,
#BeatgridLater {
#BeatgridLater,
#ShiftEarlier,
#ShiftLater {
background-color: #333;
}
#BeatgridCurpos:hover,
#BeatgridSlower:hover,
#BeatgridFaster:hover,
#BeatgridEarlier:hover,
#BeatgridLater:hover {
#BeatgridLater:hover,
#ShiftEarlier:hover,
#ShiftLater:hover {
background-color: #0f0f0f;
}
#BeatgridCurpos {
Expand All @@ -482,7 +486,12 @@ WWidgetGroup {
#BeatgridLater {
image: url(skin:/buttons/btn_beats_later.svg) no-repeat center center;
}

#ShiftEarlier {
image: url(skin:/buttons/btn_arrow_left.svg) no-repeat center center;
}
#ShiftLater {
image: url(skin:/buttons/btn_arrow_right.svg) no-repeat center center;
}

/*################################################################
###### Mic & Aux #############################################
Expand Down
36 changes: 36 additions & 0 deletions res/skins/Tango/waveform.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,24 @@ Variables:
<SetVariable name="Size">28f,24f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_faster</SetVariable>
</Template>

<WidgetGroup>
<Layout>vertical</Layout>
<Size>f,f</Size>
<Children>
<Template src="skin:button_1state_right.xml">
<SetVariable name="TooltipId">FIXME</SetVariable>
<SetVariable name="ObjectName">ShiftEarlier</SetVariable>
<SetVariable name="Size">28f,24f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,shift_times_earlier</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="group"/>,shift_times_earlier_small</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],timing_shift_buttons</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
</WidgetGroup><!-- /beats earlier & faster -->

Expand All @@ -194,6 +212,24 @@ Variables:
<SetVariable name="Size">28f,24f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_slower</SetVariable>
</Template>

<WidgetGroup>
<Layout>vertical</Layout>
<Size>f,f</Size>
<Children>
<Template src="skin:button_1state_right.xml">
<SetVariable name="TooltipId">FIXME</SetVariable>
<SetVariable name="ObjectName">ShiftLater</SetVariable>
<SetVariable name="Size">28f,24f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,shift_times_later</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="group"/>,shift_times_later_small</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],timing_shift_buttons</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
</WidgetGroup><!-- /beats later & slower -->
</Children>
Expand Down

0 comments on commit 312e2b3

Please sign in to comment.