Unify attributes section in skin.xml, fix indentations in Shade skin.xml

mixxxdj · Oct 23, 2018 · 780829c · 780829c
1 parent 4e860fe
commit 780829c
Show file tree

Hide file tree

Showing 7 changed files with 638 additions and 624 deletions.
diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml
@@ -8,37 +8,48 @@
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
     <attributes>
+      <!-- Set skin defaults. -->
       <attribute config_key="[Master],num_decks">4</attribute>
-      <attribute config_key="[Master],num_samplers">64</attribute>
+      <attribute config_key="[Master],num_samplers">16</attribute>
       <attribute config_key="[Master],num_preview_decks">1</attribute>
-      <attribute config_key="[Library],show_library">1</attribute>
-
-      <!--Skin settings-->
       <attribute persist="true" config_key="[Deere],show_parallel_waveforms">1</attribute>
-      <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
-      <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
-
+      <!-- Decks -->
       <attribute persist="true" config_key="[Skin],show_4decks">0</attribute>
-      <attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_8_hotcues">0</attribute>
       <attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
-      <attribute persist="true" config_key="[Skin],show_spinnies">0</attribute>
-      <attribute persist="true" config_key="[Skin],show_starrating">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_big_spinny_coverart">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_rate_controls">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_starrating">1</attribute>
       <attribute persist="true" config_key="[Deere],show_track_info">1</attribute>
       <attribute persist="true" config_key="[Deere],show_bpm_info">1</attribute>
-      <attribute persist="true" config_key="[Skin],show_8_hotcues">0</attribute>
-
+      <!-- Mixer -->
       <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
-      <attribute persist="true" config_key="[Deere],show_crossfader">1</attribute>
       <attribute persist="true" config_key="[Skin],show_eq_knobs">1</attribute>
-      <attribute persist="true" config_key="[Skin],show_eq_kill_buttons">0</attribute>
-      <attribute persist="true" config_key="[Master],show_faders">1</attribute>
-      <attribute persist="true" config_key="[VinylControl],show_vinylcontrol">0</attribute>
-
-      <attribute persist="true" config_key="[Samplers],show_samplers">1</attribute>
-
-      <attribute persist="true" config_key="[EffectRack1],show">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_eq_kill_buttons">1</attribute>
+      <attribute persist="true" config_key="[Master],show_xfader">1</attribute>
+      <!-- Effects -->
+      <attribute persist="true" config_key="[EffectRack1],show">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>
       <attribute persist="true" config_key="[Skin],show_superknobs">0</attribute>
+      <!-- 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">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>
+      <!-- Library -->
+      <attribute config_key="[Master],maximize_library">0</attribute>
+      <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
+      <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
       <!--Disable hidden effect routing Buttons-->
       <attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[MasterOutput]_enable">0</attribute>
       <attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[BusLeft]_enable">0</attribute>

diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
@@ -8,46 +8,42 @@
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
     <attributes>
+      <!-- Set skin defaults. -->
       <attribute config_key="[Master],num_decks">4</attribute>
       <attribute config_key="[Master],num_samplers">16</attribute>
       <attribute config_key="[Master],num_preview_decks">1</attribute>
-      <attribute config_key="[Library],show_library">1</attribute>
-
-      <!--Skin settings-->
       <attribute persist="true" config_key="[Deere],show_parallel_waveforms">1</attribute>
-      <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
-      <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
-      <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
-
+      <!-- Decks -->
       <attribute persist="true" config_key="[Skin],show_4decks">0</attribute>
-      <attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_8_hotcues">0</attribute>
       <attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
-      <attribute persist="true" config_key="[Skin],show_spinnies">0</attribute>
-      <attribute persist="true" config_key="[Skin],show_starrating">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_big_spinny_coverart">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_rate_controls">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_starrating">1</attribute>
       <attribute persist="true" config_key="[Deere],show_track_info">1</attribute>
       <attribute persist="true" config_key="[Deere],show_bpm_info">1</attribute>
-      <attribute persist="true" config_key="[Skin],show_8_hotcues">0</attribute>
-
+      <!-- Mixer -->
       <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
-      <attribute persist="true" config_key="[Deere],show_crossfader">1</attribute>
       <attribute persist="true" config_key="[Skin],show_eq_knobs">1</attribute>
-      <attribute persist="true" config_key="[Skin],show_eq_kill_buttons">0</attribute>
-      <attribute persist="true" config_key="[Master],show_faders">1</attribute>
-      <attribute persist="true" config_key="[VinylControl],show_vinylcontrol">0</attribute>
-
-      <attribute persist="true" config_key="[Samplers],show_samplers">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_eq_kill_buttons">1</attribute>
+      <attribute persist="true" config_key="[Master],show_xfader">1</attribute>
+      <!-- Effects -->
+      <attribute persist="true" config_key="[EffectRack1],show">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_superknobs">0</attribute>
+      <!-- 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">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="[EffectRack1],show">1</attribute>
-      <attribute persist="true" config_key="[Skin],show_superknobs">0</attribute>
 
+      <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
+      <!-- Library -->
+      <attribute config_key="[Master],maximize_library">0</attribute>
+      <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
+      <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
       <!--Disable hidden effect routing Buttons-->
       <attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[MasterOutput]_enable">0</attribute>
       <attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[BusLeft]_enable">0</attribute>

diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
@@ -39,26 +39,33 @@
     <attributes>
       <!-- Set skin defaults. -->
       <attribute config_key="[Master],num_decks">4</attribute>
-      <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
-      <attribute persist="true" config_key="[EffectRack1],show">0</attribute>
-      <attribute persist="true" config_key="[Samplers],show_samplers">0</attribute>
-      <attribute persist="true" config_key="[Vinylcontrol],show_vinylcontrol">0</attribute>
-      <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
-      <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
-      <attribute persist="true" config_key="[Master],show_eqs">1</attribute>
-      <attribute persist="true" config_key="[Master],show_eq_kill_buttons">1</attribute>
-      <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
+      <attribute config_key="[Master],num_samplers">4</attribute>
+      <!-- Decks -->
       <attribute persist="true" config_key="[Skin],show_4decks">0</attribute>
-      <attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>
-      <attribute persist="true" config_key="[Library],show_library">1</attribute>
-      <attribute persist="true" config_key="[Master],show_xfader">1</attribute>
       <attribute persist="true" config_key="[Skin],show_8_hotcues">0</attribute>
       <attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
       <attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
       <attribute persist="true" config_key="[Skin],show_big_spinny_coverart">0</attribute>
+      <attribute persist="true" config_key="[Vinylcontrol],show_vinylcontrol">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_rate_controls">1</attribute>
+      <!-- Mixer -->
+      <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_eq_knobs">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_eq_kill_buttons">1</attribute>
+      <attribute persist="true" config_key="[Master],show_xfader">1</attribute>
+      <!-- Effects -->
+      <attribute persist="true" config_key="[EffectRack1],show">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_superknobs">0</attribute>
+
+      <attribute persist="true" config_key="[Samplers],show_samplers">0</attribute>
+      <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
+      <!-- Library -->
       <attribute config_key="[Master],maximize_library">0</attribute>
+      <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
+      <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
+
       <attribute config_key="[Master],skin_settings">0</attribute>
-      <attribute persist="true" config_key="[Skin],show_rate_controls">1</attribute>
       <!--Disable hidden effect routing Buttons-->
       <attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[MasterOutput]_enable">0</attribute>
       <attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[BusLeft]_enable">0</attribute>