summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-27 03:00:41 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-27 03:00:46 +0200
commit321353b82fef7c675a5d62bb38c913fdc41e4f27 (patch)
tree8c124ef98bd66ef69e1fdeccb80a14c50ea04006
parenta732c85a69bcc13cd8dd6ea1c0b047fdc4c03187 (diff)
parentcbe9f582b7555351c2f6af76e4ab4d01ee6f224f (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
-rw-r--r--src/settingsui/ViewSettings.qml43
-rw-r--r--src/settingsui/main.qml6
-rw-r--r--src/settingsui/settingsuiapp.qrc2
3 files changed, 50 insertions, 1 deletions
diff --git a/src/settingsui/ViewSettings.qml b/src/settingsui/ViewSettings.qml
new file mode 100644
index 0000000..9bbbc10
--- /dev/null
+++ b/src/settingsui/ViewSettings.qml
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt for Device Creation.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.0
+
+Item {
+ id: viewSettings
+
+ property real pageMargin: 0.03 * Math.min(window.width, window.height)
+ property real spacing: pageMargin * 0.5
+ property string appFont: "TitilliumWeb"
+ property string backgroundColor: "#09102b"
+ property string borderColor: "#9d9faa"
+ property string buttonGreenColor: "#41cd52"
+ property string buttonGrayColor: "#9d9faa"
+ property string buttonActiveColor: "#216729"
+ property string scrollBarColor: "#41cd52"
+}
diff --git a/src/settingsui/main.qml b/src/settingsui/main.qml
index 874e0eb..8c97811 100644
--- a/src/settingsui/main.qml
+++ b/src/settingsui/main.qml
@@ -36,6 +36,12 @@ Window {
id: window
visible: true
+ property alias appFont: viewSettings.appFont
+
+ ViewSettings {
+ id: viewSettings
+ }
+
Item {
id: root
anchors.fill: parent
diff --git a/src/settingsui/settingsuiapp.qrc b/src/settingsui/settingsuiapp.qrc
index a3e7ca5..110cf83 100644
--- a/src/settingsui/settingsuiapp.qrc
+++ b/src/settingsui/settingsuiapp.qrc
@@ -31,6 +31,6 @@
<file>settingsuiplugin/ShutdownPopup.qml</file>
<file>bluetooth/Bluetooth.qml</file>
<file>bluetooth/Discovery.qml</file>
- <file>timedate/TimeDate.qml</file>
+ <file>ViewSettings.qml</file>
</qresource>
</RCC>