Created
July 1, 2017 19:04
-
-
Save eyalgo/85870ec257bea17f5a0e121d6a3947aa to your computer and use it in GitHub Desktop.
Diff files for Traktor Kontrol S5
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
165c165 | |
< color: colors.colorWhite09 | |
--- | |
> color: colors.colorWhite31 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
482c482,486 | |
< high1: rgba (255, 210, 220, 140), high2: rgba (255, 220, 230, 160) } | |
--- | |
> high1: rgba (255, 210, 220, 140), high2: rgba (255, 220, 230, 160) }, | |
> // Spectrum-like colors | |
> { low1: rgba (255, 50, 0, 150), low2: rgba (255, 70, 20, 170), | |
> mid1: rgba ( 80, 245, 80, 110), mid2: rgba ( 95, 245, 95, 130), | |
> high1: rgba ( 30, 85, 170, 255), high2: rgba ( 50, 100, 180, 255)} | |
487c491 | |
< return waveformColorsMap[0]; | |
--- | |
> return waveformColorsMap[8]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59c59 | |
< property int topMiddleState: hasTrackStyleHeader(deckType) ? 12 : 30 // headerSettingTopMid.value | |
--- | |
> property int topMiddleState: hasTrackStyleHeader(deckType) ? 13 : 30 // headerSettingTopMid.value | |
63c63 | |
< property int bottomMiddleState: hasTrackStyleHeader(deckType) ? 11 : 29 // headerSettingMidMid.value | |
--- | |
> property int bottomMiddleState: hasTrackStyleHeader(deckType) ? 15 : 29 // headerSettingMidMid.value | |
209c209 | |
< anchors.left: cover_small.right | |
--- | |
> anchors.left: parent.left | |
228c228 | |
< anchors.left: cover_small.right | |
--- | |
> anchors.left: parent.left | |
254a255,294 | |
> // top_middle_text: REMAINING TIME | |
> DeckHeaderText { | |
> id: top_middle_text2 | |
> deckId: deck_Id | |
> explicitName: "" | |
> maxTextWidth : 80 | |
> textState: 12 | |
> font.family: "Pragmatica" // is monospaced | |
> color: textColors[deck_Id] | |
> elide: Text.ElideRight | |
> font.pixelSize: fonts.middleFontSize | |
> horizontalAlignment: Text.AlignRight | |
> anchors.top: top_line.bottom | |
> anchors.right: parent.right | |
> anchors.topMargin: _intSetInState // set by 'state' | |
> anchors.rightMargin: 178 // set by 'state' | |
> Behavior on anchors.topMargin { NumberAnimation { duration: speed } } | |
> Behavior on anchors.rightMargin { NumberAnimation { duration: speed } } | |
> } | |
> | |
> // bottom_middle_text: ELAPSED TIME | |
> DeckHeaderText { | |
> id: bottom_middle_text2 | |
> deckId: deck_Id | |
> explicitName: "" | |
> maxTextWidth : 80 | |
> textState: 11 | |
> font.family: "Pragmatica" // is monospaced | |
> color: darkerTextColors[deck_Id] | |
> elide: Text.ElideRight | |
> opacity: _intSetInState // set by 'state' | |
> font.pixelSize: fonts.middleFontSize | |
> horizontalAlignment: Text.AlignRight | |
> anchors.top: top_line.bottom | |
> anchors.right: parent.right | |
> anchors.topMargin: 20 | |
> anchors.rightMargin: 178 | |
> Behavior on opacity { NumberAnimation { duration: speed } } | |
> } | |
> | |
400a441 | |
> visible: false | |
414a456 | |
> visible: false | |
428a471 | |
> visible: false | |
474a518 | |
> visible: false | |
501c545 | |
< anchors.rightMargin: 178 | |
--- | |
> anchors.rightMargin: 246 | |
649a694 | |
> PropertyChanges { target: top_middle_text2; font.pixelSize: fonts.middleFontSize; anchors.topMargin: 1 } | |
654a700 | |
> PropertyChanges { target: bottom_middle_text2; opacity: 0; } | |
666a713 | |
> PropertyChanges { target: top_middle_text2; font.pixelSize: fonts.largeFontSize; anchors.topMargin: 1 } | |
668a716 | |
> PropertyChanges { target: bottom_middle_text2; opacity: 1; } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
282c282 | |
< var phraseLen = 4; | |
--- | |
> var phraseLen = 8; | |
308,309c308,310 | |
< else if (isMaster) | |
< return "MASTER"; | |
--- | |
> var prefix = ""; | |
> if (isMaster) | |
> prefix = "M "; | |
311c312 | |
< return "SYNC"; | |
--- | |
> prefix = "S "; | |
315c316 | |
< return getStableTempoString(); | |
--- | |
> return prefix + getStableTempoString(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment