From 8e2d3a072fda43c4ea04e646660aec15ec238214 Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Wed, 11 May 2016 13:30:34 +0300 Subject: Replace LauncherSettings with SettingsUI from Device Utils module. Change-Id: I6c50cab59db04dc9837a13f88124202973ce40c7 Reviewed-by: Samuli Piippo Reviewed-by: Teemu Holappa --- basicsuite/launchersettings/SettingTitle.qml | 60 ---- basicsuite/launchersettings/Spacer.qml | 33 --- basicsuite/launchersettings/WifiGroupBox.qml | 131 --------- basicsuite/launchersettings/WifiNetworkList.qml | 205 ------------- basicsuite/launchersettings/description.txt | 1 - basicsuite/launchersettings/exclude.txt | 1 - .../launchersettings/images/Display_icon.png | Bin 1217 -> 0 bytes .../images/Keyboard_Thumb_default.png | Bin 14171 -> 0 bytes .../images/Keyboard_Thumb_retro.png | Bin 58203 -> 0 bytes .../launchersettings/images/Keyboard_icon.png | Bin 1471 -> 0 bytes .../launchersettings/images/Network_icon.png | Bin 2327 -> 0 bytes basicsuite/launchersettings/images/Power_icon.png | Bin 2065 -> 0 bytes basicsuite/launchersettings/launchersettings.pro | 1 - basicsuite/launchersettings/main.qml | 316 +-------------------- basicsuite/launchersettings/preview_l.jpg | Bin 43184 -> 0 bytes basicsuite/launchersettings/title.txt | 1 - 16 files changed, 4 insertions(+), 745 deletions(-) delete mode 100644 basicsuite/launchersettings/SettingTitle.qml delete mode 100644 basicsuite/launchersettings/Spacer.qml delete mode 100644 basicsuite/launchersettings/WifiGroupBox.qml delete mode 100644 basicsuite/launchersettings/WifiNetworkList.qml delete mode 100644 basicsuite/launchersettings/description.txt delete mode 100644 basicsuite/launchersettings/exclude.txt delete mode 100644 basicsuite/launchersettings/images/Display_icon.png delete mode 100644 basicsuite/launchersettings/images/Keyboard_Thumb_default.png delete mode 100644 basicsuite/launchersettings/images/Keyboard_Thumb_retro.png delete mode 100644 basicsuite/launchersettings/images/Keyboard_icon.png delete mode 100644 basicsuite/launchersettings/images/Network_icon.png delete mode 100644 basicsuite/launchersettings/images/Power_icon.png delete mode 100644 basicsuite/launchersettings/preview_l.jpg delete mode 100644 basicsuite/launchersettings/title.txt (limited to 'basicsuite') diff --git a/basicsuite/launchersettings/SettingTitle.qml b/basicsuite/launchersettings/SettingTitle.qml deleted file mode 100644 index 2471379..0000000 --- a/basicsuite/launchersettings/SettingTitle.qml +++ /dev/null @@ -1,60 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Device Creation. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ -import QtQuick 2.2 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.4 - -RowLayout { - id: root - property alias iconSource: icon.source - property alias titleText: title.text - property alias smallText: additionalText.text - - Layout.bottomMargin: engine.mm(6) - spacing: 0 - - Image { - id: icon - Layout.preferredWidth: mainLayout.width * .05 - Layout.preferredHeight: width * sourceSize.width/sourceSize.height - source: "" - fillMode: Image.PreserveAspectFit - anchors.bottom: parent.bottom - } - - Label { - id: title - text: "Display" - font.pixelSize: engine.titleFontSize() *.8 - anchors.bottom: parent.bottom - Layout.leftMargin: mainLayout.defaultMargin * .5 - Layout.preferredWidth: mainLayout.width * .5 - } - - Label { - id: additionalText - text: "" - font.pixelSize: engine.smallFontSize() - anchors.bottom: parent.bottom - Layout.fillWidth: true - elide: Label.ElideRight - } -} diff --git a/basicsuite/launchersettings/Spacer.qml b/basicsuite/launchersettings/Spacer.qml deleted file mode 100644 index 42950cf..0000000 --- a/basicsuite/launchersettings/Spacer.qml +++ /dev/null @@ -1,33 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Device Creation. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ -import QtQuick 2.2 - -Item { - width: parent.width - height: 50 - - Rectangle { - width: parent.width - height: 3 - color: "#eeeeee" - anchors.verticalCenter: parent.verticalCenter - } -} diff --git a/basicsuite/launchersettings/WifiGroupBox.qml b/basicsuite/launchersettings/WifiGroupBox.qml deleted file mode 100644 index c812db3..0000000 --- a/basicsuite/launchersettings/WifiGroupBox.qml +++ /dev/null @@ -1,131 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Device Creation. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.0 -import B2Qt.Wifi 1.0 - -ColumnLayout { - - RowLayout { - - Label { - text: qsTr("Wi-Fi") - font.pixelSize: engine.titleFontSize() *.8 - Layout.leftMargin: 0 - Layout.preferredWidth: mainLayout.column1Width - } - - Switch { - id: wifiOnOffButton - Layout.bottomMargin: 0 - - onCheckedChanged: { - if (checked && WifiManager.backendState === WifiManager.NotRunning) { - WifiManager.start() - return - } - - if (!checked && WifiManager.backendState === WifiManager.Running) { - if (networkList.visible) - networkList.visible = false - WifiManager.stop() - } - } - - function updateButtonText(backendState) - { - if (backendState === WifiManager.Initializing) { - wifiOnOffText.text = qsTr("Initializing...") - } else if (backendState === WifiManager.Terminating) { - wifiOnOffText.text = qsTr("Terminating...") - } else if (backendState === WifiManager.NotRunning) { - wifiOnOffText.text = qsTr("Off") - wifiOnOffButton.checked = false - } else if (backendState === WifiManager.Running) { - wifiOnOffText.text = qsTr("On") - wifiOnOffButton.checked = true - } - } - - Component.onCompleted: updateButtonText(WifiManager.backendState) - - Connections { - target: WifiManager - onBackendStateChanged: wifiOnOffButton.updateButtonText(backendState) - } - } - - Text { - id: wifiOnOffText - font.pixelSize: engine.smallFontSize() - Layout.leftMargin: mainLayout.width * .05 - } - } - - Connections { - target: WifiManager - onLastErrorChanged: { - wifiErrorReporter.text = "error: " + WifiManager.lastError - clearErrorTimer.restart() - } - } - - Text { - id: wifiErrorReporter - wrapMode: Text.WordWrap - Layout.leftMargin: mainLayout.column1Width - Layout.topMargin: engine.mm(2) - Layout.preferredWidth: mainLayout.width * .4 - Timer { - id: clearErrorTimer - repeat: false - interval: 6000 - onTriggered: wifiErrorReporter.text = "" - } - } - - Binding { - target: WifiManager - property: "scanning" - value: networkList.visible - } - - Button { - id: listNetworksButton - Layout.leftMargin: mainLayout.column1Width - Layout.topMargin: engine.mm(1) - Layout.preferredWidth: mainLayout.width * .4 - visible: WifiManager.backendState === WifiManager.Running - text: networkList.visible ? qsTr("Hide Wi-Fi networks") - : qsTr("List available Wi-Fi networks") - onClicked: networkList.visible = !networkList.visible - } - - WifiNetworkList { - id: networkList - implicitHeight: engine.centimeter(7) - Layout.fillWidth: true - Layout.leftMargin: mainLayout.column1Width - visible: false - clip: true - } -} diff --git a/basicsuite/launchersettings/WifiNetworkList.qml b/basicsuite/launchersettings/WifiNetworkList.qml deleted file mode 100644 index b430504..0000000 --- a/basicsuite/launchersettings/WifiNetworkList.qml +++ /dev/null @@ -1,205 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Device Creation. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ -import QtQuick 2.2 -import QtQuick.Controls 1.4 -import B2Qt.Wifi 1.0 - -Item { - - Component { - id: listDelegate - - Rectangle { - id: networkBox - property bool expanded: false - property bool isCurrentNetwork: WifiManager.currentSSID === ssid - property bool connected: isCurrentNetwork && WifiManager.networkState === WifiManager.Connected - property int notExpandedHeight: ssidLabel.height + bssidLabel.height + engine.mm(4) - property int expandedHeight: notExpandedHeight + connectionButton.height + engine.mm(8) - height: expanded ? expandedHeight : notExpandedHeight - width: parent.width - clip: true - - Component.onDestruction: if (expanded) networkView.expandedNetworkBox = null - onHeightChanged: if (expanded) networkView.positionViewAtIndex(index, ListView.Contain) - - Behavior on height { NumberAnimation { duration: 500; easing.type: Easing.InOutCubic } } - - CheckBox { - id: connectedCheckBox - anchors.top: parent.top - anchors.left: parent.left - anchors.margins: engine.mm(1) - anchors.leftMargin: engine.mm(2) - checked: connected - } - - Label { - id: ssidLabel - anchors.top: parent.top - anchors.left: connectedCheckBox.right - anchors.margins: engine.mm(1) - anchors.leftMargin: engine.mm(2) - font.pixelSize: engine.smallFontSize() - font.bold: true - color: "black" - text: isCurrentNetwork ? ssid + networkView.networkStateText : ssid - Component.onCompleted: networkView.setNetworkStateText(WifiManager.networkState) - } - - Label { - id: bssidLabel - anchors.top: ssidLabel.bottom - anchors.left: connectedCheckBox.right - anchors.margins: engine.mm(1) - anchors.leftMargin: engine.mm(2) - text: bssid - color: "black" - font.pixelSize: ssidLabel.font.pixelSize - } - - Label { - id: flagsLabel - anchors.top: bssidLabel.top - anchors.right: parent.right - text: (supportsWPA2 ? qsTr("WPA2 ") : "") - + (supportsWPA ? qsTr("WPA ") : "") - + (supportsWEP ? qsTr("WEP ") : "") - + (supportsWPS ? qsTr("WPS ") : ""); - color: "black" - font.pixelSize: ssidLabel.font.pixelSize - font.bold: true - } - - ProgressBar { - id: signalStrengthBar - height: engine.mm(3) - width: networkBox.width * 0.25 - anchors.margins: engine.mm(2) - anchors.right: parent.right - anchors.top: parent.top - minimumValue: 0 - maximumValue: 100 - property int level: signalStrength - onLevelChanged: signalStrengthBar.value = level - } - - MouseArea { - anchors.fill: parent - onClicked: handleNetworkBoxExpanding() - } - - function handleNetworkBoxExpanding() - { - expanded = !expanded - if (expanded) { - if (networkView.hasExpandedNetworkBox) - networkView.expandedNetworkBox.expanded = false - networkView.expandedNetworkBox = networkBox - } else { - networkView.expandedNetworkBox = null - } - } - - TextField { - id: passwordInput - anchors.top: flagsLabel.bottom - anchors.topMargin: engine.mm(6) - anchors.right: connectionButton.left - anchors.rightMargin: mainLayout.defaultMargin * .25 - anchors.left: ssidLabel.left - placeholderText: qsTr("Enter Password") - visible: !connected - font.pixelSize: engine.smallFontSize() - echoMode: TextInput.Password - inputMethodHints: Qt.ImhNoPredictiveText - } - - Button { - id: connectionButton - width: parent.width * .4 - anchors.right: parent.right - anchors.top: flagsLabel.bottom - anchors.topMargin: engine.mm(6) - text: connected ? qsTr("Disconnect") : qsTr("Connect") - onClicked: { - if (connected) { - WifiManager.disconnect() - } else { - config.ssid = ssid; - config.passphrase = passwordInput.text - var supportedProtocols = ""; - if (supportsWPA) supportedProtocols += "WPA " - if (supportsWPA2) supportedProtocols += "WPA2 " - if (supportsWEP) supportedProtocols += "WEP " - if (supportsWPS) supportedProtocols += "WPS " - config.protocol = supportedProtocols - WifiManager.connect(config) - } - } - } - } - } - - WifiConfiguration { - id: config - } - - GroupBox { - anchors.fill: parent - - Item { - anchors.fill: parent - clip: true - - ListView { - id: networkView - anchors.fill: parent - model: WifiManager.networks - delegate: listDelegate - - property string networkStateText: "" - property QtObject expandedNetworkBox: null - property bool hasExpandedNetworkBox: expandedNetworkBox !== null - - function setNetworkStateText(networkState) { - if (networkState === WifiManager.ObtainingIPAddress) - networkView.networkStateText = qsTr(" (obtaining ip..)") - else if (networkState === WifiManager.DhcpRequestFailed) - networkView.networkStateText = qsTr(" (dhcp request failed)") - else if (networkState === WifiManager.Connected) - networkView.networkStateText = qsTr(" (connected)") - else if (networkState === WifiManager.Authenticating) - networkView.networkStateText = qsTr(" (authenticating..)") - else if (networkState === WifiManager.HandshakeFailed) - networkView.networkStateText = qsTr(" (wrong password)") - else if (networkState === WifiManager.Disconnected) - networkView.networkStateText = "" - } - - Connections { - target: WifiManager - onNetworkStateChanged: networkView.setNetworkStateText(networkState) - } - } - } - } -} diff --git a/basicsuite/launchersettings/description.txt b/basicsuite/launchersettings/description.txt deleted file mode 100644 index 98ce6f6..0000000 --- a/basicsuite/launchersettings/description.txt +++ /dev/null @@ -1 +0,0 @@ -This demo uses the Qt Quick Controls to give a couple of options for the launcher itself. diff --git a/basicsuite/launchersettings/exclude.txt b/basicsuite/launchersettings/exclude.txt deleted file mode 100644 index 0702cb5..0000000 --- a/basicsuite/launchersettings/exclude.txt +++ /dev/null @@ -1 +0,0 @@ -all diff --git a/basicsuite/launchersettings/images/Display_icon.png b/basicsuite/launchersettings/images/Display_icon.png deleted file mode 100644 index 1f6f80b..0000000 Binary files a/basicsuite/launchersettings/images/Display_icon.png and /dev/null differ diff --git a/basicsuite/launchersettings/images/Keyboard_Thumb_default.png b/basicsuite/launchersettings/images/Keyboard_Thumb_default.png deleted file mode 100644 index c251028..0000000 Binary files a/basicsuite/launchersettings/images/Keyboard_Thumb_default.png and /dev/null differ diff --git a/basicsuite/launchersettings/images/Keyboard_Thumb_retro.png b/basicsuite/launchersettings/images/Keyboard_Thumb_retro.png deleted file mode 100644 index bfbdc9b..0000000 Binary files a/basicsuite/launchersettings/images/Keyboard_Thumb_retro.png and /dev/null differ diff --git a/basicsuite/launchersettings/images/Keyboard_icon.png b/basicsuite/launchersettings/images/Keyboard_icon.png deleted file mode 100644 index 1384a42..0000000 Binary files a/basicsuite/launchersettings/images/Keyboard_icon.png and /dev/null differ diff --git a/basicsuite/launchersettings/images/Network_icon.png b/basicsuite/launchersettings/images/Network_icon.png deleted file mode 100644 index 808b632..0000000 Binary files a/basicsuite/launchersettings/images/Network_icon.png and /dev/null differ diff --git a/basicsuite/launchersettings/images/Power_icon.png b/basicsuite/launchersettings/images/Power_icon.png deleted file mode 100644 index 1a038c0..0000000 Binary files a/basicsuite/launchersettings/images/Power_icon.png and /dev/null differ diff --git a/basicsuite/launchersettings/launchersettings.pro b/basicsuite/launchersettings/launchersettings.pro index e89b4d0..33d1882 100644 --- a/basicsuite/launchersettings/launchersettings.pro +++ b/basicsuite/launchersettings/launchersettings.pro @@ -5,7 +5,6 @@ b2qtdemo_deploy_defaults() content.files = *.qml content.path = $$DESTPATH -content.files += images OTHER_FILES += $${content.files} diff --git a/basicsuite/launchersettings/main.qml b/basicsuite/launchersettings/main.qml index 969d6ea..2be5e0a 100644 --- a/basicsuite/launchersettings/main.qml +++ b/basicsuite/launchersettings/main.qml @@ -18,318 +18,10 @@ ** $QT_END_LICENSE$ ** ******************************************************************************/ -import QtQuick 2.2 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.4 -import QtQuick.Enterprise.VirtualKeyboard.Settings 2.0 -import B2Qt.Wifi 1.0 -import B2Qt.Utils 1.0 +import QtQuick 2.6 +import com.theqtcompany.settingsui 1.0 -Rectangle { +SettingsUI { + id: settingsUI anchors.fill: parent - color: "white" - - Flickable { - anchors.top: parent.top - anchors.topMargin: engine.mm(5) - anchors.horizontalCenter: parent.horizontalCenter - height: parent.height - width: parent.width - contentHeight: mainLayout.height + engine.centimeter(2) - contentWidth: mainLayout.width - flickableDirection: Flickable.VerticalFlick - leftMargin: (width - contentWidth) * 0.5 - - ColumnLayout { - id: mainLayout - width: Math.min(engine.screenWidth(), engine.screenHeight()) - height: implicitHeight - anchors.horizontalCenter: parent.horizontalCenter - - property int defaultMargin: width * .1 - property int column1Width: width * .25 - - Label { - text: qsTr("Demo Launcher Settings") - font.pixelSize: engine.titleFontSize() - Layout.topMargin: height - Layout.bottomMargin: height - } - - SettingTitle { - titleText: qsTr("Network") - iconSource: "images/Network_icon.png" - smallText: qsTr("Current hostname: %1").arg(B2QtDevice.hostname) - } - - GridLayout { - anchors.left: parent.left - anchors.right: parent.right - Layout.bottomMargin: engine.mm(3) - columns: 3 - rows: 3 - - Label { - text: qsTr("Change Hostname:") - font.pixelSize: engine.smallFontSize() - Layout.preferredWidth: mainLayout.column1Width - Layout.leftMargin: mainLayout.defaultMargin - } - - TextField { - id: hostname - text: B2QtDevice.hostname - placeholderText: qsTr("Enter hostname") - font.pixelSize: engine.smallFontSize() - inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase | Qt.ImhNoPredictiveText - Layout.fillWidth: true - Layout.rightMargin: mainLayout.defaultMargin * .25 - onAccepted: { - Qt.inputMethod.commit() - Qt.inputMethod.hide() - B2QtDevice.setHostname(hostname.text) - hostname.focus = false - } - } - - Button { - id: hostnameButton - - anchors.right: parent.right - text: qsTr("Change") - - onClicked: hostname.accepted() - } - - Label { - text: qsTr("IP Address:") - Layout.preferredWidth: parent.width * .2 - font.pixelSize: engine.smallFontSize() - Layout.leftMargin: mainLayout.defaultMargin - } - - Label { - text: B2QtDevice.ipAddress - font.pixelSize: engine.smallFontSize() - } - } - - ColumnLayout { - id: wifiOptions - Layout.fillWidth: true - Layout.leftMargin: mainLayout.defaultMargin - visible: false - - function createWifiGroupBox() - { - if (WifiDevice.wifiSupported()) { - var component = Qt.createComponent("WifiGroupBox.qml") - var wifi = component.createObject(wifiOptions) - if (wifi) { - wifiOptions.visible = true - } else { - print("Error creating WifiGroupBox") - } - } - } - Component.onCompleted: wifiOptions.createWifiGroupBox() - } - - Spacer {} - - SettingTitle { - id: vKBSettingsTitle - titleText: qsTr("Virtual Keyboard Style") - iconSource: "images/Keyboard_icon.png" - smallText: qsTr("Preview:") - } - - RowLayout { - id: row1 - spacing: 0 - anchors.left: parent.left - anchors.right: parent.right - - GridLayout { - id: vKBStyleSelection - anchors.left: parent.left - anchors.right: parent.horizontalCenter - columns: 2 - rows: 2 - - function updateVKBStyle(style) { - VirtualKeyboardSettings.styleName = style.toLowerCase() - } - - ExclusiveGroup { id: vkbStyleGroup } - - Label { - text: qsTr("Default") - Layout.preferredWidth: mainLayout.column1Width - font.pixelSize: engine.smallFontSize() - Layout.leftMargin: mainLayout.defaultMargin - } - - RadioButton { - id: defaultStyle - exclusiveGroup: vkbStyleGroup - checked: VirtualKeyboardSettings.styleName === "default" - onClicked: vKBStyleSelection.updateVKBStyle("default") - } - - Label { - text: qsTr("Retro") - Layout.preferredWidth: mainLayout.column1Width - font.pixelSize: engine.smallFontSize() - Layout.leftMargin: mainLayout.defaultMargin - } - - RadioButton { - id: retroStyle - exclusiveGroup: vkbStyleGroup - checked: VirtualKeyboardSettings.styleName === "retro" - onClicked: vKBStyleSelection.updateVKBStyle("retro") - } - } - - Image { - id: vKBPreviewThumbnail - anchors.right: parent.right - Layout.preferredWidth: mainLayout.width *.4 - Layout.leftMargin: mainLayout.defaultMargin - source: VirtualKeyboardSettings.styleName === "retro" ? - "images/Keyboard_Thumb_retro.png" : - "images/Keyboard_Thumb_default.png" - - fillMode: Image.PreserveAspectFit - } - } - - Spacer {} - - SettingTitle { - titleText: qsTr("Display") - iconSource: "images/Display_icon.png" - } - - GridLayout { - id: gridLayout - anchors.left: parent.left - anchors.right: parent.right - columns: 3 - rows: 3 - - Label { - text: qsTr("Brightness:") - font.pixelSize: engine.smallFontSize() - Layout.preferredWidth: mainLayout.column1Width - Layout.leftMargin: mainLayout.defaultMargin - } - - Slider { - id: brightnessSlider - maximumValue: 255 - minimumValue: 1 - Layout.preferredWidth: physicalSizeSlider.width - value: B2QtDevice.displayBrightness - } - - Binding { - target: B2QtDevice - property: "displayBrightness" - value: brightnessSlider.value - } - - Text { - text: qsTr("%1%").arg(Math.round(brightnessSlider.value / brightnessSlider.maximumValue * 100)) - font.pixelSize: engine.smallFontSize() - Layout.leftMargin: mainLayout.width * .05 - } - - Label { - text: qsTr("Display FPS:") - font.pixelSize: engine.smallFontSize() - Layout.preferredWidth: parent.width * .2 - Layout.leftMargin: mainLayout.defaultMargin - } - - CheckBox { - checked: engine.fpsEnabled - onCheckedChanged: engine.fpsEnabled = checked - } - } - - Rectangle { - anchors.left: parent.left - anchors.leftMargin: mainLayout.defaultMargin - anchors.right: parent.right - height: advancedDisplaySettings.height + engine.mm(6) - color: "#efefef" - - GridLayout { - id: advancedDisplaySettings - anchors { left: parent.left; top:parent.top; right: parent.right } - anchors.margins: engine.mm(3) - columns: 3 - rows: 3 - - Label { - text: qsTr("Physical Screen Size:") - font.pixelSize: engine.smallFontSize() - wrapMode: Text.WordWrap - Layout.preferredWidth: mainLayout.width * .25 - advancedDisplaySettings.anchors.margins - } - - Slider { - id: physicalSizeSlider - maximumValue: 60 - minimumValue: 4 - Layout.fillWidth: true - value: B2QtDevice.physicalScreenSizeInch - } - - Text { - text: qsTr("%1 inches").arg(Math.round(physicalSizeSlider.value)) - font.pixelSize: engine.smallFontSize() - Layout.preferredWidth: mainLayout.width * .1 - Layout.leftMargin: mainLayout.width * .05 - } - - Label { - text: qsTr("Override\n(needs restart):") - font.pixelSize: engine.smallFontSize() - wrapMode: Text.WordWrap - Layout.preferredWidth: mainLayout.width * .25 - advancedDisplaySettings.anchors.margins - } - - CheckBox { - checked: B2QtDevice.physicalScreenSizeOverride - onCheckedChanged: B2QtDevice.physicalScreenSizeOverride = checked - } - } - } - - Spacer {} - - SettingTitle { - titleText: qsTr("Power") - iconSource: "images/Power_icon.png" - } - - RowLayout { - spacing: mainLayout.defaultMargin *.25 - - Button { - text: qsTr("Shut Down") - Layout.leftMargin: mainLayout.defaultMargin - onClicked: B2QtDevice.powerOff(); - } - - Button { - text: qsTr("Reboot") - onClicked: B2QtDevice.reboot(); - } - } - } - } } diff --git a/basicsuite/launchersettings/preview_l.jpg b/basicsuite/launchersettings/preview_l.jpg deleted file mode 100644 index 4cdb7c5..0000000 Binary files a/basicsuite/launchersettings/preview_l.jpg and /dev/null differ diff --git a/basicsuite/launchersettings/title.txt b/basicsuite/launchersettings/title.txt deleted file mode 100644 index 0ec27f6..0000000 --- a/basicsuite/launchersettings/title.txt +++ /dev/null @@ -1 +0,0 @@ -010. Launcher Settings -- cgit v1.2.3