diff options
author | Grigorii Zimin <gzimin@luxoft.com> | 2020-02-21 14:05:59 +0300 |
---|---|---|
committer | Grigorii Zimin <gzimin@luxoft.com> | 2020-02-21 11:42:10 +0000 |
commit | 7ccf8766b52f0e492fbf21c574703eee5b942a29 (patch) | |
tree | 932ccd6564418bfd5b2bb0094aa939454268b606 | |
parent | 33663795233012ef5abc250d8805e1939ed3b81a (diff) |
[camera] update qml part against Neptune changes5.13
Fixes: AUTOSUITE-1491
Change-Id: Iaf4a9861022cf1a4681ab1e495fe5e955b457f9c
Reviewed-by: Egor Nemtsev <enemtsev@luxoft.com>
-rw-r--r-- | com.pelagicore.camera/app/Camera.qml | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/com.pelagicore.camera/app/Camera.qml b/com.pelagicore.camera/app/Camera.qml index a70d067..ee39ea8 100644 --- a/com.pelagicore.camera/app/Camera.qml +++ b/com.pelagicore.camera/app/Camera.qml @@ -1,5 +1,6 @@ /**************************************************************************** ** +** Copyright (C) 2019-2020 Luxoft Sweden AB ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** @@ -54,17 +55,20 @@ import QtQuick 2.8 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.2 import QtGraphicalEffects 1.0 -import utils 1.0 -import controls 1.0 -import com.pelagicore.styles.neptune 3.0 +import shared.utils 1.0 +import shared.controls 1.0 +import shared.Style 1.0 +import shared.Sizes 1.0 +import application.windows 1.0 + import camera 0.1 -PrimaryWindow { +ApplicationCCWindow { id: root readonly property var angles: [qsTr("Front"), qsTr("Rear"), qsTr("Left"), qsTr("Right")] property bool play: !videofeed.lastError - property real buttonWidth: NeptuneStyle.dp(100) + property real buttonWidth: Sizes.dp(100) function prevCamera() { videofeed.angle = (videofeed.angle+3) % 4; @@ -91,14 +95,14 @@ PrimaryWindow { CameraStream { id: videofeed anchors.horizontalCenter: parent.horizontalCenter - width: NeptuneStyle.dp(1280) - height: NeptuneStyle.dp(1080) + width: Sizes.dp(1280) + height: Sizes.dp(1080) Row { id: controls anchors.top: parent.top width: 3*root.buttonWidth - height: NeptuneStyle.dp(100) + height: Sizes.dp(100) anchors.horizontalCenter: parent.horizontalCenter ToolButton { width: root.buttonWidth @@ -121,14 +125,14 @@ PrimaryWindow { background: Image { id: playButtonBackground anchors.centerIn: parent - width: NeptuneStyle.dp(sourceSize.width) - height: NeptuneStyle.dp(sourceSize.height) - source: Style.symbol("ic_button-bg") + width: Sizes.dp(sourceSize.width) + height: Sizes.dp(sourceSize.height) + source: Style.image("ic_button-bg") fillMode: Image.PreserveAspectFit layer.enabled: true layer.effect: ColorOverlay { source: playButtonBackground - color: NeptuneStyle.accentColor + color: Style.accentColor } } } @@ -152,7 +156,7 @@ PrimaryWindow { Label { anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom - anchors.bottomMargin: NeptuneStyle.dp(10) + anchors.bottomMargin: Sizes.dp(10) id: camlabel text: root.angles[videofeed.angle] |