Skip to content

rearrange Pitch section to save v-space for Pitch fader #5

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

Merged
Be-ing merged 1 commit into from
Feb 9, 2017
Merged

rearrange Pitch section to save v-space for Pitch fader #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 37 additions & 37 deletions res/skins/Deere/deck_inner_column.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">sync_enabled</SetVariable>
<SetVariable name="ObjectName">DeckSync</SetVariable>
<SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
<SetVariable name="MinimumSize">-1,18</SetVariable>
<SetVariable name="MaximumSize">-1,18</SetVariable>
<SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text">Sync</SetVariable>
<SetVariable name="state_0_pressed"></SetVariable>
Expand All @@ -38,45 +38,15 @@
</Connection>
</WidgetGroup>

<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<SliderComposed>
<TooltipId>rate</TooltipId>
<Size>40f,-1me</Size>
<MaximumSize>40,200</MaximumSize>
<Slider scalemode="STRETCH">slider-vertical.svg</Slider>
<Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
<Connection>
<ConfigKey><Variable name="group"/>,rate</ConfigKey>
</Connection>
</SliderComposed>
</Children>
</WidgetGroup>

<WidgetGroup>
<ObjectName>RateDisplay<Variable name="i"/></ObjectName>
<Layout>vertical</Layout>
<Children>
<NumberRate>
<TooltipId>rate_display</TooltipId>
<Channel>
<Variable name="i"/>
</Channel>
<NumberOfDigits>2</NumberOfDigits>
</NumberRate>
</Children>
</WidgetGroup>

<WidgetGroup>
<ObjectName>RateTempButtons</ObjectName>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:left_right_1state_button.xml">
<SetVariable name="ObjectName">TempRateDown</SetVariable>
<SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="MinimumSize">22,18</SetVariable>
<SetVariable name="MaximumSize">22,18</SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text"></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_remove_48px.svg</SetVariable>
Expand All @@ -88,8 +58,8 @@
<Template src="skin:left_right_1state_button.xml">
<SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
<SetVariable name="ObjectName">TempRateUp</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="MinimumSize">22,18</SetVariable>
<SetVariable name="MaximumSize">22,18</SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text"></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_add_48px.svg</SetVariable>
Expand All @@ -100,11 +70,41 @@
</Children>
</WidgetGroup>

<WidgetGroup>
<ObjectName>RateDisplay<Variable name="i"/></ObjectName>
<Layout>vertical</Layout>
<Children>
<NumberRate>
<TooltipId>rate_display</TooltipId>
<Channel>
<Variable name="i"/>
</Channel>
<NumberOfDigits>2</NumberOfDigits>
</NumberRate>
</Children>
</WidgetGroup>

<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<SliderComposed>
<TooltipId>rate</TooltipId>
<Size>40f,-1me</Size>
<MaximumSize>40,200</MaximumSize>
<Slider scalemode="STRETCH">slider-vertical.svg</Slider>
<Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
<Connection>
<ConfigKey><Variable name="group"/>,rate</ConfigKey>
</Connection>
</SliderComposed>
</Children>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<Children>
<Template src="skin:spacer_vx.xml">
<SetVariable name="height">8</SetVariable>
<SetVariable name="height">2</SetVariable>
</Template>

<Template src="skin:left_right_display_2state_button.xml">
Expand Down