diff options
Diffstat (limited to 'basicsuite')
50 files changed, 315 insertions, 210 deletions
diff --git a/basicsuite/about-b2qt/main.qml b/basicsuite/about-b2qt/main.qml index 5c5c6df..694ba50 100644 --- a/basicsuite/about-b2qt/main.qml +++ b/basicsuite/about-b2qt/main.qml @@ -40,12 +40,13 @@ ****************************************************************************/ import QtQuick 2.0 import QtQuick.Particles 2.0 +import QtQuick.Window 2.1 Item { id: root - width: 1280 - height: 800 + width : Screen.height > Screen.width ? Screen.height : Screen.width + height : Screen.height > Screen.width ? Screen.width : Screen.height // Rectangle { // anchors.fill: parent diff --git a/basicsuite/about-b2qt/title.txt b/basicsuite/about-b2qt/title.txt index 634a26a..bc7bf4b 100644 --- a/basicsuite/about-b2qt/title.txt +++ b/basicsuite/about-b2qt/title.txt @@ -1 +1 @@ -About Qt Enterprise Embedded +000. About Qt Enterprise Embedded diff --git a/basicsuite/camera/title.txt b/basicsuite/camera/title.txt index 10a226d..0cf11f5 100644 --- a/basicsuite/camera/title.txt +++ b/basicsuite/camera/title.txt @@ -1 +1 @@ -Camera +110. Camera diff --git a/basicsuite/controls-touch/title.txt b/basicsuite/controls-touch/title.txt index cc2e76a..e35803a 100644 --- a/basicsuite/controls-touch/title.txt +++ b/basicsuite/controls-touch/title.txt @@ -1 +1 @@ -Controls: Touch +080. Controls: Touch diff --git a/basicsuite/enterprise-charts/title.txt b/basicsuite/enterprise-charts/title.txt index d3ce063..2b4d97b 100644 --- a/basicsuite/enterprise-charts/title.txt +++ b/basicsuite/enterprise-charts/title.txt @@ -1 +1 @@ -Qt Charts - Gallery +090. Qt Charts - Gallery diff --git a/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml b/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml index 7958fca..632b63b 100644 --- a/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml +++ b/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml @@ -19,7 +19,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls.Styles 1.1 CircularGaugeStyle { tickmarkInset: toPixels(0.04) diff --git a/basicsuite/enterprise-dashboard/IconGaugeStyle.qml b/basicsuite/enterprise-dashboard/IconGaugeStyle.qml index 0b24351..a04d0e9 100644 --- a/basicsuite/enterprise-dashboard/IconGaugeStyle.qml +++ b/basicsuite/enterprise-dashboard/IconGaugeStyle.qml @@ -19,7 +19,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls.Styles 1.1 DashboardGaugeStyle { id: fuelGaugeStyle diff --git a/basicsuite/enterprise-dashboard/TachometerStyle.qml b/basicsuite/enterprise-dashboard/TachometerStyle.qml index c4649da..15a2601 100644 --- a/basicsuite/enterprise-dashboard/TachometerStyle.qml +++ b/basicsuite/enterprise-dashboard/TachometerStyle.qml @@ -19,7 +19,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls.Styles 1.1 DashboardGaugeStyle { id: tachometerStyle diff --git a/basicsuite/enterprise-dashboard/TurnIndicator.qml b/basicsuite/enterprise-dashboard/TurnIndicator.qml index 9dd7d5f..22d0ea9 100644 --- a/basicsuite/enterprise-dashboard/TurnIndicator.qml +++ b/basicsuite/enterprise-dashboard/TurnIndicator.qml @@ -19,7 +19,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls.Styles 1.1 Item { // This enum is actually keyboard-related, but it serves its purpose diff --git a/basicsuite/enterprise-dashboard/fonts/DejaVuSans.ttf b/basicsuite/enterprise-dashboard/fonts/DejaVuSans.ttf Binary files differnew file mode 100644 index 0000000..19ed0b4 --- /dev/null +++ b/basicsuite/enterprise-dashboard/fonts/DejaVuSans.ttf diff --git a/basicsuite/enterprise-dashboard/main.qml b/basicsuite/enterprise-dashboard/main.qml index da5f296..7f8ee75 100644 --- a/basicsuite/enterprise-dashboard/main.qml +++ b/basicsuite/enterprise-dashboard/main.qml @@ -22,8 +22,8 @@ import QtQuick 2.0 import QtQuick.Window 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 -import QtQuick.Enterprise.Controls 1.0 -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls 1.1 +import QtQuick.Enterprise.Controls.Styles 1.1 Rectangle { id: root diff --git a/basicsuite/enterprise-dashboard/title.txt b/basicsuite/enterprise-dashboard/title.txt index 1a3fb29..443fdd7 100644 --- a/basicsuite/enterprise-dashboard/title.txt +++ b/basicsuite/enterprise-dashboard/title.txt @@ -1 +1 @@ -Qt Quick Enterprise Controls - Dashboard +060. Qt Quick Enterprise Controls - Dashboard diff --git a/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml b/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml index fb85f86..0de1180 100644 --- a/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml +++ b/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml @@ -19,7 +19,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls.Styles 1.1 CircularGaugeStyle { id: root diff --git a/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml b/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml index 7aec7b6..23b25c4 100644 --- a/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml +++ b/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml @@ -19,7 +19,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls.Styles 1.1 CircularGaugeStyle { labelStepSize: 20 diff --git a/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml b/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml index 7d00c1f..87afa7d 100644 --- a/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml +++ b/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml @@ -19,7 +19,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls.Styles 1.1 CircularGaugeStyle { id: root diff --git a/basicsuite/enterprise-gallery/CircularGaugeView.qml b/basicsuite/enterprise-gallery/CircularGaugeView.qml index 92ee6c5..a24b980 100644 --- a/basicsuite/enterprise-gallery/CircularGaugeView.qml +++ b/basicsuite/enterprise-gallery/CircularGaugeView.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtQuick.Controls 1.0 -import QtQuick.Enterprise.Controls 1.0 +import QtQuick.Enterprise.Controls 1.1 ControlView { id: controlView @@ -66,8 +66,8 @@ ControlView { id: gauge minimumValue: customizerItem.minimumValue maximumValue: customizerItem.maximumValue - width: root.toPixels(0.65) - height: width + width: controlBounds.width + height: controlBounds.height value: accelerating ? maximumValue : 0 style: styleMap[customizerItem.currentStylePath] @@ -174,7 +174,7 @@ ControlView { minimumValue: 0 value: 0 maximumValue: 360 - stepSize: labelStepSizeSlider.stepSize + stepSize: 1 } CustomizerLabel { @@ -184,9 +184,9 @@ ControlView { CustomizerSlider { id: maximumValueSlider minimumValue: 0 - value: 220 + value: 240 maximumValue: 300 - stepSize: labelStepSizeSlider.stepSize + stepSize: 1 } CustomizerLabel { diff --git a/basicsuite/enterprise-gallery/ControlLabel.qml b/basicsuite/enterprise-gallery/ControlLabel.qml new file mode 100644 index 0000000..0335342 --- /dev/null +++ b/basicsuite/enterprise-gallery/ControlLabel.qml @@ -0,0 +1,28 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the QtQuick Enterprise Controls Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Text { + font.pixelSize: Math.min(32, root.toPixels(0.045)) + color: "#4e4e4e" + styleColor: "#ffffff" + style: Text.Raised +} diff --git a/basicsuite/enterprise-gallery/ControlViewToolbar.qml b/basicsuite/enterprise-gallery/ControlViewToolbar.qml index 5aac041..f3dd07b 100644 --- a/basicsuite/enterprise-gallery/ControlViewToolbar.qml +++ b/basicsuite/enterprise-gallery/ControlViewToolbar.qml @@ -76,7 +76,6 @@ BlackButtonBackground { Image { source: "images/icon-settings.png" anchors.centerIn: parent - scale: -1 } } } diff --git a/basicsuite/enterprise-gallery/CustomizerLabel.qml b/basicsuite/enterprise-gallery/CustomizerLabel.qml index c4cb69c..c85807c 100644 --- a/basicsuite/enterprise-gallery/CustomizerLabel.qml +++ b/basicsuite/enterprise-gallery/CustomizerLabel.qml @@ -21,7 +21,7 @@ import QtQuick 2.0 Text { - color: fontColor + color: darkBackground ? root.darkFontColor : root.lightFontColor font.pixelSize: root.toPixels(0.04) font.family: openSans.name anchors.horizontalCenter: parent.horizontalCenter diff --git a/basicsuite/enterprise-gallery/CustomizerCheckBox.qml b/basicsuite/enterprise-gallery/CustomizerSwitch.qml index 542e09a..3048aae 100644 --- a/basicsuite/enterprise-gallery/CustomizerCheckBox.qml +++ b/basicsuite/enterprise-gallery/CustomizerSwitch.qml @@ -19,27 +19,8 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 1.0 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls 1.1 -CheckBox { - id: checkBox +Switch { anchors.horizontalCenter: parent.horizontalCenter - width: root.width * 0.04 - height: width - - style: CheckBoxStyle { - indicator: Rectangle { - color: "#666" - height: control.height - width: height - - Rectangle { - anchors.fill: parent - anchors.margins: Math.round(checkBox.width * 0.1) - color: "#111" - visible: control.checked - } - } - } } diff --git a/basicsuite/enterprise-gallery/PieMenuControlView.qml b/basicsuite/enterprise-gallery/PieMenuControlView.qml index cba341b..2c06176 100644 --- a/basicsuite/enterprise-gallery/PieMenuControlView.qml +++ b/basicsuite/enterprise-gallery/PieMenuControlView.qml @@ -21,7 +21,7 @@ import QtQuick 2.0 import QtGraphicalEffects 1.0 import QtQuick.Controls 1.0 -import QtQuick.Enterprise.Controls 1.0 +import QtQuick.Enterprise.Controls 1.1 Rectangle { id: view @@ -94,34 +94,7 @@ Rectangle { anchors.fill: parent onClicked: { - pieMenu.popup(touchArea.mouseX, touchArea.mouseY) - } - } - - Item { - width: labelText.width - height: labelText.height - anchors.bottom: pieMenu.top - anchors.bottomMargin: 10 - anchors.horizontalCenter: pieMenu.horizontalCenter - visible: pieMenu.visible - - Item { - id: labelBlurGuard - anchors.centerIn: parent - width: labelText.implicitWidth * 2 - height: labelText.implicitHeight * 2 - - Text { - id: labelText - font.pointSize: 20 - text: pieMenu.currentIndex !== -1 ? pieMenu.menuItems[pieMenu.currentIndex].text : "" - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - anchors.centerIn: parent - color: "#ccc" - antialiasing: true - } + pieMenu.popup(touchArea.mouseX, touchArea.mouseY); } } diff --git a/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml b/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml index 354775d..ab03701 100644 --- a/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml +++ b/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls.Styles 1.1 PieMenuStyle { backgroundColor: "#222" diff --git a/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml b/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml index 1ad8480..4b0edb1 100644 --- a/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml +++ b/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls.Styles 1.1 PieMenuStyle { } diff --git a/basicsuite/enterprise-gallery/StylePicker.qml b/basicsuite/enterprise-gallery/StylePicker.qml index 48c1298..f4e097e 100644 --- a/basicsuite/enterprise-gallery/StylePicker.qml +++ b/basicsuite/enterprise-gallery/StylePicker.qml @@ -21,8 +21,8 @@ import QtQuick 2.0 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 -import QtQuick.Enterprise.Controls 1.0 -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls 1.1 +import QtQuick.Enterprise.Controls.Styles 1.1 ListView { id: stylePicker diff --git a/basicsuite/enterprise-gallery/main.qml b/basicsuite/enterprise-gallery/main.qml index f1f2e17..de60f47 100644 --- a/basicsuite/enterprise-gallery/main.qml +++ b/basicsuite/enterprise-gallery/main.qml @@ -24,12 +24,14 @@ import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 import QtQuick.Dialogs 1.0 -import QtQuick.Enterprise.Controls 1.0 -import QtQuick.Enterprise.Controls.Styles 1.0 +import QtQuick.Enterprise.Controls 1.1 +import QtQuick.Enterprise.Controls.Styles 1.1 +import QtQuick.Layouts 1.0 import QtQuick.Window 2.1 Rectangle { id: root + objectName: "window" visible: true width: 480 height: 800 @@ -42,8 +44,9 @@ Rectangle { } property bool isScreenPortrait: height > width - property color fontColor: "white" - readonly property color lightBackgroundColor: "#ccc" + property color lightFontColor: "#222" + property color darkFontColor: "#e7e7e7" + readonly property color lightBackgroundColor: "#cccccc" readonly property color darkBackgroundColor: "#161616" property real customizerPropertySpacing: 10 property real colorPickerRowSpacing: 8 @@ -53,34 +56,69 @@ Rectangle { property Component dial: ControlView { darkBackground: false - control: Dial { - id: dial - width: root.toPixels(0.3) - height: width + control: Column { + id: dialColumn + width: controlBounds.width + height: controlBounds.height - spacing + spacing: root.toPixels(0.05) + + Column { + id: volumeColumn + width: parent.width + height: (dialColumn.height - dialColumn.spacing) / 2 + spacing: height * 0.025 + + Dial { + id: volumeDial + width: parent.width + height: volumeColumn.height - volumeText.height - volumeColumn.spacing + + /*! + Determines whether the dial animates its rotation to the new value when + a single click or touch is received on the dial. + */ + property bool animate: customizerItem.animate + + Behavior on value { + enabled: volumeDial.animate && !volumeDial.pressed + NumberAnimation { + duration: 300 + easing.type: Easing.OutSine + } + } + } - /*! - Determines whether the dial animates its rotation to the new value when - a single click or touch is received on the dial. - */ - property bool animate: customizerItem.animate - - Behavior on value { - enabled: dial.animate && !dial.pressed - NumberAnimation { - duration: 300 - easing.type: Easing.OutSine + ControlLabel { + id: volumeText + text: "Volume" + anchors.horizontalCenter: parent.horizontalCenter } } - Text { - text: "Volume" - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: dial.bottom - anchors.topMargin: 10 - font.pixelSize: root.toPixels(0.045) - color: "#4e4e4e" - styleColor: "#ffffff" - style: Text.Raised + Column { + id: trebleColumn + width: parent.width + height: (dialColumn.height - dialColumn.spacing) / 2 + spacing: height * 0.025 + + Dial { + id: dial2 + width: parent.width + height: trebleColumn.height - trebleText.height - trebleColumn.spacing + + stepSize: 1 + maximumValue: 10 + + style: DialStyle { + labelInset: outerRadius * 0 + } + } + + ControlLabel { + id: trebleText + text: "Treble" + anchors.horizontalCenter: parent.horizontalCenter + } } } @@ -91,10 +129,9 @@ Rectangle { CustomizerLabel { text: "Animate" - color: "black" } - CustomizerCheckBox { + CustomizerSwitch { id: animateCheckBox } } @@ -115,8 +152,8 @@ Rectangle { id: gaugeView control: Gauge { id: gauge - width: orientation === Qt.Vertical ? root.toPixels(0.15) : gaugeView.controlBounds.width * 0.65 - height: orientation === Qt.Vertical ? root.toPixels(0.65) : gaugeView.controlBounds.height * 0.15 + width: orientation === Qt.Vertical ? gaugeView.controlBounds.height * 0.3 : gaugeView.controlBounds.width + height: orientation === Qt.Vertical ? gaugeView.controlBounds.height : gaugeView.controlBounds.height * 0.3 anchors.centerIn: parent minimumValue: 0 @@ -150,7 +187,7 @@ Rectangle { text: "Vertical orientation" } - CustomizerCheckBox { + CustomizerSwitch { id: orientationCheckBox checked: true } @@ -159,7 +196,7 @@ Rectangle { text: controlItem.orientation === Qt.Vertical ? "Left align" : "Top align" } - CustomizerCheckBox { + CustomizerSwitch { id: alignCheckBox checked: true } @@ -179,6 +216,67 @@ Rectangle { property Component pieMenu: PieMenuControlView {} + property Component statusIndicator: ControlView { + id: statusIndicatorView + darkBackground: false + + Timer { + id: recordingFlashTimer + running: true + repeat: true + interval: 1000 + } + + ColumnLayout { + id: indicatorLayout + width: statusIndicatorView.controlBounds.width * 0.25 + height: statusIndicatorView.controlBounds.height * 0.75 + anchors.centerIn: parent + + Repeater { + model: ListModel { + id: indicatorModel + ListElement { + name: "Power" + indicatorColor: "green" + } + ListElement { + name: "Recording" + indicatorColor: "red" + } + } + + ColumnLayout { + Layout.preferredWidth: indicatorLayout.width +// Layout.preferredHeight: indicatorLayout.height * 0.25 + spacing: 0 + + StatusIndicator { + id: indicator + color: indicatorColor + Layout.preferredWidth: statusIndicatorView.controlBounds.width * 0.07 + Layout.preferredHeight: Layout.preferredWidth + Layout.alignment: Qt.AlignHCenter + on: true + + Connections { + target: recordingFlashTimer + onTriggered: if (name == "Recording") indicator.on = !indicator.on + } + } + ControlLabel { + id: indicatorLabel + text: name +// elide: Text.ElideRight + Layout.alignment: Qt.AlignHCenter + Layout.maximumWidth: parent.width + horizontalAlignment: Text.AlignHCenter + } + } + } + } + } + FontLoader { id: openSans Component.onCompleted: { @@ -196,6 +294,7 @@ Rectangle { "Dial": dial, "Gauge": gauge, "PieMenu": pieMenu, + "StatusIndicator": statusIndicator, "ToggleButton": toggleButton } @@ -217,9 +316,12 @@ Rectangle { ListElement { title: "Gauge" } - //ListElement { - // title: "PieMenu" - //} +// ListElement { +// title: "PieMenu" +// } + ListElement { + title: "StatusIndicator" + } ListElement { title: "ToggleButton" } @@ -238,7 +340,7 @@ Rectangle { } style: BlackButtonStyle { - fontColor: root.fontColor + fontColor: root.darkFontColor } onClicked: { diff --git a/basicsuite/enterprise-gallery/preview_l.jpg b/basicsuite/enterprise-gallery/preview_l.jpg Binary files differindex 8ddcad8..644bac5 100644 --- a/basicsuite/enterprise-gallery/preview_l.jpg +++ b/basicsuite/enterprise-gallery/preview_l.jpg diff --git a/basicsuite/enterprise-gallery/title.txt b/basicsuite/enterprise-gallery/title.txt index 4ffcc0f..00ece55 100644 --- a/basicsuite/enterprise-gallery/title.txt +++ b/basicsuite/enterprise-gallery/title.txt @@ -1 +1 @@ -Qt Quick Enterprise Controls - Gallery +070. Qt Quick Enterprise Controls - Gallery diff --git a/basicsuite/graphicaleffects/title.txt b/basicsuite/graphicaleffects/title.txt index e048172..a679fff 100644 --- a/basicsuite/graphicaleffects/title.txt +++ b/basicsuite/graphicaleffects/title.txt @@ -1 +1 @@ -Graphical Effects +130. Graphical Effects diff --git a/basicsuite/launchersettings/NetworkList.qml b/basicsuite/launchersettings/NetworkList.qml index b733eb6..204e4e2 100644 --- a/basicsuite/launchersettings/NetworkList.qml +++ b/basicsuite/launchersettings/NetworkList.qml @@ -42,9 +42,6 @@ import QtQuick 2.0 import QtQuick.Controls 1.0 import Qt.labs.wifi 0.1 -// ### TODO -// - only 1 delagate open at the time - Item { Component { id: listDelegate @@ -52,17 +49,28 @@ Item { id: delegateBackground property bool expanded: false property bool connected: wifiManager.connectedSSID == network.ssid - property variant networkModel: model - property alias ssidText: ssidLabel.text + property bool actingNetwork: networkView.currentNetworkSsid == network.ssid height: (expanded ? (connected ? 180: 260) : 70) + width: parent.width clip: true // ### fixme color: "#5C5C5C" border.color: "black" border.width: 1 - Behavior on height { NumberAnimation { duration: 500; easing.type: Easing.InOutCubic } } + onExpandedChanged: { + if (expanded) { + if (networkView.hasExpandedDelegate) + networkView.expandedDelegate.expanded = false + networkView.expandedDelegate = this + } else { + networkView.expandedDelegate = 0 + } + } - width: parent.width + Component.onDestruction: if (expanded) networkView.expandedDelegate = 0 + onHeightChanged: if (expanded) networkView.positionViewAtIndex(index, ListView.Contain) + + Behavior on height { NumberAnimation { duration: 500; easing.type: Easing.InOutCubic } } Text { id: ssidLabel @@ -72,7 +80,7 @@ Item { font.pixelSize: 20 font.bold: true color: "#E6E6E6" - text: network.ssid + (connected ? " (connected)" : ""); + text: network.ssid + (actingNetwork ? networkView.networkStateText : ""); } Text { @@ -113,9 +121,7 @@ Item { MouseArea { anchors.fill: parent - onClicked: { - parent.expanded = !expanded - } + onClicked: parent.expanded = !expanded } TextField { @@ -134,15 +140,8 @@ Item { y: passwordInput.visible ? passwordInput.y + passwordInput.height + 20 : passwordInput.y anchors.horizontalCenter: parent.horizontalCenter text: connected ? "Disconnect" : "Connect" - onClicked: { - networkView.currentIndex = index - if (connected) { - wifiManager.disconnect() - } else { - networkView.activeNetwork = networkView.currentItem - wifiManager.connect(network, passwordInput.text); - } - } + onClicked: connected ? wifiManager.disconnect() + : wifiManager.connect(network, passwordInput.text); } } } @@ -153,20 +152,28 @@ Item { model: wifiManager.networks delegate: listDelegate - property variant activeNetwork: "" - property variant networkState: wifiManager.networkState + property string networkStateText: "" + property string currentNetworkSsid: "" + property variant expandedDelegate: 0 + property bool hasExpandedDelegate: expandedDelegate != 0 - onNetworkStateChanged: { - if (activeNetwork) { - var ssid = activeNetwork.networkModel.ssid - var state = "" - if (networkState == WifiManager.ObtainingIPAddress) - state = " (obtaining ip..)" - else if (networkState == WifiManager.DhcpRequestFailed) - state = " (dhcp request failed)" - else if (networkState == WifiManager.Connected) - state = " (connected)" - activeNetwork.ssidText = ssid + state + Connections { + target: wifiManager + onNetworkStateChanged: { + networkView.currentNetworkSsid = network.ssid + var networkStateText = "" + var state = wifiManager.networkState + if (state == WifiManager.ObtainingIPAddress) + networkStateText = " (obtaining ip..)" + else if (state == WifiManager.DhcpRequestFailed) + networkStateText = " (dhcp request failed)" + else if (state == WifiManager.Connected) + networkStateText = " (connected)" + else if (state == WifiManager.Authenticating) + networkStateText = " (authenticating..)" + else if (state == WifiManager.HandshakeFailed) + networkStateText = " (wrong password)" + networkView.networkStateText = networkStateText } } } diff --git a/basicsuite/launchersettings/main.qml b/basicsuite/launchersettings/main.qml index 718bf69..dbd1a31 100644 --- a/basicsuite/launchersettings/main.qml +++ b/basicsuite/launchersettings/main.qml @@ -44,6 +44,7 @@ import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 +import QtQuick.Window 2.1 Rectangle { id: root @@ -73,7 +74,7 @@ Rectangle { text: control.text anchors.centerIn: parent color: "white" - font.pixelSize: 23 + font.pixelSize: 22 renderType: Text.NativeRendering } } @@ -140,7 +141,8 @@ Rectangle { ColumnLayout { id: mainLayout - width: 800 + // can not use size of "root" here, it will shrink UI when virtual keyboard is open + width: Math.min(Screen.width, Screen.height) height: implicitHeight anchors.left: parent.left anchors.right: parent.right @@ -247,6 +249,7 @@ Rectangle { id: hostnameButton style: buttonStyle text: "Change hostname" + implicitWidth: 260 onClicked: networkControllerLoader.item.setHostname(hostname.text); enabled: networkControllerLoader.item != undefined } diff --git a/basicsuite/launchersettings/title.txt b/basicsuite/launchersettings/title.txt index b2fd1f4..0ec27f6 100644 --- a/basicsuite/launchersettings/title.txt +++ b/basicsuite/launchersettings/title.txt @@ -1 +1 @@ -Launcher Settings +010. Launcher Settings diff --git a/basicsuite/mediaplayer/title.txt b/basicsuite/mediaplayer/title.txt index 7919029..a752761 100644 --- a/basicsuite/mediaplayer/title.txt +++ b/basicsuite/mediaplayer/title.txt @@ -1 +1 @@ -Media Player +100. Media Player diff --git a/basicsuite/photogallery/title.txt b/basicsuite/photogallery/title.txt index 4aee1d3..eda05c5 100644 --- a/basicsuite/photogallery/title.txt +++ b/basicsuite/photogallery/title.txt @@ -1 +1 @@ -Photo Gallery +120. Photo Gallery diff --git a/basicsuite/qt5-cinematicdemo/title.txt b/basicsuite/qt5-cinematicdemo/title.txt index 68451f8..8774828 100644 --- a/basicsuite/qt5-cinematicdemo/title.txt +++ b/basicsuite/qt5-cinematicdemo/title.txt @@ -1 +1 @@ -Qt5 Cinematic Demo +030. Qt5 Cinematic Demo diff --git a/basicsuite/qt5-everywhere/demos/radio/channels.xml b/basicsuite/qt5-everywhere/demos/radio/channels.xml index 99522ab..0ba2bb7 100644 --- a/basicsuite/qt5-everywhere/demos/radio/channels.xml +++ b/basicsuite/qt5-everywhere/demos/radio/channels.xml @@ -5,10 +5,6 @@ <url>http://vpr.streamguys.net/vpr24.mp3</url> </channel> <channel> - <title>CBC Music Hard Rock</title> - <url>http://2903.live.streamtheworld.com:80/CBC_HAROCK_H_SC.mp3</url> - </channel> - <channel> <title>"JPR Classics"</title> <url>http://jpr.streamguys.org:80/jpr-classics</url> </channel> @@ -22,6 +18,6 @@ </channel> <channel> <title>Radio Paradise</title> - <url>http://scfire-m26.websys.aol.com:80/radio_paradise_mp3_128kbps.mp3</url> + <url>http://stream-tx1.radioparadise.com/mp3-128</url> </channel> </radio> diff --git a/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml b/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml index fedc9f4..9cdbb50 100644 --- a/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml @@ -86,8 +86,6 @@ Item { anchors.bottom: parent.bottom color: "Black" opacity: 0.5 - visible: iconImage.source - } Text { diff --git a/basicsuite/qt5-everywhere/title.txt b/basicsuite/qt5-everywhere/title.txt index 2f1f4ce..2aae9a5 100644 --- a/basicsuite/qt5-everywhere/title.txt +++ b/basicsuite/qt5-everywhere/title.txt @@ -1 +1 @@ -Qt5 Everywhere +020. Qt5 Everywhere diff --git a/basicsuite/qt5-launchpresentation/title.txt b/basicsuite/qt5-launchpresentation/title.txt index d475d8a..19f15b6 100644 --- a/basicsuite/qt5-launchpresentation/title.txt +++ b/basicsuite/qt5-launchpresentation/title.txt @@ -1 +1 @@ -Qt5 Launch Presentation +040. Qt5 Launch Presentation diff --git a/basicsuite/qt5-particlesdemo/title.txt b/basicsuite/qt5-particlesdemo/title.txt index 8abe769..1db7719 100644 --- a/basicsuite/qt5-particlesdemo/title.txt +++ b/basicsuite/qt5-particlesdemo/title.txt @@ -1 +1 @@ -Qt5 Particles Demo +998. Qt5 Particles Demo diff --git a/basicsuite/sensorexplorer/imports/sensoritem.cpp b/basicsuite/sensorexplorer/imports/sensoritem.cpp index cd33549..2a64d6c 100644 --- a/basicsuite/sensorexplorer/imports/sensoritem.cpp +++ b/basicsuite/sensorexplorer/imports/sensoritem.cpp @@ -101,7 +101,7 @@ void QSensorItem::setStart(bool run) */ QString QSensorItem::id() { - return (_qsensor ? _qsensor->description() : ""); + return (_qsensor ? (!_qsensor->description().isEmpty() ? _qsensor->description() : _qsensor->identifier()) : ""); } /* diff --git a/basicsuite/sensorexplorer/title.txt b/basicsuite/sensorexplorer/title.txt index c56fed8..64de850 100644 --- a/basicsuite/sensorexplorer/title.txt +++ b/basicsuite/sensorexplorer/title.txt @@ -1 +1 @@ -Sensor Explorer +999. Sensor Explorer diff --git a/basicsuite/sensors/Accelbubble.qml b/basicsuite/sensors/Accelbubble.qml index 7fba4d4..c5aeefc 100644 --- a/basicsuite/sensors/Accelbubble.qml +++ b/basicsuite/sensors/Accelbubble.qml @@ -42,6 +42,33 @@ import QtQuick 2.0 import QtSensors 5.0 Item { + function calc() { + if (xAnimation.running || yAnimation.running) + return + + var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * .8) + var newY = (bubble.y - calcPitch(accel.reading.x, accel.reading.y, accel.reading.z) * .8) + + if (newX < 0) + newX = 0 + if (newY < 0) + newY = 0 + + var right = field.width - bubble.width + var bottom = field.height - bubble.height + + if (newX > right) + newX = right + if (newY > bottom) + newY = bottom + + bubble.x = newX + bubble.y = newY + + yBehavior.enabled = true + xBehavior.enabled = true + } + Rectangle { id: field color: "lightblue" @@ -52,26 +79,13 @@ Item { Accelerometer { id: accel active:true - onReadingChanged: { - var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * .1) - var newY = (bubble.y - calcPitch(accel.reading.x, accel.reading.y, accel.reading.z) * .1) - - if (newX < 0) - newX = 0 - if (newY < 0) - newY = 0 - - var right = field.width - bubble.width - var bottom = field.height - bubble.height - - if (newX > right) - newX = right - if (newY > bottom) - newY = bottom + } - bubble.x = newX - bubble.y = newY - } + Timer { + interval: 100 + running: true + repeat: true + onTriggered: calc() } Image { @@ -85,15 +99,23 @@ Item { smooth: true Behavior on y { + id: yBehavior + enabled: false SmoothedAnimation { + id: yAnimation easing.type: Easing.Linear - duration: 100 + duration: 40 + onRunningChanged: calc() } } Behavior on x { + id: xBehavior + enabled: false SmoothedAnimation { + id: xAnimation easing.type: Easing.Linear - duration: 100 + duration: 40 + onRunningChanged: calc() } } } diff --git a/basicsuite/sensors/title.txt b/basicsuite/sensors/title.txt index 558b7c0..a3a5b97 100644 --- a/basicsuite/sensors/title.txt +++ b/basicsuite/sensors/title.txt @@ -1 +1 @@ -Sensors Demo +140. Sensors Demo diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index 808d5df..d33b09c 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -25,6 +25,9 @@ #include <QtGui/QPalette> #include <QtCore/QRegExp> +#if (QT_VERSION < QT_VERSION_CHECK(5, 3, 0)) +#include <QtQuick/QQuickItem> +#endif #include <QtQuick/QQuickView> #include <QtQml/QQmlEngine> @@ -57,10 +60,10 @@ int main(int argc, char **argv) excludeFile.close(); } - QString fontName = QStringLiteral("/system/lib/fonts/OpenSans-Regular.ttf"); + QString fontName = QStringLiteral("/system/lib/fonts/DejaVuSans.ttf"); if (QFile::exists(fontName)) { QFontDatabase::addApplicationFont(fontName); - QFont font("Open Sans"); + QFont font("DejaVu Sans"); font.setPixelSize(12); QGuiApplication::setFont(font); } else { @@ -70,6 +73,11 @@ int main(int argc, char **argv) } QQuickView view; +#if (QT_VERSION < QT_VERSION_CHECK(5, 3, 0)) + // Ensure the width and height are valid because of QTBUG-36938. + QObject::connect(&view, SIGNAL(widthChanged(int)), view.contentItem(), SLOT(setWidth(int))); + QObject::connect(&view, SIGNAL(heightChanged(int)), view.contentItem(), SLOT(setHeight(int))); +#endif DummyEngine engine; view.rootContext()->setContextProperty("engine", &engine); diff --git a/basicsuite/textinput/TextArea.qml b/basicsuite/textinput/TextArea.qml index 490e066..6832356 100644 --- a/basicsuite/textinput/TextArea.qml +++ b/basicsuite/textinput/TextArea.qml @@ -77,12 +77,6 @@ TextBase { selectionColor: Qt.rgba(1.0, 1.0, 1.0, 0.5) selectedTextColor: Qt.rgba(0.0, 0.0, 0.0, 0.8) anchors { left: parent.left; right: parent.right; margins: 12 } - cursorDelegate: Rectangle { - width: 2 - opacity: 0.7 - color: "#EEEEEE" - visible: textEdit.activeFocus - } onActiveFocusChanged: if (!activeFocus) deselect() } diff --git a/basicsuite/textinput/TextBase.qml b/basicsuite/textinput/TextBase.qml index 67ee3e3..916b3e2 100644 --- a/basicsuite/textinput/TextBase.qml +++ b/basicsuite/textinput/TextBase.qml @@ -49,7 +49,7 @@ FocusScope { property int fontPixelSize: 32 property string previewText property string enterKeyText - property bool enterKeyEnabled: true + property bool enterKeyEnabled: enterKeyText.length === 0 || editor.text.length > 0 || editor.inputMethodComposing property alias mouseParent: mouseArea.parent implicitHeight: editor.height + 12 @@ -86,6 +86,8 @@ FocusScope { parent: textBase anchors.fill: parent onClicked: { + if (editor.inputMethodComposing) + Qt.inputMethod.commit() var positionInEditor = mapToItem(editor, mouseX, mouseY) var cursorPosition = editor.positionAt(positionInEditor.x, positionInEditor.y) editor.cursorPosition = cursorPosition diff --git a/basicsuite/textinput/TextField.qml b/basicsuite/textinput/TextField.qml index 9b01418..e95ded7 100644 --- a/basicsuite/textinput/TextField.qml +++ b/basicsuite/textinput/TextField.qml @@ -82,12 +82,6 @@ TextBase { selectionColor: Qt.rgba(1.0, 1.0, 1.0, 0.5) selectedTextColor: Qt.rgba(0.0, 0.0, 0.0, 0.8) width: Math.max(flickable.width, implicitWidth)-2 - cursorDelegate: Rectangle { - width: 2 - opacity: 0.7 - color: "#EEEEEE" - visible: textInput.activeFocus - } onActiveFocusChanged: if (!activeFocus) deselect() } } diff --git a/basicsuite/textinput/main.qml b/basicsuite/textinput/main.qml index 8f63b83..70455bf 100644 --- a/basicsuite/textinput/main.qml +++ b/basicsuite/textinput/main.qml @@ -77,7 +77,6 @@ Flickable { width: parent.width previewText: "One line field" enterKeyText: "Next" - enterKeyEnabled: text.length > 0 onEnterKeyClicked: passwordField.focus = true } TextField { @@ -88,7 +87,6 @@ Flickable { previewText: "Password field" inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase | Qt.ImhSensitiveData | Qt.ImhNoPredictiveText enterKeyText: "Next" - enterKeyEnabled: text.length > 0 onEnterKeyClicked: numberField.focus = true } TextField { @@ -99,7 +97,6 @@ Flickable { previewText: "Phone number field" inputMethodHints: Qt.ImhDialableCharactersOnly enterKeyText: "Next" - enterKeyEnabled: text.length > 0 onEnterKeyClicked: textArea.focus = true } TextArea { diff --git a/basicsuite/textinput/preview_l.jpg b/basicsuite/textinput/preview_l.jpg Binary files differindex f415a86..67a2917 100644 --- a/basicsuite/textinput/preview_l.jpg +++ b/basicsuite/textinput/preview_l.jpg diff --git a/basicsuite/textinput/title.txt b/basicsuite/textinput/title.txt index 932c2f3..8e845f4 100644 --- a/basicsuite/textinput/title.txt +++ b/basicsuite/textinput/title.txt @@ -1 +1 @@ -Virtual Keyboard +050. Virtual Keyboard |
