Skip to content

Commit

Permalink
Merge pull request #43 from ronso0/cue_shift_ui
Browse files Browse the repository at this point in the history 
put Cue Shift buttons below CurPos button
  • Loading branch information
@Be-ing
Be-ing authored Apr 30, 2020
2 parents 312e2b3 + 8600e3c commit e31fc37
Showing 1 changed file with 65 additions and 46 deletions.
111 changes: 65 additions & 46 deletions res/skins/Tango/waveform.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,25 +131,79 @@ Variables:
<Layout>vertical</Layout>
<!-- Horizontal size is 82px and we'll add the WaveformContainer's negative margin
(shifts waveform center mark) so that all buttons are visible -->
<Size>82f,50me</Size>
<SizePolicy>max,me</SizePolicy>
<Children>
<WidgetGroup><Size>1me,0me</Size></WidgetGroup>
<WidgetGroup><Size>1me,1f</Size></WidgetGroup>
<WidgetGroup><Size>1min,0me</Size></WidgetGroup>
<WidgetGroup><Size>1min,1f</Size></WidgetGroup>

<WidgetGroup><!-- beat grid buttons row -->
<ObjectName>Spacer0f</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>f,f</SizePolicy>
<Children>
<Template src="skin:button_1state_right.xml">
<SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
<SetVariable name="ObjectName">BeatgridCurpos</SetVariable>
<SetVariable name="Size">24f,49f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
</Template>

<WidgetGroup><Size>1min,1f</Size></WidgetGroup>
<WidgetGroup>
<Layout>vertical</Layout>
<Size>f,f</Size>
<Children>
<Template src="skin:button_1state_right.xml">
<SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
<SetVariable name="ObjectName">BeatgridCurpos</SetVariable>
<SetVariable name="Size">24f,49f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],timing_shift_buttons</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>f,f</SizePolicy>
<Children>
<Template src="skin:button_1state_right.xml">
<SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
<SetVariable name="ObjectName">BeatgridCurpos</SetVariable>
<SetVariable name="Size">49f,24f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
</Template>

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

<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>f,f</SizePolicy>
<Children>
<Template src="skin:button_1state_right.xml">
<SetVariable name="TooltipId">FIXME</SetVariable>
<SetVariable name="ObjectName">ShiftEarlier</SetVariable>
<SetVariable name="Size">24f,24f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,shift_times_earlier</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="group"/>,shift_times_earlier_small</SetVariable>
</Template>
<WidgetGroup><Size>1f,1min</Size></WidgetGroup>
<Template src="skin:button_1state_right.xml">
<SetVariable name="TooltipId">FIXME</SetVariable>
<SetVariable name="ObjectName">ShiftLater</SetVariable>
<SetVariable name="Size">24f,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>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],timing_shift_buttons</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

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

<WidgetGroup><!-- beats earlier & faster -->
<Layout>vertical</Layout>
Expand All @@ -170,24 +224,6 @@ 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 @@ -213,23 +249,6 @@ Variables:
<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 e31fc37

Please sign in to comment.