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

Skins :: adjust styles of skin context menus, tooltip, ... #2337

Merged
merged 12 commits into from
Nov 15, 2019
Merged

Skins :: adjust styles of skin context menus, tooltip, ... #2337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5d0190c
synchronise styles of skin context menus, tooltip, effect selector an…
ronso0 Oct 29, 2019
ed0a215
Merge remote-tracking branch 'mixxx/master' into sidebar-qmenu-styles
ronso0 Oct 29, 2019
e90adbe
LateNight: re-add knob label styles after merge/master
ronso0 Nov 11, 2019
5077ae6
style library selection & cells in edit mode (QLineEdit)
ronso0 Nov 11, 2019
91c8527
style indeterminate crate menu checkboxes
ronso0 Nov 11, 2019
312d694
Tango: improve indeterminate checkbox
ronso0 Nov 12, 2019
a04cc9d
Shade Dark: use light grey for table header font
ronso0 Nov 12, 2019
b68c82f
Shade: darken headerfont and sort icons for better contrast
ronso0 Nov 12, 2019
50d8195
Merge remote-tracking branch 'mixxx/master' into sidebar-qmenu-styles
ronso0 Nov 13, 2019
b558bef
EffectS selector: comment out MacOS hack in Deere & LateNight so we c…
ronso0 Nov 13, 2019
37ff402
Shade: increase BPM/Key font
ronso0 Nov 14, 2019
6471832
all skins: add Crates feature menu checkbox, assure sufficient contra…
ronso0 Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 10 additions & 10 deletions res/skins/Deere/deck_small.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<WidgetGroup>
<Layout>horizontal</Layout>
<Size>40f,40f</Size>
<Size>40f,46f</Size>
<Children>
<SingletonContainer>
<ObjectName>DeckCoverArt<Variable name="i"/></ObjectName>
Expand All @@ -33,7 +33,7 @@
<WidgetGroup>
<ObjectName>OverviewGutterSmall</ObjectName>
<Layout>horizontal</Layout>
<Size>200me,40f</Size>
<Size>200me,46f</Size>
<Children>
<SingletonContainer>
<ObjectName>DeckOverview<Variable name="i"/></ObjectName>
Expand All @@ -44,25 +44,25 @@
<WidgetGroup>
<ObjectName>DeckTextRowSmall</ObjectName>
<Layout>vertical</Layout>
<Size>200min,40f</Size>
<Size>200min,46f</Size>
<Children>

<WidgetGroup><!-- Title/*** / PlayPos -->
<Layout>horizontal</Layout>
<Size>200min,21f</Size>
<Size>200min,24f</Size>
<Children>

<WidgetGroup>
<ObjectName>TitleGutterSmall</ObjectName>
<Layout>horizontal</Layout>
<Size>100me,20f</Size>
<Size>100me,23f</Size>
<Children>
<!-- We allow to hide track/artist info (aka AM-Mode) in the skin settings,
display just a label with asterixes instead. -->
<TrackProperty>
<TooltipId>track_title</TooltipId>
<ObjectName>TitleTextSmall</ObjectName>
<Size>100me,20f</Size>
<Size>100me,23f</Size>
<Property>title</Property>
<Group><Variable name="group"/></Group>
<Alignment>left</Alignment>
Expand Down Expand Up @@ -93,7 +93,7 @@
<NumberPos>
<TooltipId>track_time</TooltipId>
<ObjectName>PlayPositionTextSmall</ObjectName>
<Size>55min,20f</Size>
<Size>55min,23f</Size>
<Alignment>center</Alignment>
<Channel><Variable name="i"/></Channel>
<Connection>
Expand All @@ -106,7 +106,7 @@
<WidgetGroup><!-- Artist / Key / BPM -->
<ObjectName>ArtistKeyBpmGutterSmall</ObjectName>
<Layout>horizontal</Layout>
<Size>200min,19f</Size>
<Size>200min,22f</Size>
<Children>
<!-- We allow to hide track/artist info (aka AM-Mode) in the skin settings,
display just a label with asterixes instead. -->
Expand Down Expand Up @@ -141,7 +141,7 @@
<TooltipId>visual_key</TooltipId>
<ObjectName>BpmKeyTextSmall</ObjectName>
<Alignment>center</Alignment>
<Size>30min,19f</Size>
<Size>30min,22f</Size>
<Alignment>center</Alignment>
<Elide>right</Elide>
<Connection>
Expand All @@ -152,7 +152,7 @@
<NumberBpm>
<TooltipId>visual_bpm</TooltipId>
<ObjectName>BpmKeyTextSmall</ObjectName>
<Size>55min,19f</Size>
<Size>55min,22f</Size>
<Alignment>right</Alignment>
<NumberOfDigits>2</NumberOfDigits>
<Group><Variable name="group"/></Group>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Deere/decks_small.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Children>
<WidgetGroup>
<Layout>horizontal</Layout>
<Size>0me,45f</Size>
<Size>0me,51f</Size>
<Children>
<Template src="skin:deck_small.xml">
<SetVariable name="i">1</SetVariable>
Expand All @@ -20,7 +20,7 @@

<WidgetGroup>
<Layout>horizontal</Layout>
<Size>0me,45f</Size>
<Size>0me,51f</Size>
<Children>
<Template src="skin:deck_small.xml">
<SetVariable name="i">3</SetVariable>
Expand Down
1 change: 0 additions & 1 deletion res/skins/Deere/icon/ic_battery_unknown_48px.svg
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions res/skins/Deere/icon/ic_library_checkmark_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.
1 change: 1 addition & 0 deletions res/skins/Deere/preview_deck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<SignalRGBLowColor></SignalRGBLowColor>
<SignalColor>#FF8000</SignalColor>
<PlayPosColor>#00FF00</PlayPosColor>
<ShowCueTimes>false</ShowCueTimes>
<DefaultMark>
<Align>bottom</Align>
<Color>#FFFFFF</Color>
Expand Down
1 change: 1 addition & 0 deletions res/skins/Deere/sampler_controls_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<SignalRGBLowColor></SignalRGBLowColor>
<SignalColor>#FF8000</SignalColor>
<PlayPosColor>#00FF00</PlayPosColor>
<ShowCueTimes>false</ShowCueTimes>
<DefaultMark>
<Align>bottom</Align>
<Color>#006596</Color>
Expand Down
Loading