diff options
author | Andy Nichols <andy.nichols@theqtcompany.com> | 2014-12-01 11:02:18 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2014-12-02 11:34:39 +0200 |
commit | 92ee9380d360ca1c01c351ed6d5106e1799b0889 (patch) | |
tree | 19b1d3acebc0596ed8582694c2ab29a41e690202 /basicsuite/enterprise-qtdatavis3d/main.qml | |
parent | 69f43cbede072614bba882c3f5df0d9ecbf1c2f8 (diff) |
Support Flat style and add new Controls demo
The Flat style for Qt Quick Controls is now enabled by
defualt for the launcher and there are a few places that
needed to be tweeked for use the correct style. In addition
there is a new controls demo that shows off both the Enterprise
Controls from before along side the existing controls, but both
using the new Flat style which is only available to customers
and is intended for touch devices.
So we add one new demo, and disable 2 others (via exclude.txt)
Change-Id: I8aa6ddd7d48375fdf64150b0c5e2d451da07d00d
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'basicsuite/enterprise-qtdatavis3d/main.qml')
-rw-r--r-- | basicsuite/enterprise-qtdatavis3d/main.qml | 167 |
1 files changed, 81 insertions, 86 deletions
diff --git a/basicsuite/enterprise-qtdatavis3d/main.qml b/basicsuite/enterprise-qtdatavis3d/main.qml index 49ec4de..5dba141 100644 --- a/basicsuite/enterprise-qtdatavis3d/main.qml +++ b/basicsuite/enterprise-qtdatavis3d/main.qml @@ -124,107 +124,102 @@ Item { anchors.left: parent.left anchors.bottom: parent.bottom spacing: 0 - - GroupBox { - //title: "Layer Selection" + Column { Layout.fillWidth: true - flat: true - Column { - spacing: 5 - ToggleButton { - id: layerOneToggle - text: "Ground\n Layer" - checked: true - width: toPixels(0.12) - height: width - } + spacing: 5 + ToggleButton { + id: layerOneToggle + text: "Ground\n Layer" + checked: true + width: toPixels(0.12) + height: width + style: ToggleButtonStyle { } + } - ToggleButton { - id: layerTwoToggle - text: "Sea\n Layer" - checked: true - width: toPixels(0.12) - height: width - } + ToggleButton { + id: layerTwoToggle + text: "Sea\n Layer" + checked: true + width: toPixels(0.12) + height: width + style: ToggleButtonStyle { } + } - ToggleButton { - id: layerThreeToggle - text: "Tectonic\n Layer" - checked: true - width: toPixels(0.12) - height: width - } + ToggleButton { + id: layerThreeToggle + text: "Tectonic\n Layer" + checked: true + width: toPixels(0.12) + height: width + style: ToggleButtonStyle { } } } - GroupBox { - //title: "Layer Style" + Column { Layout.fillWidth: true - flat: true - Column { - spacing: 5 - ToggleButton { - id: layerOneGrid - text: "Ground\n as\n Grid" - width: toPixels(0.12) - height: width - onCheckedChanged: { - if (checked) - layerOneSeries.drawMode = Surface3DSeries.DrawWireframe - else - layerOneSeries.drawMode = Surface3DSeries.DrawSurface - } + spacing: 5 + ToggleButton { + id: layerOneGrid + text: "Ground\n as\n Grid" + width: toPixels(0.12) + height: width + style: ToggleButtonStyle { } + onCheckedChanged: { + if (checked) + layerOneSeries.drawMode = Surface3DSeries.DrawWireframe + else + layerOneSeries.drawMode = Surface3DSeries.DrawSurface } + } - ToggleButton { - id: layerTwoGrid - text: "Sea\n as\n Grid" - width: toPixels(0.12) - height: width - onCheckedChanged: { - if (checked) - layerTwoSeries.drawMode = Surface3DSeries.DrawWireframe - else - layerTwoSeries.drawMode = Surface3DSeries.DrawSurface - } + ToggleButton { + id: layerTwoGrid + text: "Sea\n as\n Grid" + width: toPixels(0.12) + height: width + style: ToggleButtonStyle { } + onCheckedChanged: { + if (checked) + layerTwoSeries.drawMode = Surface3DSeries.DrawWireframe + else + layerTwoSeries.drawMode = Surface3DSeries.DrawSurface } + } - ToggleButton { - id: layerThreeGrid - text: "Tectonic\n as\n Grid" - width: toPixels(0.12) - height: width - onCheckedChanged: { - if (checked) - layerThreeSeries.drawMode = Surface3DSeries.DrawWireframe - else - layerThreeSeries.drawMode = Surface3DSeries.DrawSurface - } + ToggleButton { + id: layerThreeGrid + text: "Tectonic\n as\n Grid" + width: toPixels(0.12) + height: width + style: ToggleButtonStyle { } + onCheckedChanged: { + if (checked) + layerThreeSeries.drawMode = Surface3DSeries.DrawWireframe + else + layerThreeSeries.drawMode = Surface3DSeries.DrawSurface } } } - GroupBox { - Layout.fillWidth: true - flat: true - Column { - spacing: 5 - ToggleButton { - id: sliceButton - text: "Slice\n All\n Layers" - width: toPixels(0.12) - height: width - onClicked: { - if (surfaceLayers.selectionMode & AbstractGraph3D.SelectionMultiSeries) { - surfaceLayers.selectionMode = AbstractGraph3D.SelectionRow - | AbstractGraph3D.SelectionSlice - text = "Slice\n All\n Layers" - } else { - surfaceLayers.selectionMode = AbstractGraph3D.SelectionRow - | AbstractGraph3D.SelectionSlice - | AbstractGraph3D.SelectionMultiSeries - text = "Slice\n One\n Layer" - } + Column { + Layout.fillWidth: true + spacing: 5 + ToggleButton { + id: sliceButton + text: "Slice\n All\n Layers" + width: toPixels(0.12) + height: width + style: ToggleButtonStyle { } + onClicked: { + if (surfaceLayers.selectionMode & AbstractGraph3D.SelectionMultiSeries) { + surfaceLayers.selectionMode = AbstractGraph3D.SelectionRow + | AbstractGraph3D.SelectionSlice + text = "Slice\n All\n Layers" + } else { + surfaceLayers.selectionMode = AbstractGraph3D.SelectionRow + | AbstractGraph3D.SelectionSlice + | AbstractGraph3D.SelectionMultiSeries + text = "Slice\n One\n Layer" } } } |