Skip to content

fresh view #4

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

Closed
ronso0 wants to merge 2 commits into from
Closed

fresh view #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
354497c
fresh view: smaller EQ knobs
Feb 8, 2017
fd344c9
fresh view: Pitch container rearranged
Feb 8, 2017
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
8 changes: 4 additions & 4 deletions res/skins/Deere/equalizer_rack_parameter_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@

<WidgetGroup>
<ObjectName>EQKnobNoLabel</ObjectName>
<MinimumSize>40,34</MinimumSize>
<MaximumSize>40,41</MaximumSize>
<MinimumSize>40,30</MinimumSize>
<MaximumSize>40,35</MaximumSize>
<Layout>vertical</Layout>
<Children>
<Template src="skin:knob.xml">
Expand All @@ -86,8 +86,8 @@

<WidgetGroup>
<ObjectName>EQKnobWithLabel</ObjectName>
<MinimumSize>40,42</MinimumSize>
<MaximumSize>40,45</MaximumSize>
<MinimumSize>40,36</MinimumSize>
<MaximumSize>40,39</MaximumSize>
<Layout>vertical</Layout>
<Children>
<Template src="skin:knob.xml">
Expand Down
8 changes: 4 additions & 4 deletions res/skins/Deere/equalizer_rack_parameter_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

<WidgetGroup>
<ObjectName>EQKnobNoLabel</ObjectName>
<MinimumSize>40,34</MinimumSize>
<MaximumSize>40,41</MaximumSize>
<MinimumSize>40,30</MinimumSize>
<MaximumSize>40,35</MaximumSize>
<Layout>vertical</Layout>
<Children>
<Template src="skin:knob.xml">
Expand All @@ -38,8 +38,8 @@

<WidgetGroup>
<ObjectName>EQKnobWithLabel</ObjectName>
<MinimumSize>40,42</MinimumSize>
<MaximumSize>40,45</MaximumSize>
<MinimumSize>40,36</MinimumSize>
<MaximumSize>40,39</MaximumSize>
<Layout>vertical</Layout>
<Children>
<Template src="skin:knob.xml">
Expand Down
36 changes: 23 additions & 13 deletions res/skins/Deere/knob_bg.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 19 additions & 13 deletions res/skins/Deere/knob_blue.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 16 additions & 10 deletions res/skins/Deere/knob_red.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading