fixed: generator overview stock/enhanced not working

kwindrem · Nov 3, 2024 · 2d6c306 · 2d6c306
1 parent 211420d
commit 2d6c306
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/FileSets/PatchSource/main.qml-v3.50 b/FileSets/PatchSource/main.qml-v3.50
@@ -101,13 +101,13 @@ PageStackWindow {
         bind: "com.victronenergy.settings/Settings/GuiMods/UseEnhancedGeneratorOverview"
         onValueChanged: selectGeneratorOverview ()
     }
-////// end GuiMods
 
 	VBusItem {
 		id: generatorOverview
 		bind: "com.victronenergy.settings/Settings/Relay/Function"
-		onValueChanged: extraOverview("OverviewGeneratorRelay.qml", value === 1)
+		onValueChanged: selectGeneratorOverview ()
 	}
+////// end GuiMods
 
 	VBusItem {
 		bind: "com.victronenergy.generator.startstop1/GensetProductId"

diff --git a/FileSets/PatchSource/main.qml-v3.50.patch b/FileSets/PatchSource/main.qml-v3.50.patch
@@ -1,5 +1,5 @@
 --- /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 22:34:13
++++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/main.qml-v3.50	2024-11-03 13:26:42
 @@ -1,3 +1,6 @@
 +//////// Modified to hide the OverviewTiles page
 +//////// Modified to substitute flow overview pages
@@ -17,7 +17,7 @@
  	property string bindPrefix: "com.victronenergy.settings"
 
  	property bool isNotificationPage: pageStack.currentPage && pageStack.currentPage.title === qsTr("Notifications")
-@@ -27,19 +31,78 @@
+@@ -27,24 +31,83 @@
  	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
 
@@ -96,11 +96,17 @@
 +        bind: "com.victronenergy.settings/Settings/GuiMods/UseEnhancedGeneratorOverview"
 +        onValueChanged: selectGeneratorOverview ()
 +    }
-+////// end GuiMods
 +
  	VBusItem {
  		id: generatorOverview
  		bind: "com.victronenergy.settings/Settings/Relay/Function"
+-		onValueChanged: extraOverview("OverviewGeneratorRelay.qml", value === 1)
++		onValueChanged: selectGeneratorOverview ()
+ 	}
++////// end GuiMods
+
+ 	VBusItem {
+ 		bind: "com.victronenergy.generator.startstop1/GensetProductId"
 @@ -63,13 +126,98 @@
  		}
  	}

diff --git a/changes b/changes
@@ -1,3 +1,6 @@
+v10.74:
+	fixed: generator overview stock/enhanced not working
+
 v10.73:
 	fixed: incomplete file set for v3.50
 

diff --git a/version b/version
@@ -1 +1 @@
-v10.73
+v10.74