Merge remote-tracking branch 'mixxx/master' into tango-remove-classic

12 files changed, 350 insertions, 324 deletions

diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml
index fcb4236eec..8ddd5897ec 100644
--- a/res/skins/Deere (64 Samplers)/skin.xml
+++ b/res/skins/Deere (64 Samplers)/skin.xml
@@ -3,8 +3,8 @@
   <manifest>
     <title>Deere</title>
     <author>RJ Ryan, S.Brandt</author>
-    <version>2.1.0.01</version>
-    <description>A flexible skin.</description>
+    <version>2.3.0.01</version>
+    <description>A flexible skin with stacked or split waveforms, 4 decks and 64 samplers.</description>
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
     <attributes>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 54dd2b8fe1..5c53966795 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -3,8 +3,8 @@
   <manifest>
     <title>Deere</title>
     <author>RJ Ryan, S.Brandt</author>
-    <version>2.1.0.01</version>
-    <description>A flexible skin.</description>
+    <version>2.3.0.01</version>
+    <description>A flexible skin with stacked or split waveforms, 4 decks and 8 samplers.</description>
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
     <attributes>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index d4dff089bf..c4fd52d031 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -228,7 +228,8 @@
 }
 
 #LibraryContainer QTableView:focus,
-#LibraryContainer QTreeView:focus {
+#LibraryContainer QTreeView:focus,
+#LibraryContainer QTextBrowser:focus {
   border: 1px solid #FF6600;
 }
 
@@ -583,15 +584,6 @@ WLibrary QRadioButton::indicator:unchecked {
 #DlgAnalysis > QPushButton:focus,
 #fadeModeCombobox:focus,
 #DlgAutoDJ QSpinBox:focus {
-  border: 1px solid #bbb;
-  outline: none;
-}
-#DlgMissing > QPushButton:checked:focus,
-#DlgHidden > QPushButton:checked:focus,
-#DlgAutoDJ > QPushButton:checked:focus,
-#DlgRecording > QPushButton:checked:focus,
-#DlgAnalysis > QPushButton:checked:focus {
-  border: 1px solid #d2d2d2;
   outline: none;
 }
 
@@ -656,6 +648,25 @@ QPushButton#pushButtonRepeatPlaylist {
 }
 /* AutoDJ button icons */
 
+/* Recording info */
+#labelRecPrefix,
+#labelRecFilename,
+#labelRecStatistics {
+  text-transform: none;
+  padding: 3px 0px 0px 0px;
+  margin: 0px;
+}
+#labelRecPrefix {
+  margin-left: 3px;
+}
+#labelRecFilename {
+  font-weight: bold;
+}
+#labelRecPrefix,
+#labelRecStatistics {
+  font-weight: normal;
+}
+
 /* Scroll bars */
 #LibraryContainer QScrollBar:horizontal,
 WEffectSelector QAbstractScrollArea QScrollBar:horizontal,
@@ -811,6 +822,7 @@ WLibrary QLabel,
 WLibrary QPushButton {
   font-family: "Open Sans";
   font-size: 12px;
+  font-weight: bold;
   text-transform: uppercase;
 }
 
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index a448ee8400..631f0888ac 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -31,7 +31,7 @@
     <title>LateNight</title>
     <author>owilliams</author>
     <version>2.3.0.01</version>
-    <description>A nighttime-compatible skin</description>
+    <description>A wide nighttime skin with stacked waveforms, 4 decks and 8 samplers.</description>
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
     <attributes>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 12eae2b8da..ae5c52703c 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -29,7 +29,6 @@ WOverview /* Hotcue labels in the overview */ {
 }
 
 /* regular font weight */
-WSearchLineEdit,
 QToolTip,
 #LibraryContainer QMenu,
 WCueMenuPopup,
@@ -506,18 +505,6 @@ QHeaderView::down-arrow {
   #DlgAutoDJ > QPushButton:focus,
   #DlgRecording > QPushButton:focus,
   #DlgAnalysis > QPushButton:focus {
-    border-width: 2px 2px 2px 2px;
-    border-image: url(skin:buttons_classic/btn_embedded_library.svg) 2 2 2 2;
-    outline: none;
-  }
-  #DlgAnalysis > QPushButton:checked:focus,
-  #DlgMissing > QPushButton:checked:focus,
-  #DlgHidden > QPushButton:checked:focus,
-  #DlgAutoDJ > QPushButton:checked:focus,
-  #DlgRecording > QPushButton:checked:focus,
-  #DlgAnalysis > QPushButton:checked:focus {
-    border-width: 2px 2px 2px 2px;
-    border-image: url(skin:buttons_classic/btn_embedded_library_active.svg) 2 2 2 2;
     outline: none;
   }
   #DlgMissing > QPushButton:pressed,
@@ -525,7 +512,7 @@ QHeaderView::down-arrow {
   #DlgAutoDJ > QPushButton:pressed,
   #DlgRecording > QPushButton:pressed,
   #DlgAnalysis > QPushButton:pressed {
-    border-image: url(skin:buttons_classic/btn_embedded_library_pressed.svg) 2 2 2 2;
+    border-image: url(skin:buttons_classic/btn_embedded_library_active.svg) 2 2 2 2;
     color: #d2d2d2;
   }
   #DlgMissing > QPushButton:!enabled,
@@ -2042,7 +2029,8 @@ WLibrary,
 }
 
 #LibraryContainer QTableView:focus,
-#LibraryContainer QTreeView:focus {
+#LibraryContainer QTreeView:focus,
+#LibraryContainer QTextBrowser:focus {
   border: 1px solid #ff6600;
 }
 
@@ -2342,7 +2330,8 @@ WLibrary QRadioButton {
 }
 
 /* Additional space for QLabels */
-WLibrary QLabel {
+#DlgAnalysis QLabel,
+#DlgAutoDJ QLabel {
   margin: 2px 5px 5px 1px;
 }
 
@@ -2363,7 +2352,7 @@ WLibrary QRadioButton::indicator:unchecked {
 #DlgAutoDJ > QPushButton,
 #DlgRecording > QPushButton,
 #DlgAnalysis > QPushButton {
-  margin: 0px 4px 3px 2px;
+  margin: 0px 6px 3px 0px;
   padding: 0px;
   height: 20px;
   }
@@ -2373,12 +2362,10 @@ WLibrary QRadioButton::indicator:unchecked {
 #DlgAnalysis > QPushButton {
   padding: 0px 5px;
   }
-  /* Focus highlight is set via border-image at the top */
-  /* Space in between 'Enable AutoDJ' and transition time spinbox */
   QPushButton#pushButtonAutoDJ {
-    margin-left: 0px;
     min-width: 40px;
   }
+  /* Space in between 'Enable AutoDJ' and transition time spinbox */
   #DlgAutoDJ > #horizontalSpacer {
     width: 100px;
   }
@@ -2391,7 +2378,20 @@ WLibrary QRadioButton::indicator:unchecked {
     margin-left: 12px;
   }
 
-
+#labelRecPrefix,
+#labelRecFilename,
+#labelRecStatistics {
+  text-transform: none;
+  font-size: 13px;
+  padding: 0px 0px 3px 0px;
+  }
+  #labelRecFilename {
+    font-weight: bold;
+  }
+  #labelRecPrefix,
+  #labelRecStatistics {
+    font-weight: normal;
+  }
 
 #LibraryContainer QTreeView {
   show-decoration-selected: 0;
@@ -2484,7 +2484,6 @@ WEffectSelector, WEffectSelector::item,
 WBeatSpinBox,
 #spinBoxTransition,
 #SkinSettings,
-WSearchLineEdit,
 WEffectSelector, WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea {
   font-size: 13px/13px;
diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml
index 444c389737..3356f10f77 100644
--- a/res/skins/Shade/preview_deck.xml
+++ b/res/skins/Shade/preview_deck.xml
@@ -1,263 +1,274 @@
 <Template>
-	<WidgetGroup>
-		<Size>e,</Size>
-		<Layout>vertical</Layout>
-		<Children>
-			<WidgetGroup>
-				<ObjectName>SamplerTopBorder</ObjectName>
-				<Size>0e,5f</Size>
-				<BackPath>style/style_bg_deck_border.png</BackPath>
-			</WidgetGroup>
+  <WidgetGroup>
+    <Size>e,</Size>
+    <Layout>vertical</Layout>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>PreviewDeckContainer</ObjectName>
+        <Size>e,</Size>
+        <Layout>vertical</Layout>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>SamplerTopBorder</ObjectName>
+            <Size>0e,5f</Size>
+            <BackPath>style/style_bg_deck_border.png</BackPath>
+          </WidgetGroup>
 
-			<!-- Middle part: left border, text/overview, VU, volume, right border -->
-			<WidgetGroup>
-				<Size>0e,54f</Size>
-				<Layout>horizontal</Layout>
-				<Style>
-					QWidget { margin: 0; padding: 0; }
-				</Style>
-				<Children>
-					<WidgetGroup>
-						<ObjectName>SamplerLeftBorder</ObjectName>
-						<Size>5f,0e</Size>
-						<BackPath>style/style_bg_deck_border.png</BackPath>
-					</WidgetGroup>
+          <!-- Middle part: left border, text/overview, VU, volume, right border -->
+          <WidgetGroup>
+            <Size>0e,54f</Size>
+            <Layout>horizontal</Layout>
+            <Style>
+              QWidget { margin: 0; padding: 0; }
+            </Style>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>SamplerLeftBorder</ObjectName>
+                <Size>5f,0e</Size>
+                <BackPath>style/style_bg_deck_border.png</BackPath>
+              </WidgetGroup>
 
-					<WidgetGroup>
-						<BackPath>style/style_bg_sampler_mid.png</BackPath>
-						<Layout>vertical</Layout>
-						<Children>
+              <WidgetGroup>
+                <BackPath>style/style_bg_sampler_mid.png</BackPath>
+                <Layout>vertical</Layout>
+                <Children>
 
-							<WidgetGroup>
-								<Layout>horizontal</Layout>
-								<Children>
-									<WidgetGroup>
-										<Size>0e,18f</Size>
-										<Layout>horizontal</Layout>
-										<Children>
-											<Text>
-												<TooltipId>text</TooltipId>
-												<Style>QLabel { font: bold 12px/14px sans-serif;
-													font-family: "Open Sans";
-													background-color: transparent;
-													color: #191F24;
-													text-align: left;
-													padding-left: 1px;
-													padding-top: 2px;}
-												</Style>
-												<Group>[PreviewDeck1]</Group>
-												<SizePolicy>me,min</SizePolicy>
-												<Elide>right</Elide>
-											</Text>
-										</Children>
-									</WidgetGroup>
-									<WidgetGroup>
-										<Size>35f,18f</Size>
-										<Children>
-											<Number>
-												<TooltipId>visual_bpm</TooltipId>
-												<Style>QLabel { font: bold 9px sans-serif;
-													font-family: "Open Sans";
-													background-color: transparent;
-													color: #191F24;
-													padding-right: 0;
-													padding-top: 2px;}
-												</Style>
-												<Size>35f,18f</Size>
-												<Group>[PreviewDeck1]</Group>
-												<!--CSS alignments not respected see bug lp:605530 , lets call <Alignment> -->
-												<Alignment>right</Alignment>
-												<Connection>
-													<ConfigKey>[PreviewDeck1],visual_bpm</ConfigKey>
-												</Connection>
-											</Number>
-										</Children>
-									</WidgetGroup>
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <WidgetGroup>
+                        <Size>0e,18f</Size>
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <Text>
+                            <TooltipId>text</TooltipId>
+                            <Style>QLabel { font: bold 12px/14px sans-serif;
+                              font-family: "Open Sans";
+                              background-color: transparent;
+                              color: #191F24;
+                              text-align: left;
+                              padding-left: 1px;
+                              padding-top: 2px;}
+                            </Style>
+                            <Group>[PreviewDeck1]</Group>
+                            <SizePolicy>me,min</SizePolicy>
+                            <Elide>right</Elide>
+                          </Text>
+                        </Children>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                        <Size>35f,18f</Size>
+                        <Children>
+                          <Number>
+                            <TooltipId>visual_bpm</TooltipId>
+                            <Style>QLabel { font: bold 9px sans-serif;
+                              font-family: "Open Sans";
+                              background-color: transparent;
+                              color: #191F24;
+                              padding-right: 0;
+                              padding-top: 2px;}
+                            </Style>
+                            <Size>35f,18f</Size>
+                            <Group>[PreviewDeck1]</Group>
+                            <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment> -->
+                            <Alignment>right</Alignment>
+                            <Connection>
+                              <ConfigKey>[PreviewDeck1],visual_bpm</ConfigKey>
+                            </Connection>
+                          </Number>
+                        </Children>
+                      </WidgetGroup>
 
-									<WidgetGroup>
-										<ObjectName>SamplerRightBorder</ObjectName>
-										<Size>1f,0e</Size>
-										<BackPath>style/style_bg_deck_border.png</BackPath>
-									</WidgetGroup>
+                      <WidgetGroup>
+                        <ObjectName>SamplerRightBorder</ObjectName>
+                        <Size>1f,0e</Size>
+                        <BackPath>style/style_bg_deck_border.png</BackPath>
+                      </WidgetGroup>
 
-									<WidgetGroup>
-										<Size>20f,18f</Size>
-										<Children>
-											<PushButton>
-												<TooltipId>eject</TooltipId>
-												<NumberStates>1</NumberStates>
-												<State>
-													<Number>0</Number>
-													<Pressed>skin:/btn/btn_eject_over.png</Pressed>
-													<Unpressed>skin:/btn/btn_eject.png</Unpressed>
-												</State>
-												<Connection>
-													<ConfigKey>[PreviewDeck1],eject</ConfigKey>
-													<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-													<ButtonState>LeftButton</ButtonState>
-													<ConnectValueToWidget>false</ConnectValueToWidget>
-												</Connection>
-											</PushButton>
-										</Children>
-									</WidgetGroup>
-								</Children>
-							</WidgetGroup>
+                      <WidgetGroup>
+                        <Size>20f,18f</Size>
+                        <Children>
+                          <PushButton>
+                            <TooltipId>eject</TooltipId>
+                            <NumberStates>1</NumberStates>
+                            <State>
+                              <Number>0</Number>
+                              <Pressed>skin:/btn/btn_eject_over.png</Pressed>
+                              <Unpressed>skin:/btn/btn_eject.png</Unpressed>
+                            </State>
+                            <Connection>
+                              <ConfigKey>[PreviewDeck1],eject</ConfigKey>
+                              <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                              <ButtonState>LeftButton</ButtonState>
+                              <ConnectValueToWidget>false</ConnectValueToWidget>
+                            </Connection>
+                          </PushButton>
+                        </Children>
+                      </WidgetGroup>
+                    </Children>
+                  </WidgetGroup>
 
-							<WidgetGroup>
-								<Size>0e,1f</Size>
-								<BackPath>style/style_bg_deck_border.png</BackPath>
-							</WidgetGroup>
+                  <WidgetGroup>
+                    <Size>0e,1f</Size>
+                    <BackPath>style/style_bg_deck_border.png</BackPath>
+                  </WidgetGroup>
 
-							<WidgetGroup>
-								<ObjectName>SamplerMid</ObjectName>
-								<Size>0e,35f</Size>
-								<Layout>horizontal</Layout>
-								<Children>
-									<WidgetGroup>
-										<ObjectName>SamplerMid</ObjectName>
-										<Size>27f,35f</Size>
-										<BackPath>style/style_bg_sampler_mid.png</BackPath>
-										<Children>
-											<PushButton>
-												<TooltipId>play_start</TooltipId>
-												<NumberStates>2</NumberStates>
-												<State>
-													<Number>0</Number>
-													<Pressed>skin:/btn/btn_play_sampler_down.png</Pressed>
-													<Unpressed>skin:/btn/btn_play_sampler.png</Unpressed>
-												</State>
-												<State>
-													<Number>1</Number>
-													<Pressed>skin:/btn/btn_play_previewdeck_overdown.png</Pressed>
-													<Unpressed>skin:/btn/btn_play_previewdeck_over.png</Unpressed>
-												</State>
-												<Pos>3,7</Pos>
-												<Connection>
-													<ConfigKey>[PreviewDeck1],play</ConfigKey>
-													<EmitOnDownPress>true</EmitOnDownPress>
-													<ButtonState>LeftButton</ButtonState>
-												</Connection>
-												<Connection>
-													<ConfigKey>[PreviewDeck1],start</ConfigKey>
-													<EmitOnDownPress>true</EmitOnDownPress>
-													<ButtonState>RightButton</ButtonState>
-													<ConnectValueToWidget>false</ConnectValueToWidget>
-												</Connection>
-											</PushButton>
-										</Children>
-									</WidgetGroup>
-									<WidgetGroup>
-										<ObjectName>SamplerMid</ObjectName>
-										<Size>0e,35f</Size>
-										<BackPath>style/style_bg_sampler_mid.png</BackPath>
-										<Layout>horizontal</Layout>
-										<Children>
-											<Overview>
-												<TooltipId>waveform_overview</TooltipId>
-												<Group>[PreviewDeck1]</Group>
-												<Pos>0,0</Pos>
-												<Size>0e,35f</Size>
-												<BgColor>#8D98A3</BgColor>
-												<PlayedOverlayColor>#60000000</PlayedOverlayColor>
-												<SignalHighColor></SignalHighColor>
-												<SignalMidColor></SignalMidColor>
-												<SignalLowColor></SignalLowColor>
-												<SignalColor>#191F24</SignalColor>
-												<PlayPosColor>#00FF00</PlayPosColor>
-												<ShowCueTimes>false</ShowCueTimes>
-												<DefaultMark>
-													<Align>top</Align>
-													<Color>#FD0564</Color>
-													<TextColor>#FFFFFF</TextColor>
-													<Text> %1 </Text>
-												</DefaultMark>
-												<Connection>
-													<ConfigKey>[PreviewDeck1],playposition</ConfigKey>
-													<EmitOnDownPress>false</EmitOnDownPress>
-												</Connection>
-											</Overview>
-										</Children>
-									</WidgetGroup>
-								</Children>
-							</WidgetGroup>
-						</Children>
-					</WidgetGroup>
+                  <WidgetGroup>
+                    <ObjectName>SamplerMid</ObjectName>
+                    <Size>0e,35f</Size>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <WidgetGroup>
+                        <ObjectName>SamplerMid</ObjectName>
+                        <Size>27f,35f</Size>
+                        <BackPath>style/style_bg_sampler_mid.png</BackPath>
+                        <Children>
+                          <PushButton>
+                            <TooltipId>play_start</TooltipId>
+                            <NumberStates>2</NumberStates>
+                            <State>
+                              <Number>0</Number>
+                              <Pressed>skin:/btn/btn_play_sampler_down.png</Pressed>
+                              <Unpressed>skin:/btn/btn_play_sampler.png</Unpressed>
+                            </State>
+                            <State>
+                              <Number>1</Number>
+                              <Pressed>skin:/btn/btn_play_previewdeck_overdown.png</Pressed>
+                              <Unpressed>skin:/btn/btn_play_previewdeck_over.png</Unpressed>
+                            </State>
+                            <Pos>3,7</Pos>
+                            <Connection>
+                              <ConfigKey>[PreviewDeck1],play</ConfigKey>
+                              <EmitOnDownPress>true</EmitOnDownPress>
+                              <ButtonState>LeftButton</ButtonState>
+                            </Connection>
+                            <Connection>
+                              <ConfigKey>[PreviewDeck1],start</ConfigKey>
+                              <EmitOnDownPress>true</EmitOnDownPress>
+                              <ButtonState>RightButton</ButtonState>
+                              <ConnectValueToWidget>false</ConnectValueToWidget>
+                            </Connection>
+                          </PushButton>
+                        </Children>
+                      </WidgetGroup>
+                      <WidgetGroup>
+                        <ObjectName>SamplerMid</ObjectName>
+                        <Size>0e,35f</Size>
+                        <BackPath>style/style_bg_sampler_mid.png</BackPath>
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <Overview>
+                            <TooltipId>waveform_overview</TooltipId>
+                            <Group>[PreviewDeck1]</Group>
+                            <Pos>0,0</Pos>
+                            <Size>0e,35f</Size>
+                            <BgColor>#8D98A3</BgColor>
+                            <PlayedOverlayColor>#60000000</PlayedOverlayColor>
+                            <SignalHighColor></SignalHighColor>
+                            <SignalMidColor></SignalMidColor>
+                            <SignalLowColor></SignalLowColor>
+                            <SignalColor>#191F24</SignalColor>
+                            <PlayPosColor>#00FF00</PlayPosColor>
+                            <ShowCueTimes>false</ShowCueTimes>
+                            <DefaultMark>
+                              <Align>top</Align>
+                              <Color>#FD0564</Color>
+                              <TextColor>#FFFFFF</TextColor>
+                              <Text> %1 </Text>
+                            </DefaultMark>
+                            <Connection>
+                              <ConfigKey>[PreviewDeck1],playposition</ConfigKey>
+                              <EmitOnDownPress>false</EmitOnDownPress>
+                            </Connection>
+                          </Overview>
+                        </Children>
+                      </WidgetGroup>
+                    </Children>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup>
 
-					<WidgetGroup>
-						<ObjectName>SamplerRightBorder</ObjectName>
-						<Size>1f,0e</Size>
-						<BackPath>style/style_bg_deck_border.png</BackPath>
-					</WidgetGroup>
+              <WidgetGroup>
+                <ObjectName>SamplerRightBorder</ObjectName>
+                <Size>1f,0e</Size>
+                <BackPath>style/style_bg_deck_border.png</BackPath>
+              </WidgetGroup>
 
-					<WidgetGroup>
-						<ObjectName>SamplerVUMeter</ObjectName>
-						<BackPath>style/style_bg_deck_pane.png</BackPath>
-						<Size>9f,54f</Size>
-						<Style>
-							QWidget { margin: 0px; padding: 2px; }
-						</Style>
-						<Children>
-							<StatusLight>
-								<TooltipId>sampler_PeakIndicator</TooltipId>
-								<PathStatusLight>skin:/style/volume_clipping_previewdeck_over.png</PathStatusLight>
-								<PathBack>skin:/style/volume_clipping_previewdeck.png</PathBack>
-								<Pos>2,2</Pos>
-								<Size>5f,8f</Size>
-								<Connection>
-									<ConfigKey>[PreviewDeck1],PeakIndicator</ConfigKey>
-								</Connection>
-							</StatusLight>
-							<VuMeter>
-								<TooltipId>sampler_VuMeter</TooltipId>
-								<PathVu>skin:/style/volume_display_previewdeck_over.png</PathVu>
-								<PathBack>skin:/style/volume_display_previewdeck.png</PathBack>
-								<Pos>2,11</Pos>
-								<Size>5f,41f</Size>
-								<Horizontal>false</Horizontal>
-								<PeakHoldSize>5</PeakHoldSize>
-								<PeakHoldTime>500</PeakHoldTime>
-								<PeakFallTime>50</PeakFallTime>
-								<PeakFallStep>2</PeakFallStep>
-								<Connection>
-									<ConfigKey>[PreviewDeck1],VuMeter</ConfigKey>
-								</Connection>
-							</VuMeter>
-						</Children>
-					</WidgetGroup>
+              <WidgetGroup>
+                <ObjectName>SamplerVUMeter</ObjectName>
+                <BackPath>style/style_bg_deck_pane.png</BackPath>
+                <Size>9f,54f</Size>
+                <Style>
+                  QWidget { margin: 0px; padding: 2px; }
+                </Style>
+                <Children>
+                  <StatusLight>
+                    <TooltipId>sampler_PeakIndicator</TooltipId>
+                    <PathStatusLight>skin:/style/volume_clipping_previewdeck_over.png</PathStatusLight>
+                    <PathBack>skin:/style/volume_clipping_previewdeck.png</PathBack>
+                    <Pos>2,2</Pos>
+                    <Size>5f,8f</Size>
+                    <Connection>
+                      <ConfigKey>[PreviewDeck1],PeakIndicator</ConfigKey>
+                    </Connection>
+                  </StatusLight>
+                  <VuMeter>
+                    <TooltipId>sampler_VuMeter</TooltipId>
+                    <PathVu>skin:/style/volume_display_previewdeck_over.png</PathVu>
+                    <PathBack>skin:/style/volume_display_previewdeck.png</PathBack>
+                    <Pos>2,11</Pos>
+                    <Size>5f,41f</Size>
+                    <Horizontal>false</Horizontal>
+                    <PeakHoldSize>5</PeakHoldSize>
+                    <PeakHoldTime>500</PeakHoldTime>
+                    <PeakFallTime>50</PeakFallTime>
+                    <PeakFallStep>2</PeakFallStep>
+                    <Connection>
+                      <ConfigKey>[PreviewDeck1],VuMeter</ConfigKey>
+                    </Connection>
+                  </VuMeter>
+                </Children>
+              </WidgetGroup>
 
-					<WidgetGroup>
-						<BackPath>style/style_bg_deck_pane.png</BackPath>
-						<Size>10f,54f</Size>
-						<Children>
-							<SliderComposed>
-								<TooltipId>pregain</TooltipId>
-								<Pos>0,1</Pos>
-								<Size>8f,52f</Size>
-								<Handle>knob_volume_previewdeck.png</Handle>
-								<Horizontal>false</Horizontal>
-								<Connection>
-									<ConfigKey>[PreviewDeck1],pregain</ConfigKey>
-									<EmitOnDownPress>false</EmitOnDownPress>
-								</Connection>
-							</SliderComposed>
-						</Children>
-					</WidgetGroup>
+              <WidgetGroup>
+                <BackPath>style/style_bg_deck_pane.png</BackPath>
+                <Size>10f,54f</Size>
+                <Children>
+                  <SliderComposed>
+                    <TooltipId>pregain</TooltipId>
+                    <Pos>0,1</Pos>
+                    <Size>8f,52f</Size>
+                    <Handle>knob_volume_previewdeck.png</Handle>
+                    <Horizontal>false</Horizontal>
+                    <Connection>
+                      <ConfigKey>[PreviewDeck1],pregain</ConfigKey>
+                      <EmitOnDownPress>false</EmitOnDownPress>
+                    </Connection>
+                  </SliderComposed>
+                </Children>
+              </WidgetGroup>
 
-					<WidgetGroup>
-						<ObjectName>SamplerRightBorder</ObjectName>
-						<Size>5f,0e</Size>
-						<BackPath>style/style_bg_deck_border.png</BackPath>
-					</WidgetGroup>
-				</Children>
-			</WidgetGroup>
-			<!-- /Middle part: left border, text/overview, VU, volume, right border -->
+              <WidgetGroup>
+                <ObjectName>SamplerRightBorder</ObjectName>
+                <Size>5f,0e</Size>
+                <BackPath>style/style_bg_deck_border.png</BackPath>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+          <!-- /Middle part: left border, text/overview, VU, volume, right border -->
 
-			<WidgetGroup>
-				<ObjectName>SamplerBottomBorder</ObjectName>
-				<Size>0e,5f</Size>
-				<BackPath>style/style_bg_deck_border.png</BackPath>
-			</WidgetGroup>
-		</Children>
-	</WidgetGroup>
+          <WidgetGroup>
+            <ObjectName>SamplerBottomBorder</ObjectName>
+            <Size>0e,5f</Size>
+            <BackPath>style/style_bg_deck_border.png</BackPath>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup>
+    </Children>
+    <Connection>
+      <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
 </Template>
 
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
index 9a94e72d17..6b7778a2cb 100644
--- a/res/skins/Shade/skin.xml
+++ b/res/skins/Shade/skin.xml
@@ -53,8 +53,8 @@
   <manifest>
     <title>Shade</title>
     <author>jus</author>
-    <version>2.1.0.01</version>
-    <description>A 2-deck split-waveform skin with 4 samplers.</description>
+    <version>2.3.0.1</version>
+    <description>A very compact skin with split waveforms, 2 decks and 8 samplers.</description>
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
     <attributes>
@@ -445,33 +445,13 @@
                 <WidgetGroup>
                   <Layout>vertical</Layout>
                   <Children>
-                    <!-- Preview deck -->
-                    <WidgetGroup>
-                      <Style>
-                        QGroupBox {
-                          margin: 2px 0px 4px 3px;
-                        }
-                      </Style>
-                      <Layout>horizontal</Layout>
-                      <Children>
-                        <Template src="skin:preview_deck.xml"/>
-                      </Children>
-                      &