diff options
author | ronso0 <ronso0@mixxx.org> | 2020-04-10 18:28:21 +0200 |
---|---|---|
committer | ronso0 <ronso0@mixxx.org> | 2020-04-10 18:28:21 +0200 |
commit | 7ca309c92d15accb6045751c1d61bb0e9a15fe80 (patch) | |
tree | 9fdc491ed3f7b19656d0a0e60f932660de4f3ba5 /res | |
parent | 1735f6016e98c573ed885d1eb7e7cb53b2919f8e (diff) |
Tango: ClubTwist theme is default, remove Classic theme
Diffstat (limited to 'res')
-rw-r--r-- | res/skins/Tango (64 Samplers)/skin.xml | 70 | ||||
-rw-r--r-- | res/skins/Tango/skin.xml | 82 | ||||
-rw-r--r-- | res/skins/Tango/skin_preview.png (renamed from res/skins/Tango/skin_preview_ClubTwist.png) | bin | 119072 -> 119072 bytes | |||
-rw-r--r-- | res/skins/Tango/skin_preview_Classic.png | bin | 98637 -> 0 bytes | |||
-rw-r--r-- | res/skins/Tango/style.qss | 48 |
5 files changed, 50 insertions, 150 deletions
diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml index d397c6ad4e..008b252840 100644 --- a/res/skins/Tango (64 Samplers)/skin.xml +++ b/res/skins/Tango (64 Samplers)/skin.xml @@ -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"/> @@ -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 ####################################### diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml index baae007d6d..0b6ac2dd8a 100644 --- a/res/skins/Tango/skin.xml +++ b/res/skins/Tango/skin.xml @@ -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> @@ -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"/> @@ -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">#001D33</SetVariable> + <SetVariable name="SpinnyCoverColor_12">purple</SetVariable> + <SetVariable name="SpinnyCoverColor_34">blue</SetVariable> <!--################################################################ Singleton definitions ####################################### diff --git a/res/skins/Tango/skin_preview_ClubTwist.png b/res/skins/Tango/skin_preview.png Binary files differindex 7fcba2f060..7fcba2f060 100644 --- a/res/skins/Tango/skin_preview_ClubTwist.png +++ b/res/skins/Tango/skin_preview.png diff --git a/res/skins/Tango/skin_preview_Classic.png b/res/skins/Tango/skin_preview_Classic.png Binary files differdeleted file mode 100644 index a68a9f12af..0000000000 --- a/res/skins/Tango/skin_preview_Classic.png +++ /dev/null diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss index fd41769564..458d33ae54 100644 --- a/res/skins/Tango/style.qss +++ b/res/skins/Tango/style.qss @@ -115,16 +115,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 - */ - /*################################################################ @@ -1298,6 +1288,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: #3693d9; +} +WLabel#TrackBy, +WLabel#TrackByMini, +WLabel#TrackComment { + color: #888; +} +#DeckOverviewRow1, #DeckOverviewRow2 { + background-color: #3A0440; +} +#DeckOverviewRow3, #DeckOverviewRow4 { + background-color: #001D33; +} + + /*################################################################ ####### Channel Mixer ######################################## ##############################################################*/ @@ -2359,9 +2377,9 @@ WCoverArtMenu::item:!enabled, } #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; @@ -2416,12 +2434,13 @@ WCoverArtMenu::item:!enabled, margin: 0px; } #LibraryContainer QTreeView:focus, - #LibraryContainer QTableView:focus { /* + #LibraryContainer QTableView:focus, + #LibraryContainer WSearchLineEdit: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 */ @@ -2883,7 +2902,6 @@ WSearchLineEdit { } WSearchLineEdit:focus { padding: 1px; - border: 2px solid #ff6600; color: #eeeeee; } /* Clear button: see /skins/default.qss */ |