aboutsummaryrefslogtreecommitdiffstats
path: root/sysui
diff options
context:
space:
mode:
authorEgor Nemtsev <enemtsev@luxoft.com>2019-12-04 16:31:46 +0300
committerEgor Nemtsev <enemtsev@luxoft.com>2019-12-05 11:26:34 +0000
commita0ec9974642cbe704ab0e57a26be54da51811e22 (patch)
treeb7b754fbc7c003528ca3b0f8a22cdb187d41a7f8 /sysui
parentbac326c7ac045514f8ae9f1db571721f4a05cfce (diff)
[sysui] add default Binding restoreMode for Qt6
- to remove Qt6 warnings in console add default value to Binding qml components Task-number: AUTOSUITE-1367 Change-Id: I15a67771b4b3a957b7f5e876aebdd9a11e9f6c5d Reviewed-by: Grigorii Zimin <gzimin@luxoft.com>
Diffstat (limited to 'sysui')
-rw-r--r--sysui/about/About.qml16
-rw-r--r--sysui/about/AboutApps.qml13
-rw-r--r--sysui/centerconsole/AbstractCenterConsole.qml57
-rw-r--r--sysui/centerconsole/CenterConsole.qml6
-rw-r--r--sysui/centerconsole/CenterConsoleWindow.qml18
-rw-r--r--sysui/home/AddWidgetPopupLoader.qml16
-rw-r--r--sysui/instrumentcluster/InstrumentClusterWindow.qml7
-rw-r--r--sysui/statusbar/+lucee/StatusBar.qml6
-rw-r--r--sysui/stores/ClusterStore.qml2
9 files changed, 116 insertions, 25 deletions
diff --git a/sysui/about/About.qml b/sysui/about/About.qml
index 1ceb4a81..b47f7274 100644
--- a/sysui/about/About.qml
+++ b/sysui/about/About.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.10
+import QtQml 2.14
import system.controls 1.0
@@ -51,7 +52,16 @@ PopupItemLoader {
state: item ? item.state : ""
readonly property string currentTabName: item ? item.currentTabName : ""
- Binding { target: root.item; property: "applicationModel"; value: root.applicationModel }
- Binding { target: root.item; property: "systemModel"; value: root.systemModel }
- Binding { target: root.item; property: "sysInfo"; value: root.sysInfo }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: root.item; property: "applicationModel"; value: root.applicationModel;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: root.item; property: "systemModel"; value: root.systemModel;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: root.item; property: "sysInfo"; value: root.sysInfo;
+ }
}
diff --git a/sysui/about/AboutApps.qml b/sysui/about/AboutApps.qml
index 237dc0c8..d5d76578 100644
--- a/sysui/about/AboutApps.qml
+++ b/sysui/about/AboutApps.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.8
+import QtQml 2.14
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtApplicationManager.SystemUI 2.0
@@ -263,7 +264,11 @@ Item {
font.pixelSize: Sizes.fontSizeXS
text: qsTr("Performance monitor")
opacity: Style.opacityMedium
- Binding { target: model.appInfo; property: "windowPerfMonitorEnabled"; value: primarySwitch.checked }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: model.appInfo; property: "windowPerfMonitorEnabled";
+ value: primarySwitch.checked;
+ }
visible: !model.appInfo.isSystemApp
}
}
@@ -294,7 +299,11 @@ Item {
font.pixelSize: Sizes.fontSizeXS
text: qsTr("Performance monitor")
opacity: Style.opacityMedium
- Binding { target: model.appInfo; property: "icWindowPerfMonitorEnabled"; value: secondarySwitch.checked }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: model.appInfo; property: "icWindowPerfMonitorEnabled";
+ value: secondarySwitch.checked;
+ }
}
}
bottomPadding: Sizes.dp(20)
diff --git a/sysui/centerconsole/AbstractCenterConsole.qml b/sysui/centerconsole/AbstractCenterConsole.qml
index d83d971c..86eded90 100644
--- a/sysui/centerconsole/AbstractCenterConsole.qml
+++ b/sysui/centerconsole/AbstractCenterConsole.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.7
+import QtQml 2.14
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0
@@ -84,8 +85,16 @@ Item {
root.store.languageTimer.start();
}
- Binding { target: root.store.systemStore; property: "activeAppInfo"; value: root.store.applicationModel.activeAppInfo }
- Binding { target: root.store.systemStore; property: "monitorEnabled"; value: about.state === "open" && about.currentTabName === "system" }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: root.store.systemStore; property: "activeAppInfo";
+ value: root.store.applicationModel.activeAppInfo;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: root.store.systemStore; property: "monitorEnabled";
+ value: about.state === "open" && about.currentTabName === "system";
+ }
Image {
anchors.fill: parent
@@ -107,14 +116,42 @@ Item {
source: "MainContentArea.qml"
anchors.fill: parent
- Binding { target: mainContentArea.item; property: "applicationModel"; value: root.store.applicationModel }
- Binding { target: mainContentArea.item; property: "launcherY"; value: statusBar.y + statusBar.height }
- Binding { target: mainContentArea.item; property: "homeBottomMargin"; value: bottomBar.height }
- Binding { target: mainContentArea.item; property: "popupParent"; value: root.popupParent }
- Binding { target: mainContentArea.item; property: "virtualKeyboard"; value: virtualKeyboard.item }
- Binding { target: mainContentArea.item; property: "enableOpacityMask"; value: root.store.hardwareVariant !== 'low' }
- Binding { target: mainContentArea.item; property: "devMode"; value: root.store.devMode }
- Binding { target: mainContentArea.item; property: "showSystemAppsInLauncher"; value: root.store.showSystemAppsInLauncher }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: mainContentArea.item; property: "applicationModel";
+ value: root.store.applicationModel;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: mainContentArea.item; property: "launcherY";
+ value: statusBar.y + statusBar.height;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: mainContentArea.item; property: "homeBottomMargin"; value: bottomBar.height;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: mainContentArea.item; property: "popupParent"; value: root.popupParent;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: mainContentArea.item; property: "virtualKeyboard"; value: virtualKeyboard.item;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: mainContentArea.item; property: "enableOpacityMask";
+ value: root.store.hardwareVariant !== 'low';
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: mainContentArea.item; property: "devMode"; value: root.store.devMode;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: mainContentArea.item; property: "showSystemAppsInLauncher";
+ value: root.store.showSystemAppsInLauncher;
+ }
}
StatusBar {
diff --git a/sysui/centerconsole/CenterConsole.qml b/sysui/centerconsole/CenterConsole.qml
index 95248afb..cfafa336 100644
--- a/sysui/centerconsole/CenterConsole.qml
+++ b/sysui/centerconsole/CenterConsole.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.7
+import QtQml 2.14
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0
@@ -106,7 +107,10 @@ AbstractCenterConsole {
popupParent: root.popupParent
popupX: originItem.mapToItem(parent, 0, 0).x + (LayoutMirroring.enabled ? -width + leftIcon.width: 0)
originItem: leftIcon
- Binding { target: volumePopup.item; property: "model"; value: root.store.volumeStore }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: volumePopup.item; property: "model"; value: root.store.volumeStore;
+ }
onClosed: { leftIcon.forceActiveFocus(); }
}
diff --git a/sysui/centerconsole/CenterConsoleWindow.qml b/sysui/centerconsole/CenterConsoleWindow.qml
index 9260a3dd..f6321cf6 100644
--- a/sysui/centerconsole/CenterConsoleWindow.qml
+++ b/sysui/centerconsole/CenterConsoleWindow.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.7
+import QtQml 2.14
import shared.utils 1.0
import stores 1.0
import QtQuick.Window 2.3
@@ -46,8 +47,14 @@ Window {
signal nextICAppIsRequested()
- Binding {target: root.store.centerConsole; property: "windowWidth"; value: root.width }
- Binding {target: root.store.centerConsole; property: "windowHeight"; value: root.height }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: root.store.centerConsole; property: "windowWidth"; value: root.width;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: root.store.centerConsole; property: "windowHeight"; value: root.height;
+ }
title: store.centerConsole.title
color: "black"
@@ -149,8 +156,11 @@ Window {
anchors.fill: centerConsole
source: "../notification/NotificationContent.qml"
- Binding { target: notificationLoader.item; property: "target";
- value: popupParent.showModalOverlay ? popupParent : centerConsole }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: notificationLoader.item; property: "target";
+ value: popupParent.showModalOverlay ? popupParent : centerConsole;
+ }
}
CenterConsoleMonitorOverlay {
diff --git a/sysui/home/AddWidgetPopupLoader.qml b/sysui/home/AddWidgetPopupLoader.qml
index df3c71dc..c619b151 100644
--- a/sysui/home/AddWidgetPopupLoader.qml
+++ b/sysui/home/AddWidgetPopupLoader.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.10
+import QtQml 2.14
/*
A seamless wrapper for AddWidgetPopup that loads it on demand
@@ -86,7 +87,16 @@ Loader {
}
}
- Binding { target: root.item; property: "parent"; value: root.popupParent }
- Binding { target: root.item; property: "originItem"; value: root.originItem }
- Binding { target: root.item; property: "model"; value: root.model }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: root.item; property: "parent"; value: root.popupParent;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: root.item; property: "originItem"; value: root.originItem;
+ }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: root.item; property: "model"; value: root.model;
+ }
}
diff --git a/sysui/instrumentcluster/InstrumentClusterWindow.qml b/sysui/instrumentcluster/InstrumentClusterWindow.qml
index 5aa468f3..8f18cccf 100644
--- a/sysui/instrumentcluster/InstrumentClusterWindow.qml
+++ b/sysui/instrumentcluster/InstrumentClusterWindow.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.7
+import QtQml 2.14
import shared.utils 1.0
import QtQuick.Window 2.3
import system.controls 1.0
@@ -182,7 +183,11 @@ Window {
root.applicationModel.instrumentClusterAppInfo.window.setWindowProperty("clusterUIMode", clusterUIMode)
}
}
- Binding { target: uiSettings; property: "navigationMode"; value: applicationICWindows.selectedNavigation }
+ Binding {
+ restoreMode: Binding.RestoreBinding;
+ target: uiSettings; property: "navigationMode";
+ value: applicationICWindows.selectedNavigation;
+ }
}
ApplicationICWindowItem {
diff --git a/sysui/statusbar/+lucee/StatusBar.qml b/sysui/statusbar/+lucee/StatusBar.qml
index a562e8b3..b52fd2b9 100644
--- a/sysui/statusbar/+lucee/StatusBar.qml
+++ b/sysui/statusbar/+lucee/StatusBar.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.6
+import QtQml 2.14
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
@@ -55,7 +56,10 @@ Item {
popupX: (root.LayoutMirroring.enabled ? root.parent.width - width - Sizes.dp(5) : Sizes.dp(5))
popupY: originPos.y
originItem: volumeIcon
- Binding { target: volumePopup.item; property: "model"; value: root.model.volumeStore }
+ Binding {
+ restoreMode: Binding.RestoreBinding
+ target: volumePopup.item; property: "model"; value: root.model.volumeStore;
+ }
}
property var voiceAssitantWindow
diff --git a/sysui/stores/ClusterStore.qml b/sysui/stores/ClusterStore.qml
index c678ac79..679eba64 100644
--- a/sysui/stores/ClusterStore.qml
+++ b/sysui/stores/ClusterStore.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.8
+import QtQml 2.14
import QtApplicationManager.SystemUI 2.0
import shared.com.pelagicore.remotesettings 1.0
import shared.com.pelagicore.drivedata 1.0
@@ -48,6 +49,7 @@ QtObject {
readonly property var clusterScreen: Qt.application.screens.length > 1
? Qt.application.screens[1] : Qt.application.screens[0]
readonly property var _clusterAvailableBinding: Binding {
+ restoreMode: Binding.RestoreBinding
target: clusterSettings
when: clusterSettings.isInitialized
property: "available"