wrap scrolling text to avoid blank at end of string

kwindrem · Oct 16, 2023 · 8341b62 · 8341b62
1 parent c77fca4
commit 8341b62
Show file tree

Hide file tree

Showing 738 changed files with 27,431 additions and 27,569 deletions.
diff --git a/FileSets/MarqueeEnhanced.qml b/FileSets/MarqueeEnhanced.qml
@@ -0,0 +1,71 @@
+////// add bold
+import QtQuick 1.1
+
+Rectangle {
+	id: marquee
+
+	height: _text.paintedHeight + 5
+	clip: true
+	color: "transparent"
+
+	property alias text: _text.text
+	property alias interval: marqueeTimer.interval
+	property alias fontSize: _text.font.pixelSize
+	property alias textColor: _text.color
+	property variant textHorizontalAlignment: Text.AlignHCenter
+    property alias bold: _text.font.bold
+	property bool scroll: true
+    property bool longName: text != "" && _text.paintedWidth > marquee.width
+
+    function doScroll()
+    {
+        if (longName)
+            marqueeTimer.running = true
+    }
+
+    Text {
+        id: _text
+        font.pixelSize: 13
+        color: "#fff"
+        width: parent.width
+        anchors.verticalCenter: parent.verticalCenter
+        // use spcified alignment unless name won't fit or are scrolling, then align left
+        horizontalAlignment: textHorizontalAlignment
+        visible: ! longName
+    }
+
+    // double incoming text so the scroll fills in past the end of the string
+    Text {
+        id: _textToDisplay
+        text: _text.text + "..." + _text.text
+        font.pixelSize: 13
+        color: "#fff"
+        width: parent.width
+        anchors.verticalCenter: parent.verticalCenter
+        // use spcified alignment unless name won't fit or are scrolling, then align left
+        horizontalAlignment: marqueeTimer.running ? Text.AlignLeft : textHorizontalAlignment
+        visible: longName
+    }
+
+
+	Timer {
+		id: marqueeTimer
+		interval: 100
+		repeat: true
+		running: _text.paintedWidth > marquee.width && scroll
+		onTriggered: moveText()
+        onRunningChanged: if (!running) _textToDisplay.x = 0
+	}
+
+	function moveText()
+	{
+        if (_textToDisplay.x + _text.paintedWidth <= 2)
+        {
+            _textToDisplay.x = 0 ////marquee.width
+            if (! scroll)
+                marqueeTimer.running = false
+        }
+        else
+            _textToDisplay.x -= 2
+    }
+}
diff --git a/FileSets/MarqueeEnhanced.qml.ALT_ORIG b/FileSets/MarqueeEnhanced.qml.ALT_ORIG
diff --git a/FileSets/v3.20~8/TileTankEnhanced.qml → FileSets/TileTankEnhanced.qml b/FileSets/v3.20~8/TileTankEnhanced.qml → FileSets/TileTankEnhanced.qml
diff --git a/FileSets/TileTankEnhanced.qml.ALT_ORIG b/FileSets/TileTankEnhanced.qml.ALT_ORIG
diff --git a/FileSets/fileList b/FileSets/fileList
@@ -3,11 +3,8 @@
 /opt/victronenergy/gui/qml/ObjectAcConnection.qml
 /opt/victronenergy/gui/qml/OverviewHubEnhanced.qml
 /opt/victronenergy/gui/qml/OverviewMobileEnhanced.qml
-/opt/victronenergy/gui/qml/TileTankEnhanced.qml
-/opt/victronenergy/gui/qml/MarqueeEnhanced.qml
 /opt/victronenergy/gui/qml/HubData.qml
 /opt/victronenergy/gui/qml/PageSettingsDisplay.qml
-/opt/victronenergy/gui/qml/Tile.qml
 /opt/victronenergy/gui/qml/PageSettingsRelay.qml
 /opt/victronenergy/gui/qml/PageSettingsGuiMods.qml
 /opt/victronenergy/gui/qml/TileRelay.qml

diff --git a/FileSets/v2.71/MarqueeEnhanced.qml b/FileSets/v2.71/MarqueeEnhanced.qml
diff --git a/FileSets/v2.71/MbEditBox.qml b/FileSets/v2.71/MbEditBox.qml
@@ -1 +1 @@
-../v3.20~8/MbEditBox.qml
+../v3.20~9/MbEditBox.qml
diff --git a/FileSets/v2.71/MbEditBoxDateTime.qml b/FileSets/v2.71/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.20~8/MbEditBoxDateTime.qml
+../v3.20~9/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.71/MbSubMenu.qml b/FileSets/v2.71/MbSubMenu.qml
@@ -1 +1 @@
-../v3.20~8/MbSubMenu.qml
+../v3.20~9/MbSubMenu.qml
diff --git a/FileSets/v2.71/Multi.qml b/FileSets/v2.71/Multi.qml
@@ -1 +1 @@
-../v3.20~8/Multi.qml
+../v3.20~9/Multi.qml
diff --git a/FileSets/v2.71/OverviewBox.qml b/FileSets/v2.71/OverviewBox.qml
@@ -1 +1 @@
-../v3.20~8/OverviewBox.qml
+../v3.20~9/OverviewBox.qml
diff --git a/FileSets/v2.71/OverviewConnection.qml b/FileSets/v2.71/OverviewConnection.qml
@@ -1 +1 @@
-../v3.20~8/OverviewConnection.qml
+../v3.20~9/OverviewConnection.qml
diff --git a/FileSets/v2.71/OverviewConnectionEnd.qml b/FileSets/v2.71/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.20~8/OverviewConnectionEnd.qml
+../v3.20~9/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.71/OverviewSolarCharger.qml b/FileSets/v2.71/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.20~8/OverviewSolarCharger.qml
+../v3.20~9/OverviewSolarCharger.qml
diff --git a/FileSets/v2.71/OverviewTankDelegate.qml b/FileSets/v2.71/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.20~8/OverviewTankDelegate.qml
+../v3.20~9/OverviewTankDelegate.qml
diff --git a/FileSets/v2.71/OverviewTanks.qml b/FileSets/v2.71/OverviewTanks.qml
@@ -1 +1 @@
-../v3.20~8/OverviewTanks.qml
+../v3.20~9/OverviewTanks.qml
diff --git a/FileSets/v2.71/TileTankEnhanced.qml b/FileSets/v2.71/TileTankEnhanced.qml
diff --git a/FileSets/v2.71/TileText.qml b/FileSets/v2.71/TileText.qml
@@ -1 +1 @@
-../v3.20~8/TileText.qml
+../v3.20~9/TileText.qml
diff --git a/FileSets/v2.71/styles.css b/FileSets/v2.71/styles.css
@@ -1 +1 @@
-../v3.20~8/styles.css
+../v3.20~9/styles.css
diff --git a/FileSets/v2.72/MarqueeEnhanced.qml b/FileSets/v2.72/MarqueeEnhanced.qml
diff --git a/FileSets/v2.72/MbEditBox.qml b/FileSets/v2.72/MbEditBox.qml
@@ -1 +1 @@
-../v3.20~8/MbEditBox.qml
+../v3.20~9/MbEditBox.qml
diff --git a/FileSets/v2.72/MbEditBoxDateTime.qml b/FileSets/v2.72/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.20~8/MbEditBoxDateTime.qml
+../v3.20~9/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.72/MbSubMenu.qml b/FileSets/v2.72/MbSubMenu.qml
@@ -1 +1 @@
-../v3.20~8/MbSubMenu.qml
+../v3.20~9/MbSubMenu.qml
diff --git a/FileSets/v2.72/Multi.qml b/FileSets/v2.72/Multi.qml
@@ -1 +1 @@
-../v3.20~8/Multi.qml
+../v3.20~9/Multi.qml
diff --git a/FileSets/v2.72/OverviewBox.qml b/FileSets/v2.72/OverviewBox.qml
@@ -1 +1 @@
-../v3.20~8/OverviewBox.qml
+../v3.20~9/OverviewBox.qml
diff --git a/FileSets/v2.72/OverviewConnection.qml b/FileSets/v2.72/OverviewConnection.qml
@@ -1 +1 @@
-../v3.20~8/OverviewConnection.qml
+../v3.20~9/OverviewConnection.qml
diff --git a/FileSets/v2.72/OverviewConnectionEnd.qml b/FileSets/v2.72/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.20~8/OverviewConnectionEnd.qml
+../v3.20~9/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.72/OverviewSolarCharger.qml b/FileSets/v2.72/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.20~8/OverviewSolarCharger.qml
+../v3.20~9/OverviewSolarCharger.qml
diff --git a/FileSets/v2.72/OverviewTankDelegate.qml b/FileSets/v2.72/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.20~8/OverviewTankDelegate.qml
+../v3.20~9/OverviewTankDelegate.qml
diff --git a/FileSets/v2.72/OverviewTanks.qml b/FileSets/v2.72/OverviewTanks.qml
@@ -1 +1 @@
-../v3.20~8/OverviewTanks.qml
+../v3.20~9/OverviewTanks.qml
diff --git a/FileSets/v2.72/TileTankEnhanced.qml b/FileSets/v2.72/TileTankEnhanced.qml
diff --git a/FileSets/v2.72/TileText.qml b/FileSets/v2.72/TileText.qml
@@ -1 +1 @@
-../v3.20~8/TileText.qml
+../v3.20~9/TileText.qml
diff --git a/FileSets/v2.72/styles.css b/FileSets/v2.72/styles.css
@@ -1 +1 @@
-../v3.20~8/styles.css
+../v3.20~9/styles.css
diff --git a/FileSets/v2.73/MarqueeEnhanced.qml b/FileSets/v2.73/MarqueeEnhanced.qml
diff --git a/FileSets/v2.73/MbEditBox.qml b/FileSets/v2.73/MbEditBox.qml
@@ -1 +1 @@
-../v3.20~8/MbEditBox.qml
+../v3.20~9/MbEditBox.qml
diff --git a/FileSets/v2.73/MbEditBoxDateTime.qml b/FileSets/v2.73/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.20~8/MbEditBoxDateTime.qml
+../v3.20~9/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.73/MbSubMenu.qml b/FileSets/v2.73/MbSubMenu.qml
@@ -1 +1 @@
-../v3.20~8/MbSubMenu.qml
+../v3.20~9/MbSubMenu.qml
diff --git a/FileSets/v2.73/Multi.qml b/FileSets/v2.73/Multi.qml
@@ -1 +1 @@
-../v3.20~8/Multi.qml
+../v3.20~9/Multi.qml
diff --git a/FileSets/v2.73/OverviewBox.qml b/FileSets/v2.73/OverviewBox.qml
@@ -1 +1 @@
-../v3.20~8/OverviewBox.qml
+../v3.20~9/OverviewBox.qml
diff --git a/FileSets/v2.73/OverviewConnection.qml b/FileSets/v2.73/OverviewConnection.qml
@@ -1 +1 @@
-../v3.20~8/OverviewConnection.qml
+../v3.20~9/OverviewConnection.qml
diff --git a/FileSets/v2.73/OverviewConnectionEnd.qml b/FileSets/v2.73/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.20~8/OverviewConnectionEnd.qml
+../v3.20~9/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.73/OverviewSolarCharger.qml b/FileSets/v2.73/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.20~8/OverviewSolarCharger.qml
+../v3.20~9/OverviewSolarCharger.qml
diff --git a/FileSets/v2.73/OverviewTankDelegate.qml b/FileSets/v2.73/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.20~8/OverviewTankDelegate.qml
+../v3.20~9/OverviewTankDelegate.qml
diff --git a/FileSets/v2.73/OverviewTanks.qml b/FileSets/v2.73/OverviewTanks.qml
@@ -1 +1 @@
-../v3.20~8/OverviewTanks.qml
+../v3.20~9/OverviewTanks.qml
diff --git a/FileSets/v2.73/TileTankEnhanced.qml b/FileSets/v2.73/TileTankEnhanced.qml
diff --git a/FileSets/v2.73/TileText.qml b/FileSets/v2.73/TileText.qml
@@ -1 +1 @@
-../v3.20~8/TileText.qml
+../v3.20~9/TileText.qml
diff --git a/FileSets/v2.73/styles.css b/FileSets/v2.73/styles.css
@@ -1 +1 @@
-../v3.20~8/styles.css
+../v3.20~9/styles.css
diff --git a/FileSets/v2.80/MarqueeEnhanced.qml b/FileSets/v2.80/MarqueeEnhanced.qml
diff --git a/FileSets/v2.80/MbEditBox.qml b/FileSets/v2.80/MbEditBox.qml
@@ -1 +1 @@
-../v3.20~8/MbEditBox.qml
+../v3.20~9/MbEditBox.qml
diff --git a/FileSets/v2.80/MbEditBoxDateTime.qml b/FileSets/v2.80/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.20~8/MbEditBoxDateTime.qml
+../v3.20~9/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.80/MbSubMenu.qml b/FileSets/v2.80/MbSubMenu.qml
@@ -1 +1 @@
-../v3.20~8/MbSubMenu.qml
+../v3.20~9/MbSubMenu.qml
diff --git a/FileSets/v2.80/Multi.qml b/FileSets/v2.80/Multi.qml
@@ -1 +1 @@
-../v3.20~8/Multi.qml
+../v3.20~9/Multi.qml
diff --git a/FileSets/v2.80/OverviewBox.qml b/FileSets/v2.80/OverviewBox.qml
@@ -1 +1 @@
-../v3.20~8/OverviewBox.qml
+../v3.20~9/OverviewBox.qml
diff --git a/FileSets/v2.80/OverviewConnection.qml b/FileSets/v2.80/OverviewConnection.qml
@@ -1 +1 @@
-../v3.20~8/OverviewConnection.qml
+../v3.20~9/OverviewConnection.qml
diff --git a/FileSets/v2.80/OverviewConnectionEnd.qml b/FileSets/v2.80/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.20~8/OverviewConnectionEnd.qml
+../v3.20~9/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.80/OverviewSolarCharger.qml b/FileSets/v2.80/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.20~8/OverviewSolarCharger.qml
+../v3.20~9/OverviewSolarCharger.qml
diff --git a/FileSets/v2.80/OverviewTankDelegate.qml b/FileSets/v2.80/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.20~8/OverviewTankDelegate.qml
+../v3.20~9/OverviewTankDelegate.qml
diff --git a/FileSets/v2.80/OverviewTanks.qml b/FileSets/v2.80/OverviewTanks.qml
@@ -1 +1 @@
-../v3.20~8/OverviewTanks.qml
+../v3.20~9/OverviewTanks.qml
diff --git a/FileSets/v2.80/TileTankEnhanced.qml b/FileSets/v2.80/TileTankEnhanced.qml
diff --git a/FileSets/v2.80/TileText.qml b/FileSets/v2.80/TileText.qml
@@ -1 +1 @@
-../v3.20~8/TileText.qml
+../v3.20~9/TileText.qml
diff --git a/FileSets/v2.80/styles.css b/FileSets/v2.80/styles.css
@@ -1 +1 @@
-../v3.20~8/styles.css
+../v3.20~9/styles.css
diff --git a/FileSets/v2.81/MarqueeEnhanced.qml b/FileSets/v2.81/MarqueeEnhanced.qml
diff --git a/FileSets/v2.81/MbEditBox.qml b/FileSets/v2.81/MbEditBox.qml
@@ -1 +1 @@
-../v3.20~8/MbEditBox.qml
+../v3.20~9/MbEditBox.qml
diff --git a/FileSets/v2.81/MbEditBoxDateTime.qml b/FileSets/v2.81/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.20~8/MbEditBoxDateTime.qml
+../v3.20~9/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.81/MbSubMenu.qml b/FileSets/v2.81/MbSubMenu.qml
@@ -1 +1 @@
-../v3.20~8/MbSubMenu.qml
+../v3.20~9/MbSubMenu.qml
diff --git a/FileSets/v2.81/Multi.qml b/FileSets/v2.81/Multi.qml
@@ -1 +1 @@
-../v3.20~8/Multi.qml
+../v3.20~9/Multi.qml
diff --git a/FileSets/v2.81/OverviewBox.qml b/FileSets/v2.81/OverviewBox.qml
@@ -1 +1 @@
-../v3.20~8/OverviewBox.qml
+../v3.20~9/OverviewBox.qml
diff --git a/FileSets/v2.81/OverviewConnection.qml b/FileSets/v2.81/OverviewConnection.qml
@@ -1 +1 @@
-../v3.20~8/OverviewConnection.qml
+../v3.20~9/OverviewConnection.qml
diff --git a/FileSets/v2.81/OverviewConnectionEnd.qml b/FileSets/v2.81/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.20~8/OverviewConnectionEnd.qml
+../v3.20~9/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.81/OverviewSolarCharger.qml b/FileSets/v2.81/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.20~8/OverviewSolarCharger.qml
+../v3.20~9/OverviewSolarCharger.qml
diff --git a/FileSets/v2.81/OverviewTankDelegate.qml b/FileSets/v2.81/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.20~8/OverviewTankDelegate.qml
+../v3.20~9/OverviewTankDelegate.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.20~8/MbEditBoxDateTime.qml
		../v3.20~9/MbEditBoxDateTime.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.20~8/OverviewBox.qml
		../v3.20~9/OverviewBox.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.20~8/OverviewConnection.qml
		../v3.20~9/OverviewConnection.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.20~8/OverviewConnectionEnd.qml
		../v3.20~9/OverviewConnectionEnd.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.20~8/OverviewSolarCharger.qml
		../v3.20~9/OverviewSolarCharger.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.20~8/OverviewTankDelegate.qml
		../v3.20~9/OverviewTankDelegate.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.20~8/OverviewTanks.qml
		../v3.20~9/OverviewTanks.qml