diff options
author | Daniel d'Andrada <daniel.dandrada@luxoft.com> | 2017-10-02 10:17:40 +0200 |
---|---|---|
committer | Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com> | 2017-10-02 12:40:38 +0000 |
commit | f42a0887c63ae0fb541ba3a33c77a0751cbf1669 (patch) | |
tree | 92dbb18090ef2978621f62a3b998ccfb41bf20d3 | |
parent | e6820a0feea072d76feafdc7fb5a65a90f31c6c9 (diff) | |
download | neptune-ui-f42a0887c63ae0fb541ba3a33c77a0751cbf1669.tar.gz |
Remove dead code
ui_config module is not used anywhere. Configuration data now lies
elsewhere
Change-Id: Ie1ef19ca45cbf20344add6092980e43bcfb54d17
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
-rw-r--r-- | imports/ui_config/auto/uiconfig/ConfigInfo.qml | 148 | ||||
-rw-r--r-- | imports/ui_config/auto/uiconfig/qmldir | 1 |
2 files changed, 0 insertions, 149 deletions
diff --git a/imports/ui_config/auto/uiconfig/ConfigInfo.qml b/imports/ui_config/auto/uiconfig/ConfigInfo.qml deleted file mode 100644 index 8e99544..0000000 --- a/imports/ui_config/auto/uiconfig/ConfigInfo.qml +++ /dev/null @@ -1,148 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Neptune IVI UI. -** -** $QT_BEGIN_LICENSE:GPL-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite 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$ -** -** SPDX-License-Identifier: GPL-3.0 -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Window 2.2 -import QtApplicationManager 1.0 -import com.pelagicore.ScreenManager 1.0 - -QtObject { - property bool withCluster: false - property int cellWidth: 53 // 1280/24 - property int cellHeight: 33 // 800/24 - property int fontWeight: Font.Light - property int fontSizeXXS: 14 - property int fontSizeXS: 16 - property int fontSizeS: 18 - property int fontSizeM: 24 - property int fontSizeL: 28 - property int fontSizeXL: 36 - property int fontSizeXXL: 38 - - property int defaultSymbolSize: symbolSizeS - property int defaultGfxSize: 1 - property int symbolSizeXS: 32 - property int symbolSizeS: 48 - property int symbolSizeM: 72 - property int symbolSizeL: 96 - property int symbolSizeXL: 114 - property int symbolSizeXXL: 192 - - property int paddingXS: 2 - property int paddingS: 4 - property int padding: 8 - property int paddingL: 12 - property int paddingXL: 16 - property int cellFactor: 24 - - property string displayBackground: "background_1920x1080" - property real disabledIconOpacity: 0.6 - property bool fakeBackground: false - property bool debugMode: false - property bool gridMode: false - property int displayHMargin: 11 - property int displayVMargin: 0 - - property int statusBarSpan: 2 - property int climateCollapsedSpan: 3 - property int launcherSpan: 19 - property int notificationCenterWidth: 800 - - property int screenWidth: Screen.width - property int screenHeight: Math.min(screenWidth * 0.62, Screen.height) - property int clusterWidth: 1920 - property int clusterHeight: 720 - - property string assetPath: Qt.resolvedUrl("../../../assets/") - property url drawableUrl: Qt.resolvedUrl(root.assetPath + 'drawable-ldpi') - property url symbolUrl: Qt.resolvedUrl(root.assetPath + 'icons') - property url gfxUrl: Qt.resolvedUrl(root.assetPath + 'gfx/') - property url fonts: Qt.resolvedUrl(root.assetPath + 'fonts/') - - onScreenWidthChanged: cellWidth = Math.floor(screenWidth/cellFactor) - onScreenHeightChanged: cellHeight = Math.floor(screenHeight/cellFactor) - - - Component.onCompleted: { - var scalFactor = (screenWidth/1280); - - print("resolution: " + screenWidth + "x" + screenHeight) - print("scalFactor: ", scalFactor) - - cellWidth = Math.floor(screenWidth/cellFactor) - cellHeight = Math.floor(screenHeight/cellFactor) - - var symbolSize = symbolSizeS - var gfxSize = 1 - if (scalFactor >= 6) { - symbolSize = symbolSizeXL - gfxSize = 4 - } else if (scalFactor >= 2) { - symbolSize = symbolSizeL - gfxSize = 3 - } else if (scalFactor >= 1.5) { - symbolSize = symbolSizeM - gfxSize = 2 - } - - defaultSymbolSize = symbolSize - defaultGfxSize = 4 - - - fontSizeXXS = scalFactor * 14 - - fontSizeXS = scalFactor * 16 - - fontSizeS = scalFactor * 18 - - fontSizeM = scalFactor * 24 - - fontSizeL = scalFactor * 28 - - fontSizeXL = scalFactor * 36 - - fontSizeXXL = scalFactor * 48 - - fontWeight = Font.Light - - var canDisplayCluster = Screen.desktopAvailableWidth > Screen.width || WindowManager.runningOnDesktop || ScreenManager.screenCount() > 1 - - if (canDisplayCluster) { - print("Instrument Cluster enabled") - withCluster = true - if (ScreenManager.availableScreens[1]) { - clusterWidth = ScreenManager.availableScreens[1].size.width - clusterHeight = Math.min(ScreenManager.availableScreens[1].size.width * 0.375, ScreenManager.availableScreens[1].size.height) - } - print("cluster resolution: " + clusterWidth + "x" + clusterHeight) - } - } -} diff --git a/imports/ui_config/auto/uiconfig/qmldir b/imports/ui_config/auto/uiconfig/qmldir deleted file mode 100644 index 898b654..0000000 --- a/imports/ui_config/auto/uiconfig/qmldir +++ /dev/null @@ -1 +0,0 @@ -ConfigInfo 1.0 ConfigInfo.qml |