diff options
| -rw-r--r-- | basicsuite/launchersettings/BrightnessController.qml | 49 | ||||
| -rw-r--r-- | basicsuite/launchersettings/NetworkController.qml | 61 | ||||
| -rw-r--r-- | basicsuite/launchersettings/PoweroffAction.qml | 47 | ||||
| -rw-r--r-- | basicsuite/launchersettings/RebootAction.qml | 47 | ||||
| -rw-r--r-- | basicsuite/launchersettings/main.qml | 42 | ||||
| -rw-r--r-- | basicsuite/shared/main.cpp | 5 | ||||
| -rw-r--r-- | basicsuite/webengine/ErrorPage.qml | 71 | ||||
| -rw-r--r-- | basicsuite/webengine/content/rubiks/js/rubik.js | 8 | ||||
| -rw-r--r-- | basicsuite/webengine/main.qml | 34 |
9 files changed, 31 insertions, 333 deletions
diff --git a/basicsuite/launchersettings/BrightnessController.qml b/basicsuite/launchersettings/BrightnessController.qml deleted file mode 100644 index 1d1abf8..0000000 --- a/basicsuite/launchersettings/BrightnessController.qml +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtDroid.Utils 1.0 -import QtQuick 2.0 - -QtObject { - function setBrightness(value) - { - DroidUtils.setDisplayBrightness(value) - } -} diff --git a/basicsuite/launchersettings/NetworkController.qml b/basicsuite/launchersettings/NetworkController.qml deleted file mode 100644 index a1b9141..0000000 --- a/basicsuite/launchersettings/NetworkController.qml +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtDroid.Utils 1.0 -import QtQuick 2.0 - -QtObject { - - function getIPAddress() - { - return DroidUtils.getIPAddress() - } - - function getHostname() - { - return DroidUtils.getHostname() - } - - function setHostname(value) - { - return DroidUtils.setHostname(value) - } - -} diff --git a/basicsuite/launchersettings/PoweroffAction.qml b/basicsuite/launchersettings/PoweroffAction.qml deleted file mode 100644 index da65140..0000000 --- a/basicsuite/launchersettings/PoweroffAction.qml +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick.Controls 1.2 -import QtDroid.Utils 1.0 - -Action -{ - onTriggered: DroidUtils.powerOffSystem()(); -} diff --git a/basicsuite/launchersettings/RebootAction.qml b/basicsuite/launchersettings/RebootAction.qml deleted file mode 100644 index c99b2f5..0000000 --- a/basicsuite/launchersettings/RebootAction.qml +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick.Controls 1.2 -import QtDroid.Utils 1.0 - -Action -{ - onTriggered: DroidUtils.rebootSystem(); -} diff --git a/basicsuite/launchersettings/main.qml b/basicsuite/launchersettings/main.qml index d067c91..c698aaf 100644 --- a/basicsuite/launchersettings/main.qml +++ b/basicsuite/launchersettings/main.qml @@ -44,15 +44,12 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Enterprise.VirtualKeyboard.Settings 1.2 import Qt.labs.wifi 0.1 as Wifi +import B2Qt.Utils 1.0 Rectangle { anchors.fill: parent color: "#212126" - Loader { id: rebootActionLoader; source: "RebootAction.qml" } - Loader { id: poweroffActionLoader; source: "PoweroffAction.qml" } - Loader { id: brightnessControllerLoader; source: "BrightnessController.qml" } - Loader { id: networkControllerLoader; source: "NetworkController.qml" } Flickable { anchors.top: parent.top @@ -88,16 +85,14 @@ Rectangle { style: SettingsButtonStyle {} text: "Shut Down" Layout.fillWidth: true - action: poweroffActionLoader.item; - enabled: action != undefined + onClicked: B2QtDevice.powerOff(); } Button { style: SettingsButtonStyle {} text: "Reboot" Layout.fillWidth: true - action: rebootActionLoader.item; - enabled: action != undefined + onClicked: B2QtDevice.reboot(); } } } @@ -128,15 +123,11 @@ Rectangle { } Slider { + id: brightnessSlider maximumValue: 255 minimumValue: 1 - value: 255 Layout.fillWidth: true - onValueChanged: { - if (brightnessControllerLoader.item != undefined) { - brightnessControllerLoader.item.setBrightness(value); - } - } + value: B2QtDevice.displayBrightness style: SliderStyle { handle: Rectangle { anchors.centerIn: parent @@ -149,6 +140,7 @@ Rectangle { } } } + CheckBox { style: SettingsCheckBoxStyle {} checked: engine.fpsEnabled @@ -186,6 +178,12 @@ Rectangle { } } + Binding { + target: B2QtDevice + property: "displayBrightness" + value: brightnessSlider.value + } + Component.onCompleted: { if (VirtualKeyboardSettings.styleName == "default") defaultStyle.checked = true @@ -222,14 +220,22 @@ Rectangle { TextField { id: hostname - text: if (networkControllerLoader.item != undefined) { networkControllerLoader.item.getHostname(); } + text: B2QtDevice.hostname + placeholderText: "Enter hostname" font.pixelSize: engine.smallFontSize() + inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase | Qt.ImhNoPredictiveText Layout.fillWidth: true Layout.preferredHeight: font.pixelSize * 2.4 + onAccepted: { + Qt.inputMethod.commit() + Qt.inputMethod.hide() + B2QtDevice.setHostname(hostname.text) + hostname.focus = false + } } Label { - text: if (networkControllerLoader.item != undefined) { networkControllerLoader.item.getIPAddress(); } + text: B2QtDevice.ipAddress font.pixelSize: engine.smallFontSize() color: "white" Layout.columnSpan: 2 @@ -239,10 +245,8 @@ Rectangle { id: hostnameButton style: SettingsButtonStyle {} text: "Change hostname" - onClicked: networkControllerLoader.item.setHostname(hostname.text); - enabled: networkControllerLoader.item != undefined + onClicked: hostname.accepted() } - } } diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index becc927..9ddb61b 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -50,9 +50,8 @@ int main(int argc, char **argv) #if defined(USE_QTWEBENGINE) // This is currently needed by all QtWebEngine applications using the HW accelerated QQuickWebView. // It enables sharing the QOpenGLContext of all QQuickWindows of the application. - // We have to do so until we expose a public API for it in Qt or choose to enable it - // by default earliest in Qt 5.4.0. - QWebEngine::initialize(); + // We have to do so until we expose public API for it in Qt or choose to enable it by default. + QtWebEngine::initialize(); #endif QString path = app.applicationDirPath(); diff --git a/basicsuite/webengine/ErrorPage.qml b/basicsuite/webengine/ErrorPage.qml deleted file mode 100644 index daa25d0..0000000 --- a/basicsuite/webengine/ErrorPage.qml +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.1 - -Rectangle { - id: errorPage - property alias mainMessage: errorMessage.text; - property bool displayingError: false; - anchors.fill: parent - color: "lightgray" - visible: displayingError - - Rectangle { - color: "white" - anchors.centerIn: parent - height: parent.height / 3 - width: Math.max(parent.width / 2, errorMessage.width + 20) - - border { - color: "dimgray" - width: 0.5 - } - - radius: 20 - Text { - id: errorMessage - color: "dimgray" - font.pixelSize: 20 - anchors.centerIn: parent - } - } - -} diff --git a/basicsuite/webengine/content/rubiks/js/rubik.js b/basicsuite/webengine/content/rubiks/js/rubik.js index 4e6cf28..72dbae7 100644 --- a/basicsuite/webengine/content/rubiks/js/rubik.js +++ b/basicsuite/webengine/content/rubiks/js/rubik.js @@ -30,7 +30,7 @@ Face.prototype.init = function(cube, type) { this._color = null; this._node = OZ.DOM.elm("div", {className:"face face"+type, width:Face.SIZE+"px", height:Face.SIZE+"px", position:"absolute", left:"0px", top:"0px"}); OZ.CSS3.set(this._node, "box-sizing", "border-box"); -// OZ.CSS3.set(this._node, "backface-visibility", "hidden"); + OZ.CSS3.set(this._node, "backface-visibility", "hidden"); switch (type) { case Face.LEFT: @@ -126,8 +126,8 @@ Cube.prototype.prepareColorChange = function(sourceCube, rotation) { } Cube.prototype.commitColorChange = function() { -// var parent = this._node.parentNode; -// parent.removeChild(this._node); + var parent = this._node.parentNode; + parent.removeChild(this._node); OZ.DOM.clear(this._node); this._faces = {}; @@ -139,7 +139,7 @@ Cube.prototype.commitColorChange = function() { this._rotation = null; this._update(); -// parent.appendChild(this._node); + parent.appendChild(this._node); } Cube.prototype._rotateType = function(type, rotation) { diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml index 29b16fd..d0b58c9 100644 --- a/basicsuite/webengine/main.qml +++ b/basicsuite/webengine/main.qml @@ -43,7 +43,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Layouts 1.1 -import QtWebEngine 0.9 +import QtWebEngine 1.0 import "ui" @@ -56,49 +56,19 @@ Rectangle { width: 1280 height: 800 - property url defaultUrl: Qt.resolvedUrl("about:blank") + property url defaultUrl: Qt.resolvedUrl("content/index.html") function load(url) { mainWebView.url = url } - ErrorPage { - id: errorPage - anchors.fill: parent - displayingError: false - } - WebEngineView { id: mainWebView anchors.fill: parent url: defaultUrl - visible: !errorPage.displayingError onLoadingChanged: { if (!loading) { addressBar.cursorPosition = 0 } - var loadError = loadRequest.errorDomain - if (loadError == WebEngineView.NoErrorDomain) { - errorPage.displayingError = false - return; - } - errorPage.displayingError = true - if (loadError == WebEngineView.InternalErrorDomain) - errorPage.mainMessage = "Internal error" - else if (loadError == WebEngineView.ConnectionErrorDomain) - errorPage.mainMessage = "Unable to connect to the Internet" - else if (loadError == WebEngineView.CertificateErrorDomain) - errorPage.mainMessage = "Certificate error" - else if (loadError == WebEngineView.DnsErrorDomain) - errorPage.mainMessage = "Unable to resolve the server's DNS address" - else // HTTP and FTP - errorPage.mainMessage = "Protocol error" } onActiveFocusChanged: activeFocus ? hideTimer.running = true : toolBar.state = "address" - - Timer { - interval: 1500 - running: false - onTriggered: defaultUrl = Qt.resolvedUrl("content/index.html") - Component.onCompleted: start() - } } MultiPointTouchArea { |