Merge branch 'beta'

FileSets/PatchSource/PageSettings.qml.patch

@@ -1,5 +1,5 @@
---- /Users/Kevin/GitHub/StockVenusOsFiles/v3.20~37//opt/victronenergy/gui/qml/PageSettings.qml	2023-12-19 16:21:11
-+++ PageSettings.qml	2024-01-08 16:51:07
+--- /Users/Kevin/GitHub/SetupHelper.copy/FileSets/PatchSource/PageSettings.qml.orig	2024-04-13 11:31:17
++++ /Users/Kevin/GitHub/SetupHelper.copy/FileSets/PatchSource/PageSettings.qml	2024-04-13 11:31:17
 @@ -1,3 +1,6 @@
 +//////// modified to insert PackageManager menu
 +//////// auto-generated by SetupHelper setup script

FileSets/VersionIndependent/PageSettingsPackageAdd.qml

@@ -151,7 +151,7 @@ MbPage {
 				else if (entryValid)
 					return ("add " + packageName + " ?")
 				else if (editPackageName.value == "")
-					return ("enter package name")
+					return ("enter a unique package name")
 				else if (editGitHubUser.value == "")
 					return ("enter GitHub user")
 				else if (editGitHubBranch.value == "")

FileSets/VersionIndependent/PageSettingsPackageEdit.qml

@@ -42,7 +42,7 @@ MbPage {
 	property bool navigate: ! actionPending && ! waitForAction
 	property bool detailsExist: incompatibleDetails != ""
 	property bool detailsResolvable: incompatibleResolvableItem.valid ? incompatibleResolvableItem.value : ""
-	property bool showProceed: ( ! detailsExist || detailsResolvable) && ! waitForAction
+
 	property bool showDetails: false
 	property string localError: ""
 
@@ -72,7 +72,13 @@ MbPage {
 			requestedAction = ''
 		}
 	}
-
+
+	onIncompatibleChanged:
+	{
+		if (! incompatible )
+			showDetails = false
+	}
+
 	onActiveChanged:
 	{
 		if (active)
@@ -203,21 +209,27 @@ MbPage {
 	{
 		if (showDetails)
 		{
-			sendCommand ( 'resolveConflicts:' + packageName, true )
-			showDetails = false
+			if (detailsResolvable)
+			{
+				sendCommand ( 'resolveConflicts:' + packageName, true )
+				showDetails = false
+			}
+			// trigger setup script prechecks
+			else
+			{
+				sendCommand ( 'check:' + packageName, true )
+				showDetails = false
+			}
 		}
 		else if (actionPending)
 			sendCommand ( requestedAction + ':' + packageName, true )
 		else if (showActionNeeded)
 		{
 			if (actionNeeded.indexOf ( "REBOOT" ) != -1 )
-			{
 				sendCommand ( 'reboot', true )
-			}
 			else if (actionNeeded.indexOf ( "restart" ) != -1 )
-			{
 				sendCommand ( 'restartGui', true )
-			}
+				hideActionNeededTimer.start ()
 		}
 		requestedAction = ''
 	}
@@ -339,9 +351,9 @@ MbPage {
 			width: 92
 			anchors { right: cancelButton.left; bottom: statusMessage.bottom }
 			description: ""
-			value: ( actionPending || showDetails ) ? qsTr("Proceed") : qsTr ("Now")
+			value: ( actionPending || detailsResolvable ) ? qsTr("Proceed") : showDetails ? qsTr ("Recheck") : qsTr ("Now")
 			onClicked: confirm ()
-			show: ( actionPending || (showDetails && detailsResolvable) || showActionNeeded ) && showProceed
+			show: ( actionPending || showDetails || showActionNeeded ) && ! waitForAction
 			writeAccessLevel: User.AccessInstaller
 		}
 		MbOK

FileSets/VersionIndependent/PageSettingsPackageManager.qml

@@ -6,16 +6,27 @@ import com.victron.velib 1.0
 
 MbPage {
 	id: root
-	title: qsTr("Package manager")
+	title: showControls ? qsTr("Package manager") : qsTr("Package manager not running")
     property string settingsPrefix: "com.victronenergy.settings/Settings/PackageManager"
     property string servicePrefix: "com.victronenergy.packageManager"
 	property string bindVrmloggerPrefix: "com.victronenergy.logger"
-    VBusItem { id: pmStatus; bind: Utils.path(servicePrefix, "/PmStatus") }
+    VBusItem { id: pmStatusItem; bind: Utils.path(servicePrefix, "/PmStatus") }
+	property string pmStatus: pmStatusItem.valid ? pmStatusItem.value : ""
     VBusItem { id: mediaStatus; bind: Utils.path(servicePrefix, "/MediaUpdateStatus") }
     VBusItem { id: actionNeeded; bind: Utils.path(servicePrefix, "/ActionNeeded") }
     VBusItem { id: editAction; bind: Utils.path(servicePrefix, "/GuiEditAction") }
     property bool showMediaStatus: mediaStatus.valid && mediaStatus.value != ""
-    property bool showControls: pmStatus.valid
+    property bool showControls: pmStatusItem.valid
+
+	// the last status message received from PackageManager is saved in lastStatus
+	//	so there is some status to display when PackageManager quits
+	property string lastStatus: ""
+
+	onPmStatusChanged:
+	{
+		if (pmStatusItem.valid)
+			lastStatus = pmStatus
+	}
 
 	model: VisibleItemModel
     {
@@ -24,12 +35,12 @@ MbPage {
 			id: status
             text:
             {
-				if (! showControls)
-					return "Package manager not running"
-				else if (mediaStatus.valid && mediaStatus.value != "")
+				if (mediaStatus.valid && mediaStatus.value != "")
 					return mediaStatus.value
+				else if (showControls)
+					return pmStatus
 				else
-					return pmStatus.value
+					return lastStatus
 			}
             wrapMode: Text.WordWrap
             horizontalAlignment: Text.AlignHCenter
@@ -82,22 +93,22 @@ MbPage {
              {
 				if (! actionNeeded.valid)
 					return ""
-				else if (actionNeeded.value == 'reboot')
+				else if (actionNeeded.value.indexOf ( "REBOOT" ) != -1 )
 					return qsTr ("Reboot")
-				else if (actionNeeded.value == 'guiRestart')
+				else if (actionNeeded.value.indexOf ( "restart" ) != -1 )
 					return qsTr ("Restart GUI")
 				else
 					return ""
 			}
 			onClicked:
             {
-				if (actionNeeded.value == 'reboot')
+				if (finishButton.value == 'REBOOT')
 				{
 					// needs immediate update because GUI will be going down ASAP
 					finishButton.description = qsTr ("REBOOTING ...")
 					editAction.setValue ( 'reboot' )
 				}
-				else if (actionNeeded.value == 'guiRestart')
+				else if (finishButton.value == 'guiRestart')
 				{
 					// needs immediate update because GUI will be going down ASAP
 					finishButton.description = qsTr ("restarting GUI ...")