Merge branch 'master' of github.com:mixxxdj/mixxx into migrate-to-QJSEngine

19 files changed, 779 insertions, 530 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..f89e62e975 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;
 }
 
@@ -819,6 +831,13 @@ WOverview {
   text-transform: none;
 }
 
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  font-size: 16px;
+  font-weight: bold;
+  color: #73b3f7;
+}
+
 /* Start spacing for Deck overview row (small waveform, option grid) */
 #OptionGrid, #ButtonGrid {
   background-color: #333333;
@@ -1831,7 +1850,8 @@ QToolTip,
 WBeatSpinBox QMenu,
 WCueMenuPopup,
 WCueMenuPopup QMenu,
-WCoverArtMenu {
+WCoverArtMenu,
+WTrackMenu QMenu {
   padding: 2px;
 }
 WEffectSelector QAbstractScrollArea,
@@ -1856,10 +1876,16 @@ WCueMenuPopup QMenu,
 WCueMenuPopup QLabel,
 WCueMenuPopup QMenu::item,
 WCoverArtMenu,
-WCoverArtMenu::item {
-    color: #c1cabe;
-    background-color: #201f1f;
-  }
+WCoverArtMenu::item,
+WTrackMenu,
+WTrackMenu::item,
+WTrackMenu QCheckBox,
+WTrackMenu QMenu,
+WTrackMenu QMenu::item,
+WTrackMenu QMenu QCheckBox {
+  color: #c1cabe;
+  background-color: #201f1f;
+}
 WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox QAbstractScrollArea,
 QToolTip,
@@ -1867,19 +1893,29 @@ QToolTip,
 WBeatSpinBox QMenu,
 WCueMenuPopup,
 WCueMenuPopup QMenu,
-WCoverArtMenu {
+WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QMenu {
   border-width: 1px;
   border-style: solid;
   border-color: #aaa;
   border-radius: 1px;
-  }
+}
   /* hovered items */
   WEffectSelector::item:selected,
   #fadeModeCombobox::item:selected,
-  #LibraryContainer QMenu::item:selected,
   WBeatSpinBox QMenu::item:selected,
   WCueMenuPopup QMenu::item:selected,
   WCoverArtMenu::item:selected,
+  WTrackMenu::item:selected,
+  WTrackMenu QCheckBox:selected,
+  WTrackMenu QCheckBox:focus,
+  WTrackMenu QCheckBox:hover,
+  WTrackMenu QMenu::item:selected,
+  WTrackMenu QMenu QCheckBox:selected,
+  WTrackMenu QMenu QCheckBox:focus,
+  WTrackMenu QMenu QCheckBox:hover,
+  #LibraryContainer QMenu::item:selected,
   #LibraryContainer QMenu QCheckBox:selected,
   #LibraryContainer QMenu QCheckBox:focus,  /* selected by keyboard */
   #LibraryContainer QMenu QCheckBox:hover /* mouse hover */ {
@@ -1959,7 +1995,10 @@ WEffectSelector {
   WBeatSpinBox QMenu::item,
   WCueMenuPopup QMenu::item,
   WCoverArtMenu::item,
-  #LibraryContainer QMenu QCheckBox {
+  WTrackMenu::item,
+  WTrackMenu QCheckBox,
+  WTrackMenu QMenu::item,
+  WTrackMenu QMenu QCheckBox {
     padding: 0px;
     margin: 0px;
     image: none;
@@ -1969,7 +2008,9 @@ WEffectSelector {
   #LibraryContainer QMenu::separator,
   WBeatSpinBox QMenu::separator,
   WCueMenuPopup QMenu::separator,
-  WCoverArtMenu::separator {
+  WCoverArtMenu::separator,
+  WTrackMenu::separator,
+  WTrackMenu QMenu::separator {
     height: 0px;
     border-top: 1px solid #0a0a0a;
     margin: 4px;
@@ -1977,7 +2018,9 @@ WEffectSelector {
   #LibraryContainer QMenu::item,
   WBeatSpinBox QMenu::item,
   WCueMenuPopup QMenu::item,
-  WCoverArtMenu::item {
+  WCoverArtMenu::item,
+  WTrackMenu::item,
+  WTrackMenu QMenu::item {
     /* right padding creates a margin to the menu expand arrow,
     left padding should be bigger than menu icon width + menu icon
     margin */
@@ -1985,20 +2028,32 @@ WEffectSelector {
     }
   /* icons in editline menu (searchbox, editable track properties) */
   #LibraryContainer QMenu::icon,
+  #LibraryContainer QMenu QCheckBox::indicator,
+  #LibraryContainer QMenu::indicator,
   WBeatSpinBox QMenu::icon,
   WCueMenuPopup QMenu::icon,
   WCoverArtMenu::icon,
-  #LibraryContainer QMenu QCheckBox::indicator,
-  #LibraryContainer QMenu::indicator,
+  WTrackMenu::icon,
+  WTrackMenu QCheckBox::indicator,
+  WTrackMenu::indicator,
+  WTrackMenu QMenu::icon,
+  WTrackMenu QMenu QCheckBox::indicator,
+  WTrackMenu QMenu::indicator,
   WCoverArtMenu::indicator {
     margin: 0px 4px 0px 2px;
     padding: 1px;
     }
-  #LibraryContainer QMenu QCheckBox {
+  #LibraryContainer QMenu QCheckBox,
+  WTrackMenu QCheckBox,
+  WTrackMenu QMenu QCheckBox {
     padding: 2px 10px 2px 3px;
     }
   #LibraryContainer QMenu QCheckBox::indicator,
-  #LibraryContainer QMenu::indicator {
+  #LibraryContainer QMenu::indicator,
+  WTrackMenu QCheckBox::indicator,
+  WTrackMenu::indicator,
+  WTrackMenu QMenu QCheckBox::indicator,
+  WTrackMenu QMenu::indicator {
     width: 13px;
     height: 13px;
     border: 1px solid #555;
@@ -2008,11 +2063,19 @@ WEffectSelector {
     outline: none;
     }
   #LibraryContainer QMenu QCheckBox::indicator:selected,
-  #LibraryContainer QMenu::indicator:selected {
+  #LibraryContainer QMenu::indicator:selected,
+  WTrackMenu QCheckBox::indicator:selected,
+  WTrackMenu::indicator:selected,
+  WTrackMenu QMenu QCheckBox::indicator:selected,
+  WTrackMenu QMenu::indicator:selected {
     border: 1px solid #999;
     }
   #LibraryContainer QMenu QCheckBox::indicator:checked,
-  #LibraryContainer QMenu::indicator:checked {
+  #LibraryContainer QMenu::indicator:checked,
+  WTrackMenu QCheckBox::indicator:checked,
+  WTrackMenu::indicator:checked,
+  WTrackMenu QMenu QCheckBox::indicator:checked,
+  WTrackMenu QMenu::indicator:checked {
     image: url(skin:/icon/ic_library_checkmark.svg);
     }
   /* disabled menu item and checkbox */
@@ -2020,20 +2083,34 @@ WEffectSelector {
   WBeatSpinBox QMenu::item:!enabled,
   WCueMenuPopup QMenu::item:!enabled,
   WCoverArtMenu::item:!enabled,
+  WTrackMenu::item:!enabled,
+  WTrackMenu QCheckBox:!enabled,
+  WTrackMenu QMenu::item:!enabled,
+  WTrackMenu QMenu QCheckBox:!enabled,
   #LibraryContainer QMenu QCheckBox:!enabled {
     color: #555;
   }
-  #LibraryContainer QMenu QCheckBox::indicator:!enabled {
+  #LibraryContainer QMenu QCheckBox::indicator:!enabled,
+  WTrackMenu QCheckBox::indicator:!enabled,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled {
     border: 1px solid #222;
     background-color: #333;
   }
   #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked,
   #LibraryContainer QMenu QCheckBox::indicator:indeterminate,
-  #LibraryContainer QCheckBox::indicator:indeterminate:!enabled {
+  #LibraryContainer QCheckBox::indicator:indeterminate:!enabled,
+  WTrackMenu QCheckBox::indicator:!enabled:checked,
+  WTrackMenu QCheckBox::indicator:indeterminate,
+  WTrackMenu QCheckBox::indicator:indeterminate:!enabled,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled:checked,
+  WTrackMenu QMenu QCheckBox::indicator:indeterminate,
+  WTrackMenu QMenu QCheckBox::indicator:indeterminate:!enabled {
     image: url(skin:/icon/ic_library_checkmark_grey.svg);
   }
 
-  #LibraryContainer QMenu::right-arrow {
+  #LibraryContainer QMenu::right-arrow,
+  WTrackMenu::right-arrow,
+  WTrackMenu QMenu::right-arrow {
     width: 16px;
     height: 16px;
     image: url(skin:/icon/ic_chevron_right_48px.svg);
@@ -2042,7 +2119,15 @@ WEffectSelector {
   #LibraryContainer QHeaderView QMenu::indicator:checked,
   #LibraryContainer QHeaderView QMenu::indicator:checked:hover,
   #LibraryContainer QHeaderView QMenu::indicator:!checked,
-  #LibraryContainer QHeaderView QMenu::indicator:!checked:hover {
+  #LibraryContainer QHeaderView QMenu::indicator:!checked:hover,
+  WTrackMenu::indicator:checked,
+  WTrackMenu::indicator:checked:hover,
+  WTrackMenu::indicator:!checked,
+  WTrackMenu::indicator:!checked:hover,
+  WTrackMenu QMenu::indicator:checked,
+  WTrackMenu QMenu::indicator:checked:hover,
+  WTrackMenu QMenu::indicator:!checked,
+  WTrackMenu QMenu::indicator:!checked:hover {
     width: 12px;
     height: 10px;
     margin-left: 2px;
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..db26390830 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -21,6 +21,8 @@ QToolTip,
 WCueMenuPopup,
 WCueMenuPopup QMenu,
 WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QMenu,
 WOverview /* Hotcue labels in the overview */ {
   font-family: "Open Sans";
   text-transform: uppercase;
@@ -29,12 +31,13 @@ WOverview /* Hotcue labels in the overview */ {
 }
 
 /* regular font weight */
-WSearchLineEdit,
 QToolTip,
 #LibraryContainer QMenu,
 WCueMenuPopup,
 WCueMenuPopup QMenu,
 WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QMenu,
 WBeatSpinBox QMenu {
   font-weight: normal;
 }
@@ -50,6 +53,10 @@ WCueMenuPopup,
 WCueMenuPopup QMenu,
 WCoverArtMenu,
 WBeatSpinBox QMenu,
+WTrackMenu,
+WTrackMenu QCheckBox,
+WTrackMenu QMenu,
+WTrackMenu QMenu QCheckBox,
 WLibrary QHeaderView {
   text-transform: none;
 }
@@ -224,6 +231,10 @@ WCueMenuPopup QMenu,
 WCueMenuPopup QLabel,
 #CueLabelEdit,
 WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QCheckBox,
+WTrackMenu QMenu,
+WTrackMenu QMenu QCheckBox,
 #LatencyLabel, WTime {
   color: #f0bb2b;
   }
@@ -262,6 +273,13 @@ WCoverArtMenu,
   #FxButtonLabel {
     qproperty-alignment: 'AlignLeft | AlignVCenter';
     }
+
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  font-weight: bold;
+  color: #d09300;
+}
+
 /************** font colors **************************************************/
 /************** font settings *************************************************/
 
@@ -506,18 +524,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 +531,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 +2048,8 @@ WLibrary,
 }
 
 #LibraryContainer QTableView:focus,
-#LibraryContainer QTreeView:focus {
+#LibraryContainer QTreeView:focus,
+#LibraryContainer QTextBrowser:focus {
   border: 1px solid #ff6600;
 }
 
@@ -2342,7 +2349,8 @@ WLibrary QRadioButton {
 }
 
 /* Additional space for QLabels */
-WLibrary QLabel {
+#DlgAnalysis QLabel,
+#DlgAutoDJ QLabel {
   margin: 2px 5px 5px 1px;
 }
 
@@ -2363,7 +2371,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 +2381,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 +2397,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;
@@ -2446,6 +2465,8 @@ WBeatSpinBox QMenu,
 WCueMenuPopup,
 WCueMenuPopup QMenu,
 WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QMenu,
 #SkinSettings {
   padding: 3px;
   border: 1px solid #888;
@@ -2465,12 +2486,18 @@ WBeatSpinBox QMenu,
   #LibraryContainer QMenu,
   WCueMenuPopup QMenu,
   WCoverArtMenu,
+  WTrackMenu,
+  WTrackMenu QMenu,
 WBeatSpinBox QMenu::item,
   #LibraryContainer QMenu::item,
   WCueMenuPopup QMenu::item,
   WCueMenuPopup QLabel,
   WCoverArtMenu::item,
+  WTrackMenu::item,
+  WTrackMenu QMenu::item,
 #LibraryContainer QMenu QCheckBox,
+WTrackMenu QCheckBox,
+WTrackMenu QMenu QCheckBox,
 WBeatSpinBox,
 #spinBoxTransition,
 #SkinSettings,
@@ -2484,7 +2511,6 @@ WEffectSelector, WEffectSelector::item,
 WBeatSpinBox,
 #spinBoxTransition,
 #SkinSettings,
-WSearchLineEdit,
 WEffectSelector, WEffectSelector QAbstractScrollArea,
 #fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea {
   font-size: 13px/13px;
@@ -2496,9 +2522,17 @@ WEffectSelector, WEffectSelector QAbstractScrollArea,
   #LibraryContainer QMenu::item:selected,
   WCueMenuPopup QMenu::item:selected,
   WCoverArtMenu::item:selected,
+  WTrackMenu::item:selected,
+  WTrackMenu QMenu::item:selected,
   #LibraryContainer QMenu QCheckBox:selected,
   #LibraryContainer QMenu QCheckBox:focus,  /* selected by keyboard */
   #LibraryContainer QMenu QCheckBox:hover, /* mouse hover */
+  WTrackMenu QCheckBox:selected,
+  WTrackMenu QCheckBox:focus,
+  WTrackMenu QCheckBox:hover,
+  WTrackMenu QMenu QCheckBox:selected,
+  WTrackMenu QMenu QCheckBox:focus,
+  WTrackMenu QMenu QCheckBox:hover,
   #SkinSettingsButton:hover,
   #SkinSettingsLabelButton:hover {
     background-color: #5E4507;
@@ -2569,7 +2603,11 @@ WEffectSelector,
   #LibraryContainer QMenu::item,
   WCueMenuPopup QMenu::item,
   WCoverArtMenu::item,
-  #LibraryContainer QMenu QCheckBox {
+  WTrackMenu::item,
+  WTrackMenu QMenu::item,
+  #LibraryContainer QMenu QCheckBox,
+  WTrackMenu QCheckBox,
+  WTrackMenu QMenu QCheckBox {
       padding: 0px;
       margin: 0px;
       image: none;
@@ -2579,13 +2617,17 @@ WEffectSelector,
   WBeatSpinBox QMenu::separator,
   #LibraryContainer QMenu::separator,
   WCueMenuPopup QMenu::separator,
+  WTrackMenu::separator,
+  WTrackMenu QMenu::separator,
   #SkinSettingsSeparator {
     border-top: 1px solid #000;
     border-bottom: 1px solid #222;
     }
     WBeatSpinBox QMenu::separator,
     #LibraryContainer QMenu::separator,
-    WCueMenuPopup QMenu::separator {
+    WCueMenuPopup QMenu::separator,
+    WTrackMenu::separator,
+    WTrackMenu QMenu::separator {
         height: 0px;
         margin: 4px;
       }
@@ -2595,7 +2637,9 @@ WEffectSelector,
   WBeatSpinBox QMenu::item,
   #LibraryContainer QMenu::item,
   WCueMenuPopup QMenu::item,
-  WCoverArtMenu::item {
+  WCoverArtMenu::item,
+  WTrackMenu::item,
+  WTrackMenu QMenu::item {
   /* Right padding creates a margin to the menu expand arrow.
     Left padding should be bigger than menu icon width + menu icon
     left/right margin */
@@ -2606,18 +2650,28 @@ WEffectSelector,
   WBeatSpinBox QMenu::icon,
   #LibraryContainer QMenu::icon,
   WCueMenuPopup QMenu::icon,
+  WTrackMenu::icon,
+  WTrackMenu QMenu::icon,
   /* checkbox in Crate name context menu:
     "[ ] Auto DJ Track Source"  */
-  #LibraryContainer QMenu::indicator {
+  #LibraryContainer QMenu::indicator,
+  WTrackMenu::indicator,
+  WTrackMenu QMenu::indicator {
     margin: 0px 4px 0px 5px;
     }
   /* items in Crate sub menu */
-  #LibraryContainer QMenu QCheckBox {
+  #LibraryContainer QMenu QCheckBox,
+  WTrackMenu QCheckBox,
+  WTrackMenu QMenu QCheckBox {
     padding: 3px 10px 3px 5px;
     }
   #LibraryContainer QMenu QCheckBox::indicator,
   #LibraryContainer QMenu::indicator,
-  WCueMenuPopup QMenu::indicator {
+  WCueMenuPopup QMenu::indicator,
+  WTrackMenu QCheckBox::indicator,
+  WTrackMenu::indicator,
+  WTrackMenu QMenu QCheckBox::indicator,
+  WTrackMenu QMenu::indicator {
     width: 13px;
     height: 13px;
     border: 1px solid #333;
@@ -2628,39 +2682,61 @@ WEffectSelector,
     }
   #LibraryContainer QMenu QCheckBox::indicator:checked,
   #LibraryContainer QMenu::indicator:checked,
+  WTrackMenu QCheckBox::indicator:checked,
+  WTrackMenu::indicator:checked,
+  WTrackMenu QMenu QCheckBox::indicator:checked,
+  WTrackMenu QMenu::indicator:checked,
   WCueMenuPopup QMenu::indicator:checked {
     image: url(skin:/buttons_classic/btn__lib_checkmark_orange.svg);
     }
   /* disabled menu item and checkbox */
   #LibraryContainer QMenu QCheckBox:!enabled,
   #LibraryContainer QMenu::item:!enabled,
+  WTrackMenu QCheckBox:!enabled,
+  WTrackMenu::item:!enabled,
+  WTrackMenu QMenu QCheckBox:!enabled,
+  WTrackMenu QMenu::item:!enabled,
   WCueMenuPopup QMenu::item:!enabled,
   WCoverArtMenu::item:!enabled,
-  #LibraryContainer QMenu QCheckBox::indicator:!enabled {
+  #LibraryContainer QMenu QCheckBox::indicator:!enabled,
+  WTrackMenu QCheckBox::indicator:!enabled,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled {
     color: #494949;
     }
   #LibraryContainer QMenu QCheckBox::indicator:!enabled:!checked,
   #LibraryContainer QMenu::indicator:!enabled:!checked,
+  WTrackMenu QCheckBox::indicator:!enabled:!checked,
+  WTrackMenu::indicator:!enabled:!checked,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled:!checked,
+  WTrackMenu QMenu::indicator:!enabled:!checked,
   WCueMenuPopup QMenu::indicator:!enabled:!checked {
     border: 1px solid #222;
     background-color: #222;
     }
-  #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked {
+  #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked,
+  WTrackMenu QCheckBox::indicator:!enabled:checked,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled:checked {
     image: url(skin:/buttons_classic/btn__lib_checkmark_grey.svg);
     border: 1px solid #222;
     background-color: #222;
     }
   #LibraryContainer QMenu QCheckBox::indicator:indeterminate,
-  #LibraryContainer QCheckBox::indicator:indeterminate:!enabled {
+  #LibraryContainer QCheckBox::indicator:indeterminate:!enabled,
+  WTrackMenu QCheckBox::indicator:indeterminate,
+  WTrackMenu QMenu QCheckBox::indicator:indeterminate {
     image: url(skin:/buttons_classic/btn__lib_checkmark_grey.svg);
   }
 
-  #LibraryContainer QMenu::right-arrow {
+  #LibraryContainer QMenu::right-arrow,
+  WTrackMenu::right-arrow,
+  WTrackMenu QMenu::right-arrow {
     width: 10px;
     height: 10px;
     image: url(skin:/style_classic/menu_arrow_yellow.svg);
     }
-  #LibraryContainer QMenu::right-arrow:selected {
+  #LibraryContainer QMenu::right-arrow:selected,
+  WTrackMenu::right-arrow:selected,
+  WTrackMenu QMenu::right-arrow:selected {
     image: url(skin:/style_classic/menu_arrow_white.svg);
   }
 
diff --git a/res/skins/LateNight/style_flip.qss b/res/skins/LateNight/style_flip.qss
index 302d155d9b..c64ac9df9f 100644
--- a/res/skins/LateNight/style_flip.qss
+++ b/res/skins/LateNight/style_flip.qss
@@ -47,6 +47,10 @@ QToolTip,
 WBeatSpinBox QMenu,
 #LibraryContainer QMenu,
 #LibraryContainer QMenu QCheckBox,
+WTrackMenu,
+WTrackMenu QCheckBox,
+WTrackMenu QMenu,
+WTrackMenu QMenu QCheckBox,
 WCoverArtMenu,
 WCueMenuPopup,
 WCueMenuPopup QMenu,
@@ -95,6 +99,14 @@ WSearchLineEdit,
   WBeatSpinBox QMenu::item:selected,
   #LibraryContainer QMenu::item:selected,
   WCoverArtMenu::item:selected,
+  WTrackMenu::item:selected,
+  WTrackMenu QMenu::item:selected,
+  WTrackMenu QCheckBox:selected,
+  WTrackMenu QCheckBox:focus,
+  WTrackMenu QCheckBox:hover,
+  WTrackMenu QMenu QCheckBox:selected,
+  WTrackMenu QMenu QCheckBox:focus,
+  WTrackMenu QMenu QCheckBox:hover,
   #LibraryContainer QMenu QCheckBox:selected,
   #LibraryContainer QMenu QCheckBox:focus,  /* selected by keyboard */
   #LibraryContainer QMenu QCheckBox:hover /* mouse hover */ {
@@ -108,10 +120,14 @@ WSearchLineEdit,
     border: 1px solid #c88500;
     background-color: #050504;
   }
-  #LibraryContainer QMenu::right-arrow {
+  #LibraryContainer QMenu::right-arrow,
+  WTrackMenu::right-arrow,
+  WTrackMenu QMenu::right-arrow {
     image: url(skin:/style_classic/menu_arrow_gold.svg);
     }
-  #LibraryContainer QMenu::right-arrow:selected {
+  #LibraryContainer QMenu::right-arrow:selected,
+  WTrackMenu::right-arrow:selected,
+  WTrackMenu QMenu::right-arrow:selected {
     image: url(skin:/style_classic/menu_arrow_black.svg);
   }
 /* BPM lock icon */
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;}