Skip to content

Deere rework styling #3

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 4 commits into from
Jan 30, 2017
Merged

Deere rework styling #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
367f68c
re-fix hotcues layout-spacing
Jan 23, 2017
c5740e5
proposal for checked/unchecked skin options
Jan 23, 2017
787b70e
another version for checked/unchecked
Jan 25, 2017
2658161
fix mixer cut-off & knob label cut-off
Jan 26, 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
4 changes: 4 additions & 0 deletions res/skins/Deere/deck_mixer_controls_col1_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,9 @@
</Template>

</Children>
<Connection>
<ConfigKey>[Master],show_eqs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
Copy link
Copy Markdown
Author

@ronso0 ronso0 Jan 26, 2017

Choose a reason for hiding this comment

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

moved this here to make code more clear in parent template

</WidgetGroup>
</Template>
4 changes: 4 additions & 0 deletions res/skins/Deere/deck_mixer_controls_col1_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,9 @@
</Template>

</Children>
<Connection>
<ConfigKey>[Master],show_eqs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Template>
4 changes: 0 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 @@ -25,10 +25,6 @@
</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>
Expand Down
22 changes: 5 additions & 17 deletions res/skins/Deere/left_deck_mixer_controls.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,16 @@
<!-- In 2 deck mode, we show a 3-column mixer section -->
<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<Template src="skin:deck_mixer_controls_col1_left.xml"/>
<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:deck_mixer_controls_col1_left.xml"/>
<Template src="skin:deck_mixer_controls_col2.xml"/>
<Template src="skin:deck_mixer_controls_col3.xml"/>
</Children>
<Connection>
<ConfigKey>[Master],show_eqs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<Template src="skin:deck_mixer_controls_col2.xml"/>
<Template src="skin:deck_mixer_controls_col3.xml"/>
</Children>
<Connection>
<ConfigKey>[Master],show_4decks</ConfigKey>
Copy link
Copy Markdown
Author

@ronso0 ronso0 Jan 26, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Mixer columns2/3 were squeezed and set off to the left, column1 was half-covered. This happened for Channel1 mixer only. Don't know why THIS works..
Reproduce:

  • 2 decks
  • split waveforms
    => with skin settings turn EQs off, then on again

Expand All @@ -41,16 +38,7 @@
<WidgetGroup>
<Layout>vertical</Layout>
<Children>
<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:deck_mixer_controls_col1_left.xml"/>
</Children>
<Connection>
<ConfigKey>[Master],show_eqs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<Template src="skin:deck_mixer_controls_col1_left.xml"/>
<WidgetGroup>
<Layout>vertical</Layout>
<ObjectName>4DecksMixerCol2ContainerLeft</ObjectName>
Expand Down
21 changes: 4 additions & 17 deletions res/skins/Deere/right_deck_mixer_controls.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,14 @@
<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:deck_mixer_controls_col3.xml"/>
<Template src="skin:deck_mixer_controls_col2.xml"/>
<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:deck_mixer_controls_col1_right.xml"/>
<Template src="skin:deck_mixer_controls_col3.xml"/>
<Template src="skin:deck_mixer_controls_col2.xml"/>
</Children>
<Connection>
<ConfigKey>[Master],show_eqs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<Template src="skin:deck_mixer_controls_col1_right.xml"/>
</Children>
<Connection>
<ConfigKey>[Master],show_4decks</ConfigKey>
Expand All @@ -41,16 +37,7 @@
<WidgetGroup>
<Layout>vertical</Layout>
<Children>
<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:deck_mixer_controls_col1_right.xml"/>
</Children>
<Connection>
<ConfigKey>[Master],show_eqs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<Template src="skin:deck_mixer_controls_col1_right.xml"/>
<WidgetGroup>
<Layout>vertical</Layout>
<ObjectName>4DecksMixerCol2ContainerRight</ObjectName>
Expand Down
76 changes: 38 additions & 38 deletions res/skins/Deere/skin_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Stacked Waveforms</Text>
<Text>&#9898; Stacked Waveforms</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Stacked Waveforms</Text>
<Text>&#9899; Stacked Waveforms</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -67,12 +67,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; 4 Decks</Text>
<Text>&#9898; 4 Decks</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; 4 Decks</Text>
<Text>&#9899; 4 Decks</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand Down Expand Up @@ -101,12 +101,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Cover Art</Text>
<Text>&#9898; Cover Art</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Cover Art</Text>
<Text>&#9899; Cover Art</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -119,12 +119,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Artist &amp; Track Title</Text>
<Text>&#9898; Artist &amp; Track Title</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Artist &amp; Track Title</Text>
<Text>&#9899; Artist &amp; Track Title</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -137,12 +137,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; BPM</Text>
<Text>&#9898; BPM</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; BPM</Text>
<Text>&#9899; BPM</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -155,12 +155,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Star Rating</Text>
<Text>&#9898; Star Rating</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Star Rating</Text>
<Text>&#9899; Star Rating</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -173,12 +173,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; More Hotcues</Text>
<Text>&#9898; More Hotcues</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; More Hotcues</Text>
<Text>&#9899; More Hotcues</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -191,12 +191,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Vinyl Control Options</Text>
<Text>&#9898; Vinyl Control Options</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Vinyl Control Options</Text>
<Text>&#9899; Vinyl Control Options</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -210,12 +210,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Minimal Controls</Text>
<Text>&#9898; Minimal Controls</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Minimal Controls</Text>
<Text>&#9899; Minimal Controls</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -241,12 +241,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Show</Text>
<Text>&#9898; Show</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Show</Text>
<Text>&#9899; Show</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -259,12 +259,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Crossfader</Text>
<Text>&#9898; Crossfader</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Crossfader</Text>
<Text>&#9899; Crossfader</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -278,12 +278,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; EQs</Text>
<Text>&#9898; EQs</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; EQs</Text>
<Text>&#9899; EQs</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -310,12 +310,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Show</Text>
<Text>&#9898; Show</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Show</Text>
<Text>&#9899; Show</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -328,12 +328,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Details</Text>
<Text>&#9898; Details</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Details</Text>
<Text>&#9899; Details</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -359,12 +359,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Show</Text>
<Text>&#9898; Show</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Show</Text>
<Text>&#9899; Show</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -391,12 +391,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Show</Text>
<Text>&#9898; Show</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Show</Text>
<Text>&#9899; Show</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -423,12 +423,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Preview Deck</Text>
<Text>&#9898; Preview Deck</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Preview Deck</Text>
<Text>&#9899; Preview Deck</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -442,12 +442,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Cover Art</Text>
<Text>&#9898; Cover Art</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Cover Art</Text>
<Text>&#9899; Cover Art</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand All @@ -461,12 +461,12 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text>&#9744; Maximize</Text>
<Text>&#9898; Maximize</Text>
<Alignment>left</Alignment>
</State>
<State>
<Number>1</Number>
<Text>&#9745; Maximize</Text>
<Text>&#9899; Maximize</Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand Down
Loading