Merge pull request #2647 from ronso0/tango-remove-classic

Tango: ClubTwist theme is default, remove Classic theme

7 files changed, 52 insertions, 151 deletions

diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml
index e7f7b0b23f..c6b306480c 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/graphics/cover_default_mini_blue.svg b/res/skins/Tango/graphics/cover_default_mini_green.svg
index f42ccd0ef9..7d73967af4 100644
--- a/res/skins/Tango/graphics/cover_default_mini_blue.svg
+++ b/res/skins/Tango/graphics/cover_default_mini_green.svg
@@ -1,2 +1,2 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg3969" width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4571" width="200" height="200" color="#000000" fill="#001d33"/><path id="path8" d="m100 9.2232c-50.148 0-90.777 40.695-90.777 90.808 0 50.113 40.629 90.746 90.777 90.746 50.148 0 90.777-40.632 90.777-90.746 0-50.113-40.629-90.808-90.777-90.808z" color="#000000" fill="#080808" stroke="#000" stroke-width="4" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path10" d="m100 57.314c-23.575 0-42.686 19.111-42.686 42.686 0 23.575 19.111 42.686 42.686 42.686 23.575 0 42.686-19.111 42.686-42.686 0-23.575-19.111-42.686-42.686-42.686z" fill="#414141"/><path id="path12" d="m102.5 100c0 1.3828-1.121 2.504-2.5039 2.504-1.3829 0-2.5039-1.1211-2.5039-2.504 0-1.3829 1.121-2.504 2.5039-2.504 1.3829 0 2.5039 1.121 2.5039 2.504z" fill="#1a1a1a"/></svg>
+<svg id="svg3969" width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4571" width="200" height="200" color="#000000" fill="#19260B"/><path id="path8" d="m100 9.2232c-50.148 0-90.777 40.695-90.777 90.808 0 50.113 40.629 90.746 90.777 90.746 50.148 0 90.777-40.632 90.777-90.746 0-50.113-40.629-90.808-90.777-90.808z" color="#000000" fill="#080808" stroke="#000" stroke-width="4" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path10" d="m100 57.314c-23.575 0-42.686 19.111-42.686 42.686 0 23.575 19.111 42.686 42.686 42.686 23.575 0 42.686-19.111 42.686-42.686 0-23.575-19.111-42.686-42.686-42.686z" fill="#414141"/><path id="path12" d="m102.5 100c0 1.3828-1.121 2.504-2.5039 2.504-1.3829 0-2.5039-1.1211-2.5039-2.504 0-1.3829 1.121-2.504 2.5039-2.504 1.3829 0 2.5039 1.121 2.5039 2.504z" fill="#1a1a1a"/></svg>
diff --git a/res/skins/Tango/graphics/spinny_mini_mask_blue.svg b/res/skins/Tango/graphics/spinny_mini_mask_green.svg
index 32af44507e..03e9fe29f9 100644
--- a/res/skins/Tango/graphics/spinny_mini_mask_blue.svg
+++ b/res/skins/Tango/graphics/spinny_mini_mask_green.svg
@@ -1 +1 @@
-<svg id="svg3826" width="50" height="50" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3828" d="m0 0v50h50v-50h-50zm25 1.0417c13.232 0 23.958 10.727 23.958 23.958 0 13.232-10.727 23.958-23.958 23.958-13.232 0-23.958-10.727-23.958-23.958 0-13.232 10.727-23.958 23.958-23.958z" fill="#001d33"/><path id="path3830" d="m48.958 25a23.958 23.958 0 0 1-47.917 0 23.958 23.958 0 1 1 47.917 0z" fill="none" stroke="#585858" stroke-width=".52083"/></svg>
+<svg id="svg3826" width="50" height="50" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3828" d="m0 0v50h50v-50h-50zm25 1.0417c13.232 0 23.958 10.727 23.958 23.958 0 13.232-10.727 23.958-23.958 23.958-13.232 0-23.958-10.727-23.958-23.958 0-13.232 10.727-23.958 23.958-23.958z" fill="#19260B"/><path id="path3830" d="m48.958 25a23.958 23.958 0 0 1-47.917 0 23.958 23.958 0 1 1 47.917 0z" fill="none" stroke="#585858" stroke-width=".52083"/></svg>
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index d5ec2587f5..0e0a5d282f 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">#19260B</SetVariable>
+    <SetVariable name="SpinnyCoverColor_12">purple</SetVariable>
+    <SetVariable name="SpinnyCoverColor_34">green</SetVariable>
 
 <!--################################################################
      Singleton definitions  #######################################
diff --git a/res/skins/Tango/skin_preview_ClubTwist.png b/res/skins/Tango/skin_preview.png
index 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
deleted 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 b4585363a1..0260f0a9be 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -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
- */
-
 
 
 /*################################################################
@@ -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  ########################################
 ##############################################################*/
@@ -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;
@@ -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 */
@@ -2942,7 +2962,6 @@ WSearchLineEdit {
   }
   WSearchLineEdit:focus {
     padding: 1px;
-    border: 2px solid #ff6600;
     color: #eeeeee;
   }
   /* Clear button: see /skins/default.qss */