diff options
| -rw-r--r-- | examples/gallery/content/RangeTab.qml | 8 | ||||
| -rw-r--r-- | src/experimental/Dial.qml (renamed from src/qtdesktop/Dial.qml) | 38 | ||||
| -rw-r--r-- | src/experimental/Dialog.qml (renamed from src/qtdesktop/Dialog.qml) | 0 | ||||
| -rw-r--r-- | src/experimental/experimental.pro | 7 | ||||
| -rw-r--r-- | src/experimental/qmldir | 3 | ||||
| -rw-r--r-- | src/qtdesktop/qmldir | 2 | ||||
| -rw-r--r-- | src/qtdesktop/qtdesktop.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 |
8 files changed, 29 insertions, 33 deletions
diff --git a/examples/gallery/content/RangeTab.qml b/examples/gallery/content/RangeTab.qml index 932ee838..5f773b02 100644 --- a/examples/gallery/content/RangeTab.qml +++ b/examples/gallery/content/RangeTab.qml @@ -106,14 +106,6 @@ Row { Behavior on opacity { NumberAnimation { easing.type: Easing.OutCubic ; duration: 220} } } } - Dial{ - width: 120 - height: 120 - scale: scale.checked && containsMouse ? 1.1 : 1 - opacity: !fade.checked || containsMouse ? 1 : 0.5 - Behavior on scale { NumberAnimation { easing.type: Easing.OutCubic ; duration: 120} } - Behavior on opacity { NumberAnimation { easing.type: Easing.OutCubic ; duration: 220} } - } } } } diff --git a/src/qtdesktop/Dial.qml b/src/experimental/Dial.qml index fa0df6df..95e32f05 100644 --- a/src/qtdesktop/Dial.qml +++ b/src/experimental/Dial.qml @@ -41,12 +41,10 @@ import QtQuick 2.0 import QtDesktop 1.0 -// jens: ContainsMouse breaks drag functionality - /*! \qmltype Dial \inqmlmodule QtDesktop 1.0 - \brief Dial is doing bla...bla... + \brief Dial provides a dial control. */ Item { @@ -147,21 +145,21 @@ Item { } } } - WheelArea { - id: wheelarea - anchors.fill: parent - horizontalMinimumValue: dial.minimumValue - horizontalMaximumValue: dial.maximumValue - verticalMinimumValue: dial.minimumValue - verticalMaximumValue: dial.maximumValue - property double step: (dial.maximumValue - dial.minimumValue)/100 - - onVerticalWheelMoved: { - value += verticalDelta/4*step - } - - onHorizontalWheelMoved: { - value += horizontalDelta/4*step - } - } +// WheelArea { // move this to MouseArea::onWheel +// id: wheelarea +// anchors.fill: parent +// horizontalMinimumValue: dial.minimumValue +// horizontalMaximumValue: dial.maximumValue +// verticalMinimumValue: dial.minimumValue +// verticalMaximumValue: dial.maximumValue +// property double step: (dial.maximumValue - dial.minimumValue)/100 + +// onVerticalWheelMoved: { +// value += verticalDelta/4*step +// } + +// onHorizontalWheelMoved: { +// value += horizontalDelta/4*step +// } +// } } diff --git a/src/qtdesktop/Dialog.qml b/src/experimental/Dialog.qml index abbda95e..abbda95e 100644 --- a/src/qtdesktop/Dialog.qml +++ b/src/experimental/Dialog.qml diff --git a/src/experimental/experimental.pro b/src/experimental/experimental.pro new file mode 100644 index 00000000..32fdaa26 --- /dev/null +++ b/src/experimental/experimental.pro @@ -0,0 +1,7 @@ +TARGETPATH = QtDesktop/Experimental + +QML_FILES = \ + Dial.qml \ + Dialog.qml + +load(qml_module) diff --git a/src/experimental/qmldir b/src/experimental/qmldir new file mode 100644 index 00000000..556b5780 --- /dev/null +++ b/src/experimental/qmldir @@ -0,0 +1,3 @@ +module QtDesktop.Experimental +Dial 1.0 Dial.qml +Dialog 1.0 Dialog.qml diff --git a/src/qtdesktop/qmldir b/src/qtdesktop/qmldir index c68f823f..908aa2b4 100644 --- a/src/qtdesktop/qmldir +++ b/src/qtdesktop/qmldir @@ -5,8 +5,6 @@ Button 1.0 Button.qml CheckBox 1.0 CheckBox.qml ComboBox 1.0 ComboBox.qml ContextMenu 1.0 ContextMenu.qml -Dial 1.0 Dial.qml -Dialog 1.0 Dialog.qml GroupBox 1.0 GroupBox.qml Label 1.0 Label.qml Page 1.0 Page.qml diff --git a/src/qtdesktop/qtdesktop.pro b/src/qtdesktop/qtdesktop.pro index 7a18e8b5..4c267b7e 100644 --- a/src/qtdesktop/qtdesktop.pro +++ b/src/qtdesktop/qtdesktop.pro @@ -12,8 +12,6 @@ QML_FILES = \ CheckBox.qml \ ComboBox.qml \ ContextMenu.qml \ - Dial.qml \ - Dialog.qml \ GroupBox.qml \ Label.qml \ Page.qml \ diff --git a/src/src.pro b/src/src.pro index 3b0d512e..d7fe5676 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += qtdesktop styles +SUBDIRS += qtdesktop styles experimental |