-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3992 from Holzhaus/qml-demo-skin-additions
QML demo skin additions
- Loading branch information
Showing
35 changed files
with
1,078 additions
and
127 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| import "." as Skin | ||
| import QtQuick 2.12 | ||
| import QtQuick.Controls 2.12 | ||
| import QtQuick.Layouts 1.12 | ||
| import "Theme" | ||
|
|
||
| Row { | ||
| id: root | ||
|
|
||
| property int unitNumber // required | ||
| property string group: "[Auxiliary" + unitNumber + "]" | ||
|
|
||
| spacing: 5 | ||
|
|
||
| Skin.VuMeter { | ||
| id: vuMeter | ||
|
|
||
| group: root.group | ||
| key: "VuMeter" | ||
| width: 4 | ||
| height: parent.height | ||
| } | ||
|
|
||
| Rectangle { | ||
| id: gainKnobFrame | ||
|
|
||
| width: 52 | ||
| height: width | ||
| color: Theme.knobBackgroundColor | ||
| radius: 5 | ||
|
|
||
| Skin.ControlKnob { | ||
| id: gainKnob | ||
|
|
||
| anchors.centerIn: parent | ||
| width: 48 | ||
| height: width | ||
| arcStart: 0 | ||
| group: root.group | ||
| key: "pregain" | ||
| color: Theme.gainKnobColor | ||
| } | ||
|
|
||
| } | ||
|
|
||
| Column { | ||
| Skin.SectionText { | ||
| width: parent.width | ||
| height: root.height / 2 | ||
| text: "AUX " + root.unitNumber | ||
| } | ||
|
|
||
| Skin.ControlButton { | ||
| id: pflButton | ||
|
|
||
| group: root.group | ||
| key: "pfl" | ||
| text: "PFL" | ||
| activeColor: Theme.pflActiveButtonColor | ||
| toggleable: true | ||
| } | ||
|
|
||
| } | ||
|
|
||
| Skin.EmbeddedBackground { | ||
| id: embedded | ||
|
|
||
| height: parent.height | ||
| width: 56 | ||
|
|
||
| Skin.OrientationToggleButton { | ||
| id: orientationButton | ||
|
|
||
| anchors.left: parent.left | ||
| anchors.right: parent.right | ||
| anchors.top: parent.top | ||
| anchors.bottom: parent.verticalCenter | ||
| group: root.group | ||
| key: "orientation" | ||
| color: Theme.crossfaderOrientationColor | ||
| } | ||
|
|
||
| Skin.InfoBarButton { | ||
| id: fx1Button | ||
|
|
||
| anchors.left: parent.left | ||
| anchors.right: parent.horizontalCenter | ||
| anchors.top: parent.verticalCenter | ||
| anchors.bottom: parent.bottom | ||
| group: "[EffectRack1_EffectUnit1]" | ||
| key: "group_" + root.group + "_enable" | ||
| activeColor: Theme.deckActiveColor | ||
|
|
||
| foreground: Skin.EmbeddedText { | ||
| anchors.centerIn: parent | ||
| text: "FX1" | ||
| } | ||
|
|
||
| } | ||
|
|
||
| Skin.InfoBarButton { | ||
| group: "[EffectRack1_EffectUnit2]" | ||
| anchors.left: parent.horizontalCenter | ||
| anchors.right: parent.right | ||
| anchors.top: parent.verticalCenter | ||
| anchors.bottom: parent.bottom | ||
| key: "group_" + root.group + "_enable" | ||
| activeColor: Theme.deckActiveColor | ||
|
|
||
| foreground: Skin.EmbeddedText { | ||
| anchors.centerIn: parent | ||
| text: "FX2" | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| import "." as Skin | ||
| import QtQuick 2.12 | ||
| import QtQuick.Controls 2.12 | ||
| import "Theme" | ||
|
|
||
| ComboBox { | ||
| id: root | ||
|
|
||
| background: Skin.EmbeddedBackground { | ||
| } | ||
|
|
||
| delegate: ItemDelegate { | ||
| width: parent.width | ||
| highlighted: root.highlightedIndex === index | ||
|
|
||
| contentItem: Text { | ||
| text: modelData | ||
| color: Theme.deckTextColor | ||
| elide: Text.ElideRight | ||
| verticalAlignment: Text.AlignVCenter | ||
| } | ||
|
|
||
| background: Rectangle { | ||
| radius: 5 | ||
| border.width: highlighted ? 1 : 0 | ||
| border.color: Theme.deckLineColor | ||
| color: "transparent" | ||
| } | ||
|
|
||
| } | ||
|
|
||
| contentItem: Text { | ||
| leftPadding: 5 | ||
| rightPadding: root.indicator.width + root.spacing | ||
| text: root.displayText | ||
| font: root.font | ||
| color: Theme.deckTextColor | ||
| verticalAlignment: Text.AlignVCenter | ||
| elide: Text.ElideRight | ||
| } | ||
|
|
||
| popup: Popup { | ||
| y: root.height | ||
| width: root.width | ||
| implicitHeight: contentItem.implicitHeight | ||
|
|
||
| contentItem: ListView { | ||
| clip: true | ||
| implicitHeight: contentHeight | ||
| model: root.popup.visible ? root.delegateModel : null | ||
| currentIndex: root.highlightedIndex | ||
|
|
||
| ScrollIndicator.vertical: ScrollIndicator { | ||
| } | ||
|
|
||
| } | ||
|
|
||
| background: Skin.EmbeddedBackground { | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import "." as Skin | ||
| import Mixxx 0.1 as Mixxx | ||
| import QtQuick 2.12 | ||
|
|
||
| Skin.MiniKnob { | ||
| id: root | ||
|
|
||
| property alias group: control.group | ||
| property alias key: control.key | ||
|
|
||
| value: control.parameter | ||
| onTurned: control.parameter = value | ||
|
|
||
| Mixxx.ControlProxy { | ||
| id: control | ||
| } | ||
|
|
||
| TapHandler { | ||
| onDoubleTapped: control.reset() | ||
| } | ||
|
|
||
| } |
This file contains 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
Oops, something went wrong.