diff options
author | ronso0 <ronso0@mixxx.org> | 2020-11-02 19:42:44 +0100 |
---|---|---|
committer | ronso0 <ronso0@mixxx.org> | 2020-11-02 19:42:44 +0100 |
commit | f83d6d885a504ed0061bf0eaab097a45898415bd (patch) | |
tree | 9133037739d7d607fe037270ed16cb0a59466f0a /res | |
parent | 434586d02c2b399fd52b2d261c67a2969757f437 (diff) |
Tango/Deere: add track colors to decks
Diffstat (limited to 'res')
-rw-r--r-- | res/skins/Deere/deck_small.xml | 14 | ||||
-rw-r--r-- | res/skins/Deere/deck_text_row.xml | 13 | ||||
-rw-r--r-- | res/skins/Deere/style.qss | 13 | ||||
-rw-r--r-- | res/skins/Tango/deck_left_mini.xml | 20 | ||||
-rw-r--r-- | res/skins/Tango/deck_right_mini.xml | 20 | ||||
-rw-r--r-- | res/skins/Tango/deck_row_text_left.xml | 14 | ||||
-rw-r--r-- | res/skins/Tango/deck_row_text_right.xml | 12 | ||||
-rw-r--r-- | res/skins/Tango/style.qss | 1 |
8 files changed, 65 insertions, 42 deletions
diff --git a/res/skins/Deere/deck_small.xml b/res/skins/Deere/deck_small.xml index 3ac199ec68..2addce9989 100644 --- a/res/skins/Deere/deck_small.xml +++ b/res/skins/Deere/deck_small.xml @@ -49,7 +49,7 @@ <WidgetGroup><!-- Title/*** / PlayPos --> <Layout>horizontal</Layout> - <Size>200min,24f</Size> + <Size>200min,23f</Size> <Children> <WidgetGroup> @@ -103,10 +103,16 @@ </Children> </WidgetGroup><!-- Title/*** / PlayPos --> + <TrackWidgetGroup> + <Size>0me,2f</Size> + <Group><Variable name="group"/></Group> + <TrackColorAlpha>255</TrackColorAlpha> + </TrackWidgetGroup> + <WidgetGroup><!-- Artist / Key / BPM --> <ObjectName>ArtistKeyBpmGutterSmall</ObjectName> <Layout>horizontal</Layout> - <Size>200min,22f</Size> + <Size>200min,21f</Size> <Children> <!-- We allow to hide track/artist info (aka AM-Mode) in the skin settings, display just a label with asterixes instead. --> @@ -163,7 +169,7 @@ </NumberBpm> </Children> - </WidgetGroup><!-- PositionKeyBpmGutter --> + </WidgetGroup><!-- ArtistKeyBpmGutterSmall --> </Children> </WidgetGroup><!-- DeckTextRowSmall --> @@ -189,7 +195,7 @@ <SetVariable name="left_connection_control"><Variable name="group"/>,play_indicator</SetVariable> </Template> </Children> - </WidgetGroup> + </WidgetGroup><!-- PlayGutterSmall --> </Children> </WidgetGroup> diff --git a/res/skins/Deere/deck_text_row.xml b/res/skins/Deere/deck_text_row.xml index 00eff4f487..f5583619db 100644 --- a/res/skins/Deere/deck_text_row.xml +++ b/res/skins/Deere/deck_text_row.xml @@ -320,6 +320,19 @@ </WidgetGroup><!-- UpperTextRow --> <WidgetGroup> + <ObjectName>TrackColorWrapper</ObjectName> + <Layout>horizontal</Layout> + <Size>0me,2f</Size> + <Children> + <TrackWidgetGroup> + <Size>0me,2f</Size> + <Group><Variable name="group"/></Group> + <TrackColorAlpha>255</TrackColorAlpha> + </TrackWidgetGroup> + </Children> + </WidgetGroup> + + <WidgetGroup> <ObjectName>LowerTextRow</ObjectName> <Layout>horizontal</Layout> <!-- When TextRow is laid out, we need to ignore our children. Otherwise diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss index 095476fbe7..1b87870f6e 100644 --- a/res/skins/Deere/style.qss +++ b/res/skins/Deere/style.qss @@ -1001,12 +1001,21 @@ WBeatSpinBox, #ArtistGutter, #TitleGutter { qproperty-layoutAlignment: 'AlignLeft | AlignTop'; - padding: 2px; -} + } + #TitleGutter { + padding: 2px 2px 1px 2px; + } + #ArtistGutter { + padding: 1px 2px 2px 2px; + } #TitleGutterSmall { padding: 0px; } +#TrackColorWrapper { + margin-right: 2px; +} + #ArtistKeyBpmGutterSmall { border-top: 1px solid #222; } diff --git a/res/skins/Tango/deck_left_mini.xml b/res/skins/Tango/deck_left_mini.xml index 7af4c1b7f1..b470067203 100644 --- a/res/skins/Tango/deck_left_mini.xml +++ b/res/skins/Tango/deck_left_mini.xml @@ -56,6 +56,12 @@ Variables: </Children> </WidgetGroup> + <TrackWidgetGroup> + <Size>0me,2f</Size> + <Group><Variable name="group"/></Group> + <TrackColorAlpha>255</TrackColorAlpha> + </TrackWidgetGroup> + <WidgetGroup><!-- by / Artist / Key / BPM --> <Layout>horizontal</Layout> <Size>200me,20f</Size> @@ -94,20 +100,6 @@ Variables: <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reset_key</SetVariable> </Template> - <!-- Show/light up if key is not original, like with script. - Not working, only once per skin load. - Tried different controls: pitch (from script), pitch_adjust, ... - <WidgetGroup> - <ObjectName>KeyOffsetWarning</ObjectName> - <Size>50f,13f</Size> - <Layout>horizontal</Layout> - <Connection> - <ConfigKey><Variable name="group"/>,visual_key</ConfigKey> - <Transform><Not/><IsEqual>1</IsEqual></Transform> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> --> - <Key><!-- Actual Key display --> <TooltipId>visual_key</TooltipId> <ObjectName>KeyDisplay</ObjectName> diff --git a/res/skins/Tango/deck_right_mini.xml b/res/skins/Tango/deck_right_mini.xml index d125df49f4..ffd85d56e8 100644 --- a/res/skins/Tango/deck_right_mini.xml +++ b/res/skins/Tango/deck_right_mini.xml @@ -99,6 +99,12 @@ Variables: </Children> </WidgetGroup><!-- Time / Title --> + <TrackWidgetGroup> + <Size>0me,2f</Size> + <Group><Variable name="group"/></Group> + <TrackColorAlpha>255</TrackColorAlpha> + </TrackWidgetGroup> + <WidgetGroup><!-- BPM / Key / by / Artist --> <Layout>horizontal</Layout> <Size>200min,20f</Size> @@ -150,20 +156,6 @@ Variables: <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reset_key</SetVariable> </Template> - <!-- Show/light up if key is not original, like with script. - Not working, only once per skin load. - Tried different controls: pitch (from script), pitch_adjust, ... - <WidgetGroup> - <ObjectName>KeyOffsetWarning</ObjectName> - <Size>50f,13f</Size> - <Layout>horizontal</Layout> - <Connection> - <ConfigKey><Variable name="group"/>,visual_key</ConfigKey> - <Transform><Not/><IsEqual>1</IsEqual></Transform> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup> --> - <Key><!-- Actual Key display --> <TooltipId>visual_key</TooltipId> <ObjectName>KeyDisplay</ObjectName> diff --git a/res/skins/Tango/deck_row_text_left.xml b/res/skins/Tango/deck_row_text_left.xml index 884a52dd01..428a5d3708 100644 --- a/res/skins/Tango/deck_row_text_left.xml +++ b/res/skins/Tango/deck_row_text_left.xml @@ -33,7 +33,7 @@ Variables: <Property>titleInfo</Property> <Alignment>Left</Alignment> <Elide>right</Elide> - <Size>1me,22f</Size> + <Size>1me,21f</Size> <Channel><Variable name="chanNum"/></Channel> </TrackProperty> </Children> @@ -55,6 +55,12 @@ Variables: </Children> </WidgetGroup><!-- /Title + Time --> + <TrackWidgetGroup> + <Size>0me,2f</Size> + <Group><Variable name="group"/></Group> + <TrackColorAlpha>255</TrackColorAlpha> + </TrackWidgetGroup> + <WidgetGroup><!-- by Artist + Duration --> <Layout>horizontal</Layout> <SizePolicy>min,min</SizePolicy> @@ -64,7 +70,7 @@ Variables: <Label> <ObjectName>TrackBy</ObjectName> - <Size>22f,22f</Size> + <Size>22f,21f</Size> <Text>by </Text> <Alignment>left</Alignment> </Label> @@ -73,14 +79,14 @@ Variables: <TooltipId>track_artist</TooltipId> <ObjectName>TrackArtist</ObjectName> <Elide>right</Elide> - <Size>1me,22f</Size> + <Size>1me,21f</Size> <Property>artist</Property> <Channel><Variable name="chanNum"/></Channel> </TrackProperty> <TrackProperty> <ObjectName>Duration</ObjectName> - <Size>60min,22f</Size> + <Size>60min,21f</Size> <TooltipId>track_duration</TooltipId> <Property>durationFormatted</Property> <Alignment>right</Alignment> diff --git a/res/skins/Tango/deck_row_text_right.xml b/res/skins/Tango/deck_row_text_right.xml index 61dd975f28..9da4c9ad70 100644 --- a/res/skins/Tango/deck_row_text_right.xml +++ b/res/skins/Tango/deck_row_text_right.xml @@ -53,7 +53,7 @@ Variables: <Property>titleInfo</Property> <Alignment>right</Alignment> <Elide>right</Elide> - <Size>1me,22f</Size> + <Size>1me,21f</Size> <Channel><Variable name="chanNum"/></Channel> </TrackProperty> </Children> @@ -66,6 +66,12 @@ Variables: </Children> </WidgetGroup><!-- /Time + Title --> + <TrackWidgetGroup> + <Size>0me,2f</Size> + <Group><Variable name="group"/></Group> + <TrackColorAlpha>255</TrackColorAlpha> + </TrackWidgetGroup> + <WidgetGroup><!-- Duration + by Artist --> <Layout>horizontal</Layout> <SizePolicy>min,me</SizePolicy> @@ -75,7 +81,7 @@ Variables: <TrackProperty> <ObjectName>Duration</ObjectName> - <Size>80me,22f</Size> + <Size>80me,21f</Size> <TooltipId>track_duration</TooltipId> <Property>durationFormatted</Property> <Alignment>left</Alignment> @@ -84,7 +90,7 @@ Variables: <Label> <ObjectName>TrackBy</ObjectName> - <Size>22f,22f</Size> + <Size>22f,21f</Size> <Text>by </Text> <Alignment>left</Alignment> </Label> diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss index 3395193975..d4cd922b4f 100644 --- a/res/skins/Tango/style.qss +++ b/res/skins/Tango/style.qss @@ -1180,7 +1180,6 @@ WBeatSpinBox, } #KeyDisplayMatch, #KeyControls { - margin-bottom: 1px; } #RateButtons { margin-top: 1px; |