Skip to content

Commit

Permalink
Merge pull request #15 from ronso0/deere_2.1_layout-fixes
Browse files Browse the repository at this point in the history 
Deere 2.1 layout & color fixes
  • Loading branch information
@Be-ing
Be-ing authored Nov 19, 2017
2 parents 15dc432 + 7fb87ec commit 10768df
Show file tree
Hide file tree
Showing 8 changed files with 287 additions and 344 deletions.
1 change: 1 addition & 0 deletions res/skins/Deere/beatjump.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<Template>
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>f,min</SizePolicy>
<Children>

<BeatSpinBox>
Expand Down
92 changes: 43 additions & 49 deletions res/skins/Deere/deck_controls_row.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,62 +9,56 @@
<WidgetGroup>
<ObjectName>ControlsRow</ObjectName>
<Layout>horizontal</Layout>
<MinimumSize>-1,47</MinimumSize>
<SizePolicy>me,min</SizePolicy>
<Children>
<Template src="skin:hotcue.xml"/>
<!-- Expanding spacers in between control contexts -->
<WidgetGroup><Size>3me,1min</Size><Children/></WidgetGroup>
<Template src="skin:loop.xml"/>
<WidgetGroup><Size>3me,1min</Size><Children/></WidgetGroup>
<Template src="skin:beatjump.xml"/>
<WidgetGroup><Size>3me,1min</Size><Children/></WidgetGroup>

<WidgetGroup>
<ObjectName>FullControlsRow</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,min</SizePolicy>
<Layout>vertical</Layout>
<MinimumSize>40,42</MinimumSize>
<MaximumSize>60, -1</MaximumSize>
<SizePolicy>me,me</SizePolicy>
<Children>
<Template src="skin:hotcue.xml"/>
<!-- Expanding spacers in between control contexts -->
<WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
<Template src="skin:loop.xml"/>
<WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
<Template src="skin:beatjump.xml"/>
<WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<MinimumSize>40,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>
<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="RightClickIsPushButton">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>
<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="RightClickIsPushButton">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>

<!-- Workaround for layout spacing -->
<Template src="skin:spacer_vx.xml">
<SetVariable name="height">2</SetVariable>
</Template>
<!-- Workaround for layout spacing -->
<Template src="skin:spacer_vx.xml">
<SetVariable name="height">2</SetVariable>
</Template>

<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">play_cue_set</SetVariable>
<SetVariable name="ObjectName">PlayToggle</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">false</SetVariable>
<SetVariable name="RightClickIsPushButton">false</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
</Template>
</Children>
</WidgetGroup>
<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">play_cue_set</SetVariable>
<SetVariable name="ObjectName">PlayToggle</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">false</SetVariable>
<SetVariable name="RightClickIsPushButton">false</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
</Template>
</Children>
</WidgetGroup>
</Children>
Expand Down
1 change: 1 addition & 0 deletions res/skins/Deere/deck_overview_row.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<MaximumSize>-1,80</MaximumSize>
<Children>
<WidgetGroup>
<ObjectName>ButtonGrid</ObjectName>
<Layout>vertical</Layout>
<Children>
<WidgetGroup>
Expand Down
Loading

0 comments on commit 10768df

Please sign in to comment.