more fixes for missing Multi tile

kwindrem · Jun 23, 2024 · 6c335e5 · 6c335e5
1 parent a44a4a5
commit 6c335e5
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 31 deletions.
diff --git a/FileSets/v2.73/OverviewHubEnhanced.qml b/FileSets/v2.73/OverviewHubEnhanced.qml
@@ -178,7 +178,15 @@ OverviewPage {
 
 	VBusItem { id: hasDcSystemItem; bind: "com.victronenergy.settings/Settings/SystemSetup/HasDcSystem" }
 
-	Component.onCompleted: { discoverServices(); showHelp () }
+	//Component.onCompleted: { discoverServices(); showHelp () }
+	onActiveChanged:
+	{
+		if (root.active)
+		{
+			discoverServices()
+			showHelp ()
+		}
+	}
 
 	title: qsTr("Simple Overview")
 
@@ -330,8 +338,8 @@ OverviewPage {
 			top: parent.top; topMargin: 3
 		}
 		inverterService: root.inverterService
-		opacity: showAcInput ? 1 : disabledTileOpacity
-		visible: showAcInput || showInactiveTiles
+		opacity: showInverter ? 1 : disabledTileOpacity
+		visible: showInverter || showInactiveTiles
 ////// add power bar graph
 		PowerGaugeMulti
 		{

diff --git a/FileSets/v3.01/OverviewFlowComplex.qml b/FileSets/v3.01/OverviewFlowComplex.qml
@@ -131,10 +131,14 @@ OverviewPage {
             return "hh:mm"
     }
 
-    Component.onCompleted:
-    {
-		discoverServices ()
-		showHelp ()
+	//Component.onCompleted: { discoverServices(); showHelp () }
+	onActiveChanged:
+	{
+		if (root.active)
+		{
+			discoverServices()
+			showHelp ()
+		}
 	}
 
 	title: dcCoupled ? qsTr("DC Coupled overview") :  qsTr("AC Coupled overview")
@@ -359,8 +363,8 @@ OverviewPage {
 	MultiEnhancedGP {
 		id: multi
 		iconId: "overview-inverter-short"
-		opacity: showAcInput ? 1 : disabledTileOpacity
-		visible: showAcInput || showInactiveTiles
+		opacity: showInverter ? 1 : disabledTileOpacity
+		visible: showInverter || showInactiveTiles
 		anchors {
 			horizontalCenter: parent.horizontalCenter
 			top: acInBox.top

diff --git a/FileSets/v3.01/OverviewHubEnhanced.qml b/FileSets/v3.01/OverviewHubEnhanced.qml
@@ -184,7 +184,15 @@ OverviewPage {
 
 	VBusItem { id: hasDcSystemItem; bind: "com.victronenergy.settings/Settings/SystemSetup/HasDcSystem" }
 
-	Component.onCompleted: { discoverServices(); showHelp () }
+	//Component.onCompleted: { discoverServices(); showHelp () }
+	onActiveChanged:
+	{
+		if (root.active)
+		{
+			discoverServices()
+			showHelp ()
+		}
+	}
 
 	title: qsTr("Simple Overview")
 
@@ -337,8 +345,8 @@ OverviewPage {
 			horizontalCenter: parent.horizontalCenter
 			top: parent.top; topMargin: 3
 		}
-		opacity: showAcInput ? 1 : disabledTileOpacity
-		visible: showAcInput || showInactiveTiles
+		opacity: showInverter ? 1 : disabledTileOpacity
+		visible: showInverter || showInactiveTiles
 		inverterService: root.inverterService
 ////// add power bar graph
 		PowerGaugeMulti

diff --git a/FileSets/v3.40~30/OverviewFlowComplex.qml b/FileSets/v3.40~30/OverviewFlowComplex.qml
@@ -131,10 +131,14 @@ OverviewPage {
             return "hh:mm"
     }
 
-    Component.onCompleted:
-    {
-		discoverServices ()
-		showHelp ()
+	//Component.onCompleted: { discoverServices(); showHelp () }
+	onActiveChanged:
+	{
+		if (root.active)
+		{
+			discoverServices()
+			showHelp ()
+		}
 	}
 
 	title: dcCoupled ? qsTr("DC Coupled overview") :  qsTr("AC Coupled overview")
@@ -359,8 +363,8 @@ OverviewPage {
 	MultiEnhancedGP {
 		id: multi
 		iconId: "overview-inverter-short"
-		opacity: showAcInput ? 1 : disabledTileOpacity
-		visible: showAcInput || showInactiveTiles
+		opacity: showInverter ? 1 : disabledTileOpacity
+		visible: showInverter || showInactiveTiles
 		anchors {
 			horizontalCenter: parent.horizontalCenter
 			top: acInBox.top

diff --git a/FileSets/v3.40~30/OverviewHubEnhanced.qml b/FileSets/v3.40~30/OverviewHubEnhanced.qml
@@ -183,7 +183,15 @@ OverviewPage {
 
 	VBusItem { id: hasDcSystemItem; bind: "com.victronenergy.settings/Settings/SystemSetup/HasDcSystem" }
 
-	Component.onCompleted: { discoverServices(); showHelp () }
+	//Component.onCompleted: { discoverServices(); showHelp () }
+	onActiveChanged:
+	{
+		if (root.active)
+		{
+			discoverServices()
+			showHelp ()
+		}
+	}
 
 	title: qsTr("Simple Overview")
 
@@ -337,8 +345,8 @@ OverviewPage {
 			top: parent.top; topMargin: 3
 		}
 		inverterService: root.inverterService
-		opacity: showAcInput ? 1 : disabledTileOpacity
-		visible: showAcInput || showInactiveTiles
+		opacity: showInverter ? 1 : disabledTileOpacity
+		visible: showInverter || showInactiveTiles
 ////// add power bar graph
 		PowerGaugeMulti
 		{

diff --git a/FileSets/v3.40~8/OverviewFlowComplex.qml b/FileSets/v3.40~8/OverviewFlowComplex.qml
@@ -131,10 +131,14 @@ OverviewPage {
             return "hh:mm"
     }
 
-    Component.onCompleted:
-    {
-		discoverServices ()
-		showHelp ()
+	//Component.onCompleted: { discoverServices(); showHelp () }
+	onActiveChanged:
+	{
+		if (root.active)
+		{
+			discoverServices()
+			showHelp ()
+		}
 	}
 
 	title: dcCoupled ? qsTr("DC Coupled overview") :  qsTr("AC Coupled overview")
@@ -359,8 +363,8 @@ OverviewPage {
 	MultiEnhancedGP {
 		id: multi
 		iconId: "overview-inverter-short"
-		opacity: showAcInput ? 1 : disabledTileOpacity
-		visible: showAcInput || showInactiveTiles
+		opacity: showInverter ? 1 : disabledTileOpacity
+		visible: showInverter || showInactiveTiles
 		anchors {
 			horizontalCenter: parent.horizontalCenter
 			top: acInBox.top

diff --git a/FileSets/v3.40~8/OverviewHubEnhanced.qml b/FileSets/v3.40~8/OverviewHubEnhanced.qml
@@ -183,7 +183,15 @@ OverviewPage {
 
 	VBusItem { id: hasDcSystemItem; bind: "com.victronenergy.settings/Settings/SystemSetup/HasDcSystem" }
 
-	Component.onCompleted: { discoverServices(); showHelp () }
+	//Component.onCompleted: { discoverServices(); showHelp () }
+	onActiveChanged:
+	{
+		if (root.active)
+		{
+			discoverServices()
+			showHelp ()
+		}
+	}
 
 	title: qsTr("Simple Overview")
 
@@ -337,8 +345,8 @@ OverviewPage {
 			top: parent.top; topMargin: 3
 		}
 		inverterService: root.inverterService
-		opacity: showAcInput ? 1 : disabledTileOpacity
-		visible: showAcInput || showInactiveTiles
+		opacity: showInverter ? 1 : disabledTileOpacity
+		visible: showInverter || showInactiveTiles
 ////// add power bar graph
 		PowerGaugeMulti
 		{

diff --git a/changes b/changes
@@ -1,3 +1,6 @@
+v10.47:
+	more fixes for missing Multi tile	
+
 v10.46:
 	add support for v3.40~30
 

diff --git a/version b/version
@@ -1 +1 @@
-v10.46
+v10.44