Skip to content

Commit

Permalink
Merge pull request #2647 from ronso0/tango-remove-classic
Browse files Browse the repository at this point in the history 
Tango: ClubTwist theme is default, remove Classic theme
  • Loading branch information
@Holzhaus
Holzhaus authored Apr 25, 2020
2 parents f6dc977 + fbb7c70 commit f54afa6
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 151 deletions.
70 changes: 8 additions & 62 deletions res/skins/Tango (64 Samplers)/skin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,68 +123,6 @@
<attribute persist="false" config_key="[EffectRack1_EffectUnit4],group_[BusTalkover]_enable">0</attribute>
</attributes>
</manifest>
<!-- ################################################################
Skin Colour Schemes ##########################################
###############################################################
-->
<Schemes>
<Scheme>
<Name>Classic</Name>
<Filters/>
<!-- Colors for waveform & overview -->
<SetVariable name="SignalColor_12">#5EBAFF</SetVariable>
<SetVariable name="SignalBgColor_12">#001D33</SetVariable>
<SetVariable name="SignalColor_34">#DF4DF0</SetVariable>
<SetVariable name="SignalBgColor_34">#3A0440</SetVariable>
<!-- small Spinny mask and default mini cover should match -->
<SetVariable name="SpinnyCoverColor_12">blue</SetVariable>
<SetVariable name="SpinnyCoverColor_34">purple</SetVariable>
<SetVariable name="EndOfTrackColor">#EA0085</SetVariable>
<Style>
<!-- All text labels in decks (artist, title, time, BPM, key, ...) -->
#Deck1 WLabel, #DeckMini1 WLabel, #RateContainer1 WLabel, #RateContainer1 WPushButton,
#Deck2 WLabel, #DeckMini2 WLabel, #RateContainer2 WLabel, #RateContainer2 WPushButton {
color: #33a8ff;}
#Deck3 WLabel, #DeckMini3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
#Deck4 WLabel, #DeckMini4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
color: #d910f0;}
WLabel#TrackBy, WLabel#TrackByMini, WLabel#TrackComment { color: #888;}
<!-- Vinyl Controls toggle is transparent. This sets bg color so it matches those above -->
#DeckOverviewRow1, #DeckOverviewRow2 { background-color: #001D33;}
#DeckOverviewRow3, #DeckOverviewRow4 { background-color: #3A0440;}
</Style>
</Scheme>
<Scheme>
<Name>ClubTwist</Name>
<SetVariable name="SignalColor_12">#DF4DF0</SetVariable>
<SetVariable name="SignalBgColor_12">#3A0440</SetVariable>
<SetVariable name="SignalColor_34">#5EBAFF</SetVariable>
<SetVariable name="SignalBgColor_34">#001D33</SetVariable>
<SetVariable name="SpinnyCoverColor_12">purple</SetVariable>
<SetVariable name="SpinnyCoverColor_34">blue</SetVariable>
<!-- Cyan end-of-track warning -->
<SetVariable name="EndOfTrackColor">#00ffff</SetVariable>
<Style>
#Deck1 WLabel, #DeckMini1 WLabel, #RateContainer1 WLabel, #RateContainer1 WPushButton,
#Deck2 WLabel, #DeckMini2 WLabel, #RateContainer2 WLabel, #RateContainer2 WPushButton {
color: #e145f3;}
#Deck3 WLabel, #DeckMini3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
#Deck4 WLabel, #DeckMini4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
color: #3693d9;}
WLabel#TrackBy, WLabel#TrackByMini, WLabel#TrackComment { color: #888;}
#DeckOverviewRow1, #DeckOverviewRow2 { background-color: #3A0440;}
#DeckOverviewRow3, #DeckOverviewRow4 { background-color: #001D33;}
<!-- brighter, broader library focus borders -->
#LibraryContainer QTreeView,
#LibraryContainer QTableView {
border-width: 2px;}
#LibraryContainer QTreeView:focus,
#LibraryContainer QTableView:focus,
#LibraryContainer WSearchLineEdit:focus {
border-color: #ff8800;}
</Style>
</Scheme>
</Schemes>

<ObjectName>Mixxx</ObjectName>
<Style src="skin:../Tango/style.qss" src-mac="skin:../Tango/style-mac.qss"/>
Expand Down Expand Up @@ -238,6 +176,14 @@
<SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
<SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
<SetVariable name="PlayedOverlayColor">#99000000</SetVariable>
<!-- Cyan end-of-track warning -->
<SetVariable name="EndOfTrackColor">#00ffff</SetVariable>
<SetVariable name="SignalColor_12">#DF4DF0</SetVariable>
<SetVariable name="SignalBgColor_12">#3A0440</SetVariable>
<SetVariable name="SignalColor_34">#5EBAFF</SetVariable>
<SetVariable name="SignalBgColor_34">#001D33</SetVariable>
<SetVariable name="SpinnyCoverColor_12">purple</SetVariable>
<SetVariable name="SpinnyCoverColor_34">blue</SetVariable>

<!--################################################################
Singleton definitions #######################################
Expand Down
2 changes: 1 addition & 1 deletion ...ango/graphics/cover_default_mini_blue.svg → ...ngo/graphics/cover_default_mini_green.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion .../Tango/graphics/spinny_mini_mask_blue.svg → ...Tango/graphics/spinny_mini_mask_green.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
82 changes: 9 additions & 73 deletions res/skins/Tango/skin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,9 @@
<!-- Samplers -->
<attribute persist="true" config_key="[Samplers],show_samplers">0</attribute>
<!-- item index in skin_settings_sampler_rows.xml, '1' enables 2 sampler rows -->
<attribute persist="true" config_key="[Skin],sampler_rows">4</attribute>
<attribute persist="true" config_key="[Skin],sampler_rows">1</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_1_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_2_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_3_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_4_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_5_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_6_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_7_expanded">0</attribute>
<attribute persist="true" config_key="[Skin],sampler_row_8_expanded">0</attribute>

<attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>

Expand Down Expand Up @@ -123,72 +117,6 @@
<attribute persist="false" config_key="[EffectRack1_EffectUnit4],group_[BusTalkover]_enable">0</attribute>
</attributes>
</manifest>
<!-- ################################################################
Skin Colour Schemes ##########################################
###############################################################
-->
<Schemes>
<Scheme>
<Name>Classic</Name>
<Filters/>
<!-- Colors for waveform & overview -->
<SetVariable name="SignalColor_12">#5EBAFF</SetVariable>
<SetVariable name="SignalBgColor_12">#001D33</SetVariable>
<SetVariable name="SignalColor_34">#DF4DF0</SetVariable>
<SetVariable name="SignalBgColor_34">#3A0440</SetVariable>
<!-- small Spinny mask and default mini cover should match -->
<SetVariable name="SpinnyCoverColor_12">blue</SetVariable>
<SetVariable name="SpinnyCoverColor_34">purple</SetVariable>
<SetVariable name="EndOfTrackColor">#EA0085</SetVariable>
<Style>
<!-- All text labels in decks (artist, title, time, BPM, key, ...) -->
#Deck1 WLabel, #DeckMini1 WLabel, #RateContainer1 WLabel, #RateContainer1 WPushButton,
#Deck2 WLabel, #DeckMini2 WLabel, #RateContainer2 WLabel, #RateContainer2 WPushButton {
color: #33a8ff;}
#Deck3 WLabel, #DeckMini3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
#Deck4 WLabel, #DeckMini4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
color: #d910f0;}
WLabel#TrackBy, WLabel#TrackByMini, WLabel#TrackComment { color: #888;}
<!-- Vinyl Controls toggle is transparent. This sets bg color so it matches those above -->
#DeckOverviewRow1, #DeckOverviewRow2 { background-color: #001D33;}
#DeckOverviewRow3, #DeckOverviewRow4 { background-color: #3A0440;}
</Style>
</Scheme>
<Scheme>
<Name>ClubTwist</Name>
<SetVariable name="SignalColor_12">#DF4DF0</SetVariable>
<SetVariable name="SignalBgColor_12">#3A0440</SetVariable>
<SetVariable name="SignalColor_34">#5EBAFF</SetVariable>
<SetVariable name="SignalBgColor_34">#001D33</SetVariable>
<SetVariable name="SpinnyCoverColor_12">purple</SetVariable>
<SetVariable name="SpinnyCoverColor_34">blue</SetVariable>
<!-- Cyan end-of-track warning -->
<SetVariable name="EndOfTrackColor">#00ffff</SetVariable>
<Style>
#Deck1 WLabel, #DeckMini1 WLabel, #RateContainer1 WLabel, #RateContainer1 WPushButton,
#Deck2 WLabel, #DeckMini2 WLabel, #RateContainer2 WLabel, #RateContainer2 WPushButton {
color: #e145f3;}
#Deck3 WLabel, #DeckMini3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
#Deck4 WLabel, #DeckMini4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
color: #3693d9;}
WLabel#TrackBy, WLabel#TrackByMini, WLabel#TrackComment { color: #888;}
#DeckOverviewRow1, #DeckOverviewRow2 { background-color: #3A0440;}
#DeckOverviewRow3, #DeckOverviewRow4 { background-color: #001D33;}
<!-- brighter, broader library focus borders -->
#LibraryContainer QTreeView,
#LibraryContainer QTableView {
border-width: 2px;}
#LibraryContainer QTreeView:focus,
#LibraryContainer QTableView:focus,
#LibraryContainer WSearchLineEdit:focus,
WBeatSpinBox:focus,
QSpinBox#spinBoxTransition:focus,
WLibrary QLineEdit,
#LibraryBPMSpinBox {
border-color: #ff8800;}
</Style>
</Scheme>
</Schemes>

<ObjectName>Mixxx</ObjectName>
<Style src="skin:../Tango/style.qss" src-mac="skin:../Tango/style-mac.qss"/>
Expand Down Expand Up @@ -242,6 +170,14 @@
<SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
<SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
<SetVariable name="PlayedOverlayColor">#99000000</SetVariable>
<!-- Cyan end-of-track warning -->
<SetVariable name="EndOfTrackColor">#00ffff</SetVariable>
<SetVariable name="SignalColor_12">#DF4DF0</SetVariable>
<SetVariable name="SignalBgColor_12">#3A0440</SetVariable>
<SetVariable name="SignalColor_34">#5EBAFF</SetVariable>
<SetVariable name="SignalBgColor_34">#19260B</SetVariable>
<SetVariable name="SpinnyCoverColor_12">purple</SetVariable>
<SetVariable name="SpinnyCoverColor_34">green</SetVariable>

<!--################################################################
Singleton definitions #######################################
Expand Down
0 res/skins/Tango/skin_preview_ClubTwist.png → res/skins/Tango/skin_preview.png
View file
File renamed without changes
Binary file removed res/skins/Tango/skin_preview_Classic.png
View file
Binary file not shown.
47 changes: 33 additions & 14 deletions res/skins/Tango/style.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,6 @@ WWidgetGroup {
image: url(skin:/graphics/splitterVert_handle_pressed.svg);
}

/* ################################################################
####### Colors ##################################################
###############################################################*/

/* All deck-specific colors are now defined in <Schemes> in skin.xml.
- deck labels
- waveform & overview background/signal colors
- Spinny mini mask, mini default cover
*/



/*################################################################
Expand Down Expand Up @@ -1294,6 +1284,34 @@ WBeatSpinBox,
}


/* ################################################################
####### Deck Colors ##################################################
###############################################################*/
#Deck1 WLabel, #DeckMini1 WLabel,
#Deck2 WLabel, #DeckMini2 WLabel,
#RateContainer1 WLabel, #RateContainer1 WPushButton,
#RateContainer2 WLabel, #RateContainer2 WPushButton {
color: #e145f3;
}
#Deck3 WLabel, #DeckMini3 WLabel,
#Deck4 WLabel, #DeckMini4 WLabel,
#RateContainer3 WLabel, #RateContainer3 WPushButton,
#RateContainer4 WLabel, #RateContainer4 WPushButton {
color: #7DBF36;
}
WLabel#TrackBy,
WLabel#TrackByMini,
WLabel#TrackComment {
color: #888;
}
#DeckOverviewRow1, #DeckOverviewRow2 {
background-color: #3A0440;
}
#DeckOverviewRow3, #DeckOverviewRow4 {
background-color: #19260B;
}


/*################################################################
####### Channel Mixer ########################################
##############################################################*/
Expand Down Expand Up @@ -2409,9 +2427,9 @@ WTrackMenu QMenu::right-arrow {
}

#LibraryContainer QTableView,
#LibraryContainer #LibraryContainer QTextBrowser,
#LibraryContainer QTextBrowser,
#LibraryContainer QTreeView {
border: 1px solid #585858;
border: 2px solid #585858;
font-weight: normal;
color: #9e9e9e;
background-color: #0f0f0f;
Expand Down Expand Up @@ -2467,12 +2485,14 @@ WTrackMenu QMenu::right-arrow {
}
#LibraryContainer QTableView:focus,
#LibraryContainer QTreeView:focus,
#LibraryContainer QTableView:focus,
#LibraryContainer WSearchLineEdit:focus { /*
#LibraryContainer QTextBrowser:focus { /*
New Library navigation COs only work if TreeView or TableView have focus.
Clicking on buttons, sliders and visuals elsewhere removes focus from Library.
In conjunction with [Library],MoveFocusBackward/..Forward, some highlight
helps a lot. */
border-color: #ff6600;
border-color: #ff8800;
}

/* Closed branch icon in tree */
Expand Down Expand Up @@ -2942,7 +2962,6 @@ WSearchLineEdit {
}
WSearchLineEdit:focus {
padding: 1px;
border: 2px solid #ff6600;
color: #eeeeee;
}
/* Clear button: see /skins/default.qss */
Expand Down

0 comments on commit f54afa6

Please sign in to comment.