Skip to content
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

Jump to bottom

Deere rework styling #2

Merged
merged 3 commits into from
Jan 15, 2017
Merged

Deere rework styling #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f60a7ca
fix button grids (hotcues, sampler bank) and EQ buttons
Jan 15, 2017
511d891
clean up
Jan 15, 2017
5f09b2a
clean up
Jan 15, 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
20 changes: 19 additions & 1 deletion res/skins/Deere/deck_controls_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@
<Layout>horizontal</Layout>
<Children>
<Template src="skin:transport.xml"/>
<!-- Expanding spacers in between control contexts -->
<WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
<Template src="skin:beatloop.xml"/>
<Template src="skin:loop.xml"/>
<WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
<Template src="skin:hotcue.xml"/>
</Children>
<Connection>
Expand Down Expand Up @@ -49,7 +52,12 @@
<SetVariable name="state_1_pressed">icon/ic_quantize_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_quantize_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,quantize</SetVariable>
</Template>
</Template>

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

<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">keylock</SetVariable>
Expand All @@ -66,6 +74,11 @@
<SetVariable name="left_connection_control"><Variable name="group"/>,keylock</SetVariable>
</Template>

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

<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">sync_enabled</SetVariable>
<SetVariable name="ObjectName">DeckSync</SetVariable>
Expand Down Expand Up @@ -104,6 +117,11 @@
<SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
</Template>

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

<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">play_cue_set</SetVariable>
<SetVariable name="ObjectName">PlayToggle</SetVariable>
Expand Down
5 changes: 5 additions & 0 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 @@ -121,6 +121,11 @@
<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>

<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">play_cue_set</SetVariable>
<SetVariable name="ObjectName">PlayToggle</SetVariable>
Expand Down
9 changes: 5 additions & 4 deletions res/skins/Deere/deck_mixer_controls_col2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">pfl</SetVariable>
<SetVariable name="ObjectName">DeckPFLButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<SetVariable name="MinimumSize">30,30</SetVariable>
<SetVariable name="MaximumSize">30,30</SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text"></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
Expand Down Expand Up @@ -49,8 +49,9 @@
<Template src="skin:left_2state_button.xml">
<SetVariable name="TooltipId">pfl</SetVariable>
<SetVariable name="ObjectName">DeckPFLButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
<!-- make Pfl button bigger because it's important and space is occupied anyway -->
<SetVariable name="MinimumSize">25,25</SetVariable>
<SetVariable name="MaximumSize">25,25</SetVariable>
<SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
<SetVariable name="state_0_text"></SetVariable>
<SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
Expand Down
1 change: 1 addition & 0 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 @@ -19,6 +19,7 @@
<Children>

<SizeAwareStack>
<Size>40f,-1me</Size>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha, I didn't realize the fix would be so simple. Thanks for figuring that out.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, neither did I ;) it was late and I just reversed elements' order in ...left.xml and diffed

<Children>

<WidgetGroup>
Expand Down
14 changes: 10 additions & 4 deletions res/skins/Deere/hotcue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
<WidgetGroup>
<ObjectName>HotcueGrid</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>max,max</SizePolicy>
<SizePolicy>min,min</SizePolicy>
<Children>
<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:hotcue_button.xml">
<SetVariable name="hotcue">1</SetVariable>
Expand All @@ -24,8 +25,13 @@
</Children>
</WidgetGroup>

<!-- Workaround. Remove when https://bugs.launchpad.net/mixxx/+bug/1578111
is fixed -->
<WidgetGroup><Size>1min,2f</Size><Children/></WidgetGroup>

<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:hotcue_button.xml">
<SetVariable name="hotcue">3</SetVariable>
Expand All @@ -49,11 +55,11 @@
<WidgetGroup>
<ObjectName>HotcueGridExtended</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>max,max</SizePolicy>
<SizePolicy>min,min</SizePolicy>
<Children>
<WidgetGroup>
<ObjectName>HotcueGridExtendedRow1</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:hotcue_button.xml">
<SetVariable name="hotcue">1</SetVariable>
Expand All @@ -71,8 +77,8 @@
</WidgetGroup>

<WidgetGroup>
<ObjectName>HotcueGridExtendedRow2</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:hotcue_button.xml">
<SetVariable name="hotcue">5</SetVariable>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere/main_decks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</Connection>
</WidgetGroup>

<WidgetGroup>
<WidgetGroup>
<ObjectName>MainDeckContainer</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
Expand Down
8 changes: 7 additions & 1 deletion res/skins/Deere/sampler_bank_controls.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<WidgetGroup>
<ObjectName>SamplerBankContainer</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,f</SizePolicy>
<SizePolicy>min,min</SizePolicy>
<Children>
<Label>
<ObjectName>SamplerBankLabel</ObjectName>
Expand Down Expand Up @@ -102,7 +102,9 @@
</Label>

<WidgetGroup>
<ObjectName>SamplerBankGrid</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:left_2state_button.xml">
<!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
Expand Down Expand Up @@ -138,7 +140,9 @@
</WidgetGroup>

<WidgetGroup>
<ObjectName>SamplerBankGrid</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:left_2state_button.xml">
<!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
Expand Down Expand Up @@ -176,7 +180,9 @@
<Template src="skin:spacer_v.xml"/>

<WidgetGroup>
<ObjectName>SamplerBankGrid</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:left_1state_button.xml">
<!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
Expand Down
16 changes: 16 additions & 0 deletions res/skins/Deere/spacer_hx.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!DOCTYPE template>
<!--
Description: Spacer.
-->
<Template>
<WidgetGroup>
<ObjectName>Spacer</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Size><Variable name="width"/></Size>
<MinimumSize><Variable name="width"/></MinimumSize>
<MaximumSize><Variable name="width"/></MaximumSize>
<Children>
</Children>
</WidgetGroup>
</Template>
10 changes: 7 additions & 3 deletions res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,14 +623,14 @@ WWidget, QLabel {
qproperty-layoutSpacing: 5;
}

#MinimalControlsContainer {
qproperty-layoutSpacing: 2;}

#HotcueGrid, #HotcueGridExtended {
background-color: #333333;
padding: 1px;
qproperty-layoutSpacing: 2;
}
#HotcueGridExtendedRow1, #HotcueGridExtendedRow1 {
qproperty-layoutSpacing: 2;
}

#HotcueGrid WWidgetGroup, #HotcueGridExtended WWidgetGroup {
qproperty-layoutSpacing: 2;
Expand Down Expand Up @@ -1073,6 +1073,10 @@ WStarRating {
qproperty-layoutSpacing: 2;
}

#SamplerBankGrid {
qproperty-layoutSpacing: 2;
}

#SampleDecksExpanded, #SampleDecksCollapsed {
qproperty-layoutAlignment: 'AlignLeft | AlignTop';
}
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Deere/vinylcontrol.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<WidgetGroup>
<ObjectName>VinylControlsContainer</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>max,max</SizePolicy>
<SizePolicy>min,min</SizePolicy>
<Connection>
<ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
<BindProperty>visible</BindProperty>
Expand Down Expand Up @@ -58,4 +58,4 @@

</Children>
</WidgetGroup>
</Template>
</Template>