add support for v3.20~49 and others; add ignored missage to generator…

… overview
kwindrem · Feb 9, 2024 · 6405efd · 6405efd
1 parent 5dc57d6
commit 6405efd
Show file tree

Hide file tree

Showing 1,265 changed files with 6,009 additions and 2,275 deletions.
diff --git a/ExtTransferSwitch.py b/ExtTransferSwitch.py
@@ -123,7 +123,6 @@ def getVeBusObjects (self):
 			transferSwitchLocation = 0
 		elif self.numberOfAcInputs == 1:
 			transferSwitchLocation = 1
-			self.numberOfAcInputs > 1 and self.DbusSettings['transferSwitchOnAc2'] == 1
 		elif self.DbusSettings['transferSwitchOnAc2'] == 1:
 			transferSwitchLocation = 2
 		else:

diff --git a/FileSets/v2.71/MbEditBox.qml b/FileSets/v2.71/MbEditBox.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBox.qml
+../v3.30~3/MbEditBox.qml
diff --git a/FileSets/v2.71/MbEditBoxDateTime.qml b/FileSets/v2.71/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBoxDateTime.qml
+../v3.30~3/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.71/MbSubMenu.qml b/FileSets/v2.71/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30~1/MbSubMenu.qml
+../v3.30~3/MbSubMenu.qml
diff --git a/FileSets/v2.71/Multi.qml b/FileSets/v2.71/Multi.qml
@@ -1 +1 @@
-../v3.30~1/Multi.qml
+../v3.30~3/Multi.qml
diff --git a/FileSets/v2.71/OverviewBox.qml b/FileSets/v2.71/OverviewBox.qml
@@ -1 +1 @@
-../v3.30~1/OverviewBox.qml
+../v3.30~3/OverviewBox.qml
diff --git a/FileSets/v2.71/OverviewConnection.qml b/FileSets/v2.71/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnection.qml
+../v3.30~3/OverviewConnection.qml
diff --git a/FileSets/v2.71/OverviewConnectionEnd.qml b/FileSets/v2.71/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnectionEnd.qml
+../v3.30~3/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.71/OverviewSolarCharger.qml b/FileSets/v2.71/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30~1/OverviewSolarCharger.qml
+../v3.30~3/OverviewSolarCharger.qml
diff --git a/FileSets/v2.71/OverviewTankDelegate.qml b/FileSets/v2.71/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTankDelegate.qml
+../v3.30~3/OverviewTankDelegate.qml
diff --git a/FileSets/v2.71/OverviewTanks.qml b/FileSets/v2.71/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTanks.qml
+../v3.30~3/OverviewTanks.qml
diff --git a/FileSets/v2.71/TileText.qml b/FileSets/v2.71/TileText.qml
@@ -1 +1 @@
-../v3.30~1/TileText.qml
+../v3.30~3/TileText.qml
diff --git a/FileSets/v2.71/styles.css b/FileSets/v2.71/styles.css
@@ -1 +1 @@
-../v3.30~1/styles.css
+../v3.30~3/styles.css
diff --git a/FileSets/v2.72/MbEditBox.qml b/FileSets/v2.72/MbEditBox.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBox.qml
+../v3.30~3/MbEditBox.qml
diff --git a/FileSets/v2.72/MbEditBoxDateTime.qml b/FileSets/v2.72/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBoxDateTime.qml
+../v3.30~3/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.72/MbSubMenu.qml b/FileSets/v2.72/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30~1/MbSubMenu.qml
+../v3.30~3/MbSubMenu.qml
diff --git a/FileSets/v2.72/Multi.qml b/FileSets/v2.72/Multi.qml
@@ -1 +1 @@
-../v3.30~1/Multi.qml
+../v3.30~3/Multi.qml
diff --git a/FileSets/v2.72/OverviewBox.qml b/FileSets/v2.72/OverviewBox.qml
@@ -1 +1 @@
-../v3.30~1/OverviewBox.qml
+../v3.30~3/OverviewBox.qml
diff --git a/FileSets/v2.72/OverviewConnection.qml b/FileSets/v2.72/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnection.qml
+../v3.30~3/OverviewConnection.qml
diff --git a/FileSets/v2.72/OverviewConnectionEnd.qml b/FileSets/v2.72/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnectionEnd.qml
+../v3.30~3/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.72/OverviewSolarCharger.qml b/FileSets/v2.72/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30~1/OverviewSolarCharger.qml
+../v3.30~3/OverviewSolarCharger.qml
diff --git a/FileSets/v2.72/OverviewTankDelegate.qml b/FileSets/v2.72/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTankDelegate.qml
+../v3.30~3/OverviewTankDelegate.qml
diff --git a/FileSets/v2.72/OverviewTanks.qml b/FileSets/v2.72/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTanks.qml
+../v3.30~3/OverviewTanks.qml
diff --git a/FileSets/v2.72/TileText.qml b/FileSets/v2.72/TileText.qml
@@ -1 +1 @@
-../v3.30~1/TileText.qml
+../v3.30~3/TileText.qml
diff --git a/FileSets/v2.72/styles.css b/FileSets/v2.72/styles.css
@@ -1 +1 @@
-../v3.30~1/styles.css
+../v3.30~3/styles.css
diff --git a/FileSets/v2.73/MbEditBox.qml b/FileSets/v2.73/MbEditBox.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBox.qml
+../v3.30~3/MbEditBox.qml
diff --git a/FileSets/v2.73/MbEditBoxDateTime.qml b/FileSets/v2.73/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBoxDateTime.qml
+../v3.30~3/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.73/MbSubMenu.qml b/FileSets/v2.73/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30~1/MbSubMenu.qml
+../v3.30~3/MbSubMenu.qml
diff --git a/FileSets/v2.73/Multi.qml b/FileSets/v2.73/Multi.qml
@@ -1 +1 @@
-../v3.30~1/Multi.qml
+../v3.30~3/Multi.qml
diff --git a/FileSets/v2.73/OverviewBox.qml b/FileSets/v2.73/OverviewBox.qml
@@ -1 +1 @@
-../v3.30~1/OverviewBox.qml
+../v3.30~3/OverviewBox.qml
diff --git a/FileSets/v2.73/OverviewConnection.qml b/FileSets/v2.73/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnection.qml
+../v3.30~3/OverviewConnection.qml
diff --git a/FileSets/v2.73/OverviewConnectionEnd.qml b/FileSets/v2.73/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnectionEnd.qml
+../v3.30~3/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.73/OverviewHubEnhanced.qml b/FileSets/v2.73/OverviewHubEnhanced.qml
@@ -189,22 +189,24 @@ OverviewPage {
 		height: showStatusBar ? 100 : 120
 		title:
 		{
-			// input 2 is active
-			if (! acActiveInput.valid || acActiveInput.value == 1)
+			// input 1 is active
+			if (acActiveInput.value == 0)
 			{
-				if (ignoreAcInput2.valid && ignoreAcInput2.value == 1)
-					return qsTr ("AC In 2 Ignored")
+				if (ignoreAcInput1.valid && ignoreAcInput1.value == 1)
+					return qsTr ("AC In 1 Ignored")
 				else
 					return getAcSourceName(sys.acSource)
 			}
-			// input 1 is active
-			else
+			// input 2 is active
+			else if (acActiveInput.value == 1)
 			{
-				if (ignoreAcInput1.valid && ignoreAcInput1.value == 1)
-					return qsTr ("AC In 1 Ignored")
+				if (ignoreAcInput2.valid && ignoreAcInput2.value == 1)
+					return qsTr ("AC In 2 Ignored")
 				else
 					return getAcSourceName(sys.acSource)
 			}
+			else
+				return "no input"
 		}
 		anchors {
 			top: multi.top

diff --git a/FileSets/v2.73/OverviewSolarCharger.qml b/FileSets/v2.73/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30~1/OverviewSolarCharger.qml
+../v3.30~3/OverviewSolarCharger.qml
diff --git a/FileSets/v2.73/OverviewTankDelegate.qml b/FileSets/v2.73/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTankDelegate.qml
+../v3.30~3/OverviewTankDelegate.qml
diff --git a/FileSets/v2.73/OverviewTanks.qml b/FileSets/v2.73/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTanks.qml
+../v3.30~3/OverviewTanks.qml
diff --git a/FileSets/v2.73/TileText.qml b/FileSets/v2.73/TileText.qml
@@ -1 +1 @@
-../v3.30~1/TileText.qml
+../v3.30~3/TileText.qml
diff --git a/FileSets/v2.73/styles.css b/FileSets/v2.73/styles.css
@@ -1 +1 @@
-../v3.30~1/styles.css
+../v3.30~3/styles.css
diff --git a/FileSets/v2.80/MbEditBox.qml b/FileSets/v2.80/MbEditBox.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBox.qml
+../v3.30~3/MbEditBox.qml
diff --git a/FileSets/v2.80/MbEditBoxDateTime.qml b/FileSets/v2.80/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBoxDateTime.qml
+../v3.30~3/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.80/MbSubMenu.qml b/FileSets/v2.80/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30~1/MbSubMenu.qml
+../v3.30~3/MbSubMenu.qml
diff --git a/FileSets/v2.80/Multi.qml b/FileSets/v2.80/Multi.qml
@@ -1 +1 @@
-../v3.30~1/Multi.qml
+../v3.30~3/Multi.qml
diff --git a/FileSets/v2.80/OverviewBox.qml b/FileSets/v2.80/OverviewBox.qml
@@ -1 +1 @@
-../v3.30~1/OverviewBox.qml
+../v3.30~3/OverviewBox.qml
diff --git a/FileSets/v2.80/OverviewConnection.qml b/FileSets/v2.80/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnection.qml
+../v3.30~3/OverviewConnection.qml
diff --git a/FileSets/v2.80/OverviewConnectionEnd.qml b/FileSets/v2.80/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnectionEnd.qml
+../v3.30~3/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.80/OverviewSolarCharger.qml b/FileSets/v2.80/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30~1/OverviewSolarCharger.qml
+../v3.30~3/OverviewSolarCharger.qml
diff --git a/FileSets/v2.80/OverviewTankDelegate.qml b/FileSets/v2.80/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTankDelegate.qml
+../v3.30~3/OverviewTankDelegate.qml
diff --git a/FileSets/v2.80/OverviewTanks.qml b/FileSets/v2.80/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTanks.qml
+../v3.30~3/OverviewTanks.qml
diff --git a/FileSets/v2.80/TileText.qml b/FileSets/v2.80/TileText.qml
@@ -1 +1 @@
-../v3.30~1/TileText.qml
+../v3.30~3/TileText.qml
diff --git a/FileSets/v2.80/styles.css b/FileSets/v2.80/styles.css
@@ -1 +1 @@
-../v3.30~1/styles.css
+../v3.30~3/styles.css
diff --git a/FileSets/v2.81/MbEditBox.qml b/FileSets/v2.81/MbEditBox.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBox.qml
+../v3.30~3/MbEditBox.qml
diff --git a/FileSets/v2.81/MbEditBoxDateTime.qml b/FileSets/v2.81/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBoxDateTime.qml
+../v3.30~3/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.81/MbSubMenu.qml b/FileSets/v2.81/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30~1/MbSubMenu.qml
+../v3.30~3/MbSubMenu.qml
diff --git a/FileSets/v2.81/Multi.qml b/FileSets/v2.81/Multi.qml
@@ -1 +1 @@
-../v3.30~1/Multi.qml
+../v3.30~3/Multi.qml
diff --git a/FileSets/v2.81/OverviewBox.qml b/FileSets/v2.81/OverviewBox.qml
@@ -1 +1 @@
-../v3.30~1/OverviewBox.qml
+../v3.30~3/OverviewBox.qml
diff --git a/FileSets/v2.81/OverviewConnection.qml b/FileSets/v2.81/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnection.qml
+../v3.30~3/OverviewConnection.qml
diff --git a/FileSets/v2.81/OverviewConnectionEnd.qml b/FileSets/v2.81/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnectionEnd.qml
+../v3.30~3/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.81/OverviewSolarCharger.qml b/FileSets/v2.81/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30~1/OverviewSolarCharger.qml
+../v3.30~3/OverviewSolarCharger.qml
diff --git a/FileSets/v2.81/OverviewTankDelegate.qml b/FileSets/v2.81/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTankDelegate.qml
+../v3.30~3/OverviewTankDelegate.qml
diff --git a/FileSets/v2.81/OverviewTanks.qml b/FileSets/v2.81/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTanks.qml
+../v3.30~3/OverviewTanks.qml
diff --git a/FileSets/v2.81/TileText.qml b/FileSets/v2.81/TileText.qml
@@ -1 +1 @@
-../v3.30~1/TileText.qml
+../v3.30~3/TileText.qml
diff --git a/FileSets/v2.81/styles.css b/FileSets/v2.81/styles.css
@@ -1 +1 @@
-../v3.30~1/styles.css
+../v3.30~3/styles.css
diff --git a/FileSets/v2.82/MbEditBox.qml b/FileSets/v2.82/MbEditBox.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBox.qml
+../v3.30~3/MbEditBox.qml
diff --git a/FileSets/v2.82/MbEditBoxDateTime.qml b/FileSets/v2.82/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30~1/MbEditBoxDateTime.qml
+../v3.30~3/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.82/MbSubMenu.qml b/FileSets/v2.82/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30~1/MbSubMenu.qml
+../v3.30~3/MbSubMenu.qml
diff --git a/FileSets/v2.82/Multi.qml b/FileSets/v2.82/Multi.qml
@@ -1 +1 @@
-../v3.30~1/Multi.qml
+../v3.30~3/Multi.qml
diff --git a/FileSets/v2.82/OverviewBox.qml b/FileSets/v2.82/OverviewBox.qml
@@ -1 +1 @@
-../v3.30~1/OverviewBox.qml
+../v3.30~3/OverviewBox.qml
diff --git a/FileSets/v2.82/OverviewConnection.qml b/FileSets/v2.82/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnection.qml
+../v3.30~3/OverviewConnection.qml
diff --git a/FileSets/v2.82/OverviewConnectionEnd.qml b/FileSets/v2.82/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30~1/OverviewConnectionEnd.qml
+../v3.30~3/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.82/OverviewSolarCharger.qml b/FileSets/v2.82/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30~1/OverviewSolarCharger.qml
+../v3.30~3/OverviewSolarCharger.qml
diff --git a/FileSets/v2.82/OverviewTankDelegate.qml b/FileSets/v2.82/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTankDelegate.qml
+../v3.30~3/OverviewTankDelegate.qml
diff --git a/FileSets/v2.82/OverviewTanks.qml b/FileSets/v2.82/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30~1/OverviewTanks.qml
+../v3.30~3/OverviewTanks.qml
diff --git a/FileSets/v2.82/TileText.qml b/FileSets/v2.82/TileText.qml
@@ -1 +1 @@
-../v3.30~1/TileText.qml
+../v3.30~3/TileText.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30~1/MbEditBoxDateTime.qml
		../v3.30~3/MbEditBoxDateTime.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30~1/OverviewBox.qml
		../v3.30~3/OverviewBox.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30~1/OverviewConnection.qml
		../v3.30~3/OverviewConnection.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30~1/OverviewConnectionEnd.qml
		../v3.30~3/OverviewConnectionEnd.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30~1/OverviewSolarCharger.qml
		../v3.30~3/OverviewSolarCharger.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30~1/OverviewTankDelegate.qml
		../v3.30~3/OverviewTankDelegate.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30~1/OverviewTanks.qml
		../v3.30~3/OverviewTanks.qml