Updated for Traktor Pro 3.4.

kokernutz · Sep 30, 2020 · 9ec1b5c · 9ec1b5c
1 parent 1fbdb3e
commit 9ec1b5c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Replacement screens for **Traktor Pro 3.3** and **Kontrol D2/S5/S8 and S4 MK3**
+# Replacement screens for **Traktor Pro 3.4** and **Kontrol D2/S5/S8 and S4 MK3**
 
 **Contact:**
 

diff --git a/Screens/Defines/Colors.qml b/Screens/Defines/Colors.qml
@@ -7,16 +7,16 @@ QtObject {
   readonly property variant textColors:         [colors.colorDeckBlueBright,  colors.colorDeckBlueBright,   colors.colorGrey232,  colors.colorGrey232 ]
   readonly property variant mixerFXColors:      [colors.colorMixerFXOrange, colors.colorMixerFXRed, colors.colorMixerFXGreen, colors.colorMixerFXBlue, colorMixerFXYellow]
 
-  // this categorizes any rgb value to multiples of 8 for each channel to avoid unbalanced colors on the display (r5-g6-b5 bit)
-  // function neutralizer(value) { if(value%8 > 4) { return  value - value%8 + 8} else { return  value - value%8 }}
-  function neutralizer(value) { return value}
-
   property variant colorMixerFXOrange:          rgba(250, 132, 42, 255)
   property variant colorMixerFXRed:             rgba(254, 0, 0, 255)
   property variant colorMixerFXGreen:           rgba(78, 225, 12, 255)
   property variant colorMixerFXBlue:            rgba(92, 201, 238, 255)
   property variant colorMixerFXYellow:          rgba(254, 217, 36, 255)
 
+  // this categorizes any rgb value to multiples of 8 for each channel to avoid unbalanced colors on the display (r5-g6-b5 bit)
+  // function neutralizer(value) { if(value%8 > 4) { return  value - value%8 + 8} else { return  value - value%8 }}
+  function neutralizer(value) { return value}
+
   property variant colorBlack:                  rgba (0, 0, 0, 255)
   property variant colorBlack94:                rgba (0, 0, 0, 240)
   property variant colorBlack88:                rgba (0, 0, 0, 224)

diff --git a/Screens/Images/BrowserIcons/Browser_Icon_MusicFolder.png b/Screens/Images/BrowserIcons/Browser_Icon_MusicFolder.png
diff --git a/Screens/S8/Views/Browser/BrowserFooter.qml b/Screens/S8/Views/Browser/BrowserFooter.qml
@@ -268,9 +268,13 @@ Rectangle {
 
 
     function getSortingNameForSortId(id) {
-      var pos = getPosForSortId(id);
-      if (pos >= 0 && pos < sortNames.length)
-      return sortNames[pos];
+      if (id >= 0)
+      {
+        var pos = getPosForSortId(id);
+
+        if (pos >= 0 && pos < sortNames.length)
+          return sortNames[pos];
+      }
       return "SORTED";
     }
 

diff --git a/Screens/S8/Views/Overlays/CenterOverlays/BrowserSorting.qml b/Screens/S8/Views/Overlays/CenterOverlays/BrowserSorting.qml
@@ -17,7 +17,6 @@ CenterOverlay {
   function getText(id) {
     // the given numbers are determined by the EContentListColumns in Traktor
     switch (id) {
-      case -1:
       case 0:   return "#"
       case 2:   return "TITLE"
       case 3:   return "ARTIST"

diff --git a/Screens/S8/Views/Waveform/Stripe.qml b/Screens/S8/Views/Waveform/Stripe.qml
@@ -35,22 +35,6 @@ Traktor.Stripe {
 
    //--------------------------------------------------------------------------------------------------------------------
 
-  Rectangle
-  {
-    id: darkenAlreadyPlayedBox
-
-    anchors.top:       parent.top
-    anchors.left:      parent.left
-    height:            parent.height
-    width:             Math.max(Math.min(elapsedTime.value / trackLength.value, 1), 0) * parent.width
-
-    radius:            1
-    color:             colors.colorBlack66
-    antialiasing:      false
-  }
-
-   //--------------------------------------------------------------------------------------------------------------------
-
   Rectangle {
     id: trackEndWarningOverlay
 
@@ -200,6 +184,22 @@ Traktor.Stripe {
 
   //--------------------------------------------------------------------------------------------------------------------
 
+  Rectangle
+  {
+    id: darkenAlreadyPlayedBox
+
+    anchors.top:       parent.top
+    anchors.left:      parent.left
+    height:            parent.height
+    width:             Math.max(Math.min(elapsedTime.value / trackLength.value, 1), 0) * parent.width
+
+    radius:            1
+    color:             colors.colorBlack66
+    antialiasing:      false
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+
   Repeater {
     id: minuteMarkers
     model: Math.floor(trackLength.value / 60)