Revamped deck header and added hot cue bar.

README.md

@@ -1,4 +1,4 @@
-# Replacement screens for the Native Instruments Traktor Kontrol D2, S5, and S8
+# Replacement screens for **Traktor Pro 3** and **Kontrol D2/S5/S8**
 
 **Contact:**
 
@@ -10,47 +10,48 @@
 
   - Preferences: Edit prefs file at Screens/Defines/Prefs.qml 
   - Global: Toggle between Open and Camelot key (toggle in prefs)
+  - Global: User defined phrase length (set in prefs)
   - Browser: Gauges for Key/BPM match (toggle in prefs)
   - Browser: Display 7 or 9 items on screen (toggle in prefs)
+  - Deck: Layout more closely resembles main Traktor layout
+  - Deck: All 9 data elements are configurable (set it prefs)
   - Deck: Spectrum colors (toggle in prefs)
-  - Deck: *EXPERIMENTAL* Beat/phase meter (toggle in prefs)
+  - Deck: Beat/phase meter (toggle in prefs)
   - Deck: Hide Album Art (toggle in prefs)
-  - Deck: Display keylock status
-  - Deck: Display key
-  - Deck: Display SYNC/MASTER status
-  - Deck: Display original BPM
+  - Deck: **NEW** Hot Cue bar which displays cue point names (toggle in prefs)
   - Deck: Added minute markers
-  - Deck: Added track comment (toggle in prefs)
-  - Deck: Toggle between beat countdown and beats from grid start (toggle in prefs)
-  - Deck: Always displays tempo offset
   - Deck: Darkened portion of stripe already played
-  - Deck: Time remaining to right of stripe (toggle in prefs)
   - FX: Added 2 additional lines
   - FX: Text now left-justified
 
 ## How to install
 
+**Download the mods:**
+
+  - At the top of the github page, click the green button labeled **Clone or download**
+  - Click **Download ZIP**
+  - Unzip the download if your operating system does not automatically
+
 **Mac:**
 
   - Quit Traktor
-  - Navigate to /Applications/Native Instruments/Traktor Pro 3
-  - Right click Traktor.app, then click Show Package Contents
-  - Navigate to Contents/Resources/qml
-  - Rename "Screens" folder to "ScreensBackup" 
-  - Copy "Screens" from download to this folder
+  - Navigate to **/Applications/Native Instruments/Traktor Pro 3**
+  - Right click **Traktor**, then click **Show Package Contents**
+  - Navigate to **Contents/Resources/qml**
+  - Rename the **Screens** folder to **ScreensBackup** 
+  - Copy the **Screens** folder from the download to this folder
   - Start Traktor
 
 **Windows:**
 
   - Quit Traktor
-  - Navigate to C:\Program Files\Native Instruments\Traktor Pro 3\Resources64\qml
-  - Make a backup of this directory!
-  - Rename "Screens" directory to "ScreensBackup"
-  - Copy "Screens" directory from download to this directory     
+  - Navigate to **C:\Program Files\Native Instruments\Traktor Pro 3\Resources64\qml
+  - Rename the **Screens** directory to *ScreensBackup**
+  - Copy the **Screens** directory from the download to this directory     
   - Start Traktor
 
 ## Screenshots
 
-![Deck](https://user-images.githubusercontent.com/757885/37592063-f58dec64-2b43-11e8-9727-1308d663786d.jpg)
-![Browser](https://user-images.githubusercontent.com/757885/45928219-371e9a80-bf0e-11e8-85b4-931cb41554a9.jpg))
+![Deck](https://user-images.githubusercontent.com/757885/47607125-e35e1000-d9e9-11e8-8005-36d73a504fa6.jpeg)
+![Browser](https://user-images.githubusercontent.com/757885/47607126-e6f19700-d9e9-11e8-95cd-b26d9b72ca34.jpeg)
 ![FX Browser](https://user-images.githubusercontent.com/757885/33605793-1ce1edb8-d989-11e7-861a-869e0d495d5e.jpg)

Screens/Defines/Prefs.qml

@@ -2,21 +2,46 @@ import QtQuick 2.0
 
 QtObject {
 
-// change the behavior of the mods by setting the following items to true or false
-
-// global preferences
-readonly property bool camelotKey: 				true
-
-// browser preferences
-readonly property bool displayMatchGuides:		true
-readonly property bool displayMoreItems:		true // toggle between 7 and 9 items on screen
-
-// deck preferences
-readonly property bool displayAlbumCover:		true
-readonly property int  displayBeatCounter:		1    // 0 = off, 1 = Count Down To Next Cue Point, 2 = Count From Grid Start
-readonly property bool displayPhaseMeter:		true
-readonly property bool displayTimeLeft:			true
-readonly property bool displayTrackComment:		true
-readonly property bool spectrumWaveformColors:	true
+	// global preferences
+	readonly property bool camelotKey: 				true
+	readonly property int  phraseLength:            4
+
+	// browser preferences
+	readonly property bool displayMatchGuides:		true
+	readonly property bool displayMoreItems:		true
+
+	// deck preferences
+	readonly property bool displayAlbumCover:		true
+	readonly property bool displayHotCueBar:		true
+	readonly property bool displayPhaseMeter:		true
+	readonly property bool spectrumWaveformColors:	true
+
+	// deck header text (use -1 to turn off)
+
+	readonly property int topLeftText:      0
+	readonly property int topCenterText:    14
+	readonly property int topRightText:     12
+
+	readonly property int middleLeftText:   1
+	readonly property int middleCenterText: 31
+	readonly property int middleRightText:  24
+
+	readonly property int bottomLeftText:   19
+	readonly property int bottomCenterText: 15
+	readonly property int bottomRightText:  28
+
+	// options:
+	//
+	// 0:  "title",          1: "artist",       2:  "release", 
+	// 3:  "mix",            4: "label",        5:  "catNo", 
+	// 6:  "genre",          7: "trackLength",  8:  "bitrate", 
+	// 9:  "bpmTrack",      10: "gain",        11: "elapsedTime", 
+	// 12: "remainingTime", 13: "beats",       14: "beatsToCue", 
+	// 15: "bpm",           16: "tempo",       17: "key", 
+	// 18: "keyText",       19: "comment",     20: "comment2",
+	// 21: "remixer",       22: "pitchRange",  23: "bpmStable", 
+	// 24: "tempoStable",   25: "sync",        26: "off", 
+	// 27: "off",           28: "bpmTrack"     29: "remixBeats"
+	// 30: "remixQuantize", 31: "keyDisplay"
 
 }

Screens/Defines/Utils.qml

@@ -4,12 +4,12 @@ QtObject {
 
   function convertToTimeString(inSeconds)
   {
-    return Math.floor(inSeconds / 60) + ":" + ("0" + Math.floor(inSeconds) % 60).slice(-2);
+    return ("0" + Math.floor(inSeconds / 60)).slice(-2) + ":" + ("0" + Math.floor(inSeconds) % 60).slice(-2);
   }
 
   function computeRemainingTimeString(length, elapsed)
   {
-    return elapsed > length ? convertToTimeString(0) : convertToTimeString(length - elapsed);
+    return "-" + (elapsed > length ? convertToTimeString(0) : convertToTimeString(length - elapsed));
   }
 
   function getKeyOffset(offset)

Screens/S8/Templates/Deck/DeckView.qml

@@ -43,7 +43,7 @@ Item {
 
   //--------------------------------------------------------------------------------------------------------------------
   // Properties defined by the designers
-  readonly property int smallDeckHeight:  58 //Waveform+Header
+  readonly property int smallDeckHeight:  70 //Waveform+Header
   readonly property int mediumDeckHeight: view.height - smallDeckHeight  //view.height-smallDeckHeight
   readonly property int largeDeckHeight:  view.height
   readonly property int speed:            durations.deckTransition

Screens/S8/Views/Browser/BrowserFooter.qml

@@ -145,7 +145,7 @@ Rectangle {
           text: ""
         }
 
-        Rectangle {
+        Text {
           id: divider
           height: 15
           width: 1