Skip to content

Commit

Permalink
Merge pull request #2013 from ronso0/tango-spinnycover-fix
Browse files Browse the repository at this point in the history 
Tango :: fix spinny/cover with color schemes
  • Loading branch information
@daschuer
daschuer authored Feb 6, 2019
2 parents 59f4670 + a22b99c commit e0ea6d6
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 16 deletions.
8 changes: 4 additions & 4 deletions res/skins/Tango (64 Samplers)/skin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@
#Deck4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
color: #d910f0;}
<!-- Vinyl Controls toggle is transparent. This sets bg color so it matches those above -->
#DeckOverview1, #DeckOverview2 { background-color: #001D33;}
#DeckOverview3, #DeckOverview4 { background-color: #3A0440;}
#DeckOverviewRow1, #DeckOverviewRow2 { background-color: #001D33;}
#DeckOverviewRow3, #DeckOverviewRow4 { background-color: #3A0440;}
</Style>
</Scheme>
<Scheme>
Expand All @@ -168,8 +168,8 @@
#Deck3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
#Deck4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
color: #3693d9;}
#DeckOverview1, #DeckOverview2 { background-color: #3A0440;}
#DeckOverview3, #DeckOverview4 { background-color: #001D33;}
#DeckOverviewRow1, #DeckOverviewRow2 { background-color: #3A0440;}
#DeckOverviewRow3, #DeckOverviewRow4 { background-color: #001D33;}
<!-- brighter, broader library focus borders -->
QTreeView, QTableView { border-width: 2px;}
QTreeView:focus, QTableView:focus, WSearchLineEdit:focus {
Expand Down
0 ...s/Tango/graphics/spinnyMini_mask_blue.svg → .../Tango/graphics/spinny_mini_mask_blue.svg
View file
File renamed without changes
0 ...Tango/graphics/spinnyMini_mask_purple.svg → ...ango/graphics/spinny_mini_mask_purple.svg
View file
File renamed without changes
12 changes: 8 additions & 4 deletions res/skins/Tango/skin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
#Deck4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
color: #d910f0;}
<!-- Vinyl Controls toggle is transparent. This sets bg color so it matches those above -->
#DeckOverview1, #DeckOverview2 { background-color: #001D33;}
#DeckOverview3, #DeckOverview4 { background-color: #3A0440;}
#DeckOverviewRow1, #DeckOverviewRow2 { background-color: #001D33;}
#DeckOverviewRow3, #DeckOverviewRow4 { background-color: #3A0440;}
</Style>
</Scheme>
<Scheme>
Expand All @@ -162,8 +162,8 @@
#Deck3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
#Deck4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
color: #3693d9;}
#DeckOverview1, #DeckOverview2 { background-color: #3A0440;}
#DeckOverview3, #DeckOverview4 { background-color: #001D33;}
#DeckOverviewRow1, #DeckOverviewRow2 { background-color: #3A0440;}
#DeckOverviewRow3, #DeckOverviewRow4 { background-color: #001D33;}
<!-- brighter, broader library focus borders -->
QTreeView, QTableView { border-width: 2px;}
QTreeView:focus, QTableView:focus, WSearchLineEdit:focus {
Expand Down Expand Up @@ -285,6 +285,7 @@
<Children>
<Template src="skin:spinny_cover_mini.xml">
<SetVariable name="chanNum">1</SetVariable>
<SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_12"/></SetVariable>
</Template>
</Children>
</SingletonDefinition>
Expand All @@ -294,6 +295,7 @@
<Children>
<Template src="skin:spinny_cover_mini.xml">
<SetVariable name="chanNum">2</SetVariable>
<SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_12"/></SetVariable>
</Template>
</Children>
</SingletonDefinition>
Expand All @@ -303,6 +305,7 @@
<Children>
<Template src="skin:spinny_cover_mini.xml">
<SetVariable name="chanNum">3</SetVariable>
<SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_34"/></SetVariable>
</Template>
</Children>
</SingletonDefinition>
Expand All @@ -312,6 +315,7 @@
<Children>
<Template src="skin:spinny_cover_mini.xml">
<SetVariable name="chanNum">4</SetVariable>
<SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_34"/></SetVariable>
</Template>
</Children>
</SingletonDefinition>
Expand Down
16 changes: 8 additions & 8 deletions res/skins/Tango/spinny_cover_mini.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Variables:
<TooltipId>spinny</TooltipId>
<Size>40me,40me</Size>
<Group><Variable name="group"/></Group>
<PathBackground scalemode="STRETCH_ASPECT">graphics/spinnyMini_bg.svg</PathBackground>
<PathForeground scalemode="STRETCH_ASPECT">graphics/spinnyMini_indicator.svg</PathForeground>
<PathMask scalemode="STRETCH_ASPECT">graphics/spinnyMini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
<PathGhost scalemode="STRETCH_ASPECT">graphics/spinnyMini_indicator_ghost.svg</PathGhost>
<PathBackground scalemode="STRETCH_ASPECT">graphics/spinny_mini_bg.svg</PathBackground>
<PathForeground scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator.svg</PathForeground>
<PathMask scalemode="STRETCH_ASPECT">graphics/spinny_mini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
<PathGhost scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator_ghost.svg</PathGhost>
<ShowCover>false</ShowCover>
<Connection>
<ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
Expand All @@ -39,10 +39,10 @@ Variables:
<TooltipId>spinny</TooltipId>
<Size>40me,40me</Size>
<Group><Variable name="group"/></Group>
<PathBackground scalemode="STRETCH_ASPECT">graphics/spinnyMini_bg.svg</PathBackground>
<PathForeground scalemode="STRETCH_ASPECT">graphics/spinnyMini_indicator.svg</PathForeground>
<PathMask scalemode="STRETCH_ASPECT">graphics/spinnyMini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
<PathGhost scalemode="STRETCH_ASPECT">graphics/spinnyMini_indicator_ghost.svg</PathGhost>
<PathBackground scalemode="STRETCH_ASPECT">graphics/spinny_mini_bg.svg</PathBackground>
<PathForeground scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator.svg</PathForeground>
<PathMask scalemode="STRETCH_ASPECT">graphics/spinny_mini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
<PathGhost scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator_ghost.svg</PathGhost>
<ShowCover>true</ShowCover>
<Connection>
<ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
Expand Down

0 comments on commit e0ea6d6

Please sign in to comment.