Skip to content

Commit ba1cdd2

Browse files
kwindremkwindrem
committed
fixed: relay and dig inputs overviews not showing up in v3.70 and newer
1 parent 8aeb470 commit ba1cdd2

63 files changed

Lines changed: 5413 additions & 5372 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

FileSets/PatchSource/Main.qml-v3.70~71 renamed to FileSets/PatchSource/Main.qml-v3.70

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,19 @@ Page {
118118
onValueChanged: extraOverview ("OverviewTiles.qml", value === 1)
119119
}
120120

121+
////// GuiMods - show/hide the OverviewRelays page
122+
VBusItem {
123+
id: showOverviewRelays
124+
bind: "com.victronenergy.settings/Settings/GuiMods/ShowRelayOverview"
125+
onValueChanged: extraOverview ("OverviewRelays.qml", value === 1)
126+
}
127+
128+
////// GuiMods - show/hide the Overview Tanks/Temps/Digital Inputs page
129+
VBusItem {
130+
id: showOverviewTanksTemps
131+
bind: "com.victronenergy.settings/Settings/GuiMods/ShowTanksTempsDigIn"
132+
onValueChanged: extraOverview ("OverviewTanksTempsDigInputs.qml", value === 1)
133+
}
121134

122135
function selectGeneratorOverview ()
123136
{

FileSets/PatchSource/Main.qml-v3.70~71.orig renamed to FileSets/PatchSource/Main.qml-v3.70.orig

File renamed without changes.

FileSets/PatchSource/Main.qml-v3.70~71.patch renamed to FileSets/PatchSource/Main.qml-v3.70.patch

Lines changed: 54 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/Main.qml-v3.70~71.orig 2025-12-23 15:01:36
2-
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/Main.qml-v3.70~71 2025-12-23 22:10:17
1+
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/Main.qml-v3.70.orig 2025-12-23 15:01:36
2+
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/Main.qml-v3.70 2026-03-20 15:21:38
33
@@ -14,7 +14,8 @@
44
property bool completed: false
55
property bool alarm: alarmNotification.valid ? alarmNotification.value : 0
@@ -10,7 +10,7 @@
1010
property string bindPrefix: "com.victronenergy.settings"
1111

1212
property bool isNotificationPage: pageStack.currentItem && pageStack.currentItem.title === qsTr("Notifications")
13-
@@ -25,19 +26,154 @@
13+
@@ -25,19 +26,167 @@
1414
property bool showInputLoads: theSystem.acInLoad.power.valid && (hasVebusEss ? (theSystem.hasGridMeter && withoutGridMeter.value === 0) : theSystem.hasGridMeter)
1515
property int newUiAnnouncementVersion: 2 // Increase to make the popup appear again
1616

@@ -111,6 +111,19 @@
111111
+ onValueChanged: extraOverview ("OverviewTiles.qml", value === 1)
112112
+ }
113113
+
114+
+////// GuiMods - show/hide the OverviewRelays page
115+
+ VBusItem {
116+
+ id: showOverviewRelays
117+
+ bind: "com.victronenergy.settings/Settings/GuiMods/ShowRelayOverview"
118+
+ onValueChanged: extraOverview ("OverviewRelays.qml", value === 1)
119+
+ }
120+
+
121+
+////// GuiMods - show/hide the Overview Tanks/Temps/Digital Inputs page
122+
+ VBusItem {
123+
+ id: showOverviewTanksTemps
124+
+ bind: "com.victronenergy.settings/Settings/GuiMods/ShowTanksTempsDigIn"
125+
+ onValueChanged: extraOverview ("OverviewTanksTempsDigInputs.qml", value === 1)
126+
+ }
114127
+
115128
+ function selectGeneratorOverview ()
116129
+ {
@@ -170,7 +183,7 @@
170183
header: VeStatusBar {
171184
id: statusBar
172185

173-
@@ -69,12 +205,6 @@
186+
@@ -69,12 +218,6 @@
174187
}
175188

176189
VBusItem {
@@ -183,7 +196,7 @@
183196
bind: "com.victronenergy.generator.startstop1/GensetProductId"
184197
onValueChanged: {
185198
// Show specific overview for FischerPanda
186-
@@ -91,12 +221,11 @@
199+
@@ -91,12 +234,11 @@
187200
}
188201
}
189202

@@ -198,7 +211,7 @@
198211
}
199212
VBusItem {
200213
id: tanksOverview
201-
@@ -200,82 +329,109 @@
214+
@@ -200,82 +342,109 @@
202215
width: parent.width
203216
anchors.bottom: parent.bottom
204217

@@ -207,14 +220,6 @@
207220
- anchors.left: mbTools.left
208221
- height: mbTools.height
209222
- width: 200
210-
-
211-
- MouseArea {
212-
- anchors.fill: parent
213-
- onClicked: {
214-
- if (pageStack.currentItem)
215-
- pageStack.currentItem.toolbarHandler.leftAction(true)
216-
- }
217-
- }
218223
+//// GuiMods - DarkMode - add clickable light/dark mode button to center section
219224
+ Row
220225
+ {
@@ -226,39 +231,54 @@
226231
+ height: mbTools.height
227232
+ width: 170
228233

229-
- Row {
230-
- anchors.centerIn: parent
231-
-
232-
- MbIcon {
233-
- anchors.verticalCenter: parent.verticalCenter
234-
- iconId: pageStack.currentItem ? pageStack.currentItem.leftIcon : ""
234+
- MouseArea {
235+
- anchors.fill: parent
236+
- onClicked: {
237+
- if (pageStack.currentItem)
238+
- pageStack.currentItem.toolbarHandler.leftAction(true)
235239
+ MouseArea {
236240
+ anchors.fill: parent
237241
+ onClicked: {
238242
+ if (pageStack.currentItem)
239243
+ pageStack.currentItem.toolbarHandler.leftAction(true)
240244
+ }
241245
}
246+
- }
247+
248+
- Row {
249+
- anchors.centerIn: parent
250+
+ Row {
251+
+ anchors.centerIn: parent
252+
253+
- MbIcon {
254+
- anchors.verticalCenter: parent.verticalCenter
255+
- iconId: pageStack.currentItem ? pageStack.currentItem.leftIcon : ""
256+
- }
257+
+ MbIcon {
258+
+ anchors.verticalCenter: parent.verticalCenter
259+
+ iconId: pageStack.currentItem ? pageStack.currentItem.leftIcon : ""
260+
+ }
242261

243262
- Text {
244263
- anchors.verticalCenter: parent.verticalCenter
245264
- text: pageStack.currentItem ? pageStack.currentItem.leftText : ""
246265
- color: "white"
247266
- font.bold: true
248267
- font.pixelSize: 16
249-
- }
250-
- }
268+
+ Text {
269+
+ anchors.verticalCenter: parent.verticalCenter
270+
+ text: pageStack.currentItem ? pageStack.currentItem.leftText : ""
271+
+ color: "white"
272+
+ font.bold: true
273+
+ font.pixelSize: 16
274+
+ }
275+
}
276+
}
251277
- }
252-
+ Row {
253-
+ anchors.centerIn: parent
254278

255279
- MbIcon {
256280
- id: centerScrollIndicator
257-
+ MbIcon {
258-
+ anchors.verticalCenter: parent.verticalCenter
259-
+ iconId: pageStack.currentItem ? pageStack.currentItem.leftIcon : ""
260-
+ }
261-
281+
-
262282
- anchors {
263283
- horizontalCenter: parent.horizontalCenter
264284
- verticalCenter: mbTools.verticalCenter
@@ -277,16 +297,9 @@
277297
- onClicked: {
278298
- if (pageStack.currentItem)
279299
- pageStack.currentItem.toolbarHandler.rightAction(true)
280-
+ Text {
281-
+ anchors.verticalCenter: parent.verticalCenter
282-
+ text: pageStack.currentItem ? pageStack.currentItem.leftText : ""
283-
+ color: "white"
284-
+ font.bold: true
285-
+ font.pixelSize: 16
286-
+ }
287-
}
288-
}
289-
300+
- }
301+
- }
302+
-
290303
- Row {
291304
- anchors.centerIn: parent
292305
+ Item {
@@ -366,7 +379,7 @@
366379
Component.onCompleted: {
367380
completed = true
368381
}
369-
@@ -285,9 +441,10 @@
382+
@@ -285,9 +454,10 @@
370383
ListElement {
371384
pageSource: "OverviewHub.qml"
372385
}
@@ -380,7 +393,7 @@
380393
}
381394

382395
Component {
383-
@@ -382,11 +539,19 @@
396+
@@ -382,11 +552,19 @@
384397
}
385398
}
386399

‎FileSets/VersionIndependent/TileRelay.qml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ Tile {
239239
horizontalAlignment: Text.AlignHCenter
240240
text: " "
241241
}
242-
Button
242+
DetailButton
243243
{
244244
id: onButton
245245
////// GuiMods - DarkMode
@@ -255,7 +255,7 @@ Tile {
255255
color: onButtonActive ? "white" : "black"
256256
}
257257
}
258-
Button
258+
DetailButton
259259
{
260260
id: offButton
261261
////// GuiMods - DarkMode
@@ -271,7 +271,7 @@ Tile {
271271
color: offButtonActive ? "white" : "black"
272272
}
273273
}
274-
Button
274+
DetailButton
275275
{
276276
id: autoButton
277277
////// GuiMods - DarkMode

‎FileSets/v3.60/OverviewFlowComplex.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../v3.80~5/OverviewFlowComplex.qml
1+
../v3.80~7/OverviewFlowComplex.qml

‎FileSets/v3.60/OverviewGeneratorEnhanced.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../v3.80~5/OverviewGeneratorEnhanced.qml
1+
../v3.80~7/OverviewGeneratorEnhanced.qml

‎FileSets/v3.60/OverviewHubEnhanced.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../v3.80~5/OverviewHubEnhanced.qml
1+
../v3.80~7/OverviewHubEnhanced.qml

‎FileSets/v3.60/PageSettingsGuiMods.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../v3.80~5/PageSettingsGuiMods.qml
1+
../v3.80~7/PageSettingsGuiMods.qml

‎FileSets/v3.60/PowerGauge.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../v3.80~5/PowerGauge.qml
1+
../v3.80~7/PowerGauge.qml

‎FileSets/v3.62/OverviewFlowComplex.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../v3.80~5/OverviewFlowComplex.qml
1+
../v3.80~7/OverviewFlowComplex.qml

0 commit comments

Comments
 (0)