fixed: not showing GuiMods flow overview pages

kwindrem · Nov 3, 2024 · 6d55624 · 6d55624
1 parent 5c4cc90
commit 6d55624
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/FileSets/PatchSource/main.qml-v3.50 b/FileSets/PatchSource/main.qml-v3.50
@@ -19,6 +19,7 @@ PageStackWindow {
 	property bool completed: false
 	property bool alarm: alarmNotification.valid ? alarmNotification.value : 0
 	property bool showAlert: alertNotification.valid ? alertNotification.value : 0
+//////// added for GuiMods flow pages
 	property bool overviewsLoaded: defaultOverview.valid && generatorOverview.valid && mobileOverview.valid && tanksOverview.valid && startWithMenu.valid && mobileOverviewEnhanced.valid && guiModsFlowOverview.valid && generatorOverviewEnhanced.valid
 	property string bindPrefix: "com.victronenergy.settings"
 
@@ -43,6 +44,13 @@ PageStackWindow {
 //////// modified for OverviewHubEnhanced page
 	onShowInputLoadsChanged: selectHubOverview ()
 
+	VBusItem
+    {
+        id: guiModsFlowOverview
+        bind: "com.victronenergy.settings/Settings/GuiMods/FlowOverview"
+        onValueChanged: selectHubOverview ()
+    }
+
 ////// GuiMods — DarkMode
 	property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
 	property bool darkMode: darkModeItem.valid && darkModeItem.value == 1

diff --git a/FileSets/PatchSource/main.qml-v3.50.patch b/FileSets/PatchSource/main.qml-v3.50.patch
@@ -1,22 +1,23 @@
 --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/main.qml-v3.50.orig	2024-10-29 13:29:52
-+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/main.qml-v3.50	2024-11-02 21:56:23
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/main.qml-v3.50	2024-11-02 22:34:13
 @@ -1,3 +1,6 @@
 +//////// Modified to hide the OverviewTiles page
 +//////// Modified to substitute flow overview pages
 +
  import QtQuick 1.1
 
  import Qt.labs.components.native 1.0
-@@ -16,7 +19,7 @@
+@@ -16,7 +19,8 @@
  	property bool completed: false
  	property bool alarm: alarmNotification.valid ? alarmNotification.value : 0
  	property bool showAlert: alertNotification.valid ? alertNotification.value : 0
 -	property bool overviewsLoaded: defaultOverview.valid && generatorOverview.valid && mobileOverview.valid && tanksOverview.valid && startWithMenu.valid
++//////// added for GuiMods flow pages
 +	property bool overviewsLoaded: defaultOverview.valid && generatorOverview.valid && mobileOverview.valid && tanksOverview.valid && startWithMenu.valid && mobileOverviewEnhanced.valid && guiModsFlowOverview.valid && generatorOverviewEnhanced.valid
  	property string bindPrefix: "com.victronenergy.settings"
 
  	property bool isNotificationPage: pageStack.currentPage && pageStack.currentPage.title === qsTr("Notifications")
-@@ -27,19 +30,71 @@
+@@ -27,19 +31,78 @@
  	property bool showInputLoads: theSystem.acInLoad.power.valid && (hasVebusEss ? (theSystem.hasGridMeter && withoutGridMeter.value === 0) : theSystem.hasGridMeter)
  	property int newUiAnnouncementVersion: 2 // Increase to make the popup appear again
 
@@ -38,6 +39,13 @@
 +//////// modified for OverviewHubEnhanced page
 +	onShowInputLoadsChanged: selectHubOverview ()
 +
++	VBusItem
++    {
++        id: guiModsFlowOverview
++        bind: "com.victronenergy.settings/Settings/GuiMods/FlowOverview"
++        onValueChanged: selectHubOverview ()
++    }
++
 +////// GuiMods — DarkMode
 +	property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
 +	property bool darkMode: darkModeItem.valid && darkModeItem.value == 1
@@ -93,7 +101,7 @@
  	VBusItem {
  		id: generatorOverview
  		bind: "com.victronenergy.settings/Settings/Relay/Function"
-@@ -63,13 +118,98 @@
+@@ -63,13 +126,98 @@
  		}
  	}
 
@@ -198,7 +206,7 @@
  	VBusItem {
  		id: tanksOverview
  		bind: "com.victronenergy.settings/Settings/Gui/TanksOverview"
-@@ -172,76 +312,111 @@
+@@ -172,76 +320,111 @@
  		id: mbTools
  		height: parent.height
 
@@ -363,7 +371,7 @@
  				}
  			}
  		}
-@@ -256,9 +431,10 @@
+@@ -256,9 +439,10 @@
  		ListElement {
  			pageSource: "OverviewHub.qml"
  		}
@@ -377,7 +385,7 @@
  	}
 
  	Component {
-@@ -284,7 +460,12 @@
+@@ -284,7 +468,12 @@
  		id: newUiPopupTimer
  		interval: 10000
  		running: false
@@ -391,7 +399,7 @@
  	}
 
  	function showNewUiPopup()
-@@ -350,11 +531,19 @@
+@@ -350,11 +539,19 @@
  		}
  	}
 

diff --git a/FileSets/v3.50/PageGenerator.qml.USE_ORIGINAL b/FileSets/v3.50/PageGenerator.qml.USE_ORIGINAL
diff --git a/changes b/changes
@@ -1,3 +1,6 @@
+v10.72:
+	fixed: not showing GuiMods flow overview pages
+
 v10.71:
 	fixed: white screen (GUI crash)
 	fixed: light/dark selection not shown at bottom of screen

diff --git a/version b/version
@@ -1 +1 @@
-v10.71
+v10.72