From 06522cc28a987eddf2585b08091461145b7e5799 Mon Sep 17 00:00:00 2001 From: Daniel McInnes Date: Tue, 12 Sep 2023 22:28:02 +1000 Subject: [PATCH] Register all QML types properly into a module, declaratively --- ApplicationContent.qml | 4 +- CMakeLists.txt | 661 ++++++++++++++++-- main.qml => Main.qml | 3 +- components/ArcGauge.qml | 2 +- components/CircularMultiGauge.qml | 2 +- components/CircularSingleGauge.qml | 2 +- components/ElectricalQuantityLabel.qml | 2 +- components/EnvironmentGaugePanel.qml | 2 +- components/ExpandedTanksView.qml | 4 +- components/GaugeModel.qml | 4 +- components/GeneratorIconLabel.qml | 2 +- components/GsmStatusIcon.qml | 2 +- components/NavBar.qml | 12 +- components/QuantityLabel.qml | 2 +- components/ScaledArcGauge.qml | 2 +- components/SideGauge.qml | 2 +- components/SolarDetailBox.qml | 2 +- components/SolarHistoryTableView.qml | 2 +- components/SolarYieldGauge.qml | 2 +- components/SolarYieldGraph.qml | 2 +- components/StatusBar.qml | 2 +- components/TankGauge.qml | 2 +- components/TankGaugeGroup.qml | 4 +- components/TimeSelector.qml | 2 +- components/Units.js | 2 +- components/ValueRange.qml | 2 +- components/dialogs/GeneratorStartDialog.qml | 2 +- components/dialogs/GeneratorStopDialog.qml | 2 +- .../dialogs/InverterChargerModeDialog.qml | 2 +- components/dialogs/NumberSelectorDialog.qml | 2 +- components/dialogs/TimeSelectorDialog.qml | 2 +- components/listitems/ListDateSelector.qml | 2 +- components/listitems/ListSpinBox.qml | 2 +- components/listitems/ListTimeSelector.qml | 2 +- .../CGwacsBatteryScheduleNavigationItem.qml | 3 +- .../TemperatureRelayNavigationItem.qml | 2 +- components/widgets/AcGeneratorWidget.qml | 2 +- components/widgets/BatteryWidget.qml | 4 +- components/widgets/EvcsWidget.qml | 6 +- components/widgets/SolarYieldWidget.qml | 7 +- components/widgets/WidgetConnector.qml | 2 +- data/AcInputs.qml | 1 - data/Batteries.qml | 3 +- data/Chargers.qml | 1 - data/DataManager.qml | 11 +- data/DcInputs.qml | 1 - data/DigitalInputs.qml | 1 - data/EnvironmentInputs.qml | 1 - data/EvChargers.qml | 1 - data/Generators.qml | 1 - data/Inverters.qml | 1 - data/MeteoDevices.qml | 1 - data/MotorDrives.qml | 1 - data/MultiRsDevices.qml | 1 - data/PulseMeters.qml | 1 - data/PvInverters.qml | 1 - data/Relays.qml | 1 - data/SolarChargers.qml | 1 - data/System.qml | 2 +- data/SystemAc.qml | 2 +- data/Tanks.qml | 1 - data/UnsupportedDevices.qml | 1 - data/VeBusDevices.qml | 1 - data/common/AcInput.qml | 2 +- data/common/AcInputServiceLoader.qml | 3 +- data/common/EnvironmentInput.qml | 2 +- data/common/EssData.qml | 2 +- data/common/EvCharger.qml | 2 +- data/common/Generator.qml | 2 +- data/common/Relay.qml | 2 +- data/common/SolarCharger.qml | 2 +- data/common/SystemData.qml | 2 +- data/common/Tank.qml | 4 +- data/common/VeBusDevice.qml | 1 - data/dbus/AcInputsImpl.qml | 1 - data/dbus/BatteriesImpl.qml | 1 - data/dbus/ChargersImpl.qml | 1 - data/dbus/DBusDataManager.qml | 1 + data/dbus/DcInputsImpl.qml | 1 - data/dbus/DigitalInputsImpl.qml | 1 - data/dbus/EnvironmentInputsImpl.qml | 1 - data/dbus/EssImpl.qml | 2 +- data/dbus/EvChargersImpl.qml | 1 - data/dbus/GeneratorsImpl.qml | 1 - data/dbus/InvertersImpl.qml | 1 - data/dbus/MeteoDevicesImpl.qml | 1 - data/dbus/MotorDrivesImpl.qml | 1 - data/dbus/MultiRsDevicesImpl.qml | 1 - data/dbus/PulseMetersImpl.qml | 1 - data/dbus/PvInvertersImpl.qml | 1 - data/dbus/RelaysImpl.qml | 1 - data/dbus/SolarChargersImpl.qml | 1 - data/dbus/SystemImpl.qml | 2 +- data/dbus/TanksImpl.qml | 1 - data/dbus/UnsupportedDevicesImpl.qml | 1 - data/dbus/VeBusDevicesImpl.qml | 1 - data/mock/InvertersImpl.qml | 1 - data/mock/MockDataManager.qml | 2 +- data/mock/PvInvertersImpl.qml | 1 - data/mock/SolarChargersImpl.qml | 3 +- data/mock/config/MockDataSimulator.qml | 10 +- data/mqtt/AcInputsImpl.qml | 1 - data/mqtt/BatteriesImpl.qml | 2 +- data/mqtt/ChargersImpl.qml | 1 - data/mqtt/DcInputsImpl.qml | 1 - data/mqtt/DigitalInputsImpl.qml | 1 - data/mqtt/EnvironmentInputsImpl.qml | 1 - data/mqtt/EssImpl.qml | 2 +- data/mqtt/EvChargersImpl.qml | 1 - data/mqtt/GeneratorsImpl.qml | 1 - data/mqtt/InvertersImpl.qml | 1 - data/mqtt/MeteoDevicesImpl.qml | 1 - data/mqtt/MotorDrivesImpl.qml | 1 - data/mqtt/MqttDataManager.qml | 1 + data/mqtt/MultiRsDevicesImpl.qml | 1 - data/mqtt/PulseMetersImpl.qml | 1 - data/mqtt/PvInvertersImpl.qml | 1 - data/mqtt/RelaysImpl.qml | 1 - data/mqtt/SolarChargersImpl.qml | 1 - data/mqtt/SystemImpl.qml | 2 +- data/mqtt/TanksImpl.qml | 1 - data/mqtt/UnsupportedDevicesImpl.qml | 1 - data/mqtt/VeBusDevicesImpl.qml | 1 - pages/BriefMonitorPanel.qml | 2 +- pages/BriefPage.qml | 4 +- pages/EnvironmentTab.qml | 4 +- pages/MainView.qml | 4 +- pages/NotificationLayer.qml | 2 +- pages/OverviewPage.qml | 2 +- pages/SettingsPage.qml | 52 +- pages/TanksTab.qml | 2 +- pages/controlcards/GeneratorCard.qml | 2 +- pages/evcs/EvChargerListPage.qml | 4 +- pages/evcs/EvChargerPage.qml | 6 +- pages/settings/GeneratorCondition.qml | 2 +- pages/settings/IpAddressListView.qml | 2 +- pages/settings/PageChargeCurrentLimits.qml | 2 +- pages/settings/PageDeviceInfo.qml | 2 +- pages/settings/PageGenerator.qml | 4 +- pages/settings/PageGeneratorAcLoad.qml | 2 +- pages/settings/PageGeneratorConditions.qml | 6 +- pages/settings/PageGps.qml | 2 +- pages/settings/PageRelayGenerator.qml | 2 +- pages/settings/PageSettingsBleSensors.qml | 2 +- pages/settings/PageSettingsCGwacs.qml | 2 +- pages/settings/PageSettingsCGwacsOverview.qml | 4 +- pages/settings/PageSettingsCanbus.qml | 8 +- pages/settings/PageSettingsDisplay.qml | 4 +- pages/settings/PageSettingsDisplayBrief.qml | 2 +- pages/settings/PageSettingsDvcc.qml | 4 +- pages/settings/PageSettingsFirmware.qml | 6 +- pages/settings/PageSettingsFronius.qml | 8 +- .../settings/PageSettingsFroniusInverter.qml | 2 +- .../settings/PageSettingsFroniusInverters.qml | 4 +- .../PageSettingsFroniusSetIpAddresses.qml | 2 +- .../PageSettingsFroniusShowIpAddresses.qml | 2 +- pages/settings/PageSettingsGenerator.qml | 6 +- pages/settings/PageSettingsGpsList.qml | 2 +- pages/settings/PageSettingsGsm.qml | 2 +- pages/settings/PageSettingsHub4.qml | 4 +- pages/settings/PageSettingsIo.qml | 4 +- pages/settings/PageSettingsLogger.qml | 2 +- pages/settings/PageSettingsModbusTcp.qml | 2 +- pages/settings/PageSettingsRelay.qml | 2 +- .../settings/PageSettingsRelayTempSensors.qml | 2 +- pages/settings/PageSettingsRvcDevice.qml | 4 +- pages/settings/PageSettingsRvcDevices.qml | 4 +- pages/settings/PageSettingsServices.qml | 2 +- pages/settings/PageSettingsSystem.qml | 6 +- pages/settings/PageSettingsSystemStatus.qml | 2 +- pages/settings/PageSettingsTankPump.qml | 2 +- pages/settings/PageSettingsTcpIp.qml | 2 +- pages/settings/PageSettingsVecanDevices.qml | 4 +- pages/settings/PageSettingsWifi.qml | 2 +- .../PageSettingsWifiWithAccessPoint.qml | 2 +- pages/settings/PageTzInfo.qml | 1 - pages/settings/PageVrmDeviceInstances.qml | 2 +- pages/settings/debug/PageDebug.qml | 12 +- pages/settings/debug/PageDebugVeQItems.qml | 2 +- pages/settings/devicelist/DeviceListPage.qml | 18 +- .../devicelist/PageNotYetImplemented.qml | 4 +- .../devicelist/PageUnsupportedDevice.qml | 4 +- .../devicelist/tank/PageTankAlarm.qml | 2 +- .../devicelist/tank/PageTankSensor.qml | 6 +- .../devicelist/tank/PageTankSetup.qml | 10 +- .../devicelist/tank/PageTankShape.qml | 2 +- pages/solar/PvInverterPage.qml | 2 +- pages/solar/SolarChargerPage.qml | 8 +- pages/solar/SolarDeviceListPage.qml | 4 +- qml.qrc | 480 ------------- src/main.cpp | 367 +--------- 191 files changed, 854 insertions(+), 1182 deletions(-) rename main.qml => Main.qml (99%) delete mode 100644 qml.qrc diff --git a/ApplicationContent.qml b/ApplicationContent.qml index 53537d3be..a7b376aa5 100644 --- a/ApplicationContent.qml +++ b/ApplicationContent.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Item { id: root @@ -70,7 +70,7 @@ Item { // testCloseOnClick() when clicking outside of the focused text field, to auto-close the VKB. Component.onCompleted: { if (Qt.platform.os !== "wasm") { - _inputComponent = Qt.createComponent(Qt.resolvedUrl("qrc:/components/InputPanel.qml"), Component.Asynchronous) + _inputComponent = Qt.createComponent(Qt.resolvedUrl("qrc:/qt/qml/Victron/VenusOS/components/InputPanel.qml"), Component.Asynchronous) _inputComponent.statusChanged.connect(function() { if (_inputComponent.status === Component.Ready) { Global.inputPanel = _inputComponent.createObject(root, { mainViewItem: mainView }) diff --git a/CMakeLists.txt b/CMakeLists.txt index 391892f6a..c29a3ca46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.24) # earlier versions of cmake don't handle 'qt_add_qml_module' properly, you get errors at runtime like: "qrc:/main.qml:164 ApplicationContent is not a type\n" +cmake_policy(SET CMP0071 NEW) # process GENERATED source files in AUTOMOC and AUTOUIC. Added to silence a cmake warning. cmake_policy(SET CMP0079 NEW) project(venus-gui-v2 LANGUAGES CXX VERSION 0.01.15) @@ -26,27 +27,445 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) add_compile_definitions(VENUS_WEBASSEMBLY_BUILD) add_compile_definitions(MQTT_WEBSOCKETS_ENABLED) - find_package(Qt6 COMPONENTS Core Qml Quick Svg Xml LinguistTools Mqtt WebSockets REQUIRED) + find_package(Qt6 6.5.2 COMPONENTS Core Qml Quick Svg Xml LinguistTools Mqtt WebSockets REQUIRED) # require at least qt 6.5.2 for qt_add_qml_module to work properly else() set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - find_package(Qt6 COMPONENTS Core Qml Quick Svg Xml DBus LinguistTools Mqtt) - if (NOT ${Qt6_FOUND}) - # cmake can't automatically find Qt 6.2 on Ubuntu Linux, give it a hint: - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.2.0/gcc_64/lib/cmake/") - endif() - find_package(Qt6 COMPONENTS Core Qml Quick Svg Xml DBus LinguistTools REQUIRED) - endif() + find_package(Qt6 6.5.2 COMPONENTS Core Qml Quick Svg Xml DBus LinguistTools Mqtt REQUIRED) # require at least qt 6.5.2 for qt_add_qml_module to work properly endif() -qt_add_resources(QML_RESOURCES - qml.qrc) - +# This has to go after 'find_package(Qt6 COMPONENTS Core)', and before 'qt_add_qml_module(... QML_FILES ${VENUS_QML_MODULE_SOURCES})' +if(QT_KNOWN_POLICY_QTP0001) + qt_policy(SET QTP0001 NEW) # >Qt6.5 only. Enabling this policy ensures that your QML module is placed under a default import path, and its types can be found without manual calls to QQmlEngine::addImportPath. +endif() include_directories(src/veutil/inc src .) +set (VENUS_QML_MODULE_SINGLETON_SOURCES # All qml singletons have to be added here + components/CommonWords.qml + components/VenusFont.qml + Global.qml +) +set_source_files_properties( ${VENUS_QML_MODULE_SINGLETON_SOURCES} PROPERTIES QT_QML_SINGLETON_TYPE TRUE ) + +set (VENUS_QML_MODULE_SOURCES + ${VENUS_QML_MODULE_SINGLETON_SOURCES} + + ApplicationContent.qml + FrameRateVisualizer.qml + + components/AcceptButtonBackground.qml + components/Arc.qml + components/ArcGauge.qml + components/ArcGaugeQuantityLabel.qml + components/AsymmetricRoundedRectangle.qml + components/ButtonControlValue.qml + components/CircularMultiGauge.qml + components/CircularSingleGauge.qml + components/ControlCard.qml + components/ControlValue.qml + components/DataPoint.qml + components/Device.qml + components/ElectricalQuantityLabel.qml + components/EnvironmentGauge.qml + components/EnvironmentGaugePanel.qml + components/ExpandedTanksView.qml + components/FirmwareUpdate.qml + components/FixedWidthLabel.qml + components/GaugeModel.qml + components/EvChargerStatusModel.qml + components/GeneratorIconLabel.qml + components/GradientListView.qml + components/GsmStatusIcon.qml + components/IconButton.qml + components/InputPanel.qml + components/LoadGraph.qml + components/LoadGraphShapePath.qml + components/NavBar.qml + components/NavButton.qml + components/NotificationDelegate.qml + components/NotificationsView.qml + components/Page.qml + components/PageStack.qml + components/ProgressArc.qml + components/QuantityLabel.qml + components/QuantityTableSummary.qml + components/QuantityTable.qml + components/RadioButtonControlValue.qml + components/ScaledArc.qml + components/ScaledArcGauge.qml + components/SegmentedButtonRow.qml + components/SeparatorBar.qml + components/ShinyProgressArc.qml + components/SideGauge.qml + components/SolarDetailBox.qml + components/SolarHistoryChart.qml + components/SolarHistoryErrorView.qml + components/SolarHistoryTableView.qml + components/SolarYieldGauge.qml + components/SolarYieldGraph.qml + components/SolarYieldModel.qml + components/SplashView.qml + components/StatusBar.qml + components/SwitchControlValue.qml + components/TabBar.qml + components/TankGauge.qml + components/TankGaugeGroup.qml + components/ThreePhaseDisplay.qml + components/TimeSelector.qml + components/ToastNotification.qml + components/ValueRange.qml + components/VerticalGauge.qml + components/ViewGradient.qml + components/ClassAndVrmInstance.qml + components/WeatherDetails.qml + + components/controls/Button.qml + components/controls/ComboBox.qml + components/controls/Label.qml + components/controls/ListItemButton.qml + components/controls/ProgressBar.qml + components/controls/RadioButton.qml + components/controls/ScrollBar.qml + components/controls/Slider.qml + components/controls/SpinBox.qml + components/controls/Switch.qml + components/controls/TextField.qml + + components/dialogs/DateSelectorDialog.qml + components/dialogs/DialogShadow.qml + components/dialogs/VrmInstanceSwapDialog.qml + components/dialogs/ESSMinimumSOCDialog.qml + components/dialogs/GeneratorStartDialog.qml + components/dialogs/GeneratorStopDialog.qml + components/dialogs/InverterChargerModeDialog.qml + components/dialogs/ModalDialog.qml + components/dialogs/ModalWarningDialog.qml + components/dialogs/NumberSelectorDialog.qml + components/dialogs/SolarDailyHistoryDialog.qml + components/dialogs/TimeSelectorDialog.qml + + components/listitems/ListAlarm.qml + components/listitems/ListButton.qml + components/listitems/ListDateSelector.qml + components/listitems/ListIpAddressField.qml + components/listitems/ListItem.qml + components/listitems/ListItemBackground.qml + components/listitems/ListLabel.qml + components/listitems/ListNavigationItem.qml + components/listitems/ListPortField.qml + components/listitems/ListRadioButton.qml + components/listitems/ListRadioButtonGroup.qml + components/listitems/ListQuantityGroup.qml + components/listitems/ListQuantityItem.qml + components/listitems/ListSlider.qml + components/listitems/ListSpinBox.qml + components/listitems/ListSwitch.qml + components/listitems/ListTextField.qml + components/listitems/ListTextGroup.qml + components/listitems/ListTextItem.qml + components/listitems/ListTimeSelector.qml + + components/settings/CGwacsBatteryScheduleNavigationItem.qml + components/settings/FirmwareCheckListButton.qml + components/settings/ListDvccSwitch.qml + components/settings/MountStateListButton.qml + components/settings/SettingsSlider.qml + components/settings/TemperatureRelayNavigationItem.qml + components/settings/TemperatureRelaySettings.qml + components/settings/VolumeUnitRadioButtonGroup.qml + + components/widgets/AcGeneratorWidget.qml + components/widgets/AcInputWidget.qml + components/widgets/AcLoadsWidget.qml + components/widgets/AlternatorWidget.qml + components/widgets/BatteryWidget.qml + components/widgets/DcGeneratorWidget.qml + components/widgets/DcInputWidget.qml + components/widgets/DcLoadsWidget.qml + components/widgets/EvcsWidget.qml + components/widgets/GridWidget.qml + components/widgets/OverviewWidget.qml + components/widgets/ShoreWidget.qml + components/widgets/SolarYieldWidget.qml + components/widgets/VeBusDeviceWidget.qml + components/widgets/WidgetConnector.qml + components/widgets/WidgetConnectorAnchor.qml + components/widgets/WidgetConnectorPath.qml + components/widgets/WidgetHeader.qml + components/widgets/WindWidget.qml + + data/AcInputs.qml + data/Chargers.qml + data/Batteries.qml + data/DataManager.qml + data/DcInputs.qml + data/DigitalInputs.qml + data/EnvironmentInputs.qml + data/Ess.qml + data/EvChargers.qml + data/Generators.qml + data/Inverters.qml + data/MeteoDevices.qml + data/MotorDrives.qml + data/MultiRsDevices.qml + data/Notifications.qml + data/PulseMeters.qml + data/PvInverters.qml + data/Relays.qml + data/SolarChargers.qml + data/System.qml + data/SystemAc.qml + data/SystemDc.qml + data/SystemSettings.qml + data/Tanks.qml + data/UnsupportedDevices.qml + data/VeBusDevices.qml + data/VenusPlatform.qml + + data/common/AcData.qml + data/common/AcInput.qml + data/common/AcInputServiceLoader.qml + data/common/AcInputSettings.qml + data/common/Battery.qml + data/common/Charger.qml + data/common/DcInput.qml + data/common/DigitalInput.qml + data/common/DeviceModel.qml + data/common/EnvironmentInput.qml + data/common/EssData.qml + data/common/EvCharger.qml + data/common/Generator.qml + data/common/Inverter.qml + data/common/MeteoDevice.qml + data/common/MotorDrive.qml + data/common/MultiRsDevice.qml + data/common/PulseMeter.qml + data/common/PvInverter.qml + data/common/PvMonitor.qml + data/common/Relay.qml + data/common/SolarCharger.qml + data/common/SolarDailyHistory.qml + data/common/SolarHistoryErrorModel.qml + data/common/SystemBattery.qml + data/common/SystemData.qml + data/common/Tank.qml + data/common/UnsupportedDevice.qml + data/common/VeBusDevice.qml + + pages/BriefMonitorPanel.qml + pages/BriefPage.qml + pages/ControlCardsPage.qml + pages/EnvironmentTab.qml + pages/LevelsPage.qml + pages/MainView.qml + pages/NotificationLayer.qml + pages/NotificationsPage.qml + pages/OverviewPage.qml + pages/PageManager.qml + pages/SettingsPage.qml + pages/TanksTab.qml + pages/controlcards/ESSCard.qml + pages/controlcards/GeneratorCard.qml + pages/controlcards/SwitchesCard.qml + pages/controlcards/VeBusDeviceCard.qml + pages/evcs/EvChargerListPage.qml + pages/evcs/EvChargerPage.qml + pages/evcs/EvChargerSetupPage.qml + pages/settings/DvccCommonSettings.qml + pages/settings/GeneratorCondition.qml + pages/settings/IpAddressListView.qml + pages/settings/PageCanbusStatus.qml + pages/settings/PageChargeCurrentLimits.qml + pages/settings/PageDeviceInfo.qml + pages/settings/PageGenerator.qml + pages/settings/PageGeneratorAcLoad.qml + pages/settings/PageGeneratorConditions.qml + pages/settings/PageGeneratorRuntimeService.qml + pages/settings/PageGeneratorTestRun.qml + pages/settings/PageGps.qml + pages/settings/PageHub4Debug.qml + pages/settings/PageRelayGenerator.qml + pages/settings/PageSettingsBatteries.qml + pages/settings/PageSettingsBleSensors.qml + pages/settings/PageSettingsBluetooth.qml + pages/settings/PageSettingsCGwacs.qml + pages/settings/PageSettingsCGwacsOverview.qml + pages/settings/PageSettingsCanbus.qml + pages/settings/PageSettingsDisplay.qml + pages/settings/PageSettingsDisplayBrief.qml + pages/settings/PageSettingsDisplayUnits.qml + pages/settings/PageSettingsDvcc.qml + pages/settings/PageSettingsFirmware.qml + pages/settings/PageSettingsFirmwareOffline.qml + pages/settings/PageSettingsFirmwareOnline.qml + pages/settings/PageSettingsFronius.qml + pages/settings/PageSettingsFroniusInverter.qml + pages/settings/PageSettingsFroniusInverters.qml + pages/settings/PageSettingsFroniusSetIpAddresses.qml + pages/settings/PageSettingsFroniusShowIpAddresses.qml + pages/settings/PageSettingsGeneral.qml + pages/settings/PageSettingsGenerator.qml + pages/settings/PageSettingsGpsList.qml + pages/settings/PageSettingsGsm.qml + pages/settings/PageSettingsHub4.qml + pages/settings/PageSettingsHub4Feedin.qml + pages/settings/PageSettingsIo.qml + pages/settings/PageSettingsLarge.qml + pages/settings/PageSettingsLogger.qml + pages/settings/PageSettingsModbusTcp.qml + pages/settings/PageSettingsModbusTcpServices.qml + pages/settings/PageSettingsRelay.qml + pages/settings/PageSettingsRelayTempSensors.qml + pages/settings/PageSettingsRemoteConsole.qml + pages/settings/PageSettingsRootfsSelect.qml + pages/settings/PageSettingsRvcDevice.qml + pages/settings/PageSettingsRvcDeviceConfiguration.qml + pages/settings/PageSettingsRvcDevices.qml + pages/settings/PageSettingsServices.qml + pages/settings/PageSettingsSystem.qml + pages/settings/PageSettingsSystemStatus.qml + pages/settings/PageSettingsTankPump.qml + pages/settings/PageSettingsTcpIp.qml + pages/settings/PageSettingsVecanDevice.qml + pages/settings/PageSettingsVecanDevices.qml + pages/settings/PageSettingsWifi.qml + pages/settings/PageSettingsWifiWithAccessPoint.qml + pages/settings/PageTzInfo.qml + pages/settings/PageVrmDeviceInstances.qml + pages/settings/debug/HubData.qml + pages/settings/debug/ObjectAcConnection.qml + pages/settings/debug/PageDebug.qml + pages/settings/debug/PageDebugVeQItems.qml + pages/settings/debug/PagePowerDebug.qml + pages/settings/debug/PageSettingsDemo.qml + pages/settings/debug/PageSystemData.qml + pages/settings/devicelist/DeviceListPage.qml + pages/settings/devicelist/PageNotYetImplemented.qml + pages/settings/devicelist/PageUnsupportedDevice.qml + pages/settings/devicelist/tank/PageTankAlarm.qml + pages/settings/devicelist/tank/PageTankSensor.qml + pages/settings/devicelist/tank/PageTankSetup.qml + pages/settings/devicelist/tank/PageTankShape.qml + pages/settings/tz/TzAfricaData.qml + pages/settings/tz/TzAmericaData.qml + pages/settings/tz/TzAntarcticaData.qml + pages/settings/tz/TzArcticData.qml + pages/settings/tz/TzAsiaData.qml + pages/settings/tz/TzAtlanticData.qml + pages/settings/tz/TzAustraliaData.qml + pages/settings/tz/TzEtcData.qml + pages/settings/tz/TzEuropeData.qml + pages/settings/tz/TzIndianData.qml + pages/settings/tz/TzPacificData.qml + pages/solar/PvInverterPage.qml + pages/solar/SolarChargerAlarmsAndErrorsPage.qml + pages/solar/SolarChargerNetworkedOperationPage.qml + pages/solar/SolarChargerPage.qml + pages/solar/SolarChargerHistoryPage.qml + pages/solar/SolarDeviceListPage.qml +) + +set(Dbus_MODULE_SOURCES + data/dbus/AcInputsImpl.qml + data/dbus/BatteriesImpl.qml + data/dbus/ChargersImpl.qml + data/dbus/DBusDataManager.qml + data/dbus/DcInputsImpl.qml + data/dbus/DigitalInputsImpl.qml + data/dbus/EnvironmentInputsImpl.qml + data/dbus/EssImpl.qml + data/dbus/EvChargersImpl.qml + data/dbus/GeneratorsImpl.qml + data/dbus/InvertersImpl.qml + data/dbus/MeteoDevicesImpl.qml + data/dbus/MotorDrivesImpl.qml + data/dbus/MultiRsDevicesImpl.qml + data/dbus/NotificationsImpl.qml + data/dbus/PulseMetersImpl.qml + data/dbus/PvInvertersImpl.qml + data/dbus/RelaysImpl.qml + data/dbus/SolarChargersImpl.qml + data/dbus/SystemImpl.qml + data/dbus/SystemSettingsImpl.qml + data/dbus/TanksImpl.qml + data/dbus/UnsupportedDevicesImpl.qml + data/dbus/VeBusDevicesImpl.qml +) + +set(Mock_MODULE_SOURCES + data/mock/AcInputsImpl.qml + data/mock/BatteriesImpl.qml + data/mock/ChargersImpl.qml + data/mock/DcInputsImpl.qml + data/mock/DigitalInputsImpl.qml + data/mock/EnvironmentInputsImpl.qml + data/mock/EssImpl.qml + data/mock/EvChargersImpl.qml + data/mock/GeneratorsImpl.qml + data/mock/InvertersImpl.qml + data/mock/MeteoDevicesImpl.qml + data/mock/MockDevice.qml + data/mock/MockDataManager.qml + data/mock/MotorDrivesImpl.qml + data/mock/MultiRsDevicesImpl.qml + data/mock/NotificationsImpl.qml + data/mock/PulseMetersImpl.qml + data/mock/PvInvertersImpl.qml + data/mock/RelaysImpl.qml + data/mock/SolarChargersImpl.qml + data/mock/SystemImpl.qml + data/mock/SystemSettingsImpl.qml + data/mock/TanksImpl.qml + data/mock/UnsupportedDevicesImpl.qml + data/mock/VeBusDevicesImpl.qml + data/mock/config/BriefAndOverviewPageConfig.qml + data/mock/config/LevelsPageConfig.qml + data/mock/config/MockDataSimulator.qml + data/mock/config/NotificationsPageConfig.qml + data/mock/config/SettingsPageConfig.qml +) + +set(Units_MODULE_SOURCES + components/Units.js +) + +set(Utils_MODULE_SOURCES + components/Utils.js +) + +set(Gauges_MODULE_SOURCES + components/Gauges.js +) + +set(Mqtt_MODULE_SOURCES + data/mqtt/AcInputsImpl.qml + data/mqtt/BatteriesImpl.qml + data/mqtt/ChargersImpl.qml + data/mqtt/DcInputsImpl.qml + data/mqtt/DigitalInputsImpl.qml + data/mqtt/EnvironmentInputsImpl.qml + data/mqtt/EssImpl.qml + data/mqtt/EvChargersImpl.qml + data/mqtt/GeneratorsImpl.qml + data/mqtt/InvertersImpl.qml + data/mqtt/MeteoDevicesImpl.qml + data/mqtt/MotorDrivesImpl.qml + data/mqtt/MqttDataManager.qml + data/mqtt/MultiRsDevicesImpl.qml + data/mqtt/NotificationsImpl.qml + data/mqtt/PulseMetersImpl.qml + data/mqtt/PvInvertersImpl.qml + data/mqtt/RelaysImpl.qml + data/mqtt/SolarChargersImpl.qml + data/mqtt/SystemImpl.qml + data/mqtt/SystemSettingsImpl.qml + data/mqtt/TanksImpl.qml + data/mqtt/UnsupportedDevicesImpl.qml + data/mqtt/VeBusDevicesImpl.qml +) + set(CONNMAN_SOURCES_MOCK src/connman-api.h ) @@ -124,7 +543,7 @@ set(GUIv1_DBUS_SOURCES src/gui-v1/wakespeed_error.cpp ) -set(VENUS_SOURCES +set(VENUS_CPP_SOURCES src/main.cpp src/basedevicemodel.h src/basedevicemodel.cpp @@ -149,23 +568,29 @@ set(VENUS_SOURCES src/frameratemodel.cpp ) +list(APPEND SOURCES + ${VEUTIL_CORE_SOURCES} + ${VENUS_CPP_SOURCES} + ${VEUTIL_MQTT_SOURCES} + ${QML_QRC_RESOURCES} + ${VENUS_QML_MODULE_SOURCES} + ${Dbus_MODULE_SOURCES} + ${Mock_MODULE_SOURCES} + ${Mqtt_MODULE_SOURCES} + ${Gauges_MODULE_SOURCES} + ${Units_MODULE_SOURCES} + ${Utils_MODULE_SOURCES} +) + if(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten") list(APPEND SOURCES ${CONNMAN_SOURCES_MOCK} - ${VEUTIL_CORE_SOURCES} - ${VEUTIL_MQTT_SOURCES} - ${VENUS_SOURCES} - ${QML_RESOURCES} ) else() list(APPEND SOURCES ${CONNMAN_SOURCES} ${GUIv1_DBUS_SOURCES} - ${VEUTIL_CORE_SOURCES} ${VEUTIL_DBUS_SOURCES} - ${VEUTIL_MQTT_SOURCES} - ${VENUS_SOURCES} - ${QML_RESOURCES} ) endif() @@ -184,14 +609,16 @@ set(TRANSLATIONS_QM_FILES # it would be good if we could do this via qt6_add_lupdate # instead, but that macro is broken, so do it ourselves. add_custom_target(${TRANSLATIONS_TS_TARGET} - SOURCES ${QML_RESOURCES} ${SOURCES}) + SOURCES ${SOURCES}) add_custom_command( TARGET ${TRANSLATIONS_TS_TARGET} BYPRODUCTS ${TRANSLATIONS_TS_FILES} COMMENT "Manually updating translations files" COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::lupdate - ARGS "${CMAKE_CURRENT_SOURCE_DIR}/qml.qrc" src - -ts ${TRANSLATIONS_TS_FILES} + ARGS + ${SOURCES} + src + -ts ${TRANSLATIONS_TS_FILES} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) # add a custom target to generate the .qm files via qt6_add_lrelease(). # force the .qm generation step to depend on the .ts generation step. @@ -236,6 +663,155 @@ else() ) endif() +qt_add_qml_module( ${PROJECT_NAME} + URI ${PROJECT_NAME} + VERSION 1.0 + RESOURCE_PREFIX / + QML_FILES Main.qml +) + +qt_add_qml_module(VenusQMLModule + URI Victron.VenusOS + VERSION 2.0 + STATIC + OUTPUT_DIRECTORY Victron/VenusOS + QML_FILES ${VENUS_QML_MODULE_SOURCES} +) + +qt_add_qml_module(Gauges + URI Victron.Gauges + STATIC + OUTPUT_DIRECTORY Victron/Gauges + QML_FILES ${Gauges_MODULE_SOURCES} +) + +qt_add_qml_module(Units + URI Victron.Units + STATIC + OUTPUT_DIRECTORY Victron/Units + QML_FILES ${Units_MODULE_SOURCES} +) + +qt_add_qml_module(Utils + URI Victron.Utils + STATIC + OUTPUT_DIRECTORY Victron/Utils + QML_FILES ${Utils_MODULE_SOURCES} +) + +qt_add_qml_module(Dbus + URI Victron.Dbus + STATIC + OUTPUT_DIRECTORY Victron/Dbus + QML_FILES ${Dbus_MODULE_SOURCES} +) + +qt_add_qml_module(Mock + URI Victron.Mock + STATIC + OUTPUT_DIRECTORY Victron/Mock + QML_FILES ${Mock_MODULE_SOURCES} +) + +qt_add_qml_module(Mqtt + URI Victron.Mqtt + STATIC + OUTPUT_DIRECTORY Victron/Mqtt + QML_FILES ${Mqtt_MODULE_SOURCES} +) + +qt_add_resources(${PROJECT_NAME} "${PROJECT_NAME}_large_resources" + BIG_RESOURCES + FILES + fonts/MuseoSans-500.otf + images/acloads.svg + images/alternator.svg + images/battery.svg + images/battery_charging.svg + images/battery_discharging.svg + images/blackWater.svg + images/brief.svg + images/cloud.svg + images/consumption.svg + images/dcloads.svg + images/dropdown.svg + images/electron.svg + images/ess.svg + images/freshWater.svg + images/freshWater20x27.svg + images/fuel.svg + images/fueltank.svg + images/gauge_intro_5_matte_black.gif + images/gauge_intro_5_matte_white.gif + images/gauge_intro_7_matte_black.gif + images/gauge_intro_7_matte_white.gif + images/generator.svg + images/grid.svg + images/icon_simlocked_32.svg + images/icon_alarm_48.svg + images/icon_alarm_snooze_24 + images/icon_autostart_24.svg + images/icon_back_32.svg + images/icon_charging_station_24.svg + images/icon_checkmark_32.svg + images/icon_checkmark_48.svg + images/icon_controls_off_32.svg + images/icon_controls_on_32.svg + images/icon_humidity_32.svg + images/icon_hydraulic_oil_32.svg + images/icon_input_24.svg + images/icon_lng_32.svg + images/icon_lpg_32.svg + images/icon_manualstart_24.svg + images/icon_manualstart_timer_24.svg + images/icon_minus.svg + images/icon_plus.svg + images/icon_raw_water_32.svg + images/icon_refresh_32.svg + images/icon_sidepanel_off_32.svg + images/icon_sidepanel_on_32.svg + images/icon_temp_32.svg + images/information.svg + images/inverter.svg + images/inverter_charger.svg + images/levels.svg + images/liveWell.svg + images/notifications.svg + images/oil.svg + images/overview.svg + images/rain.svg + images/scatteredcloud.svg + images/settings.png + images/settings.svg + images/shore.svg + images/solaryield.svg + images/splash-logo-icon-5inch.svg + images/splash-logo-icon-7inch.svg + images/splash-logo-text-5inch.svg + images/splash-logo-text-7inch.svg + images/sunny.svg + images/switch_indicator.png + images/switches.svg + images/tank.svg + images/toast_icon_alarm.svg + images/toast_icon_checkmark.svg + images/toast_icon_close.svg + images/toast_icon_info.svg + images/wasteWater.svg + images/widget_connector_nub_horizontal.svg + images/widget_connector_nub_vertical.svg + images/wind.svg + themes/animation/Animation.json + themes/color/ColorDesign.json + themes/color/Dark.json + themes/color/Light.json + themes/geometry/FiveInch.json + themes/geometry/SevenInch.json + themes/typography/FiveInch.json + themes/typography/SevenInch.json + themes/typography/TypographyDesign.json +) + add_dependencies(${PROJECT_NAME} ${TRANSLATIONS_QM_TARGET}) qt_add_resources(${PROJECT_NAME} "i18n" PREFIX "/i18n" @@ -243,7 +819,7 @@ qt_add_resources(${PROJECT_NAME} "i18n" FILES ${TRANSLATIONS_QM_FILES}) set_source_files_properties( - ${VENUS_SOURCES} + ${VENUS_CPP_SOURCES} PROPERTIES COMPILE_OPTIONS "${venusCompileFlags}" ) @@ -251,33 +827,32 @@ set_source_files_properties( target_compile_definitions(${PROJECT_NAME} PRIVATE $<$,$>:QT_QML_DEBUG>) +target_link_libraries(${PROJECT_NAME} PRIVATE + Qt6::Core + Qt6::Qml + Qt6::Quick + Qt6::Svg + Qt6::Xml + Qt6::Mqtt + VenusQMLModuleplugin + Gaugesplugin + Unitsplugin + Utilsplugin + Dbusplugin + Mockplugin + Mqttplugin +) + if(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten") target_link_libraries(${PROJECT_NAME} PRIVATE - Qt6::Core - Qt6::Qml - Qt6::Quick - Qt6::Svg - Qt6::Xml - Qt6::Mqtt Qt6::WebSockets ) else() target_link_libraries(${PROJECT_NAME} PRIVATE - Qt6::Core - Qt6::Qml - Qt6::Quick - Qt6::Svg - Qt6::Xml Qt6::DBus - Qt6::Mqtt ) endif() -qt_add_qml_module(${PROJECT_NAME} - URI Victron.VenusOS - VERSION 2.0 -) - # see if the dependency graph is correct, for translations support... add_custom_target(graphviz "${CMAKE_COMMAND}" "--graphviz=venus" . diff --git a/main.qml b/Main.qml similarity index 99% rename from main.qml rename to Main.qml index 73b628885..a765ef5f1 100644 --- a/main.qml +++ b/Main.qml @@ -5,7 +5,6 @@ import QtQuick import QtQuick.Window import Victron.VenusOS -import "data" as Data Window { id: root @@ -69,7 +68,7 @@ Window { asynchronous: true active: false sourceComponent: Component { - Data.DataManager { } + DataManager { } } } diff --git a/components/ArcGauge.qml b/components/ArcGauge.qml index 8920508d9..69d10037f 100644 --- a/components/ArcGauge.qml +++ b/components/ArcGauge.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Window import Victron.VenusOS -import "/components/Gauges.js" as Gauges +import Victron.Gauges // A progress gauge running an on arc, where 0° is at the top, and positive is clockwise Item { diff --git a/components/CircularMultiGauge.qml b/components/CircularMultiGauge.qml index 367b50536..c81f5ff37 100644 --- a/components/CircularMultiGauge.qml +++ b/components/CircularMultiGauge.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Window import QtQuick.Controls.impl as CP import Victron.VenusOS -import "/components/Gauges.js" as Gauges +import Victron.Gauges Item { id: gauges diff --git a/components/CircularSingleGauge.qml b/components/CircularSingleGauge.qml index 06ff5b479..1d7e8c73e 100644 --- a/components/CircularSingleGauge.qml +++ b/components/CircularSingleGauge.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Window import QtQuick.Controls.impl as CP import Victron.VenusOS -import "/components/Gauges.js" as Gauges +import Victron.Gauges Item { id: gauges diff --git a/components/ElectricalQuantityLabel.qml b/components/ElectricalQuantityLabel.qml index 3dd6f5c76..ac0a9b55a 100644 --- a/components/ElectricalQuantityLabel.qml +++ b/components/ElectricalQuantityLabel.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Units.js" as Units +import Victron.Units QuantityLabel { id: root diff --git a/components/EnvironmentGaugePanel.qml b/components/EnvironmentGaugePanel.qml index e1a6281cc..39481163e 100644 --- a/components/EnvironmentGaugePanel.qml +++ b/components/EnvironmentGaugePanel.qml @@ -1,6 +1,6 @@ import QtQuick import Victron.VenusOS -import "/components/Units.js" as Units +import Victron.Units Rectangle { id: root diff --git a/components/ExpandedTanksView.qml b/components/ExpandedTanksView.qml index ac2ae16d6..af9901ce1 100644 --- a/components/ExpandedTanksView.qml +++ b/components/ExpandedTanksView.qml @@ -5,8 +5,8 @@ import QtQuick import Victron.VenusOS import QtQuick.Controls.impl as CP -import "/components/Gauges.js" as Gauges -import "/components/Units.js" as Units +import Victron.Gauges +import Victron.Units Rectangle { id: root diff --git a/components/GaugeModel.qml b/components/GaugeModel.qml index 05363780a..72e1b3c66 100644 --- a/components/GaugeModel.qml +++ b/components/GaugeModel.qml @@ -5,8 +5,8 @@ import QtQuick import Victron.VenusOS import QtQuick.Controls.impl as CP -import "/components/Utils.js" as Utils -import "/components/Gauges.js" as Gauges +import Victron.Utils +import Victron.Gauges /* A model of gauge data, sorted according to the preferred order from system settings. diff --git a/components/GeneratorIconLabel.qml b/components/GeneratorIconLabel.qml index d05149f3f..e4223ff16 100644 --- a/components/GeneratorIconLabel.qml +++ b/components/GeneratorIconLabel.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Controls as C import QtQuick.Controls.impl as CP import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Item { id: root diff --git a/components/GsmStatusIcon.qml b/components/GsmStatusIcon.qml index 9ce4c2773..365f77b68 100644 --- a/components/GsmStatusIcon.qml +++ b/components/GsmStatusIcon.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Controls.impl as CP import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Row { id: root diff --git a/components/NavBar.qml b/components/NavBar.qml index d73ed5d8b..417dbff87 100644 --- a/components/NavBar.qml +++ b/components/NavBar.qml @@ -29,31 +29,31 @@ Rectangle { // Use an opaque background so that page disappears behind nav bar //% "Brief" text: qsTrId("nav_brief") icon: "qrc:/images/brief.svg" - url: "qrc:/pages/BriefPage.qml" + url: "qrc:/qt/qml/Victron/VenusOS/pages/BriefPage.qml" } ListElement { //% "Overview" text: qsTrId("nav_overview") icon: "qrc:/images/overview.svg" - url: "qrc:/pages/OverviewPage.qml" + url: "qrc:/qt/qml/Victron/VenusOS/pages/OverviewPage.qml" } ListElement { //% "Levels" text: qsTrId("nav_levels") icon: "qrc:/images/levels.svg" - url: "qrc:/pages/LevelsPage.qml" + url: "qrc:/qt/qml/Victron/VenusOS/pages/LevelsPage.qml" } ListElement { //% "Notifications" text: qsTrId("nav_notifications") icon: "qrc:/images/notifications.svg" - url: "qrc:/pages/NotificationsPage.qml" + url: "qrc:/qt/qml/Victron/VenusOS/pages/NotificationsPage.qml" } ListElement { //% "Settings" text: qsTrId("nav_settings") icon: "qrc:/images/settings.png" - url: "qrc:/pages/SettingsPage.qml" + url: "qrc:/qt/qml/Victron/VenusOS/pages/SettingsPage.qml" } } @@ -88,7 +88,7 @@ Rectangle { // Use an opaque background so that page disappears behind nav bar height: width radius: Theme.geometry.notificationsPage.delegate.marker.radius color: Theme.color.critical - visible: model.url === "qrc:/pages/NotificationsPage.qml" && !!Global.notifications && Global.notifications.activeModel.hasNewNotifications + visible: model.url === "qrc:/qt/qml/Victron/VenusOS/pages/NotificationsPage.qml" && !!Global.notifications && Global.notifications.activeModel.hasNewNotifications } } } diff --git a/components/QuantityLabel.qml b/components/QuantityLabel.qml index 900a6eca6..141699394 100644 --- a/components/QuantityLabel.qml +++ b/components/QuantityLabel.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Units.js" as Units +import Victron.Units Item { id: root diff --git a/components/ScaledArcGauge.qml b/components/ScaledArcGauge.qml index d495629ee..83a3681b0 100644 --- a/components/ScaledArcGauge.qml +++ b/components/ScaledArcGauge.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Shapes import Victron.VenusOS -import "/components/Gauges.js" as Gauges +import Victron.Gauges Item { id: gauge diff --git a/components/SideGauge.qml b/components/SideGauge.qml index 459946747..b4877bace 100644 --- a/components/SideGauge.qml +++ b/components/SideGauge.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "Utils.js" as Utils +import Victron.Utils ArcGauge { id: root diff --git a/components/SolarDetailBox.qml b/components/SolarDetailBox.qml index 57a3cbfc9..6d78b39df 100644 --- a/components/SolarDetailBox.qml +++ b/components/SolarDetailBox.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Rectangle { id: root diff --git a/components/SolarHistoryTableView.qml b/components/SolarHistoryTableView.qml index c68816d95..c26b7a819 100644 --- a/components/SolarHistoryTableView.qml +++ b/components/SolarHistoryTableView.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Column { id: root diff --git a/components/SolarYieldGauge.qml b/components/SolarYieldGauge.qml index 2301ffbac..0e136b276 100644 --- a/components/SolarYieldGauge.qml +++ b/components/SolarYieldGauge.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import QtQuick.Controls.impl as CP -import "/components/Utils.js" as Utils +import Victron.Utils Item { id: root diff --git a/components/SolarYieldGraph.qml b/components/SolarYieldGraph.qml index 3dfb907dc..f2500ddb0 100644 --- a/components/SolarYieldGraph.qml +++ b/components/SolarYieldGraph.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Item { id: root diff --git a/components/StatusBar.qml b/components/StatusBar.qml index f8ffdff19..16a0af358 100644 --- a/components/StatusBar.qml +++ b/components/StatusBar.qml @@ -87,7 +87,7 @@ Rectangle { } enabled: !!Global.pageManager && !!Global.pageManager.navBar - && Global.pageManager.navBar.currentUrl === "qrc:/pages/NotificationsPage.qml" + && Global.pageManager.navBar.currentUrl === "qrc:/qt/qml/Victron/VenusOS/pages/NotificationsPage.qml" && Global.notifications.audibleAlarmActive && !Global.notifications.snoozeAudibleAlarmActive opacity: enabled ? 1 : 0 diff --git a/components/TankGauge.qml b/components/TankGauge.qml index 975feab1b..8b8daced6 100644 --- a/components/TankGauge.qml +++ b/components/TankGauge.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import QtQuick.Controls.impl as CP -import "/components/Gauges.js" as Gauges +import Victron.Gauges VerticalGauge { id: root diff --git a/components/TankGaugeGroup.qml b/components/TankGaugeGroup.qml index 0464fd49c..f76a3b0be 100644 --- a/components/TankGaugeGroup.qml +++ b/components/TankGaugeGroup.qml @@ -5,8 +5,8 @@ import QtQuick import Victron.VenusOS import QtQuick.Controls.impl as CP -import "/components/Gauges.js" as Gauges -import "/components/Units.js" as Units +import Victron.Gauges +import Victron.Units Rectangle { id: root diff --git a/components/TimeSelector.qml b/components/TimeSelector.qml index 51c18a47f..5caf0a5c1 100644 --- a/components/TimeSelector.qml +++ b/components/TimeSelector.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Item { id: root diff --git a/components/Units.js b/components/Units.js index 0afa26ff9..c728c0b92 100644 --- a/components/Units.js +++ b/components/Units.js @@ -4,7 +4,7 @@ .pragma library .import Victron.VenusOS as V -.import "/components/Utils.js" as Utils +.import Victron.Utils as Utils function defaultUnitPrecision(unit) { if (unit === V.VenusOS.Units_Energy_KiloWattHour) { diff --git a/components/ValueRange.qml b/components/ValueRange.qml index 7edc58294..e268ae99d 100644 --- a/components/ValueRange.qml +++ b/components/ValueRange.qml @@ -3,7 +3,7 @@ */ import QtQml -import "/components/Utils.js" as Utils +import Victron.Utils QtObject { property real value: NaN diff --git a/components/dialogs/GeneratorStartDialog.qml b/components/dialogs/GeneratorStartDialog.qml index cc2d46e15..9268ac8ec 100644 --- a/components/dialogs/GeneratorStartDialog.qml +++ b/components/dialogs/GeneratorStartDialog.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils ModalDialog { id: root diff --git a/components/dialogs/GeneratorStopDialog.qml b/components/dialogs/GeneratorStopDialog.qml index 1518a8b6b..dff2359ae 100644 --- a/components/dialogs/GeneratorStopDialog.qml +++ b/components/dialogs/GeneratorStopDialog.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils ModalDialog { id: root diff --git a/components/dialogs/InverterChargerModeDialog.qml b/components/dialogs/InverterChargerModeDialog.qml index 0903f006c..bdaf9a616 100644 --- a/components/dialogs/InverterChargerModeDialog.qml +++ b/components/dialogs/InverterChargerModeDialog.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils ModalDialog { id: root diff --git a/components/dialogs/NumberSelectorDialog.qml b/components/dialogs/NumberSelectorDialog.qml index a528dc7f9..615e7f1a7 100644 --- a/components/dialogs/NumberSelectorDialog.qml +++ b/components/dialogs/NumberSelectorDialog.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils ModalDialog { id: root diff --git a/components/dialogs/TimeSelectorDialog.qml b/components/dialogs/TimeSelectorDialog.qml index c2d1adb81..f55b7b614 100644 --- a/components/dialogs/TimeSelectorDialog.qml +++ b/components/dialogs/TimeSelectorDialog.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils ModalDialog { id: root diff --git a/components/listitems/ListDateSelector.qml b/components/listitems/ListDateSelector.qml index 593e81f9b..32c5717ab 100644 --- a/components/listitems/ListDateSelector.qml +++ b/components/listitems/ListDateSelector.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils ListButton { id: root diff --git a/components/listitems/ListSpinBox.qml b/components/listitems/ListSpinBox.qml index 83058b374..7b72cd26f 100644 --- a/components/listitems/ListSpinBox.qml +++ b/components/listitems/ListSpinBox.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils ListButton { id: root diff --git a/components/listitems/ListTimeSelector.qml b/components/listitems/ListTimeSelector.qml index 4a589099f..a1609db76 100644 --- a/components/listitems/ListTimeSelector.qml +++ b/components/listitems/ListTimeSelector.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils ListButton { id: root diff --git a/components/settings/CGwacsBatteryScheduleNavigationItem.qml b/components/settings/CGwacsBatteryScheduleNavigationItem.qml index d04ff5104..8f217113a 100644 --- a/components/settings/CGwacsBatteryScheduleNavigationItem.qml +++ b/components/settings/CGwacsBatteryScheduleNavigationItem.qml @@ -4,8 +4,7 @@ import QtQuick import Victron.VenusOS -import "../../components/Utils.js" as Utils - +import Victron.Utils ListNavigationItem { id: root diff --git a/components/settings/TemperatureRelayNavigationItem.qml b/components/settings/TemperatureRelayNavigationItem.qml index 50916b6f6..db4811a6c 100644 --- a/components/settings/TemperatureRelayNavigationItem.qml +++ b/components/settings/TemperatureRelayNavigationItem.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils ListNavigationItem { id: root diff --git a/components/widgets/AcGeneratorWidget.qml b/components/widgets/AcGeneratorWidget.qml index 179ed24ba..9a6513a55 100644 --- a/components/widgets/AcGeneratorWidget.qml +++ b/components/widgets/AcGeneratorWidget.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils AcInputWidget { id: root diff --git a/components/widgets/BatteryWidget.qml b/components/widgets/BatteryWidget.qml index 411c4da6c..7fffc873c 100644 --- a/components/widgets/BatteryWidget.qml +++ b/components/widgets/BatteryWidget.qml @@ -4,8 +4,8 @@ import QtQuick import Victron.VenusOS -import "../Utils.js" as Utils -import "../Units.js" as Units +import Victron.Utils +import Victron.Units OverviewWidget { id: root diff --git a/components/widgets/EvcsWidget.qml b/components/widgets/EvcsWidget.qml index a3751c213..7724168d2 100644 --- a/components/widgets/EvcsWidget.qml +++ b/components/widgets/EvcsWidget.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils OverviewWidget { id: root @@ -37,10 +37,10 @@ OverviewWidget { anchors.fill: parent onClicked: { if (Global.evChargers.model.count === 1) { - Global.pageManager.pushPage("/pages/evcs/EvChargerPage.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/evcs/EvChargerPage.qml", { "evCharger": Global.evChargers.model.deviceAt(0) }) } else { - Global.pageManager.pushPage("/pages/evcs/EvChargerListPage.qml") + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/evcs/EvChargerListPage.qml") } } } diff --git a/components/widgets/SolarYieldWidget.qml b/components/widgets/SolarYieldWidget.qml index 0889cab2e..2634c1384 100644 --- a/components/widgets/SolarYieldWidget.qml +++ b/components/widgets/SolarYieldWidget.qml @@ -64,16 +64,17 @@ OverviewWidget { MouseArea { anchors.fill: parent + onClicked: { const singleDeviceOnly = (Global.solarChargers.model.count + Global.pvInverters.model.count) === 1 if (singleDeviceOnly && Global.solarChargers.model.count === 1) { - Global.pageManager.pushPage("/pages/solar/SolarChargerPage.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/solar/SolarChargerPage.qml", { "solarCharger": Global.solarChargers.model.deviceAt(0) }) } else if (singleDeviceOnly && Global.pvInverters.model === 1) { - Global.pageManager.pushPage("/pages/solar/PvInverterPage.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/solar/PvInverterPage.qml", { "pvInverter": Global.pvInverters.model.deviceAt(0) }) } else { - Global.pageManager.pushPage("/pages/solar/SolarDeviceListPage.qml", { "title": root.title }) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/solar/SolarDeviceListPage.qml", { "title": root.title }) } } } diff --git a/components/widgets/WidgetConnector.qml b/components/widgets/WidgetConnector.qml index e7be021b1..44afa3728 100644 --- a/components/widgets/WidgetConnector.qml +++ b/components/widgets/WidgetConnector.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Shapes import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Item { id: root diff --git a/data/AcInputs.qml b/data/AcInputs.qml index ea51a823b..4fed76b72 100644 --- a/data/AcInputs.qml +++ b/data/AcInputs.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/Batteries.qml b/data/Batteries.qml index 2c783fae1..62804069b 100644 --- a/data/Batteries.qml +++ b/data/Batteries.qml @@ -4,8 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils -import "common" +import Victron.Utils QtObject { id: root diff --git a/data/Chargers.qml b/data/Chargers.qml index a78a58e80..def85a92e 100644 --- a/data/Chargers.qml +++ b/data/Chargers.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/DataManager.qml b/data/DataManager.qml index f5cd19393..950da3d87 100644 --- a/data/DataManager.qml +++ b/data/DataManager.qml @@ -4,8 +4,9 @@ import QtQuick import Victron.VenusOS - -import "mock" as MockData +import Victron.Dbus +import Victron.Mqtt +import Victron.Mock Item { id: root @@ -52,15 +53,15 @@ Item { switch (BackendConnection.type) { case BackendConnection.DBusSource: console.warn("Loading D-Bus data backend...") - dataManagerLoader.source = "qrc:/data/dbus/DBusDataManager.qml" + dataManagerLoader.source = "qrc:/qt/qml/Victron/Dbus/data/dbus/DBusDataManager.qml" break case BackendConnection.MqttSource: console.warn("Loading MQTT data backend...") - dataManagerLoader.source = "qrc:/data/mqtt/MqttDataManager.qml" + dataManagerLoader.source = "qrc:/qt/qml/Victron/Mqtt/data/mqtt/MqttDataManager.qml" break case BackendConnection.MockSource: console.warn("Loading mock data backend...") - dataManagerLoader.source = "qrc:/data/mock/MockDataManager.qml" + dataManagerLoader.source = "qrc:/qt/qml/Victron/Mock/data/mock/MockDataManager.qml" break default: console.warn("Unsupported data backend!", BackendConnection.type) diff --git a/data/DcInputs.qml b/data/DcInputs.qml index 06f815e53..565edc7db 100644 --- a/data/DcInputs.qml +++ b/data/DcInputs.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/DigitalInputs.qml b/data/DigitalInputs.qml index 178e1bbae..429f1d834 100644 --- a/data/DigitalInputs.qml +++ b/data/DigitalInputs.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/EnvironmentInputs.qml b/data/EnvironmentInputs.qml index 7919a3971..73e266b5c 100644 --- a/data/EnvironmentInputs.qml +++ b/data/EnvironmentInputs.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/EvChargers.qml b/data/EvChargers.qml index ac3882762..197bbfd99 100644 --- a/data/EvChargers.qml +++ b/data/EvChargers.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/Generators.qml b/data/Generators.qml index f9f856f59..540243c88 100644 --- a/data/Generators.qml +++ b/data/Generators.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/Inverters.qml b/data/Inverters.qml index f14f3beea..ca55b9ba4 100644 --- a/data/Inverters.qml +++ b/data/Inverters.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/MeteoDevices.qml b/data/MeteoDevices.qml index 8b69adaf0..6e1c2fed4 100644 --- a/data/MeteoDevices.qml +++ b/data/MeteoDevices.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/MotorDrives.qml b/data/MotorDrives.qml index 3ed1d7a17..37b8cb423 100644 --- a/data/MotorDrives.qml +++ b/data/MotorDrives.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/MultiRsDevices.qml b/data/MultiRsDevices.qml index a4d0e421e..d0b569c9f 100644 --- a/data/MultiRsDevices.qml +++ b/data/MultiRsDevices.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/PulseMeters.qml b/data/PulseMeters.qml index ca3b760d9..e931a794d 100644 --- a/data/PulseMeters.qml +++ b/data/PulseMeters.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/PvInverters.qml b/data/PvInverters.qml index c92fc671b..93f507e75 100644 --- a/data/PvInverters.qml +++ b/data/PvInverters.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/Relays.qml b/data/Relays.qml index d7118822a..212d8f7c3 100644 --- a/data/Relays.qml +++ b/data/Relays.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/SolarChargers.qml b/data/SolarChargers.qml index dd9a07163..9f5f321ad 100644 --- a/data/SolarChargers.qml +++ b/data/SolarChargers.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/System.qml b/data/System.qml index 573006624..32311c1d5 100644 --- a/data/System.qml +++ b/data/System.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils QtObject { id: root diff --git a/data/SystemAc.qml b/data/SystemAc.qml index ad4e414d1..f89b70802 100644 --- a/data/SystemAc.qml +++ b/data/SystemAc.qml @@ -3,7 +3,7 @@ */ import QtQuick -import "/components/Utils.js" as Utils +import Victron.Utils QtObject { id: root diff --git a/data/Tanks.qml b/data/Tanks.qml index 24c6e5a19..a7aec2337 100644 --- a/data/Tanks.qml +++ b/data/Tanks.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/UnsupportedDevices.qml b/data/UnsupportedDevices.qml index f0e40a61f..0ccba596d 100644 --- a/data/UnsupportedDevices.qml +++ b/data/UnsupportedDevices.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/VeBusDevices.qml b/data/VeBusDevices.qml index 9836ea8fb..a6592d12d 100644 --- a/data/VeBusDevices.qml +++ b/data/VeBusDevices.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "common" QtObject { id: root diff --git a/data/common/AcInput.qml b/data/common/AcInput.qml index 236f767de..f91326ab2 100644 --- a/data/common/AcInput.qml +++ b/data/common/AcInput.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Device { id: input diff --git a/data/common/AcInputServiceLoader.qml b/data/common/AcInputServiceLoader.qml index 093e126b0..923eef563 100644 --- a/data/common/AcInputServiceLoader.qml +++ b/data/common/AcInputServiceLoader.qml @@ -5,8 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils - +import Victron.Utils /* Provides frequency/current/power/voltage readings for an AC input, including each phase diff --git a/data/common/EnvironmentInput.qml b/data/common/EnvironmentInput.qml index 4b48310d1..25a648a60 100644 --- a/data/common/EnvironmentInput.qml +++ b/data/common/EnvironmentInput.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.Veutil import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Device { id: input diff --git a/data/common/EssData.qml b/data/common/EssData.qml index 49dba6267..1a344b0c6 100644 --- a/data/common/EssData.qml +++ b/data/common/EssData.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils QtObject { id: root diff --git a/data/common/EvCharger.qml b/data/common/EvCharger.qml index 4fe128233..911819388 100644 --- a/data/common/EvCharger.qml +++ b/data/common/EvCharger.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Device { id: evCharger diff --git a/data/common/Generator.qml b/data/common/Generator.qml index b6ad40067..0ed0ebf24 100644 --- a/data/common/Generator.qml +++ b/data/common/Generator.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.Veutil import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Device { id: generator diff --git a/data/common/Relay.qml b/data/common/Relay.qml index c958bdf36..ea28ae0fe 100644 --- a/data/common/Relay.qml +++ b/data/common/Relay.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.Veutil import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Device { id: relay diff --git a/data/common/SolarCharger.qml b/data/common/SolarCharger.qml index 4cc215a92..f81c1e865 100644 --- a/data/common/SolarCharger.qml +++ b/data/common/SolarCharger.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Device { id: solarCharger diff --git a/data/common/SystemData.qml b/data/common/SystemData.qml index 145573035..c22af3846 100644 --- a/data/common/SystemData.qml +++ b/data/common/SystemData.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils QtObject { id: root diff --git a/data/common/Tank.qml b/data/common/Tank.qml index 2a09cbf7b..cfab9e419 100644 --- a/data/common/Tank.qml +++ b/data/common/Tank.qml @@ -5,8 +5,8 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils -import "/components/Gauges.js" as Gauges +import Victron.Utils +import Victron.Gauges Device { id: tank diff --git a/data/common/VeBusDevice.qml b/data/common/VeBusDevice.qml index a0a862526..4bdd47f72 100644 --- a/data/common/VeBusDevice.qml +++ b/data/common/VeBusDevice.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils Device { id: inverter diff --git a/data/dbus/AcInputsImpl.qml b/data/dbus/AcInputsImpl.qml index 435e9f1a7..3cf1cea03 100644 --- a/data/dbus/AcInputsImpl.qml +++ b/data/dbus/AcInputsImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/BatteriesImpl.qml b/data/dbus/BatteriesImpl.qml index 29138b2a7..42597f971 100644 --- a/data/dbus/BatteriesImpl.qml +++ b/data/dbus/BatteriesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { property Instantiator batteryObjects: Instantiator { diff --git a/data/dbus/ChargersImpl.qml b/data/dbus/ChargersImpl.qml index 52cef5b5d..cf68c9615 100644 --- a/data/dbus/ChargersImpl.qml +++ b/data/dbus/ChargersImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/DBusDataManager.qml b/data/dbus/DBusDataManager.qml index 3a25ed7d3..b19a45519 100644 --- a/data/dbus/DBusDataManager.qml +++ b/data/dbus/DBusDataManager.qml @@ -5,6 +5,7 @@ import QtQuick import Victron.Veutil import Victron.VenusOS +import Victron.Dbus QtObject { id: root diff --git a/data/dbus/DcInputsImpl.qml b/data/dbus/DcInputsImpl.qml index 1ebc506ff..c67931e72 100644 --- a/data/dbus/DcInputsImpl.qml +++ b/data/dbus/DcInputsImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/DigitalInputsImpl.qml b/data/dbus/DigitalInputsImpl.qml index 9e1dcf179..0e2807b64 100644 --- a/data/dbus/DigitalInputsImpl.qml +++ b/data/dbus/DigitalInputsImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/EnvironmentInputsImpl.qml b/data/dbus/EnvironmentInputsImpl.qml index c89b753d3..8026b4a92 100644 --- a/data/dbus/EnvironmentInputsImpl.qml +++ b/data/dbus/EnvironmentInputsImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.Veutil import Victron.VenusOS -import "../common" QtObject { id: root diff --git a/data/dbus/EssImpl.qml b/data/dbus/EssImpl.qml index 7254ae0ad..cda345e52 100644 --- a/data/dbus/EssImpl.qml +++ b/data/dbus/EssImpl.qml @@ -3,6 +3,6 @@ */ import QtQuick -import "../common" +import Victron.VenusOS EssData {} diff --git a/data/dbus/EvChargersImpl.qml b/data/dbus/EvChargersImpl.qml index fe5ce10bf..d7e09dfd5 100644 --- a/data/dbus/EvChargersImpl.qml +++ b/data/dbus/EvChargersImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/GeneratorsImpl.qml b/data/dbus/GeneratorsImpl.qml index 6e1adf6a1..5c566a77a 100644 --- a/data/dbus/GeneratorsImpl.qml +++ b/data/dbus/GeneratorsImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.Veutil import Victron.VenusOS -import "../common" QtObject { id: root diff --git a/data/dbus/InvertersImpl.qml b/data/dbus/InvertersImpl.qml index affde6da4..7409daa9b 100644 --- a/data/dbus/InvertersImpl.qml +++ b/data/dbus/InvertersImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/MeteoDevicesImpl.qml b/data/dbus/MeteoDevicesImpl.qml index fb5942c5a..d10687db0 100644 --- a/data/dbus/MeteoDevicesImpl.qml +++ b/data/dbus/MeteoDevicesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/MotorDrivesImpl.qml b/data/dbus/MotorDrivesImpl.qml index 5c036d8a0..320fd2e7b 100644 --- a/data/dbus/MotorDrivesImpl.qml +++ b/data/dbus/MotorDrivesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/MultiRsDevicesImpl.qml b/data/dbus/MultiRsDevicesImpl.qml index 53e61f779..b106ea0e5 100644 --- a/data/dbus/MultiRsDevicesImpl.qml +++ b/data/dbus/MultiRsDevicesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/PulseMetersImpl.qml b/data/dbus/PulseMetersImpl.qml index 1d7fd6d19..ee6a3bc54 100644 --- a/data/dbus/PulseMetersImpl.qml +++ b/data/dbus/PulseMetersImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/PvInvertersImpl.qml b/data/dbus/PvInvertersImpl.qml index 2283b91dd..44ef57ea4 100644 --- a/data/dbus/PvInvertersImpl.qml +++ b/data/dbus/PvInvertersImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/RelaysImpl.qml b/data/dbus/RelaysImpl.qml index a55a2b867..3df3b3c38 100644 --- a/data/dbus/RelaysImpl.qml +++ b/data/dbus/RelaysImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.Veutil import Victron.VenusOS -import "../common" QtObject { id: root diff --git a/data/dbus/SolarChargersImpl.qml b/data/dbus/SolarChargersImpl.qml index e7798abfc..0dc8d4c9d 100644 --- a/data/dbus/SolarChargersImpl.qml +++ b/data/dbus/SolarChargersImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/SystemImpl.qml b/data/dbus/SystemImpl.qml index bb15b53d3..41e811e50 100644 --- a/data/dbus/SystemImpl.qml +++ b/data/dbus/SystemImpl.qml @@ -3,7 +3,7 @@ */ import QtQuick -import "../common" +import Victron.VenusOS QtObject { id: root diff --git a/data/dbus/TanksImpl.qml b/data/dbus/TanksImpl.qml index 5c8027550..dfde89f22 100644 --- a/data/dbus/TanksImpl.qml +++ b/data/dbus/TanksImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/UnsupportedDevicesImpl.qml b/data/dbus/UnsupportedDevicesImpl.qml index edb37ffb2..04a3be95c 100644 --- a/data/dbus/UnsupportedDevicesImpl.qml +++ b/data/dbus/UnsupportedDevicesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/dbus/VeBusDevicesImpl.qml b/data/dbus/VeBusDevicesImpl.qml index c6ce3bb55..2ee468f23 100644 --- a/data/dbus/VeBusDevicesImpl.qml +++ b/data/dbus/VeBusDevicesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mock/InvertersImpl.qml b/data/mock/InvertersImpl.qml index 57dd3af78..cd1be3ef2 100644 --- a/data/mock/InvertersImpl.qml +++ b/data/mock/InvertersImpl.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "../common" Item { id: root diff --git a/data/mock/MockDataManager.qml b/data/mock/MockDataManager.qml index 94c5a8200..9b56fcbc3 100644 --- a/data/mock/MockDataManager.qml +++ b/data/mock/MockDataManager.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "config" +import Victron.Mock QtObject { id: root diff --git a/data/mock/PvInvertersImpl.qml b/data/mock/PvInvertersImpl.qml index 84c85d45e..27b9c7866 100644 --- a/data/mock/PvInvertersImpl.qml +++ b/data/mock/PvInvertersImpl.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "../common" QtObject { id: root diff --git a/data/mock/SolarChargersImpl.qml b/data/mock/SolarChargersImpl.qml index 4021e80d7..28edc96dd 100644 --- a/data/mock/SolarChargersImpl.qml +++ b/data/mock/SolarChargersImpl.qml @@ -4,8 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils -import "../common" +import Victron.Utils QtObject { id: root diff --git a/data/mock/config/MockDataSimulator.qml b/data/mock/config/MockDataSimulator.qml index f532d87f8..0d58ba736 100644 --- a/data/mock/config/MockDataSimulator.qml +++ b/data/mock/config/MockDataSimulator.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils QtObject { id: root @@ -24,10 +24,10 @@ QtObject { signal deactivateSingleAlarm() readonly property var _configs: ({ - "qrc:/pages/BriefPage.qml": briefAndOverviewConfig, - "qrc:/pages/OverviewPage.qml": briefAndOverviewConfig, - "qrc:/pages/LevelsPage.qml": levelsConfig, - "qrc:/pages/SettingsPage.qml": settingsConfig, + "qrc:/qt/qml/Victron/VenusOS/pages/BriefPage.qml": briefAndOverviewConfig, + "qrc:/qt/qml/Victron/VenusOS/pages/OverviewPage.qml": briefAndOverviewConfig, + "qrc:/qt/qml/Victron/VenusOS/pages/LevelsPage.qml": levelsConfig, + "qrc:/qt/qml/Victron/VenusOS/pages/SettingsPage.qml": settingsConfig, }) function setConfigIndex(pageConfig, configIndex) { diff --git a/data/mqtt/AcInputsImpl.qml b/data/mqtt/AcInputsImpl.qml index 12583ea02..fd2be1385 100644 --- a/data/mqtt/AcInputsImpl.qml +++ b/data/mqtt/AcInputsImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/BatteriesImpl.qml b/data/mqtt/BatteriesImpl.qml index d947c4757..1fc875b41 100644 --- a/data/mqtt/BatteriesImpl.qml +++ b/data/mqtt/BatteriesImpl.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.Veutil -import "../common" +import Victron.VenusOS QtObject { property Instantiator batteryObjects: Instantiator { diff --git a/data/mqtt/ChargersImpl.qml b/data/mqtt/ChargersImpl.qml index d3b4db19f..ea7ab9455 100644 --- a/data/mqtt/ChargersImpl.qml +++ b/data/mqtt/ChargersImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/DcInputsImpl.qml b/data/mqtt/DcInputsImpl.qml index 7ebf4c373..839704a13 100644 --- a/data/mqtt/DcInputsImpl.qml +++ b/data/mqtt/DcInputsImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/DigitalInputsImpl.qml b/data/mqtt/DigitalInputsImpl.qml index f2a26fb07..f64349db1 100644 --- a/data/mqtt/DigitalInputsImpl.qml +++ b/data/mqtt/DigitalInputsImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/EnvironmentInputsImpl.qml b/data/mqtt/EnvironmentInputsImpl.qml index 26797eda1..15fcb3fe4 100644 --- a/data/mqtt/EnvironmentInputsImpl.qml +++ b/data/mqtt/EnvironmentInputsImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.Veutil import Victron.VenusOS -import "../common" QtObject { id: root diff --git a/data/mqtt/EssImpl.qml b/data/mqtt/EssImpl.qml index 7254ae0ad..cda345e52 100644 --- a/data/mqtt/EssImpl.qml +++ b/data/mqtt/EssImpl.qml @@ -3,6 +3,6 @@ */ import QtQuick -import "../common" +import Victron.VenusOS EssData {} diff --git a/data/mqtt/EvChargersImpl.qml b/data/mqtt/EvChargersImpl.qml index 45a78b80c..66604977b 100644 --- a/data/mqtt/EvChargersImpl.qml +++ b/data/mqtt/EvChargersImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/GeneratorsImpl.qml b/data/mqtt/GeneratorsImpl.qml index ec175dc03..9a5094ebd 100644 --- a/data/mqtt/GeneratorsImpl.qml +++ b/data/mqtt/GeneratorsImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.Veutil import Victron.VenusOS -import "../common" QtObject { id: root diff --git a/data/mqtt/InvertersImpl.qml b/data/mqtt/InvertersImpl.qml index ade6af9cf..b88541454 100644 --- a/data/mqtt/InvertersImpl.qml +++ b/data/mqtt/InvertersImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/MeteoDevicesImpl.qml b/data/mqtt/MeteoDevicesImpl.qml index 71b2edd3a..f661f8c25 100644 --- a/data/mqtt/MeteoDevicesImpl.qml +++ b/data/mqtt/MeteoDevicesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/MotorDrivesImpl.qml b/data/mqtt/MotorDrivesImpl.qml index 02de04f52..e0d73ad50 100644 --- a/data/mqtt/MotorDrivesImpl.qml +++ b/data/mqtt/MotorDrivesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/MqttDataManager.qml b/data/mqtt/MqttDataManager.qml index c5dcee6f8..e7961f187 100644 --- a/data/mqtt/MqttDataManager.qml +++ b/data/mqtt/MqttDataManager.qml @@ -5,6 +5,7 @@ import QtQuick import Victron.Veutil import Victron.VenusOS +import Victron.Mqtt QtObject { id: root diff --git a/data/mqtt/MultiRsDevicesImpl.qml b/data/mqtt/MultiRsDevicesImpl.qml index 3b991bc64..390d42e8c 100644 --- a/data/mqtt/MultiRsDevicesImpl.qml +++ b/data/mqtt/MultiRsDevicesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/PulseMetersImpl.qml b/data/mqtt/PulseMetersImpl.qml index b0912b432..ad12807a5 100644 --- a/data/mqtt/PulseMetersImpl.qml +++ b/data/mqtt/PulseMetersImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/PvInvertersImpl.qml b/data/mqtt/PvInvertersImpl.qml index 4349d75b3..c1946044e 100644 --- a/data/mqtt/PvInvertersImpl.qml +++ b/data/mqtt/PvInvertersImpl.qml @@ -6,7 +6,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/RelaysImpl.qml b/data/mqtt/RelaysImpl.qml index 32a1754e9..44d5e0001 100644 --- a/data/mqtt/RelaysImpl.qml +++ b/data/mqtt/RelaysImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.Veutil import Victron.VenusOS -import "../common" QtObject { id: root diff --git a/data/mqtt/SolarChargersImpl.qml b/data/mqtt/SolarChargersImpl.qml index dd07f6996..4d0c26302 100644 --- a/data/mqtt/SolarChargersImpl.qml +++ b/data/mqtt/SolarChargersImpl.qml @@ -6,7 +6,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/SystemImpl.qml b/data/mqtt/SystemImpl.qml index 8773d1bf3..5ad5e9976 100644 --- a/data/mqtt/SystemImpl.qml +++ b/data/mqtt/SystemImpl.qml @@ -3,7 +3,7 @@ */ import QtQuick -import "../common" +import Victron.VenusOS QtObject { id: root diff --git a/data/mqtt/TanksImpl.qml b/data/mqtt/TanksImpl.qml index 69328d4b9..f12cd3a4a 100644 --- a/data/mqtt/TanksImpl.qml +++ b/data/mqtt/TanksImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/UnsupportedDevicesImpl.qml b/data/mqtt/UnsupportedDevicesImpl.qml index 4a96601ad..4ed08cd82 100644 --- a/data/mqtt/UnsupportedDevicesImpl.qml +++ b/data/mqtt/UnsupportedDevicesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/data/mqtt/VeBusDevicesImpl.qml b/data/mqtt/VeBusDevicesImpl.qml index 6e21f64cd..c06d69716 100644 --- a/data/mqtt/VeBusDevicesImpl.qml +++ b/data/mqtt/VeBusDevicesImpl.qml @@ -5,7 +5,6 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "../common" QtObject { id: root diff --git a/pages/BriefMonitorPanel.qml b/pages/BriefMonitorPanel.qml index e96b26494..e6102a360 100644 --- a/pages/BriefMonitorPanel.qml +++ b/pages/BriefMonitorPanel.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Controls as C import QtQuick.Controls.impl as CP import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Column { id: root diff --git a/pages/BriefPage.qml b/pages/BriefPage.qml index bb9311d44..49af21e77 100644 --- a/pages/BriefPage.qml +++ b/pages/BriefPage.qml @@ -4,8 +4,8 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils -import "/components/Gauges.js" as Gauges +import Victron.Utils +import Victron.Gauges Page { id: root diff --git a/pages/EnvironmentTab.qml b/pages/EnvironmentTab.qml index 1bbb3ab42..0a4b0d70e 100644 --- a/pages/EnvironmentTab.qml +++ b/pages/EnvironmentTab.qml @@ -5,8 +5,8 @@ import QtQuick import Victron.VenusOS import QtQuick.Controls.impl as CP -import "/components/Utils.js" as Utils -import "/components/Units.js" as Units +import Victron.Utils +import Victron.Units Flickable { id: root diff --git a/pages/MainView.qml b/pages/MainView.qml index dbbffda0a..40fcf7bb6 100644 --- a/pages/MainView.qml +++ b/pages/MainView.qml @@ -66,7 +66,7 @@ Item { return } // When pushing a settings sub-page, ensure nav bar is visible. - if (navBar.currentIndex === navBar.model.count - 1 && obj !== "qrc:/pages/ControlCardsPage.qml") { + if (navBar.currentIndex === navBar.model.count - 1 && obj !== "qrc:/qt/qml/Victron/VenusOS/pages/ControlCardsPage.qml") { properties = properties || {} properties.height = pageStack.height - navBar.height } @@ -95,7 +95,7 @@ Item { onLeftButtonClicked: { switch (leftButton) { case VenusOS.StatusBar_LeftButton_ControlsInactive: - pageManager.pushPage("qrc:/pages/ControlCardsPage.qml") + pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/ControlCardsPage.qml") break case VenusOS.StatusBar_LeftButton_ControlsActive: // fall through case VenusOS.StatusBar_LeftButton_Back: diff --git a/pages/NotificationLayer.qml b/pages/NotificationLayer.qml index 49d91ebf1..cef170656 100644 --- a/pages/NotificationLayer.qml +++ b/pages/NotificationLayer.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Item { id: root diff --git a/pages/OverviewPage.qml b/pages/OverviewPage.qml index f066f4074..dbf472f38 100644 --- a/pages/OverviewPage.qml +++ b/pages/OverviewPage.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/SettingsPage.qml b/pages/SettingsPage.qml index 4950535fd..bce9f4d2d 100644 --- a/pages/SettingsPage.qml +++ b/pages/SettingsPage.qml @@ -24,130 +24,130 @@ Page { { //% "Device List" text: qsTrId("settings_device_list"), - page: "/pages/settings/devicelist/DeviceListPage.qml", + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/devicelist/DeviceListPage.qml", }, { //% "Bluetooth" text: qsTrId("settings_bluetooth"), - page: "/pages/settings/PageSettingsBluetooth.qml", + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsBluetooth.qml", show: Connman.technologyList.indexOf("bluetooth") !== -1 }, { //% "General" text: qsTrId("settings_general"), - page: "/pages/settings/PageSettingsGeneral.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsGeneral.qml" }, { //% "Firmware" text: qsTrId("settings_firmware"), - page: "/pages/settings/PageSettingsFirmware.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsFirmware.qml" }, { //% "Date & Time" text: qsTrId("settings_date_and_time"), - page: "/pages/settings/PageTzInfo.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageTzInfo.qml" }, { //% "Remote Console" text: qsTrId("settings_remote_console"), - page: "/pages/settings/PageSettingsRemoteConsole.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsRemoteConsole.qml" }, { //% "System setup" text: qsTrId("settings_system_setup"), - page: "/pages/settings/PageSettingsSystem.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsSystem.qml" }, { //% "DVCC" text: qsTrId("settings_system_dvcc"), - page: "/pages/settings/PageSettingsDvcc.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsDvcc.qml" }, { //% "Display & Language" text: qsTrId("settings_display_and_language"), - page: "/pages/settings/PageSettingsDisplay.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsDisplay.qml" }, { //% "VRM online portal" text: qsTrId("settings_vrm_online_portal"), - page: "/pages/settings/PageSettingsLogger.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsLogger.qml" }, { //% "ESS" text: systemType.value === "Hub-4" ? systemType.value : qsTrId("settings_ess"), - page: "/pages/settings/PageSettingsHub4.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsHub4.qml" }, { //% "Energy meters" text: qsTrId("settings_energy_meters"), - page: "/pages/settings/PageSettingsCGwacsOverview.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsCGwacsOverview.qml" }, //% "PV inverters" { text: qsTrId("settings_pv_inverters"), - page: "/pages/settings/PageSettingsFronius.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsFronius.qml" }, { //% "Ethernet" text: qsTrId("settings_ethernet"), - page: "/pages/settings/PageSettingsTcpIp.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsTcpIp.qml" }, { //% "Wi-Fi" text: qsTrId("settings_wifi"), page: accessPoint.valid - ? "/pages/settings/PageSettingsWifiWithAccessPoint.qml" - : "/pages/settings/PageSettingsWifi.qml" + ? "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsWifiWithAccessPoint.qml" + : "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsWifi.qml" }, { //% "GSM modem" text: qsTrId("settings_gsm_modem"), - page: "/pages/settings/PageSettingsGsm.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsGsm.qml" }, { //% "GPS" text: qsTrId("settings_gps"), - page: "/pages/settings/PageSettingsGpsList.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsGpsList.qml" }, { //% "Generator start/stop" text: qsTrId("settings_generator_start_stop"), - page: "/pages/settings/PageRelayGenerator.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageRelayGenerator.qml" }, { //% "Tank pump" text: qsTrId("settings_tank_pump"), - page: "/pages/settings/PageSettingsTankPump.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsTankPump.qml" }, { text: CommonWords.relay, - page: "/pages/settings/PageSettingsRelay.qml", + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsRelay.qml", visible: relay0.valid }, { //% "Services" text: qsTrId("settings_services"), - page: "/pages/settings/PageSettingsServices.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsServices.qml" }, { //% "I/O" text: qsTrId("settings_io"), - page: "/pages/settings/PageSettingsIo.qml" + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsIo.qml" }, { //% "Venus OS Large features" text: qsTrId("settings_venus_os_large_features"), - page: "/pages/settings/PageSettingsLarge.qml", + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsLarge.qml", visible: signalK.valid || nodeRed.valid }, { //% "VRM Device Instances" text: qsTrId("settings_vrm_device_instances"), - page: "/pages/settings/PageVrmDeviceInstances.qml", + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageVrmDeviceInstances.qml", }, { text: "Debug", - page: "/pages/settings/debug/PageDebug.qml", + page: "qrc:/qt/qml/Victron/VenusOS/pages/settings/debug/PageDebug.qml", showAccessLevel: VenusOS.User_AccessType_SuperUser }, ] diff --git a/pages/TanksTab.qml b/pages/TanksTab.qml index 6f299f948..ced3fd68d 100644 --- a/pages/TanksTab.qml +++ b/pages/TanksTab.qml @@ -9,7 +9,7 @@ import QtQuick import Victron.VenusOS import QtQuick.Controls.impl as CP -import "/components/Utils.js" as Utils +import Victron.Utils ListView { id: root diff --git a/pages/controlcards/GeneratorCard.qml b/pages/controlcards/GeneratorCard.qml index 4a68f62be..bed4fa2ed 100644 --- a/pages/controlcards/GeneratorCard.qml +++ b/pages/controlcards/GeneratorCard.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Controls as C import QtQuick.Controls.impl as CP import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils ControlCard { id: root diff --git a/pages/evcs/EvChargerListPage.qml b/pages/evcs/EvChargerListPage.qml index d63724296..c18fd7e11 100644 --- a/pages/evcs/EvChargerListPage.qml +++ b/pages/evcs/EvChargerListPage.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Units.js" as Units +import Victron.Units Page { id: root @@ -67,7 +67,7 @@ Page { return statusText } - onClicked: Global.pageManager.pushPage("/pages/evcs/EvChargerPage.qml", { "evCharger": model.device }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/evcs/EvChargerPage.qml", { "evCharger": model.device }) } } } diff --git a/pages/evcs/EvChargerPage.qml b/pages/evcs/EvChargerPage.qml index fbe4542fd..923574709 100644 --- a/pages/evcs/EvChargerPage.qml +++ b/pages/evcs/EvChargerPage.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -144,7 +144,7 @@ Page { ListNavigationItem { text: CommonWords.setup onClicked: { - Global.pageManager.pushPage("/pages/evcs/EvChargerSetupPage.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/evcs/EvChargerSetupPage.qml", { "title": text, "evCharger": root.evCharger }) } } @@ -152,7 +152,7 @@ Page { ListNavigationItem { text: CommonWords.device_info_title onClicked: { - Global.pageManager.pushPage("/pages/settings/PageDeviceInfo.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageDeviceInfo.qml", { "title": text, "bindPrefix": root.evCharger.serviceUid }) } } diff --git a/pages/settings/GeneratorCondition.qml b/pages/settings/GeneratorCondition.qml index db7911b9b..6438d64c5 100644 --- a/pages/settings/GeneratorCondition.qml +++ b/pages/settings/GeneratorCondition.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils ListNavigationItem { id: root diff --git a/pages/settings/IpAddressListView.qml b/pages/settings/IpAddressListView.qml index 1946cd165..b90888967 100644 --- a/pages/settings/IpAddressListView.qml +++ b/pages/settings/IpAddressListView.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Controls as C import QtQuick.Controls.impl as CP import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils GradientListView { id: root diff --git a/pages/settings/PageChargeCurrentLimits.qml b/pages/settings/PageChargeCurrentLimits.qml index bc1abb75e..9a5b43383 100644 --- a/pages/settings/PageChargeCurrentLimits.qml +++ b/pages/settings/PageChargeCurrentLimits.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageDeviceInfo.qml b/pages/settings/PageDeviceInfo.qml index 5c7327874..6343dd703 100644 --- a/pages/settings/PageDeviceInfo.qml +++ b/pages/settings/PageDeviceInfo.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import QtQuick.Controls.impl as CP -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageGenerator.qml b/pages/settings/PageGenerator.qml index 634f699fb..bf1300979 100644 --- a/pages/settings/PageGenerator.qml +++ b/pages/settings/PageGenerator.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -241,7 +241,7 @@ Page { //% "Settings" text: qsTrId("settings_page_relay_generator_settings") onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsGenerator.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsGenerator.qml", { title: text, settingsBindPrefix: root.settingsBindPrefix, startStopBindPrefix: root.startStopBindPrefix }) } } diff --git a/pages/settings/PageGeneratorAcLoad.qml b/pages/settings/PageGeneratorAcLoad.qml index 1e6117f46..28c7e9bba 100644 --- a/pages/settings/PageGeneratorAcLoad.qml +++ b/pages/settings/PageGeneratorAcLoad.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageGeneratorConditions.qml b/pages/settings/PageGeneratorConditions.qml index 50d179577..7fdf83b89 100644 --- a/pages/settings/PageGeneratorConditions.qml +++ b/pages/settings/PageGeneratorConditions.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -116,7 +116,7 @@ Page { ListNavigationItem { text: CommonWords.ac_load secondaryText: acLoadEnabled.value === 1 ? CommonWords.enabled : CommonWords.disabled - onClicked: Global.pageManager.pushPage("/pages/settings/PageGeneratorAcLoad.qml", { bindPrefix: root.bindPrefix + "/AcLoad"}) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageGeneratorAcLoad.qml", { bindPrefix: root.bindPrefix + "/AcLoad"}) DataPoint { id: acLoadEnabled @@ -148,7 +148,7 @@ Page { //% "Periodic run" text: qsTrId("page_generator_conditions_periodic_run") secondaryText: testRunEnabled.value === 1 ? CommonWords.enabled : CommonWords.disabled - onClicked: Global.pageManager.pushPage("/pages/settings/PageGeneratorTestRun.qml", { title: text, bindPrefix: root.bindPrefix }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageGeneratorTestRun.qml", { title: text, bindPrefix: root.bindPrefix }) DataPoint { id: testRunEnabled diff --git a/pages/settings/PageGps.qml b/pages/settings/PageGps.qml index e405a982d..e8f0df9f2 100644 --- a/pages/settings/PageGps.qml +++ b/pages/settings/PageGps.qml @@ -112,7 +112,7 @@ Page { ListNavigationItem { text: CommonWords.device_info_title onClicked: { - Global.pageManager.pushPage("/pages/settings/PageDeviceInfo.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageDeviceInfo.qml", { "title": text, "bindPrefix": root.bindPrefix }) } } diff --git a/pages/settings/PageRelayGenerator.qml b/pages/settings/PageRelayGenerator.qml index b311b8133..bdf707ebd 100644 --- a/pages/settings/PageRelayGenerator.qml +++ b/pages/settings/PageRelayGenerator.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils PageGenerator { id: root diff --git a/pages/settings/PageSettingsBleSensors.qml b/pages/settings/PageSettingsBleSensors.qml index e8a7b9134..fe7e0ce2a 100644 --- a/pages/settings/PageSettingsBleSensors.qml +++ b/pages/settings/PageSettingsBleSensors.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsCGwacs.qml b/pages/settings/PageSettingsCGwacs.qml index d53be90e9..435f4fe41 100644 --- a/pages/settings/PageSettingsCGwacs.qml +++ b/pages/settings/PageSettingsCGwacs.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsCGwacsOverview.qml b/pages/settings/PageSettingsCGwacsOverview.qml index 1500d31d2..7ea50d709 100644 --- a/pages/settings/PageSettingsCGwacsOverview.qml +++ b/pages/settings/PageSettingsCGwacsOverview.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -33,7 +33,7 @@ Page { text: getDescription(customNameItem.value, modelData) secondaryText: getMenuName(serviceType.value, l2ServiceType.value) - onClicked: Global.pageManager.pushPage("/pages/settings/PageSettingsCGwacs.qml", { title: text, devicePath: devicePath }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsCGwacs.qml", { title: text, devicePath: devicePath }) DataPoint { id: customNameItem diff --git a/pages/settings/PageSettingsCanbus.qml b/pages/settings/PageSettingsCanbus.qml index 93893dfe0..d5ac5129b 100644 --- a/pages/settings/PageSettingsCanbus.qml +++ b/pages/settings/PageSettingsCanbus.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -103,8 +103,8 @@ Page { onClicked: { if (!!Global.pageManager) { const url = root._isVecan - ? "/pages/settings/PageSettingsVecanDevices.qml" - : "/pages/settings/PageSettingsRvcDevices.qml" + ? "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsVecanDevices.qml" + : "qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsRvcDevices.qml" Global.pageManager.pushPage(url, { gateway: root.gateway }) } } @@ -214,7 +214,7 @@ Page { //% "Network status" text: qsTrId("settings_network_status") onClicked: { - Global.pageManager.pushPage("/pages/settings/PageCanbusStatus.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageCanbusStatus.qml", { gateway: root.gateway, title: root.title }) } } diff --git a/pages/settings/PageSettingsDisplay.qml b/pages/settings/PageSettingsDisplay.qml index 9eee411ef..6534b124c 100644 --- a/pages/settings/PageSettingsDisplay.qml +++ b/pages/settings/PageSettingsDisplay.qml @@ -85,7 +85,7 @@ Page { //% "Brief view levels" text: qsTrId("settings_brief_view_levels") onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsDisplayBrief.qml", {"title": text}) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsDisplayBrief.qml", {"title": text}) } } @@ -150,7 +150,7 @@ Page { //% "Units" text: qsTrId("settings_units") onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsDisplayUnits.qml", {"title": text}) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsDisplayUnits.qml", {"title": text}) } } } diff --git a/pages/settings/PageSettingsDisplayBrief.qml b/pages/settings/PageSettingsDisplayBrief.qml index 3a9179681..2f787d7f1 100644 --- a/pages/settings/PageSettingsDisplayBrief.qml +++ b/pages/settings/PageSettingsDisplayBrief.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import QtQuick.Controls as C -import "/components/Gauges.js" as Gauges +import Victron.Gauges Page { id: root diff --git a/pages/settings/PageSettingsDvcc.qml b/pages/settings/PageSettingsDvcc.qml index d069f5914..06e71d904 100644 --- a/pages/settings/PageSettingsDvcc.qml +++ b/pages/settings/PageSettingsDvcc.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import QtQuick.Controls as C -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -30,7 +30,7 @@ Page { //% "Charge Current limits" text: qsTrId("settings_dvcc_charge_current_limits") showAccessLevel: VenusOS.User_AccessType_Service - onClicked: Global.pageManager.pushPage("/pages/settings/PageChargeCurrentLimits.qml", { title: text }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageChargeCurrentLimits.qml", { title: text }) } ListSwitch { diff --git a/pages/settings/PageSettingsFirmware.qml b/pages/settings/PageSettingsFirmware.qml index bd959821a..578b6bf11 100644 --- a/pages/settings/PageSettingsFirmware.qml +++ b/pages/settings/PageSettingsFirmware.qml @@ -31,7 +31,7 @@ Page { //% "Online updates" text: qsTrId("settings_online_updates") onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsFirmwareOnline.qml", { title: text }) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsFirmwareOnline.qml", { title: text }) } } @@ -39,7 +39,7 @@ Page { //% "Install firmware from SD/USB" text: qsTrId("settings_install_firmware_from_sd_usb") onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsFirmwareOffline.qml", { title: text }) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsFirmwareOffline.qml", { title: text }) } } @@ -47,7 +47,7 @@ Page { //% "Stored backup firmware" text: qsTrId("settings_stored_backup_firmware") onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsRootfsSelect.qml", { title: text }) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsRootfsSelect.qml", { title: text }) } } } diff --git a/pages/settings/PageSettingsFronius.qml b/pages/settings/PageSettingsFronius.qml index a457eac04..c6e776a7b 100644 --- a/pages/settings/PageSettingsFronius.qml +++ b/pages/settings/PageSettingsFronius.qml @@ -3,8 +3,8 @@ */ import QtQuick +import Victron.Utils import Victron.VenusOS -import "/components/Utils.js" as Utils Page { id: root // TODO: update this UI when a design is available @@ -29,7 +29,7 @@ Page { ListNavigationItem { //% "Inverters" text: qsTrId("page_settings_fronius_inverters") - onClicked: Global.pageManager.pushPage("/pages/settings/PageSettingsFroniusInverters.qml", {"title": text}) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsFroniusInverters.qml", {"title": text}) } ListButton { @@ -42,13 +42,13 @@ Page { ListNavigationItem { //% "Detected IP addresses" text: qsTrId("page_settings_fronius_detected_ip_addresses") - onClicked: Global.pageManager.pushPage("/pages/settings/PageSettingsFroniusShowIpAddresses.qml", {"title": text}) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsFroniusShowIpAddresses.qml", {"title": text}) } ListNavigationItem { //% "Add IP address manually" text: qsTrId("page_settings_fronius_add_ip_address_manually") - onClicked: Global.pageManager.pushPage("/pages/settings/PageSettingsFroniusSetIpAddresses.qml", {"title": text}) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsFroniusSetIpAddresses.qml", {"title": text}) } ListPortField { diff --git a/pages/settings/PageSettingsFroniusInverter.qml b/pages/settings/PageSettingsFroniusInverter.qml index 4e3d8df5b..d1d95fee9 100644 --- a/pages/settings/PageSettingsFroniusInverter.qml +++ b/pages/settings/PageSettingsFroniusInverter.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsFroniusInverters.qml b/pages/settings/PageSettingsFroniusInverters.qml index 0b34e743f..9a0a7f8ab 100644 --- a/pages/settings/PageSettingsFroniusInverters.qml +++ b/pages/settings/PageSettingsFroniusInverters.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -33,7 +33,7 @@ Page { property DataPoint positionItem: DataPoint { source: inverterPath + "/Position" } property DataPoint serialNumberItem: DataPoint { source: inverterPath + "/SerialNumber" } - onClicked: Global.pageManager.pushPage("/pages/settings/PageSettingsFroniusInverter.qml", {"title": menu.text, "bindPrefix": menu.inverterPath}) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsFroniusInverter.qml", {"title": menu.text, "bindPrefix": menu.inverterPath}) text: customNameItem.value || serialNumberItem.value || '--' secondaryText: { switch (positionItem.value) { diff --git a/pages/settings/PageSettingsFroniusSetIpAddresses.qml b/pages/settings/PageSettingsFroniusSetIpAddresses.qml index a3da17fc8..cabfb3f58 100644 --- a/pages/settings/PageSettingsFroniusSetIpAddresses.qml +++ b/pages/settings/PageSettingsFroniusSetIpAddresses.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Controls as C import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsFroniusShowIpAddresses.qml b/pages/settings/PageSettingsFroniusShowIpAddresses.qml index 639d5dc26..7d1f551b4 100644 --- a/pages/settings/PageSettingsFroniusShowIpAddresses.qml +++ b/pages/settings/PageSettingsFroniusShowIpAddresses.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Controls as C import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsGenerator.qml b/pages/settings/PageSettingsGenerator.qml index 7b6cf6d06..80c70c4c7 100644 --- a/pages/settings/PageSettingsGenerator.qml +++ b/pages/settings/PageSettingsGenerator.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -27,7 +27,7 @@ Page { ListNavigationItem { //% "Conditions" text: qsTrId("page_settings_generator_conditions") - onClicked: Global.pageManager.pushPage("/pages/settings/PageGeneratorConditions.qml", { title: text, bindPrefix: root.settingsBindPrefix, startStopBindPrefix: root.startStopBindPrefix }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageGeneratorConditions.qml", { title: text, bindPrefix: root.settingsBindPrefix, startStopBindPrefix: root.startStopBindPrefix }) } ListSpinBox { @@ -131,7 +131,7 @@ Page { ListNavigationItem { //% "Run time and service" text: qsTrId("page_settings_generator_run_time_and_service") - onClicked: Global.pageManager.pushPage("/pages/settings/PageGeneratorRuntimeService.qml", + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageGeneratorRuntimeService.qml", { title: text, settingsBindPrefix: root.settingsBindPrefix, diff --git a/pages/settings/PageSettingsGpsList.qml b/pages/settings/PageSettingsGpsList.qml index c0b9d6c43..beec9aa0b 100644 --- a/pages/settings/PageSettingsGpsList.qml +++ b/pages/settings/PageSettingsGpsList.qml @@ -47,7 +47,7 @@ Page { : "--" onClicked: { - Global.pageManager.pushPage("/pages/settings/PageGps.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageGps.qml", {"title": text, bindPrefix: model.uid }) } diff --git a/pages/settings/PageSettingsGsm.qml b/pages/settings/PageSettingsGsm.qml index 1dacfe639..7c1f55169 100644 --- a/pages/settings/PageSettingsGsm.qml +++ b/pages/settings/PageSettingsGsm.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsHub4.qml b/pages/settings/PageSettingsHub4.qml index c792561dc..08c5564e5 100644 --- a/pages/settings/PageSettingsHub4.qml +++ b/pages/settings/PageSettingsHub4.qml @@ -266,7 +266,7 @@ Page { visible: defaultVisible && essMode.value !== VenusOS.Ess_Hub4ModeState_Disabled onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsHub4Feedin.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsHub4Feedin.qml", { title: text, hub4Mode: Qt.binding(function() { return essMode.value }) }) } } @@ -304,7 +304,7 @@ Page { && Global.systemSettings.canAccess(VenusOS.User_AccessType_Service) onClicked: { - Global.pageManager.pushPage("/pages/settings/PageHub4Debug.qml") + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageHub4Debug.qml") } } } diff --git a/pages/settings/PageSettingsIo.qml b/pages/settings/PageSettingsIo.qml index 41bc7e4e3..1452846f7 100644 --- a/pages/settings/PageSettingsIo.qml +++ b/pages/settings/PageSettingsIo.qml @@ -6,7 +6,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil import net.connman 0.1 -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -113,7 +113,7 @@ Page { text: qsTrId("settings_io_bt_sensors") visible: Connman.technologyList.indexOf("bluetooth") !== -1 onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsBleSensors.qml", {"title": text}) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsBleSensors.qml", {"title": text}) } } } diff --git a/pages/settings/PageSettingsLogger.qml b/pages/settings/PageSettingsLogger.qml index 1e21145f1..e32b69e65 100644 --- a/pages/settings/PageSettingsLogger.qml +++ b/pages/settings/PageSettingsLogger.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsModbusTcp.qml b/pages/settings/PageSettingsModbusTcp.qml index 60d1f35a5..e4adea11e 100644 --- a/pages/settings/PageSettingsModbusTcp.qml +++ b/pages/settings/PageSettingsModbusTcp.qml @@ -58,7 +58,7 @@ Page { //% "Available services" text: qsTrId("settings_modbus_available_services") visible: enableModbusTcp.checked - onClicked: Global.pageManager.pushPage("/pages/settings/PageSettingsModbusTcpServices.qml", { title: text }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsModbusTcpServices.qml", { title: text }) } } } diff --git a/pages/settings/PageSettingsRelay.qml b/pages/settings/PageSettingsRelay.qml index 90ecdef4f..0d5a49734 100644 --- a/pages/settings/PageSettingsRelay.qml +++ b/pages/settings/PageSettingsRelay.qml @@ -108,7 +108,7 @@ Page { visible: relayFunction.currentValue === VenusOS.Relay_Function_Temperature || relay1Function.currentValue === VenusOS.Relay_Function_Temperature onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsRelayTempSensors.qml", { title: text }) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsRelayTempSensors.qml", { title: text }) } } } diff --git a/pages/settings/PageSettingsRelayTempSensors.qml b/pages/settings/PageSettingsRelayTempSensors.qml index b11716e1f..64f0bed67 100644 --- a/pages/settings/PageSettingsRelayTempSensors.qml +++ b/pages/settings/PageSettingsRelayTempSensors.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsRvcDevice.qml b/pages/settings/PageSettingsRvcDevice.qml index f206eb211..1528d36a4 100644 --- a/pages/settings/PageSettingsRvcDevice.qml +++ b/pages/settings/PageSettingsRvcDevice.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -67,7 +67,7 @@ Page { visible: root.isLocalSender && userHasWriteAccess onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsRvcDeviceConfiguration.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsRvcDeviceConfiguration.qml", { bindPrefix: root.bindPrefix, title: text }) } } diff --git a/pages/settings/PageSettingsRvcDevices.qml b/pages/settings/PageSettingsRvcDevices.qml index 835fc8831..5093680dc 100644 --- a/pages/settings/PageSettingsRvcDevices.qml +++ b/pages/settings/PageSettingsRvcDevices.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -47,7 +47,7 @@ Page { secondaryText: Utils.toHexFormat(nad.value) onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsRvcDevice.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsRvcDevice.qml", { bindPrefix: model.uid, title: modelName.value || "" }) } diff --git a/pages/settings/PageSettingsServices.qml b/pages/settings/PageSettingsServices.qml index b8afcaffe..5de6f089a 100644 --- a/pages/settings/PageSettingsServices.qml +++ b/pages/settings/PageSettingsServices.qml @@ -16,7 +16,7 @@ Page { secondaryText: modbus.value === 1 ? CommonWords.enabled : CommonWords.disabled showAccessLevel: VenusOS.User_AccessType_Installer onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsModbusTcp.qml", { title: text }) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsModbusTcp.qml", { title: text }) } DataPoint { diff --git a/pages/settings/PageSettingsSystem.qml b/pages/settings/PageSettingsSystem.qml index 830e670a4..57f640338 100644 --- a/pages/settings/PageSettingsSystem.qml +++ b/pages/settings/PageSettingsSystem.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -143,14 +143,14 @@ Page { ListNavigationItem { //% "Battery Measurements" text: qsTrId("settings_system_battery_measurements") - onClicked: Global.pageManager.pushPage("/pages/settings/PageSettingsBatteries.qml", { title: text }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsBatteries.qml", { title: text }) } ListNavigationItem { //% "System Status" text: qsTrId("settings_system_system_status") showAccessLevel: VenusOS.User_AccessType_SuperUser - onClicked: Global.pageManager.pushPage("/pages/settings/PageSettingsSystemStatus.qml", { title: text }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsSystemStatus.qml", { title: text }) } } } diff --git a/pages/settings/PageSettingsSystemStatus.qml b/pages/settings/PageSettingsSystemStatus.qml index bcc95c1db..96416c420 100644 --- a/pages/settings/PageSettingsSystemStatus.qml +++ b/pages/settings/PageSettingsSystemStatus.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsTankPump.qml b/pages/settings/PageSettingsTankPump.qml index bae50d530..f2b39ff43 100644 --- a/pages/settings/PageSettingsTankPump.qml +++ b/pages/settings/PageSettingsTankPump.qml @@ -4,7 +4,7 @@ import QtQuick import Victron.VenusOS -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsTcpIp.qml b/pages/settings/PageSettingsTcpIp.qml index 6d73e3056..ef98730f4 100644 --- a/pages/settings/PageSettingsTcpIp.qml +++ b/pages/settings/PageSettingsTcpIp.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import net.connman 0.1 -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsVecanDevices.qml b/pages/settings/PageSettingsVecanDevices.qml index 9059af2cf..1aa4cd22f 100644 --- a/pages/settings/PageSettingsVecanDevices.qml +++ b/pages/settings/PageSettingsVecanDevices.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Controls.impl as CP import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -59,7 +59,7 @@ Page { parent: listDelegate.backgroundRect anchors.fill: parent onClicked: { - Global.pageManager.pushPage("/pages/settings/PageSettingsVecanDevice.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsVecanDevice.qml", { bindPrefix: model.uid, title: text }) } } diff --git a/pages/settings/PageSettingsWifi.qml b/pages/settings/PageSettingsWifi.qml index 6807a247d..d495e9a08 100644 --- a/pages/settings/PageSettingsWifi.qml +++ b/pages/settings/PageSettingsWifi.qml @@ -7,7 +7,7 @@ import QtQuick.Controls as C import QtQuick.Controls.impl as CP import Victron.VenusOS import net.connman 0.1 -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root diff --git a/pages/settings/PageSettingsWifiWithAccessPoint.qml b/pages/settings/PageSettingsWifiWithAccessPoint.qml index ebe3a2afa..32595e8b5 100644 --- a/pages/settings/PageSettingsWifiWithAccessPoint.qml +++ b/pages/settings/PageSettingsWifiWithAccessPoint.qml @@ -37,7 +37,7 @@ Page { ListNavigationItem { //% "Wi-Fi networks" text: qsTrId("settings_wifi_networks") - onClicked: Global.pageManager.pushPage("/pages/settings/PageSettingsWifi.qml", { title: text }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsWifi.qml", { title: text }) } } } diff --git a/pages/settings/PageTzInfo.qml b/pages/settings/PageTzInfo.qml index 315201d55..222511a91 100644 --- a/pages/settings/PageTzInfo.qml +++ b/pages/settings/PageTzInfo.qml @@ -4,7 +4,6 @@ import QtQuick import Victron.VenusOS -import "tz" Page { id: root diff --git a/pages/settings/PageVrmDeviceInstances.qml b/pages/settings/PageVrmDeviceInstances.qml index 988c4d9fe..d344cb8d4 100644 --- a/pages/settings/PageVrmDeviceInstances.qml +++ b/pages/settings/PageVrmDeviceInstances.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Controls as C import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils // Allows VRM instances to be changed for devices on the system. // diff --git a/pages/settings/debug/PageDebug.qml b/pages/settings/debug/PageDebug.qml index d8dd50f3e..97141c66a 100644 --- a/pages/settings/debug/PageDebug.qml +++ b/pages/settings/debug/PageDebug.qml @@ -31,34 +31,34 @@ Page { ListNavigationItem { text: "Power" - onClicked: Global.pageManager.pushPage("/pages/settings/debug/PagePowerDebug.qml", { title: text }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/debug/PagePowerDebug.qml", { title: text }) } ListNavigationItem { text: "System data" - onClicked: Global.pageManager.pushPage("/pages/settings/debug/PageSystemData.qml", { title: text }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/debug/PageSystemData.qml", { title: text }) } ListNavigationItem { text: "Test" - onClicked: Global.pageManager.pushPage("/pages/settings/debug/PageSettingsDemo.qml", { title: text }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/debug/PageSettingsDemo.qml", { title: text }) } ListNavigationItem { text: "Values" - onClicked: Global.pageManager.pushPage("/pages/settings/debug/PageDebugVeQItems.qml", { title: text }) + onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/debug/PageDebugVeQItems.qml", { title: text }) } ListNavigationItem { text: "glibc memory" // TODO implement when venus-platform provides equivalent of vePlatform.getMemInfo() - // onClicked: Global.pageManager.pushPage("/pages/settings/debug/PageDebugMemoryLibc.qml", { title: text }) + // onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/debug/PageDebugMemoryLibc.qml", { title: text }) } ListNavigationItem { text: "Qt memory" // TODO implement when venus-platform provides equivalent of QuickView.imageCacheSize() - // onClicked: Global.pageManager.pushPage("/pages/settings/debug/PageDebugMemoryQt.qml", { title: text }) + // onClicked: Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/debug/PageDebugMemoryQt.qml", { title: text }) } } } diff --git a/pages/settings/debug/PageDebugVeQItems.qml b/pages/settings/debug/PageDebugVeQItems.qml index 16356cda2..276e56e31 100644 --- a/pages/settings/debug/PageDebugVeQItems.qml +++ b/pages/settings/debug/PageDebugVeQItems.qml @@ -34,7 +34,7 @@ Page { enabled: subModel.rowCount > 0 onClicked: { - Global.pageManager.pushPage("/pages/settings/debug/PageDebugVeQItems.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/debug/PageDebugVeQItems.qml", { title: text, bindPrefix: model.uid }) } diff --git a/pages/settings/devicelist/DeviceListPage.qml b/pages/settings/devicelist/DeviceListPage.qml index 84604c862..c347734c1 100644 --- a/pages/settings/devicelist/DeviceListPage.qml +++ b/pages/settings/devicelist/DeviceListPage.qml @@ -8,7 +8,7 @@ import QtQuick import QtQuick.Controls.impl as CP import Victron.VenusOS -import "/components/Units.js" as Units +import Victron.Units Page { id: root @@ -29,7 +29,7 @@ Page { summary = [ Global.system.systemStateToText(device.state) ] } else if (serviceType === "multi") { - url = "/pages/settings/devicelist/PageNotYetImplemented.qml" + url = "qrc:/qt/qml/Victron/VenusOS/pages/settings/devicelist/PageNotYetImplemented.qml" params = { "bindPrefix" : device.serviceUid } summary = [ Global.system.systemStateToText(device.state) ] @@ -41,7 +41,7 @@ Page { ] } else if (serviceType === "solarcharger") { - url = "/pages/solar/SolarChargerPage.qml" + url = "qrc:/qt/qml/Victron/VenusOS/pages/solar/SolarChargerPage.qml" params = { "solarCharger" : device } summary = [ device.errorCode <= 0 @@ -51,17 +51,17 @@ Page { ] } else if (serviceType === "pvinverter") { - url = "/pages/solar/PvInverterPage.qml" + url = "qrc:/qt/qml/Victron/VenusOS/pages/solar/PvInverterPage.qml" params = { "pvInverter" : device } summary = [ Units.getCombinedDisplayText(VenusOS.Units_Watt, device.power) ] } else if (serviceType === "charger") { - url = "/pages/settings/devicelist/PageNotYetImplemented.qml" + url = "qrc:/qt/qml/Victron/VenusOS/pages/settings/devicelist/PageNotYetImplemented.qml" params = { "bindPrefix" : device.serviceUid } summary = [ Global.system.systemStateToText(device.state) ] } else if (serviceType === "tank") { - url = "/pages/settings/devicelist/tank/PageTankSensor.qml" + url = "qrc:/qt/qml/Victron/VenusOS/pages/settings/devicelist/tank/PageTankSensor.qml" params = { "title": device.name, "bindPrefix" : device.serviceUid } if (device.status === VenusOS.Tank_Status_Ok) { @@ -96,7 +96,7 @@ Page { } } else if (serviceType === "motordrive") { - url = "/pages/settings/devicelist/PageNotYetImplemented.qml" + url = "qrc:/qt/qml/Victron/VenusOS/pages/settings/devicelist/PageNotYetImplemented.qml" params = { "bindPrefix" : device.serviceUid } summary = [ Units.getCombinedDisplayText(VenusOS.Units_RevolutionsPerMinute, device.motorRpm) ] @@ -122,7 +122,7 @@ Page { summary = [ Global.digitalInputs.inputStateToText(device.state) ] } else if (serviceType === "evcharger") { - url = "/pages/evcs/EvChargerPage.qml" + url = "qrc:/qt/qml/Victron/VenusOS/pages/evcs/EvChargerPage.qml" params = { "evCharger" : device } const evChargerModeText = Global.evChargers.chargerModeToText(device.mode) @@ -146,7 +146,7 @@ Page { //: Device is not supported //% "Unsupported" summary = [ qsTrId("devicelist_unsupported") ] - url = "/pages/settings/devicelist/PageUnsupportedDevice.qml" + url = "qrc:/qt/qml/Victron/VenusOS/pages/settings/devicelist/PageUnsupportedDevice.qml" params = { "bindPrefix": device.serviceUid } } else if (serviceType === "meteo") { diff --git a/pages/settings/devicelist/PageNotYetImplemented.qml b/pages/settings/devicelist/PageNotYetImplemented.qml index 4b40e9cbe..884d61460 100644 --- a/pages/settings/devicelist/PageNotYetImplemented.qml +++ b/pages/settings/devicelist/PageNotYetImplemented.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -22,7 +22,7 @@ Page { ListNavigationItem { text: CommonWords.device_info_title onClicked: { - Global.pageManager.pushPage("/pages/settings/PageDeviceInfo.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageDeviceInfo.qml", { "title": text, "bindPrefix": root.bindPrefix }) } } diff --git a/pages/settings/devicelist/PageUnsupportedDevice.qml b/pages/settings/devicelist/PageUnsupportedDevice.qml index b9c1b58d7..1f99b885c 100644 --- a/pages/settings/devicelist/PageUnsupportedDevice.qml +++ b/pages/settings/devicelist/PageUnsupportedDevice.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Utils.js" as Utils +import Victron.Utils Page { id: root @@ -23,7 +23,7 @@ Page { ListNavigationItem { text: CommonWords.device_info_title onClicked: { - Global.pageManager.pushPage("/pages/settings/PageDeviceInfo.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageDeviceInfo.qml", { "title": text, "bindPrefix": root.bindPrefix }) } } diff --git a/pages/settings/devicelist/tank/PageTankAlarm.qml b/pages/settings/devicelist/tank/PageTankAlarm.qml index 888dea4d4..95c06a2ed 100644 --- a/pages/settings/devicelist/tank/PageTankAlarm.qml +++ b/pages/settings/devicelist/tank/PageTankAlarm.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Units.js" as Units +import Victron.Units Page { id: root diff --git a/pages/settings/devicelist/tank/PageTankSensor.qml b/pages/settings/devicelist/tank/PageTankSensor.qml index a2ac61793..90d4b01fd 100644 --- a/pages/settings/devicelist/tank/PageTankSensor.qml +++ b/pages/settings/devicelist/tank/PageTankSensor.qml @@ -5,7 +5,7 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Units.js" as Units +import Victron.Units Page { id: root @@ -71,7 +71,7 @@ Page { ListNavigationItem { text: CommonWords.setup onClicked: { - Global.pageManager.pushPage("/pages/settings/devicelist/tank/PageTankSetup.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/devicelist/tank/PageTankSetup.qml", { "title": text, "bindPrefix": root.bindPrefix }) } } @@ -79,7 +79,7 @@ Page { ListNavigationItem { text: CommonWords.device_info_title onClicked: { - Global.pageManager.pushPage("/pages/settings/PageDeviceInfo.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageDeviceInfo.qml", { "title": text, "bindPrefix": root.bindPrefix }) } } diff --git a/pages/settings/devicelist/tank/PageTankSetup.qml b/pages/settings/devicelist/tank/PageTankSetup.qml index d3c038dc8..cc050a77c 100644 --- a/pages/settings/devicelist/tank/PageTankSetup.qml +++ b/pages/settings/devicelist/tank/PageTankSetup.qml @@ -5,8 +5,8 @@ import QtQuick import Victron.VenusOS import Victron.Veutil -import "/components/Units.js" as Units -import "/components/Gauges.js" as Gauges +import Victron.Units +import Victron.Gauges Page { id: root @@ -131,7 +131,7 @@ Page { visible: shape.seen onClicked: { - Global.pageManager.pushPage("/pages/settings/devicelist/tank/PageTankShape.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/devicelist/tank/PageTankShape.qml", { "title": text, "bindPrefix": root.bindPrefix }) } @@ -163,7 +163,7 @@ Page { visible: low.seen onClicked: { - Global.pageManager.pushPage("/pages/settings/devicelist/tank/PageTankAlarm.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/devicelist/tank/PageTankAlarm.qml", { "title": text, "bindPrefix": root.bindPrefix + "/Alarms/Low" }) } @@ -178,7 +178,7 @@ Page { visible: high.seen onClicked: { - Global.pageManager.pushPage("/pages/settings/devicelist/tank/PageTankAlarm.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/devicelist/tank/PageTankAlarm.qml", { "title": text, "bindPrefix": root.bindPrefix + "/Alarms/High" }) } diff --git a/pages/settings/devicelist/tank/PageTankShape.qml b/pages/settings/devicelist/tank/PageTankShape.qml index 8ed7eb895..8f46fe1bf 100644 --- a/pages/settings/devicelist/tank/PageTankShape.qml +++ b/pages/settings/devicelist/tank/PageTankShape.qml @@ -6,7 +6,7 @@ import QtQuick import QtQuick.Controls.impl as CP import Victron.VenusOS import Victron.Veutil -import "/components/Units.js" as Units +import Victron.Units Page { id: root diff --git a/pages/solar/PvInverterPage.qml b/pages/solar/PvInverterPage.qml index 4045ec0fc..3d3d8efaa 100644 --- a/pages/solar/PvInverterPage.qml +++ b/pages/solar/PvInverterPage.qml @@ -118,7 +118,7 @@ Page { ListNavigationItem { text: CommonWords.device_info_title onClicked: { - Global.pageManager.pushPage("/pages/settings/PageDeviceInfo.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageDeviceInfo.qml", { "title": text, "bindPrefix": root.pvInverter.serviceUid }) } } diff --git a/pages/solar/SolarChargerPage.qml b/pages/solar/SolarChargerPage.qml index 6566afbdf..00c2af237 100644 --- a/pages/solar/SolarChargerPage.qml +++ b/pages/solar/SolarChargerPage.qml @@ -130,7 +130,7 @@ Page { || root.solarCharger.errorModel.count onClicked: { - Global.pageManager.pushPage("/pages/solar/SolarChargerAlarmsAndErrorsPage.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/solar/SolarChargerAlarmsAndErrorsPage.qml", { "title": text, "solarCharger": root.solarCharger }) } @@ -152,7 +152,7 @@ Page { //: Solar charger historic data information. %1 = charger name //% "%1 History" const title = qsTrId("charger_history_name").arg(root.solarCharger.name) - Global.pageManager.pushPage("/pages/solar/SolarChargerHistoryPage.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/solar/SolarChargerHistoryPage.qml", { "title": title, "solarCharger": root.solarCharger }) } } @@ -161,7 +161,7 @@ Page { //% "Networked operation" text: qsTrId("charger_networked_operation") onClicked: { - Global.pageManager.pushPage("/pages/solar/SolarChargerNetworkedOperationPage.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/solar/SolarChargerNetworkedOperationPage.qml", { "title": text, "solarCharger": root.solarCharger }) } } @@ -169,7 +169,7 @@ Page { ListNavigationItem { text: CommonWords.device_info_title onClicked: { - Global.pageManager.pushPage("/pages/settings/PageDeviceInfo.qml", + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/settings/PageDeviceInfo.qml", { "title": text, "bindPrefix": root.solarCharger.serviceUid }) } } diff --git a/pages/solar/SolarDeviceListPage.qml b/pages/solar/SolarDeviceListPage.qml index db5c7efd0..7f88fdbe8 100644 --- a/pages/solar/SolarDeviceListPage.qml +++ b/pages/solar/SolarDeviceListPage.qml @@ -72,9 +72,9 @@ Page { onClicked: { if (solarCharger) { - Global.pageManager.pushPage("/pages/solar/SolarChargerPage.qml", { "solarCharger": solarCharger }) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/solar/SolarChargerPage.qml", { "solarCharger": solarCharger }) } else { - Global.pageManager.pushPage("/pages/solar/PvInverterPage.qml", { "pvInverter": pvInverter }) + Global.pageManager.pushPage("qrc:/qt/qml/Victron/VenusOS/pages/solar/PvInverterPage.qml", { "pvInverter": pvInverter }) } } diff --git a/qml.qrc b/qml.qrc deleted file mode 100644 index d100a745e..000000000 --- a/qml.qrc +++ /dev/null @@ -1,480 +0,0 @@ - - - main.qml - ApplicationContent.qml - Global.qml - FrameRateVisualizer.qml - components/AcceptButtonBackground.qml - components/Arc.qml - components/ArcGauge.qml - components/ArcGaugeQuantityLabel.qml - components/AsymmetricRoundedRectangle.qml - components/ButtonControlValue.qml - components/CircularMultiGauge.qml - components/CircularSingleGauge.qml - components/CommonWords.qml - components/ControlCard.qml - components/ControlValue.qml - components/DataPoint.qml - components/Device.qml - components/ElectricalQuantityLabel.qml - components/EnvironmentGauge.qml - components/EnvironmentGaugePanel.qml - components/ExpandedTanksView.qml - components/FirmwareUpdate.qml - components/FixedWidthLabel.qml - components/Gauges.js - components/GaugeModel.qml - components/EvChargerStatusModel.qml - components/GeneratorIconLabel.qml - components/GradientListView.qml - components/GsmStatusIcon.qml - components/IconButton.qml - components/InputPanel.qml - components/LoadGraph.qml - components/LoadGraphShapePath.qml - components/NavBar.qml - components/NavButton.qml - components/NotificationDelegate.qml - components/NotificationsView.qml - components/Page.qml - components/PageStack.qml - components/ProgressArc.qml - components/QuantityLabel.qml - components/QuantityTableSummary.qml - components/QuantityTable.qml - components/RadioButtonControlValue.qml - components/ScaledArc.qml - components/ScaledArcGauge.qml - components/SegmentedButtonRow.qml - components/SeparatorBar.qml - components/ShinyProgressArc.qml - components/SideGauge.qml - components/SolarDetailBox.qml - components/SolarHistoryChart.qml - components/SolarHistoryErrorView.qml - components/SolarHistoryTableView.qml - components/SolarYieldGauge.qml - components/SolarYieldGraph.qml - components/SolarYieldModel.qml - components/SplashView.qml - components/StatusBar.qml - components/SwitchControlValue.qml - components/TabBar.qml - components/TankGauge.qml - components/TankGaugeGroup.qml - components/ThreePhaseDisplay.qml - components/TimeSelector.qml - components/ToastNotification.qml - components/Units.js - components/Utils.js - components/ValueRange.qml - components/VenusFont.qml - components/VerticalGauge.qml - components/ViewGradient.qml - components/ClassAndVrmInstance.qml - components/WeatherDetails.qml - components/controls/Button.qml - components/controls/ComboBox.qml - components/controls/Label.qml - components/controls/ListItemButton.qml - components/controls/ProgressBar.qml - components/controls/RadioButton.qml - components/controls/ScrollBar.qml - components/controls/Slider.qml - components/controls/SpinBox.qml - components/controls/Switch.qml - components/controls/TextField.qml - components/dialogs/DateSelectorDialog.qml - components/dialogs/DialogShadow.qml - components/dialogs/VrmInstanceSwapDialog.qml - components/dialogs/ESSMinimumSOCDialog.qml - components/dialogs/GeneratorStartDialog.qml - components/dialogs/GeneratorStopDialog.qml - components/dialogs/InverterChargerModeDialog.qml - components/dialogs/ModalDialog.qml - components/dialogs/ModalWarningDialog.qml - components/dialogs/NumberSelectorDialog.qml - components/dialogs/SolarDailyHistoryDialog.qml - components/dialogs/TimeSelectorDialog.qml - components/listitems/ListAlarm.qml - components/listitems/ListButton.qml - components/listitems/ListDateSelector.qml - components/listitems/ListIpAddressField.qml - components/listitems/ListItem.qml - components/listitems/ListItemBackground.qml - components/listitems/ListLabel.qml - components/listitems/ListNavigationItem.qml - components/listitems/ListPortField.qml - components/listitems/ListRadioButton.qml - components/listitems/ListRadioButtonGroup.qml - components/listitems/ListQuantityGroup.qml - components/listitems/ListQuantityItem.qml - components/listitems/ListSlider.qml - components/listitems/ListSpinBox.qml - components/listitems/ListSwitch.qml - components/listitems/ListTextField.qml - components/listitems/ListTextGroup.qml - components/listitems/ListTextItem.qml - components/listitems/ListTimeSelector.qml - components/settings/CGwacsBatteryScheduleNavigationItem.qml - components/settings/FirmwareCheckListButton.qml - components/settings/ListDvccSwitch.qml - components/settings/MountStateListButton.qml - components/settings/SettingsSlider.qml - components/settings/TemperatureRelayNavigationItem.qml - components/settings/TemperatureRelaySettings.qml - components/settings/VolumeUnitRadioButtonGroup.qml - components/widgets/AcGeneratorWidget.qml - components/widgets/AcInputWidget.qml - components/widgets/AcLoadsWidget.qml - components/widgets/AlternatorWidget.qml - components/widgets/BatteryWidget.qml - components/widgets/DcGeneratorWidget.qml - components/widgets/DcInputWidget.qml - components/widgets/DcLoadsWidget.qml - components/widgets/EvcsWidget.qml - components/widgets/GridWidget.qml - components/widgets/OverviewWidget.qml - components/widgets/ShoreWidget.qml - components/widgets/SolarYieldWidget.qml - components/widgets/VeBusDeviceWidget.qml - components/widgets/WidgetConnector.qml - components/widgets/WidgetConnectorAnchor.qml - components/widgets/WidgetConnectorPath.qml - components/widgets/WidgetHeader.qml - components/widgets/WindWidget.qml - data/AcInputs.qml - data/Chargers.qml - data/Batteries.qml - data/DataManager.qml - data/DcInputs.qml - data/DigitalInputs.qml - data/EnvironmentInputs.qml - data/Ess.qml - data/EvChargers.qml - data/Generators.qml - data/Inverters.qml - data/MeteoDevices.qml - data/MotorDrives.qml - data/MultiRsDevices.qml - data/Notifications.qml - data/PulseMeters.qml - data/PvInverters.qml - data/Relays.qml - data/SolarChargers.qml - data/System.qml - data/SystemAc.qml - data/SystemDc.qml - data/SystemSettings.qml - data/Tanks.qml - data/UnsupportedDevices.qml - data/VeBusDevices.qml - data/VenusPlatform.qml - data/common/AcData.qml - data/common/AcInput.qml - data/common/AcInputSettings.qml - data/common/AcInputServiceLoader.qml - data/common/Charger.qml - data/common/Battery.qml - data/common/DcInput.qml - data/common/DigitalInput.qml - data/common/DeviceModel.qml - data/common/EnvironmentInput.qml - data/common/EssData.qml - data/common/EvCharger.qml - data/common/Generator.qml - data/common/Inverter.qml - data/common/MeteoDevice.qml - data/common/MotorDrive.qml - data/common/MultiRsDevice.qml - data/common/PulseMeter.qml - data/common/PvInverter.qml - data/common/PvMonitor.qml - data/common/Relay.qml - data/common/SolarCharger.qml - data/common/SolarDailyHistory.qml - data/common/SolarHistoryErrorModel.qml - data/common/SystemBattery.qml - data/common/SystemData.qml - data/common/Tank.qml - data/common/UnsupportedDevice.qml - data/common/VeBusDevice.qml - data/dbus/AcInputsImpl.qml - data/dbus/ChargersImpl.qml - data/dbus/BatteriesImpl.qml - data/dbus/DBusDataManager.qml - data/dbus/DcInputsImpl.qml - data/dbus/DigitalInputsImpl.qml - data/dbus/EnvironmentInputsImpl.qml - data/dbus/EssImpl.qml - data/dbus/EvChargersImpl.qml - data/dbus/GeneratorsImpl.qml - data/dbus/InvertersImpl.qml - data/dbus/MeteoDevicesImpl.qml - data/dbus/MotorDrivesImpl.qml - data/dbus/MultiRsDevicesImpl.qml - data/dbus/NotificationsImpl.qml - data/dbus/PulseMetersImpl.qml - data/dbus/PvInvertersImpl.qml - data/dbus/RelaysImpl.qml - data/dbus/SolarChargersImpl.qml - data/dbus/SystemImpl.qml - data/dbus/SystemSettingsImpl.qml - data/dbus/TanksImpl.qml - data/dbus/UnsupportedDevicesImpl.qml - data/dbus/VeBusDevicesImpl.qml - data/mock/AcInputsImpl.qml - data/mock/ChargersImpl.qml - data/mock/BatteriesImpl.qml - data/mock/DcInputsImpl.qml - data/mock/DigitalInputsImpl.qml - data/mock/EnvironmentInputsImpl.qml - data/mock/EssImpl.qml - data/mock/EvChargersImpl.qml - data/mock/GeneratorsImpl.qml - data/mock/InvertersImpl.qml - data/mock/MeteoDevicesImpl.qml - data/mock/MockDevice.qml - data/mock/MockDataManager.qml - data/mock/MotorDrivesImpl.qml - data/mock/MultiRsDevicesImpl.qml - data/mock/NotificationsImpl.qml - data/mock/PulseMetersImpl.qml - data/mock/PvInvertersImpl.qml - data/mock/RelaysImpl.qml - data/mock/SolarChargersImpl.qml - data/mock/SystemImpl.qml - data/mock/SystemSettingsImpl.qml - data/mock/TanksImpl.qml - data/mock/UnsupportedDevicesImpl.qml - data/mock/VeBusDevicesImpl.qml - data/mock/config/BriefAndOverviewPageConfig.qml - data/mock/config/LevelsPageConfig.qml - data/mock/config/MockDataSimulator.qml - data/mock/config/NotificationsPageConfig.qml - data/mock/config/SettingsPageConfig.qml - data/mqtt/AcInputsImpl.qml - data/mqtt/ChargersImpl.qml - data/mqtt/BatteriesImpl.qml - data/mqtt/DcInputsImpl.qml - data/mqtt/DigitalInputsImpl.qml - data/mqtt/EnvironmentInputsImpl.qml - data/mqtt/EssImpl.qml - data/mqtt/EvChargersImpl.qml - data/mqtt/GeneratorsImpl.qml - data/mqtt/InvertersImpl.qml - data/mqtt/MeteoDevicesImpl.qml - data/mqtt/MotorDrivesImpl.qml - data/mqtt/MqttDataManager.qml - data/mqtt/MultiRsDevicesImpl.qml - data/mqtt/NotificationsImpl.qml - data/mqtt/PulseMetersImpl.qml - data/mqtt/PvInvertersImpl.qml - data/mqtt/RelaysImpl.qml - data/mqtt/SolarChargersImpl.qml - data/mqtt/SystemImpl.qml - data/mqtt/SystemSettingsImpl.qml - data/mqtt/TanksImpl.qml - data/mqtt/UnsupportedDevicesImpl.qml - data/mqtt/VeBusDevicesImpl.qml - fonts/MuseoSans-500.otf - images/acloads.svg - images/alternator.svg - images/battery.svg - images/battery_charging.svg - images/battery_discharging.svg - images/blackWater.svg - images/brief.svg - images/cloud.svg - images/consumption.svg - images/dcloads.svg - images/dropdown.svg - images/electron.svg - images/ess.svg - images/freshWater.svg - images/freshWater20x27.svg - images/fuel.svg - images/fueltank.svg - images/gauge_intro_5_matte_black.gif - images/gauge_intro_5_matte_white.gif - images/gauge_intro_7_matte_black.gif - images/gauge_intro_7_matte_white.gif - images/generator.svg - images/grid.svg - images/icon_simlocked_32.svg - images/icon_alarm_48.svg - images/icon_alarm_snooze_24 - images/icon_autostart_24.svg - images/icon_back_32.svg - images/icon_charging_station_24.svg - images/icon_checkmark_32.svg - images/icon_checkmark_48.svg - images/icon_controls_off_32.svg - images/icon_controls_on_32.svg - images/icon_humidity_32.svg - images/icon_hydraulic_oil_32.svg - images/icon_input_24.svg - images/icon_lng_32.svg - images/icon_lpg_32.svg - images/icon_manualstart_24.svg - images/icon_manualstart_timer_24.svg - images/icon_minus.svg - images/icon_plus.svg - images/icon_raw_water_32.svg - images/icon_refresh_32.svg - images/icon_sidepanel_off_32.svg - images/icon_sidepanel_on_32.svg - images/icon_temp_32.svg - images/information.svg - images/inverter.svg - images/inverter_charger.svg - images/levels.svg - images/liveWell.svg - images/notifications.svg - images/oil.svg - images/overview.svg - images/rain.svg - images/scatteredcloud.svg - images/settings.png - images/settings.svg - images/shore.svg - images/solaryield.svg - images/splash-logo-icon-5inch.svg - images/splash-logo-icon-7inch.svg - images/splash-logo-text-5inch.svg - images/splash-logo-text-7inch.svg - images/sunny.svg - images/switch_indicator.png - images/switches.svg - images/tank.svg - images/toast_icon_alarm.svg - images/toast_icon_checkmark.svg - images/toast_icon_close.svg - images/toast_icon_info.svg - images/wasteWater.svg - images/widget_connector_nub_horizontal.svg - images/widget_connector_nub_vertical.svg - images/wind.svg - pages/BriefMonitorPanel.qml - pages/BriefPage.qml - pages/ControlCardsPage.qml - pages/EnvironmentTab.qml - pages/LevelsPage.qml - pages/MainView.qml - pages/NotificationLayer.qml - pages/NotificationsPage.qml - pages/OverviewPage.qml - pages/PageManager.qml - pages/SettingsPage.qml - pages/TanksTab.qml - pages/controlcards/ESSCard.qml - pages/controlcards/GeneratorCard.qml - pages/controlcards/SwitchesCard.qml - pages/controlcards/VeBusDeviceCard.qml - pages/evcs/EvChargerListPage.qml - pages/evcs/EvChargerPage.qml - pages/evcs/EvChargerSetupPage.qml - pages/settings/DvccCommonSettings.qml - pages/settings/GeneratorCondition.qml - pages/settings/IpAddressListView.qml - pages/settings/PageCanbusStatus.qml - pages/settings/PageChargeCurrentLimits.qml - pages/settings/PageDeviceInfo.qml - pages/settings/PageGenerator.qml - pages/settings/PageGeneratorAcLoad.qml - pages/settings/PageGeneratorConditions.qml - pages/settings/PageGeneratorRuntimeService.qml - pages/settings/PageGeneratorTestRun.qml - pages/settings/PageGps.qml - pages/settings/PageHub4Debug.qml - pages/settings/PageRelayGenerator.qml - pages/settings/PageSettingsBatteries.qml - pages/settings/PageSettingsBleSensors.qml - pages/settings/PageSettingsBluetooth.qml - pages/settings/PageSettingsCGwacs.qml - pages/settings/PageSettingsCGwacsOverview.qml - pages/settings/PageSettingsCanbus.qml - pages/settings/PageSettingsDisplay.qml - pages/settings/PageSettingsDisplayBrief.qml - pages/settings/PageSettingsDisplayUnits.qml - pages/settings/PageSettingsDvcc.qml - pages/settings/PageSettingsFirmware.qml - pages/settings/PageSettingsFirmwareOffline.qml - pages/settings/PageSettingsFirmwareOnline.qml - pages/settings/PageSettingsFronius.qml - pages/settings/PageSettingsFroniusInverter.qml - pages/settings/PageSettingsFroniusInverters.qml - pages/settings/PageSettingsFroniusSetIpAddresses.qml - pages/settings/PageSettingsFroniusShowIpAddresses.qml - pages/settings/PageSettingsGeneral.qml - pages/settings/PageSettingsGenerator.qml - pages/settings/PageSettingsGpsList.qml - pages/settings/PageSettingsGsm.qml - pages/settings/PageSettingsHub4.qml - pages/settings/PageSettingsHub4Feedin.qml - pages/settings/PageSettingsIo.qml - pages/settings/PageSettingsLarge.qml - pages/settings/PageSettingsLogger.qml - pages/settings/PageSettingsModbusTcp.qml - pages/settings/PageSettingsModbusTcpServices.qml - pages/settings/PageSettingsRelay.qml - pages/settings/PageSettingsRelayTempSensors.qml - pages/settings/PageSettingsRemoteConsole.qml - pages/settings/PageSettingsRootfsSelect.qml - pages/settings/PageSettingsRvcDevice.qml - pages/settings/PageSettingsRvcDeviceConfiguration.qml - pages/settings/PageSettingsRvcDevices.qml - pages/settings/PageSettingsServices.qml - pages/settings/PageSettingsSystem.qml - pages/settings/PageSettingsSystemStatus.qml - pages/settings/PageSettingsTankPump.qml - pages/settings/PageSettingsTcpIp.qml - pages/settings/PageSettingsVecanDevice.qml - pages/settings/PageSettingsVecanDevices.qml - pages/settings/PageSettingsWifi.qml - pages/settings/PageSettingsWifiWithAccessPoint.qml - pages/settings/PageTzInfo.qml - pages/settings/PageVrmDeviceInstances.qml - pages/settings/debug/HubData.qml - pages/settings/debug/ObjectAcConnection.qml - pages/settings/debug/PageDebug.qml - pages/settings/debug/PageDebugVeQItems.qml - pages/settings/debug/PagePowerDebug.qml - pages/settings/debug/PageSettingsDemo.qml - pages/settings/debug/PageSystemData.qml - pages/settings/devicelist/DeviceListPage.qml - pages/settings/devicelist/PageNotYetImplemented.qml - pages/settings/devicelist/PageUnsupportedDevice.qml - pages/settings/devicelist/tank/PageTankAlarm.qml - pages/settings/devicelist/tank/PageTankSensor.qml - pages/settings/devicelist/tank/PageTankSetup.qml - pages/settings/devicelist/tank/PageTankShape.qml - pages/settings/tz/TzAfricaData.qml - pages/settings/tz/TzAmericaData.qml - pages/settings/tz/TzAntarcticaData.qml - pages/settings/tz/TzArcticData.qml - pages/settings/tz/TzAsiaData.qml - pages/settings/tz/TzAtlanticData.qml - pages/settings/tz/TzAustraliaData.qml - pages/settings/tz/TzEtcData.qml - pages/settings/tz/TzEuropeData.qml - pages/settings/tz/TzIndianData.qml - pages/settings/tz/TzPacificData.qml - pages/solar/PvInverterPage.qml - pages/solar/SolarChargerAlarmsAndErrorsPage.qml - pages/solar/SolarChargerNetworkedOperationPage.qml - pages/solar/SolarChargerPage.qml - pages/solar/SolarChargerHistoryPage.qml - pages/solar/SolarDeviceListPage.qml - themes/animation/Animation.json - themes/color/ColorDesign.json - themes/color/Dark.json - themes/color/Light.json - themes/geometry/FiveInch.json - themes/geometry/SevenInch.json - themes/typography/FiveInch.json - themes/typography/SevenInch.json - themes/typography/TypographyDesign.json - - diff --git a/src/main.cpp b/src/main.cpp index 24b0c8c9a..74771e71a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -253,12 +253,7 @@ void registerQmlTypes() qmlRegisterSingletonType( "Victron.VenusOS", 2, 0, "VenusOS", &Victron::VenusOS::Enums::instance); - qmlRegisterSingletonType(QUrl(QStringLiteral("qrc:/components/VenusFont.qml")), - "Victron.VenusOS", 2, 0, "VenusFont"); - qmlRegisterSingletonType(QUrl(QStringLiteral("qrc:/components/CommonWords.qml")), - "Victron.VenusOS", 2, 0, "CommonWords"); - qmlRegisterSingletonType(QUrl(QStringLiteral("qrc:/Global.qml")), - "Victron.VenusOS", 2, 0, "Global"); + qmlRegisterSingletonType( "Victron.VenusOS", 2, 0, "ActiveNotificationsModel", [](QQmlEngine *, QJSEngine *) -> QObject * { @@ -284,364 +279,6 @@ void registerQmlTypes() qmlRegisterType("Victron.VenusOS", 2, 0, "BaseDeviceModel"); qmlRegisterType("Victron.VenusOS", 2, 0, "AggregateDeviceModel"); - /* main content */ - qmlRegisterType(QUrl(QStringLiteral("qrc:/ApplicationContent.qml")), - "Victron.VenusOS", 2, 0, "ApplicationContent"); - - /* data sources */ - qmlRegisterType(QUrl(QStringLiteral("qrc:/data/DataManager.qml")), - "Victron.VenusOS", 2, 0, "DataManager"); - - /* controls */ - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/Button.qml")), - "Victron.VenusOS", 2, 0, "Button"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/ComboBox.qml")), - "Victron.VenusOS", 2, 0, "ComboBox"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/ListItemButton.qml")), - "Victron.VenusOS", 2, 0, "ListItemButton"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/Label.qml")), - "Victron.VenusOS", 2, 0, "Label"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/ProgressBar.qml")), - "Victron.VenusOS", 2, 0, "ProgressBar"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/RadioButton.qml")), - "Victron.VenusOS", 2, 0, "RadioButton"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/RadioButtonIndicator.qml")), - "Victron.VenusOS", 2, 0, "RadioButtonIndicator"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/RadioButtonLabel.qml")), - "Victron.VenusOS", 2, 0, "RadioButtonLabel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/ScrollBar.qml")), - "Victron.VenusOS", 2, 0, "ScrollBar"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/Slider.qml")), - "Victron.VenusOS", 2, 0, "Slider"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/SpinBox.qml")), - "Victron.VenusOS", 2, 0, "SpinBox"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/Switch.qml")), - "Victron.VenusOS", 2, 0, "Switch"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/controls/TextField.qml")), - "Victron.VenusOS", 2, 0, "TextField"); - - /* components */ - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/AcceptButtonBackground.qml")), - "Victron.VenusOS", 2, 0, "AcceptButtonBackground"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/Arc.qml")), - "Victron.VenusOS", 2, 0, "Arc"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ArcGauge.qml")), - "Victron.VenusOS", 2, 0, "ArcGauge"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ArcGaugeQuantityLabel.qml")), - "Victron.VenusOS", 2, 0, "ArcGaugeQuantityLabel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/AsymmetricRoundedRectangle.qml")), - "Victron.VenusOS", 2, 0, "AsymmetricRoundedRectangle"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ButtonControlValue.qml")), - "Victron.VenusOS", 2, 0, "ButtonControlValue"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/CircularMultiGauge.qml")), - "Victron.VenusOS", 2, 0, "CircularMultiGauge"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/CircularSingleGauge.qml")), - "Victron.VenusOS", 2, 0, "CircularSingleGauge"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ClassAndVrmInstance.qml")), - "Victron.VenusOS", 2, 0, "ClassAndVrmInstance"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ControlCard.qml")), - "Victron.VenusOS", 2, 0, "ControlCard"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ControlValue.qml")), - "Victron.VenusOS", 2, 0, "ControlValue"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/Device.qml")), - "Victron.VenusOS", 2, 0, "Device"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/EnvironmentGauge.qml")), - "Victron.VenusOS", 2, 0, "EnvironmentGauge"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/EnvironmentGaugePanel.qml")), - "Victron.VenusOS", 2, 0, "EnvironmentGaugePanel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ExpandedTanksView.qml")), - "Victron.VenusOS", 2, 0, "ExpandedTanksView"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/GaugeModel.qml")), - "Victron.VenusOS", 2, 0, "GaugeModel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/GsmStatusIcon.qml")), - "Victron.VenusOS", 2, 0, "GsmStatusIcon"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/IconButton.qml")), - "Victron.VenusOS", 2, 0, "IconButton"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/InputPanel.qml")), - "Victron.VenusOS", 2, 0, "InputPanel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/EvChargerStatusModel.qml")), - "Victron.VenusOS", 2, 0, "EvChargerStatusModel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/FirmwareUpdate.qml")), - "Victron.VenusOS", 2, 0, "FirmwareUpdate"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/GeneratorIconLabel.qml")), - "Victron.VenusOS", 2, 0, "GeneratorIconLabel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/IpAddressButtonGroup.qml")), - "Victron.VenusOS", 2, 0, "IpAddressButtonGroup"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/TankGaugeGroup.qml")), - "Victron.VenusOS", 2, 0, "TankGaugeGroup"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/LoadGraph.qml")), - "Victron.VenusOS", 2, 0, "LoadGraph"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/LoadGraphShapePath.qml")), - "Victron.VenusOS", 2, 0, "LoadGraphShapePath"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ModalDialog.qml")), - "Victron.VenusOS", 2, 0, "ModalDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/NavBar.qml")), - "Victron.VenusOS", 2, 0, "NavBar"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/NavButton.qml")), - "Victron.VenusOS", 2, 0, "NavButton"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/NotificationDelegate.qml")), - "Victron.VenusOS", 2, 0, "NotificationDelegate"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/NotificationsView.qml")), - "Victron.VenusOS", 2, 0, "NotificationsView"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/Page.qml")), - "Victron.VenusOS", 2, 0, "Page"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/PageStack.qml")), - "Victron.VenusOS", 2, 0, "PageStack"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ProgressArc.qml")), - "Victron.VenusOS", 2, 0, "ProgressArc"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/QuantityLabel.qml")), - "Victron.VenusOS", 2, 0, "QuantityLabel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/QuantityTableSummary.qml")), - "Victron.VenusOS", 2, 0, "QuantityTableSummary"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/QuantityTable.qml")), - "Victron.VenusOS", 2, 0, "QuantityTable"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/DataPoint.qml")), - "Victron.VenusOS", 2, 0, "DataPoint"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ElectricalQuantityLabel.qml")), - "Victron.VenusOS", 2, 0, "ElectricalQuantityLabel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/FixedWidthLabel.qml")), - "Victron.VenusOS", 2, 0, "FixedWidthLabel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/GradientListView.qml")), - "Victron.VenusOS", 2, 0, "GradientListView"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/RadioButtonControlValue.qml")), - "Victron.VenusOS", 2, 0, "RadioButtonControlValue"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ScaledArc.qml")), - "Victron.VenusOS", 2, 0, "ScaledArc"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ScaledArcGauge.qml")), - "Victron.VenusOS", 2, 0, "ScaledArcGauge"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SegmentedButtonRow.qml")), - "Victron.VenusOS", 2, 0, "SegmentedButtonRow"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SeparatorBar.qml")), - "Victron.VenusOS", 2, 0, "SeparatorBar"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ShinyProgressArc.qml")), - "Victron.VenusOS", 2, 0, "ShinyProgressArc"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SideGauge.qml")), - "Victron.VenusOS", 2, 0, "SideGauge"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SolarDetailBox.qml")), - "Victron.VenusOS", 2, 0, "SolarDetailBox"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SolarHistoryChart.qml")), - "Victron.VenusOS", 2, 0, "SolarHistoryChart"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SolarHistoryErrorView.qml")), - "Victron.VenusOS", 2, 0, "SolarHistoryErrorView"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SolarHistoryTableView.qml")), - "Victron.VenusOS", 2, 0, "SolarHistoryTableView"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SolarYieldGauge.qml")), - "Victron.VenusOS", 2, 0, "SolarYieldGauge"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SolarYieldGraph.qml")), - "Victron.VenusOS", 2, 0, "SolarYieldGraph"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SolarYieldModel.qml")), - "Victron.VenusOS", 2, 0, "SolarYieldModel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/Spacer.qml")), - "Victron.VenusOS", 2, 0, "Spacer"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SplashView.qml")), - "Victron.VenusOS", 2, 0, "SplashView"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/StatusBar.qml")), - "Victron.VenusOS", 2, 0, "StatusBar"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/SwitchControlValue.qml")), - "Victron.VenusOS", 2, 0, "SwitchControlValue"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/TabBar.qml")), - "Victron.VenusOS", 2, 0, "TabBar"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/TankGauge.qml")), - "Victron.VenusOS", 2, 0, "TankGauge"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ThreePhaseDisplay.qml")), - "Victron.VenusOS", 2, 0, "ThreePhaseDisplay"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/TimeSelector.qml")), - "Victron.VenusOS", 2, 0, "TimeSelector"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ToastNotification.qml")), - "Victron.VenusOS", 2, 0, "ToastNotification"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ValueRange.qml")), - "Victron.VenusOS", 2, 0, "ValueRange"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/ViewGradient.qml")), - "Victron.VenusOS", 2, 0, "ViewGradient"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/WeatherDetails.qml")), - "Victron.VenusOS", 2, 0, "WeatherDetails"); - - /* list items */ - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListAlarm.qml")), - "Victron.VenusOS", 2, 0, "ListAlarm"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListLabel.qml")), - "Victron.VenusOS", 2, 0, "ListLabel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListButton.qml")), - "Victron.VenusOS", 2, 0, "ListButton"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListDateSelector.qml")), - "Victron.VenusOS", 2, 0, "ListDateSelector"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListItem.qml")), - "Victron.VenusOS", 2, 0, "ListItem"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListItemBackground.qml")), - "Victron.VenusOS", 2, 0, "ListItemBackground"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListTextItem.qml")), - "Victron.VenusOS", 2, 0, "ListTextItem"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListNavigationItem.qml")), - "Victron.VenusOS", 2, 0, "ListNavigationItem"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListPortField.qml")), - "Victron.VenusOS", 2, 0, "ListPortField"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListRadioButton.qml")), - "Victron.VenusOS", 2, 0, "ListRadioButton"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListRadioButtonGroup.qml")), - "Victron.VenusOS", 2, 0, "ListRadioButtonGroup"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListQuantityGroup.qml")), - "Victron.VenusOS", 2, 0, "ListQuantityGroup"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListQuantityItem.qml")), - "Victron.VenusOS", 2, 0, "ListQuantityItem"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListSlider.qml")), - "Victron.VenusOS", 2, 0, "ListSlider"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListSpinBox.qml")), - "Victron.VenusOS", 2, 0, "ListSpinBox"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListSwitch.qml")), - "Victron.VenusOS", 2, 0, "ListSwitch"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListTextField.qml")), - "Victron.VenusOS", 2, 0, "ListTextField"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListIpAddressField.qml")), - "Victron.VenusOS", 2, 0, "ListIpAddressField"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListTextGroup.qml")), - "Victron.VenusOS", 2, 0, "ListTextGroup"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/listitems/ListTimeSelector.qml")), - "Victron.VenusOS", 2, 0, "ListTimeSelector"); - - /* settings */ - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/settings/CGwacsBatteryScheduleNavigationItem.qml")), - "Victron.VenusOS", 2, 0, "CGwacsBatteryScheduleNavigationItem"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/settings/FirmwareCheckListButton.qml")), - "Victron.VenusOS", 2, 0, "FirmwareCheckListButton"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/settings/ListDvccSwitch.qml")), - "Victron.VenusOS", 2, 0, "ListDvccSwitch"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/settings/MountStateListButton.qml")), - "Victron.VenusOS", 2, 0, "MountStateListButton"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/settings/SettingsSlider.qml")), - "Victron.VenusOS", 2, 0, "SettingsSlider"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/settings/TemperatureRelayNavigationItem.qml")), - "Victron.VenusOS", 2, 0, "TemperatureRelayNavigationItem"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/settings/TemperatureRelaySettings.qml")), - "Victron.VenusOS", 2, 0, "TemperatureRelaySettings"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/settings/VolumeUnitRadioButtonGroup.qml")), - "Victron.VenusOS", 2, 0, "VolumeUnitRadioButtonGroup"); - - /* widgets */ - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/OverviewWidget.qml")), - "Victron.VenusOS", 2, 0, "OverviewWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/AlternatorWidget.qml")), - "Victron.VenusOS", 2, 0, "AlternatorWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/AcGeneratorWidget.qml")), - "Victron.VenusOS", 2, 0, "AcGeneratorWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/DcGeneratorWidget.qml")), - "Victron.VenusOS", 2, 0, "DcGeneratorWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/GridWidget.qml")), - "Victron.VenusOS", 2, 0, "GridWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/ShoreWidget.qml")), - "Victron.VenusOS", 2, 0, "ShoreWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/SolarYieldWidget.qml")), - "Victron.VenusOS", 2, 0, "SolarYieldWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/WindWidget.qml")), - "Victron.VenusOS", 2, 0, "WindWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/BatteryWidget.qml")), - "Victron.VenusOS", 2, 0, "BatteryWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/AcLoadsWidget.qml")), - "Victron.VenusOS", 2, 0, "AcLoadsWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/DcLoadsWidget.qml")), - "Victron.VenusOS", 2, 0, "DcLoadsWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/VerticalGauge.qml")), - "Victron.VenusOS", 2, 0, "VerticalGauge"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/VeBusDeviceWidget.qml")), - "Victron.VenusOS", 2, 0, "VeBusDeviceWidget"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/WidgetConnector.qml")), - "Victron.VenusOS", 2, 0, "WidgetConnector"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/WidgetConnectorAnchor.qml")), - "Victron.VenusOS", 2, 0, "WidgetConnectorAnchor"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/WidgetConnectorPath.qml")), - "Victron.VenusOS", 2, 0, "WidgetConnectorPath"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/WidgetHeader.qml")), - "Victron.VenusOS", 2, 0, "WidgetHeader"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/widgets/EvcsWidget.qml")), - "Victron.VenusOS", 2, 0, "EvcsWidget"); - - /* control cards */ - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/controlcards/ESSCard.qml")), - "Victron.VenusOS", 2, 0, "ESSCard"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/controlcards/GeneratorCard.qml")), - "Victron.VenusOS", 2, 0, "GeneratorCard"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/controlcards/SwitchesCard.qml")), - "Victron.VenusOS", 2, 0, "SwitchesCard"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/controlcards/VeBusDeviceCard.qml")), - "Victron.VenusOS", 2, 0, "VeBusDeviceCard"); - - /* dialogs */ - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/DateSelectorDialog.qml")), - "Victron.VenusOS", 2, 0, "DateSelectorDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/DialogShadow.qml")), - "Victron.VenusOS", 2, 0, "DialogShadow"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/DeviceInstanceSwapDialog.qml")), - "Victron.VenusOS", 2, 0, "DeviceInstanceSwapDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/ESSMinimumSOCDialog.qml")), - "Victron.VenusOS", 2, 0, "ESSMinimumSOCDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/GeneratorDisableAutostartDialog.qml")), - "Victron.VenusOS", 2, 0, "GeneratorDisableAutostartDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/GeneratorStartDialog.qml")), - "Victron.VenusOS", 2, 0, "GeneratorStartDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/GeneratorStopDialog.qml")), - "Victron.VenusOS", 2, 0, "GeneratorStopDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/InverterChargerModeDialog.qml")), - "Victron.VenusOS", 2, 0, "InverterChargerModeDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/ModalDialog.qml")), - "Victron.VenusOS", 2, 0, "ModalDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/ModalWarningDialog.qml")), - "Victron.VenusOS", 2, 0, "ModalWarningDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/NumberSelectorDialog.qml")), - "Victron.VenusOS", 2, 0, "NumberSelectorDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/SolarDailyHistoryDialog.qml")), - "Victron.VenusOS", 2, 0, "SolarDailyHistoryDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/TimeSelectorDialog.qml")), - "Victron.VenusOS", 2, 0, "TimeSelectorDialog"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/components/dialogs/VrmInstanceSwapDialog.qml")), - "Victron.VenusOS", 2, 0, "VrmInstanceSwapDialog"); - - /* pages */ - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/NotificationLayer.qml")), - "Victron.VenusOS", 2, 0, "NotificationLayer"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/MainView.qml")), - "Victron.VenusOS", 2, 0, "MainView"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/PageManager.qml")), - "Victron.VenusOS", 2, 0, "PageManager"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/BriefMonitorPanel.qml")), - "Victron.VenusOS", 2, 0, "BriefMonitorPanel"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/ControlCardsPage.qml")), - "Victron.VenusOS", 2, 0, "ControlCardsPage"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/EnvironmentTab.qml")), - "Victron.VenusOS", 2, 0, "EnvironmentTab"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/LevelsPage.qml")), - "Victron.VenusOS", 2, 0, "LevelsPage"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/OverviewPage.qml")), - "Victron.VenusOS", 2, 0, "OverviewPage"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/SettingsPage.qml")), - "Victron.VenusOS", 2, 0, "SettingsPage"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/TanksTab.qml")), - "Victron.VenusOS", 2, 0, "TanksTab"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/BriefPage.qml")), - "Victron.VenusOS", 2, 0, "BriefPage"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/NotificationsPage.qml")), - "Victron.VenusOS", 2, 0, "NotificationsPage"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzAfricaData.qml")), - "Victron.VenusOS", 2, 0, "TzAfricaData"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzAmericaData.qml")), - "Victron.VenusOS", 2, 0, "TzAmericaData"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzAntarcticaData.qml")), - "Victron.VenusOS", 2, 0, "TzAntarcticaData"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzArcticData.qml")), - "Victron.VenusOS", 2, 0, "TzArcticData"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzAsiaData.qml")), - "Victron.VenusOS", 2, 0, "TzAsiaData"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzAtlanticData.qml")), - "Victron.VenusOS", 2, 0, "TzAtlanticData"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzAustraliaData.qml")), - "Victron.VenusOS", 2, 0, "TzAustraliaData"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzEtcData.qml")), - "Victron.VenusOS", 2, 0, "TzEtcData"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzEuropeData.qml")), - "Victron.VenusOS", 2, 0, "TzEuropeData"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzIndianData.qml")), - "Victron.VenusOS", 2, 0, "TzIndianData"); - qmlRegisterType(QUrl(QStringLiteral("qrc:/pages/settings/tz/TzPacificData.qml")), - "Victron.VenusOS", 2, 0, "TzPacificData"); - // These types do not use dbus, so are safe to import even in the Qt Wasm build. qmlRegisterType("Victron.Veutil", 1, 0, "VeQuickItem"); qmlRegisterType("Victron.Veutil", 1, 0, "VeQItem"); @@ -708,7 +345,7 @@ int main(int argc, char *argv[]) engine.setProperty("screenSize", Victron::VenusOS::Theme::SevenInch); #endif - QQmlComponent component(&engine, QUrl(QStringLiteral("qrc:/main.qml"))); + QQmlComponent component(&engine, QUrl(QStringLiteral("qrc:/venus-gui-v2/Main.qml"))); if (component.isError()) { qWarning() << component.errorString(); return EXIT_FAILURE;