Use AllowedItemModel instead of ObjectModel where possible

AllowedItemModel automatically filters out non-allowed items so that they are not part of any view that uses the model. This means that: - views won't need to create unnecessary delegates - when key navigation is added, it won't try to focus non-allowed delegates AllowedItemModel does not have an insert() function so it cannot be used from SwipePageModel. Part of #1732
victronenergy · Jan 15, 2025 · d11a187 · d11a187
1 parent e666ee7
commit d11a187
Show file tree

Hide file tree

Showing 129 changed files with 148 additions and 148 deletions.
diff --git a/components/PageGensetModel.qml b/components/PageGensetModel.qml
@@ -6,7 +6,7 @@
 import QtQuick
 import Victron.VenusOS
 
-ObjectModel {
+AllowedItemModel {
 	id: root
 
 	property string bindPrefix
@@ -226,7 +226,7 @@ ObjectModel {
 
 			Page {
 				GradientListView {
-					model: ObjectModel {
+					model: AllowedItemModel {
 						ListQuantity {
 							//% "Speed"
 							text: qsTrId("ac-in-genset_speed")
@@ -345,7 +345,7 @@ ObjectModel {
 
 			Page {
 				GradientListView {
-					model: ObjectModel {
+					model: AllowedItemModel {
 						ListSpinBox {
 							//% "Charge voltage"
 							text: qsTrId("genset_charge_voltage")

diff --git a/components/listitems/ListChargeSchedule.qml b/components/listitems/ListChargeSchedule.qml
@@ -108,7 +108,7 @@ ListNavigation {
 			id: scheduledOptionsPage
 
 			GradientListView {
-				model: ObjectModel {
+				model: AllowedItemModel {
 					ListSwitch {
 						id: itemEnabled
 

diff --git a/pages/ControlCardsPage.qml b/pages/ControlCardsPage.qml
@@ -36,7 +36,7 @@ Page {
 		maximumFlickVelocity: Theme.geometry_flickable_maximumFlickVelocity
 		flickDeceleration: Theme.geometry_flickable_flickDeceleration
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			Loader {
 				active: systemType.value === "ESS" || systemType.value === "Hub-4"
 				width: active ? root.cardWidth : -cardsView.spacing

diff --git a/pages/NotificationLayer.qml b/pages/NotificationLayer.qml
@@ -43,7 +43,7 @@ Item {
 		spacing: Theme.geometry_toastNotification_bottomMargin
 		layoutDirection: Qt.RightToLeft     // layout from bottom to top
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			id: toastItemsModel
 		}
 	}

diff --git a/pages/SettingsPage.qml b/pages/SettingsPage.qml
@@ -24,7 +24,7 @@ SwipeViewPage {
 		id: settingsListView
 
 		clip: true
-		model: ObjectModel {
+		model: AllowedItemModel {
 			SettingsListNavigation {
 				text: CommonWords.devices
 				//% "All connected devices"

diff --git a/pages/evcs/EvChargerPage.qml b/pages/evcs/EvChargerPage.qml
@@ -16,7 +16,7 @@ Page {
 	title: evCharger.name
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListItemBackground {
 				height: phaseTable.y + phaseTable.height
 

diff --git a/pages/evcs/EvChargerSetupPage.qml b/pages/evcs/EvChargerSetupPage.qml
@@ -13,7 +13,7 @@ Page {
 	required property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListEvChargerPositionRadioButtonGroup {
 				dataItem.uid: root.bindPrefix + "/Position"
 			}

diff --git a/pages/invertercharger/OverviewInverterChargerPage.qml b/pages/invertercharger/OverviewInverterChargerPage.qml
@@ -50,7 +50,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListItem {
 				id: modeListButton
 

diff --git a/pages/settings/GeneratorCondition.qml b/pages/settings/GeneratorCondition.qml
@@ -56,7 +56,7 @@ ListNavigation {
 
 			GradientListView {
 
-				model: ObjectModel {
+				model: AllowedItemModel {
 
 					ListSwitch {
 						text: root.enableDescription

diff --git a/pages/settings/PageCanbusStatus.qml b/pages/settings/PageCanbusStatus.qml
@@ -93,7 +93,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListTextGroup {
 				id: stateGroup
 

diff --git a/pages/settings/PageDeviceInfo.qml b/pages/settings/PageDeviceInfo.qml
@@ -16,7 +16,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				//% "Connection"
 				text: qsTrId("settings_deviceinfo_connection")

diff --git a/pages/settings/PageGenerator.qml b/pages/settings/PageGenerator.qml
@@ -45,7 +45,7 @@ Page {
 		}
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: startStopModel
 
 		ListSwitch {

diff --git a/pages/settings/PageGeneratorAcLoad.qml b/pages/settings/PageGeneratorAcLoad.qml
@@ -30,7 +30,7 @@ Page {
 
 	GradientListView {
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListSwitch {
 				id: enableSwitch

diff --git a/pages/settings/PageGeneratorConditions.qml b/pages/settings/PageGeneratorConditions.qml
@@ -33,7 +33,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListRadioButtonGroup {
 				id: monitorService

diff --git a/pages/settings/PageGeneratorRuntimeService.qml b/pages/settings/PageGeneratorRuntimeService.qml
@@ -41,7 +41,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListText {
 				//% "Total run time"

diff --git a/pages/settings/PageGeneratorTestRun.qml b/pages/settings/PageGeneratorTestRun.qml
@@ -11,7 +11,7 @@ Page {
 
 	GradientListView {
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListSwitch {
 				id: enableSwitch

diff --git a/pages/settings/PageGps.qml b/pages/settings/PageGps.qml
@@ -35,7 +35,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				text: CommonWords.status
 				secondaryText: {

diff --git a/pages/settings/PageHub4Debug.qml b/pages/settings/PageHub4Debug.qml
@@ -20,7 +20,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSpinBox {
 				id: gridSetpoint
 

diff --git a/pages/settings/PageRelayGenerator.qml b/pages/settings/PageRelayGenerator.qml
@@ -16,7 +16,7 @@ PageGenerator {
 
 	model: !relayFunction.isValid || relayFunction.value === 1 ? startStopModel : disabledModel
 
-	ObjectModel {
+	AllowedItemModel {
 		id: disabledModel
 
 		ListItem {

diff --git a/pages/settings/PageSettingsAcSystem.qml b/pages/settings/PageSettingsAcSystem.qml
@@ -34,7 +34,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				id: acInput1
 

diff --git a/pages/settings/PageSettingsAccessAndSecurity.qml b/pages/settings/PageSettingsAccessAndSecurity.qml
@@ -67,7 +67,7 @@ Page {
 		id: settingsListView
 
 		boundsBehavior: Flickable.DragOverBounds
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				//% "Access level"
 				text: qsTrId("settings_access_level")

diff --git a/pages/settings/PageSettingsAlarmsAndFeedback.qml b/pages/settings/PageSettingsAlarmsAndFeedback.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				//% "Audible alarm"
 				text: qsTrId("settings_audible_alarm")

diff --git a/pages/settings/PageSettingsBatteries.qml b/pages/settings/PageSettingsBatteries.qml
@@ -14,7 +14,7 @@ Page {
 	title: CommonWords.batteries
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				id: batteryMonitorRadioButtons
 

diff --git a/pages/settings/PageSettingsBatteryMeasurements.qml b/pages/settings/PageSettingsBatteryMeasurements.qml
@@ -81,7 +81,7 @@ Page {
 
 				Page {
 					GradientListView {
-						model: ObjectModel {
+						model: AllowedItemModel {
 							ListText {
 								text: root._visibleText
 								//% "Active battery monitor"

diff --git a/pages/settings/PageSettingsBleSensors.qml b/pages/settings/PageSettingsBleSensors.qml
@@ -33,7 +33,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				id: enable
 				text: CommonWords.enable

diff --git a/pages/settings/PageSettingsBluetooth.qml b/pages/settings/PageSettingsBluetooth.qml
@@ -11,7 +11,7 @@ Page {
 
 	GradientListView {
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListSwitch {
 				id: bluetoothEnabled

diff --git a/pages/settings/PageSettingsCGwacs.qml b/pages/settings/PageSettingsCGwacs.qml
@@ -29,7 +29,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				text: CommonWords.ac_input_role
 				optionModel: Global.acInputs.roles.map(function(role) {

diff --git a/pages/settings/PageSettingsCanbus.qml b/pages/settings/PageSettingsCanbus.qml
@@ -35,7 +35,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				//% "CAN-bus profile"
 				text: qsTrId("settings_canbus_profile")

diff --git a/pages/settings/PageSettingsConnectivity.qml b/pages/settings/PageSettingsConnectivity.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListNavigation {
 				//% "Ethernet"
 				text: qsTrId("pagesettingsconnectivity_ethernet")

diff --git a/pages/settings/PageSettingsDisplayAndAppearance.qml b/pages/settings/PageSettingsDisplayAndAppearance.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListSwitch {
 				id: autoBrightness

diff --git a/pages/settings/PageSettingsDisplayMinMax.qml b/pages/settings/PageSettingsDisplayMinMax.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				//: Whether to adjust the min/max values in the range dynamically, based on the lowest and highest values observed on the system.
 				//% "Auto-ranging"

diff --git a/pages/settings/PageSettingsDisplayStartPage.qml b/pages/settings/PageSettingsDisplayStartPage.qml
@@ -30,7 +30,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListNavigation {
 				id: startPageNavigation
 				//% "Start page"
@@ -99,7 +99,7 @@ Page {
 
 		Page {
 			GradientListView {
-				model: ObjectModel {
+				model: AllowedItemModel {
 					ListSwitch {
 						id: startPageMode
 						text: CommonWords.auto

diff --git a/pages/settings/PageSettingsDisplayUnits.qml b/pages/settings/PageSettingsDisplayUnits.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				text: CommonWords.temperature
 				optionModel: [

diff --git a/pages/settings/PageSettingsDvcc.qml b/pages/settings/PageSettingsDvcc.qml
@@ -13,7 +13,7 @@ Page {
 	GradientListView {
 		id: dvccSettings
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			PrimaryListLabel {
 				//% "<b>CAUTION:</b> Read the manual before adjusting."
 				text: qsTrId("settings_dvcc_instructions")

diff --git a/pages/settings/PageSettingsDynamicEss.qml b/pages/settings/PageSettingsDynamicEss.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				id: dEssMode
 				text: CommonWords.mode

diff --git a/pages/settings/PageSettingsEthernet.qml b/pages/settings/PageSettingsEthernet.qml
@@ -14,7 +14,7 @@ Page {
 		model: networkServices.ready ? connectedModel : disconnectedModel
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: disconnectedModel
 
 		ListText {
@@ -27,7 +27,7 @@ Page {
 		}
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: connectedModel
 
 		ListText {

diff --git a/pages/settings/PageSettingsFirmware.qml b/pages/settings/PageSettingsFirmware.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListText {
 				id: remotePort

diff --git a/pages/settings/PageSettingsFirmwareOffline.qml b/pages/settings/PageSettingsFirmwareOffline.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListFirmwareCheckButton {
 				//% "Check for updates on SD/USB"

diff --git a/pages/settings/PageSettingsFirmwareOnline.qml b/pages/settings/PageSettingsFirmwareOnline.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListRadioButtonGroup {
 				//% "Auto update"

diff --git a/pages/settings/PageSettingsFronius.qml b/pages/settings/PageSettingsFronius.qml
@@ -24,7 +24,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListNavigation {
 				//% "Inverters"
 				text: qsTrId("page_settings_fronius_inverters")