Skip to content

Commit

Permalink
add support for v3.40~13
Browse files Browse the repository at this point in the history 
add support for v3.40~13
fixed: GuiMods Simple flow not showning tanks
remove local copy of HelperResources
  • Loading branch information
@kwindrem
kwindrem committed May 9, 2024
1 parent 87c1bcb commit 5ad7314
Show file tree
Hide file tree
Showing 905 changed files with 813 additions and 3,312 deletions.
2 changes: 1 addition & 1 deletion FileSets/v2.71/MbEditBoxDateTime.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbEditBoxDateTime.qml
../v3.40~13/MbEditBoxDateTime.qml
2 changes: 1 addition & 1 deletion FileSets/v2.71/MbSubMenu.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbSubMenu.qml
../v3.40~13/MbSubMenu.qml
2 changes: 1 addition & 1 deletion FileSets/v2.71/Multi.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/Multi.qml
../v3.40~13/Multi.qml
2 changes: 1 addition & 1 deletion FileSets/v2.71/OverviewBox.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewBox.qml
../v3.40~13/OverviewBox.qml
2 changes: 1 addition & 1 deletion FileSets/v2.71/OverviewConnection.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnection.qml
../v3.40~13/OverviewConnection.qml
2 changes: 1 addition & 1 deletion FileSets/v2.71/OverviewConnectionEnd.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnectionEnd.qml
../v3.40~13/OverviewConnectionEnd.qml
2 changes: 1 addition & 1 deletion FileSets/v2.71/OverviewSolarCharger.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewSolarCharger.qml
../v3.40~13/OverviewSolarCharger.qml
2 changes: 1 addition & 1 deletion FileSets/v2.71/OverviewTankDelegate.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTankDelegate.qml
../v3.40~13/OverviewTankDelegate.qml
2 changes: 1 addition & 1 deletion FileSets/v2.71/OverviewTanks.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTanks.qml
../v3.40~13/OverviewTanks.qml
2 changes: 1 addition & 1 deletion FileSets/v2.71/TileText.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/TileText.qml
../v3.40~13/TileText.qml
2 changes: 1 addition & 1 deletion FileSets/v2.71/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/styles.css
../v3.40~13/styles.css
2 changes: 1 addition & 1 deletion FileSets/v2.72/MbEditBoxDateTime.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbEditBoxDateTime.qml
../v3.40~13/MbEditBoxDateTime.qml
2 changes: 1 addition & 1 deletion FileSets/v2.72/MbSubMenu.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbSubMenu.qml
../v3.40~13/MbSubMenu.qml
2 changes: 1 addition & 1 deletion FileSets/v2.72/Multi.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/Multi.qml
../v3.40~13/Multi.qml
2 changes: 1 addition & 1 deletion FileSets/v2.72/OverviewBox.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewBox.qml
../v3.40~13/OverviewBox.qml
2 changes: 1 addition & 1 deletion FileSets/v2.72/OverviewConnection.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnection.qml
../v3.40~13/OverviewConnection.qml
2 changes: 1 addition & 1 deletion FileSets/v2.72/OverviewConnectionEnd.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnectionEnd.qml
../v3.40~13/OverviewConnectionEnd.qml
2 changes: 1 addition & 1 deletion FileSets/v2.72/OverviewSolarCharger.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewSolarCharger.qml
../v3.40~13/OverviewSolarCharger.qml
2 changes: 1 addition & 1 deletion FileSets/v2.72/OverviewTankDelegate.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTankDelegate.qml
../v3.40~13/OverviewTankDelegate.qml
2 changes: 1 addition & 1 deletion FileSets/v2.72/OverviewTanks.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTanks.qml
../v3.40~13/OverviewTanks.qml
2 changes: 1 addition & 1 deletion FileSets/v2.72/TileText.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/TileText.qml
../v3.40~13/TileText.qml
2 changes: 1 addition & 1 deletion FileSets/v2.72/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/styles.css
../v3.40~13/styles.css
2 changes: 1 addition & 1 deletion FileSets/v2.73/MbEditBoxDateTime.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbEditBoxDateTime.qml
../v3.40~13/MbEditBoxDateTime.qml
2 changes: 1 addition & 1 deletion FileSets/v2.73/MbSubMenu.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbSubMenu.qml
../v3.40~13/MbSubMenu.qml
2 changes: 1 addition & 1 deletion FileSets/v2.73/Multi.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/Multi.qml
../v3.40~13/Multi.qml
2 changes: 1 addition & 1 deletion FileSets/v2.73/OverviewBox.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewBox.qml
../v3.40~13/OverviewBox.qml
2 changes: 1 addition & 1 deletion FileSets/v2.73/OverviewConnection.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnection.qml
../v3.40~13/OverviewConnection.qml
2 changes: 1 addition & 1 deletion FileSets/v2.73/OverviewConnectionEnd.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnectionEnd.qml
../v3.40~13/OverviewConnectionEnd.qml
13 changes: 5 additions & 8 deletions FileSets/v2.73/OverviewHubEnhanced.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ OverviewPage {
property int numberOfTanks: 0
property int numberOfTemps: 0
//////// added/modified for control show/hide gauges, tanks and temps from menus
property int tankCount: showTanksEnable ? numberOfTanks : 0
property int tankCount: showTanksEnable ? tankModel.rowCount : 0
property int tempCount: showTempsEnable ? numberOfTemps : 0
property int tankTempCount: tankCount + tempCount
property bool showTanks: showTanksEnable ? showStatusBar ? false : tankCount > 0 ? true : false : false
Expand Down Expand Up @@ -1108,8 +1108,11 @@ OverviewPage {
interactive: count > 4 ? true : false
orientation: ListView.Horizontal

model: tanksModel
model: TankModel { id: tankModel }
delegate: TileTankEnhanced {
// Without an intermediate assignment this will trigger a binding loop warning.
property variant theService: DBusServices.get(buddy.id)
service: theService
width: tanksColum.tileWidth
height: root.tanksHeight
pumpBindPrefix: root.pumpBindPreffix
Expand Down Expand Up @@ -1193,11 +1196,6 @@ OverviewPage {
{
switch (service.type)
{
//////// add for temp sensors
case (service.type === DBusService.DBUS_SERVICE_TANK):
tanksModel.append({serviceName: service.name})
numberOfTanks++
break;;
//////// add for temp sensors
case DBusService.DBUS_SERVICE_TEMPERATURE_SENSOR:
numberOfTemps++
Expand Down Expand Up @@ -1287,7 +1285,6 @@ OverviewPage {
pvInverterPrefix3 = ""
alternatorPrefix1 = ""
alternatorPrefix2 = ""
tanksModel.clear()
tempsModel.clear()
for (var i = 0; i < DBusServices.count; i++)
{
Expand Down
2 changes: 1 addition & 1 deletion FileSets/v2.73/OverviewSolarCharger.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewSolarCharger.qml
../v3.40~13/OverviewSolarCharger.qml
2 changes: 1 addition & 1 deletion FileSets/v2.73/OverviewTankDelegate.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTankDelegate.qml
../v3.40~13/OverviewTankDelegate.qml
2 changes: 1 addition & 1 deletion FileSets/v2.73/OverviewTanks.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTanks.qml
../v3.40~13/OverviewTanks.qml
2 changes: 1 addition & 1 deletion FileSets/v2.73/TileText.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/TileText.qml
../v3.40~13/TileText.qml
2 changes: 1 addition & 1 deletion FileSets/v2.73/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/styles.css
../v3.40~13/styles.css
2 changes: 1 addition & 1 deletion FileSets/v2.80/MbEditBoxDateTime.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbEditBoxDateTime.qml
../v3.40~13/MbEditBoxDateTime.qml
2 changes: 1 addition & 1 deletion FileSets/v2.80/MbSubMenu.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbSubMenu.qml
../v3.40~13/MbSubMenu.qml
2 changes: 1 addition & 1 deletion FileSets/v2.80/Multi.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/Multi.qml
../v3.40~13/Multi.qml
2 changes: 1 addition & 1 deletion FileSets/v2.80/OverviewBox.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewBox.qml
../v3.40~13/OverviewBox.qml
2 changes: 1 addition & 1 deletion FileSets/v2.80/OverviewConnection.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnection.qml
../v3.40~13/OverviewConnection.qml
2 changes: 1 addition & 1 deletion FileSets/v2.80/OverviewConnectionEnd.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnectionEnd.qml
../v3.40~13/OverviewConnectionEnd.qml
2 changes: 1 addition & 1 deletion FileSets/v2.80/OverviewSolarCharger.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewSolarCharger.qml
../v3.40~13/OverviewSolarCharger.qml
2 changes: 1 addition & 1 deletion FileSets/v2.80/OverviewTankDelegate.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTankDelegate.qml
../v3.40~13/OverviewTankDelegate.qml
2 changes: 1 addition & 1 deletion FileSets/v2.80/OverviewTanks.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTanks.qml
../v3.40~13/OverviewTanks.qml
2 changes: 1 addition & 1 deletion FileSets/v2.80/TileText.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/TileText.qml
../v3.40~13/TileText.qml
2 changes: 1 addition & 1 deletion FileSets/v2.80/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/styles.css
../v3.40~13/styles.css
2 changes: 1 addition & 1 deletion FileSets/v2.81/MbEditBoxDateTime.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbEditBoxDateTime.qml
../v3.40~13/MbEditBoxDateTime.qml
2 changes: 1 addition & 1 deletion FileSets/v2.81/MbSubMenu.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbSubMenu.qml
../v3.40~13/MbSubMenu.qml
2 changes: 1 addition & 1 deletion FileSets/v2.81/Multi.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/Multi.qml
../v3.40~13/Multi.qml
2 changes: 1 addition & 1 deletion FileSets/v2.81/OverviewBox.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewBox.qml
../v3.40~13/OverviewBox.qml
2 changes: 1 addition & 1 deletion FileSets/v2.81/OverviewConnection.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnection.qml
../v3.40~13/OverviewConnection.qml
2 changes: 1 addition & 1 deletion FileSets/v2.81/OverviewConnectionEnd.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnectionEnd.qml
../v3.40~13/OverviewConnectionEnd.qml
2 changes: 1 addition & 1 deletion FileSets/v2.81/OverviewSolarCharger.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewSolarCharger.qml
../v3.40~13/OverviewSolarCharger.qml
2 changes: 1 addition & 1 deletion FileSets/v2.81/OverviewTankDelegate.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTankDelegate.qml
../v3.40~13/OverviewTankDelegate.qml
2 changes: 1 addition & 1 deletion FileSets/v2.81/OverviewTanks.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTanks.qml
../v3.40~13/OverviewTanks.qml
2 changes: 1 addition & 1 deletion FileSets/v2.81/TileText.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/TileText.qml
../v3.40~13/TileText.qml
2 changes: 1 addition & 1 deletion FileSets/v2.81/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/styles.css
../v3.40~13/styles.css
2 changes: 1 addition & 1 deletion FileSets/v2.82/MbEditBoxDateTime.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbEditBoxDateTime.qml
../v3.40~13/MbEditBoxDateTime.qml
2 changes: 1 addition & 1 deletion FileSets/v2.82/MbSubMenu.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbSubMenu.qml
../v3.40~13/MbSubMenu.qml
2 changes: 1 addition & 1 deletion FileSets/v2.82/Multi.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/Multi.qml
../v3.40~13/Multi.qml
2 changes: 1 addition & 1 deletion FileSets/v2.82/OverviewBox.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewBox.qml
../v3.40~13/OverviewBox.qml
2 changes: 1 addition & 1 deletion FileSets/v2.82/OverviewConnection.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnection.qml
../v3.40~13/OverviewConnection.qml
2 changes: 1 addition & 1 deletion FileSets/v2.82/OverviewConnectionEnd.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnectionEnd.qml
../v3.40~13/OverviewConnectionEnd.qml
2 changes: 1 addition & 1 deletion FileSets/v2.82/OverviewSolarCharger.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewSolarCharger.qml
../v3.40~13/OverviewSolarCharger.qml
2 changes: 1 addition & 1 deletion FileSets/v2.82/OverviewTankDelegate.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTankDelegate.qml
../v3.40~13/OverviewTankDelegate.qml
2 changes: 1 addition & 1 deletion FileSets/v2.82/OverviewTanks.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewTanks.qml
../v3.40~13/OverviewTanks.qml
2 changes: 1 addition & 1 deletion FileSets/v2.82/TileText.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/TileText.qml
../v3.40~13/TileText.qml
2 changes: 1 addition & 1 deletion FileSets/v2.82/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/styles.css
../v3.40~13/styles.css
2 changes: 1 addition & 1 deletion FileSets/v2.83/MbEditBoxDateTime.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbEditBoxDateTime.qml
../v3.40~13/MbEditBoxDateTime.qml
2 changes: 1 addition & 1 deletion FileSets/v2.83/MbSubMenu.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/MbSubMenu.qml
../v3.40~13/MbSubMenu.qml
2 changes: 1 addition & 1 deletion FileSets/v2.83/Multi.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/Multi.qml
../v3.40~13/Multi.qml
2 changes: 1 addition & 1 deletion FileSets/v2.83/OverviewBox.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewBox.qml
../v3.40~13/OverviewBox.qml
2 changes: 1 addition & 1 deletion FileSets/v2.83/OverviewConnection.qml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../v3.40~12/OverviewConnection.qml
../v3.40~13/OverviewConnection.qml
Loading

0 comments on commit 5ad7314

Please sign in to comment.