|
diff --git a/Screens/Views/Deck/DeckHeader.qml b/Screens/Views/Deck/DeckHeader.qml |
|
index d6ee6df..d35db7f 100755 |
|
--- a/Screens/Views/Deck/DeckHeader.qml |
|
+++ b/Screens/Views/Deck/DeckHeader.qml |
|
@@ -56,11 +56,11 @@ Item { |
|
// NOTE: For now, we set fix states in the DeckHeader! But we wanna be able to |
|
// change the states. |
|
property int topLeftState: 0 // headerSettingTopLeft.value |
|
- property int topMiddleState: hasTrackStyleHeader(deckType) ? 12 : 30 // headerSettingTopMid.value |
|
+ property int topMiddleState: hasTrackStyleHeader(deckType) ? 13 : 30 // headerSettingTopMid.value |
|
property int topRightState: 23 // headerSettingTopRight.value |
|
|
|
property int bottomLeftState: 1 // headerSettingMidLeft.value |
|
- property int bottomMiddleState: hasTrackStyleHeader(deckType) ? 11 : 29 // headerSettingMidMid.value |
|
+ property int bottomMiddleState: hasTrackStyleHeader(deckType) ? 14 : 29 // headerSettingMidMid.value |
|
property int bottomRightState: 25 // headerSettingMidRight.value |
|
|
|
height: largeHeaderHeight |
|
@@ -201,7 +201,7 @@ Item { |
|
elide: Text.ElideRight |
|
font.pixelSize: fonts.largeFontSize // set in state |
|
anchors.top: top_line.bottom |
|
- anchors.left: cover_small.right |
|
+ anchors.left: parent.left |
|
|
|
anchors.topMargin: _intSetInState // set by 'state' |
|
anchors.leftMargin: _intSetInState // set by 'state' |
|
@@ -220,7 +220,7 @@ Item { |
|
elide: Text.ElideRight |
|
font.pixelSize: fonts.middleFontSize |
|
anchors.top: top_line.bottom |
|
- anchors.left: cover_small.right |
|
+ anchors.left: parent.left |
|
anchors.topMargin: 18 |
|
anchors.leftMargin: 5 |
|
Behavior on anchors.leftMargin { NumberAnimation { duration: speed } } |
|
@@ -267,6 +267,44 @@ Item { |
|
Behavior on opacity { NumberAnimation { duration: speed } } |
|
} |
|
|
|
+ // bottom_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: 113 |
|
+ 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 } } |
|
+ } |
|
// top_right_text: BPM |
|
DeckHeaderText { |
|
id: top_right_text |
|
@@ -393,6 +431,7 @@ Item { |
|
color: "black" |
|
anchors.fill: cover_small |
|
anchors.margins: -1 |
|
+ visible: false |
|
} |
|
|
|
DropShadow { |
|
@@ -407,6 +446,7 @@ Item { |
|
color: "#000000" |
|
transparentBorder: true |
|
source: blackBorder |
|
+ visible: false |
|
} |
|
|
|
Rectangle { |
|
@@ -421,6 +461,7 @@ Item { |
|
// if no cover can be found: blue / grey background (set in parent). Otherwise transparent |
|
opacity: (headerPropertyCover.value == "") ? 1.0 : 0.0 |
|
//visible: headerState == "large" && (opacity == 1.0) |
|
+ visible: false |
|
color: coverBgEmptyColors[deck_Id] |
|
Behavior on opacity { NumberAnimation { duration: speed } } |
|
Behavior on width { NumberAnimation { duration: speed } } |
|
@@ -467,6 +508,7 @@ Item { |
|
width: height |
|
anchors.top: cover_small.top |
|
anchors.left: cover_small.left |
|
+ visible: false |
|
} |
|
|
|
|
|
@@ -493,7 +535,7 @@ Item { |
|
anchors.top: top_line.bottom |
|
anchors.topMargin: 3 |
|
anchors.right: parent.right |
|
- anchors.rightMargin: 178 |
|
+ anchors.rightMargin: 246 |
|
|
|
width: 30 |
|
height: 30 |
|
@@ -642,11 +684,13 @@ Item { |
|
|
|
|
|
PropertyChanges { target: top_middle_text; font.pixelSize: fonts.middleFontSize; anchors.topMargin: 1 } |
|
+ PropertyChanges { target: top_middle_text2; font.pixelSize: fonts.middleFontSize; anchors.topMargin: 1 } |
|
PropertyChanges { target: top_right_text; font.pixelSize: fonts.middleFontSize; anchors.topMargin: 1 } |
|
PropertyChanges { target: bottom_left_text; opacity: 0; } |
|
PropertyChanges { target: bottom_warning_text; opacity: 0; } |
|
|
|
PropertyChanges { target: bottom_middle_text; opacity: 0; } |
|
+ PropertyChanges { target: bottom_middle_text2; opacity: 0; } |
|
PropertyChanges { target: bottom_right_text; opacity: 0; } |
|
}, |
|
State { |
|
@@ -659,10 +703,12 @@ Item { |
|
PropertyChanges { target: top_warning_text; font.pixelSize: fonts.largeFontSize; anchors.topMargin: -2 } |
|
|
|
PropertyChanges { target: top_middle_text; font.pixelSize: fonts.largeFontSize; anchors.topMargin: 1 } |
|
+ PropertyChanges { target: top_middle_text2; font.pixelSize: fonts.largeFontSize; anchors.topMargin: 1 } |
|
PropertyChanges { target: top_right_text; font.pixelSize: fonts.largeFontSize; anchors.topMargin: 1 } |
|
+ |
|
PropertyChanges { target: bottom_middle_text; opacity: 1; } |
|
+ PropertyChanges { target: bottom_middle_text2; opacity: 1; } |
|
PropertyChanges { target: bottom_left_text; opacity: 1; anchors.leftMargin: (deckType.description === "Live Input" || directThru.value) ? -1 : 5} |
|
- |
|
PropertyChanges { target: bottom_right_text; opacity: 1; } |
|
} |
|
] |
if you wanna get Rekordbox style colors with RGB then use this
{ low1: rgba (0, 81, 234, 140), low2: rgba (0, 81, 234, 160), mid1: rgba (195, 95, 0, 255), mid2: rgba (195, 95, 0, 255), high1: rgba (253, 235, 211, 255), high2: rgba (253, 235, 211, 255) }