-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
119 changed files
with
5,850 additions
and
51,275 deletions.
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.22.orig 2024-07-08 09:45:00 | ||
| +++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.22 2024-01-24 10:19:41 | ||
| @@ -1,11 +1,52 @@ | ||
| +//////// GuiMods modified order to put Settings, then Notifications at top of list | ||
| + | ||
| import QtQuick 1.1 | ||
| +import "utils.js" as Utils | ||
| import com.victron.velib 1.0 | ||
|
|
||
| MbPage { | ||
| id: root | ||
| title: qsTr("Device List") | ||
|
|
||
| +//////// GuiMods put Settings, Notifications, Remove disconnected... at top of list | ||
| + property VBusItem moveSettings: VBusItem { id: moveSettings; bind: Utils.path("com.victronenergy.settings", "/Settings/GuiMods/MoveSettings")} | ||
| + property bool settingsAtTop: moveSettings.valid && moveSettings.value === 1 | ||
| + | ||
| model: VisualModels { | ||
| +//////// GuiMods put Settings, Notifications, Remove disconnected... at top of list | ||
| + VisibleItemModel { | ||
| + MbSubMenu { | ||
| + description: qsTr("Settings") | ||
| + subpage: Component { PageSettings {} } | ||
| + show: settingsAtTop | ||
| + } | ||
| + | ||
| + MbSubMenu { | ||
| + id: menuNotificationsTop | ||
| + description: qsTr("Notifications") | ||
| + item: VBusItem { | ||
| + property variant active: NotificationCenter.notifications.filter( | ||
| + function isActive(obj) { return obj.active} ) | ||
| + value: active.length > 0 ? active.length : "" | ||
| + } | ||
| + subpage: Component { PageNotifications {} } | ||
| + show: settingsAtTop | ||
| + } | ||
| + | ||
| + MbOK { | ||
| + description: qsTr("Remove disconnected devices") | ||
| + value: qsTr("Press to remove") | ||
| + show: settingsAtTop && deviceList.disconnectedDevices != 0 | ||
| + editable: true | ||
| + | ||
| + function clicked() { | ||
| + listview.decrementCurrentIndex() | ||
| + deviceList.removeDisconnected() | ||
| + } | ||
| + } | ||
| + } | ||
| +//////// end GuiMods put Settings, Notifications, Remove disconnected... at top of list | ||
| + | ||
| VisualDataModel { | ||
| model: VeSortFilterProxyModel { | ||
| model: DeviceList { | ||
| @@ -37,17 +78,22 @@ | ||
| value: active.length > 0 ? active.length : "" | ||
| } | ||
| subpage: Component { PageNotifications {} } | ||
| +//////// GuiMods hide this if added at top | ||
| + show: !settingsAtTop | ||
| } | ||
|
|
||
| MbSubMenu { | ||
| description: qsTr("Settings") | ||
| subpage: Component { PageSettings {} } | ||
| +//////// GuiMods hide this if added at top | ||
| + show: !settingsAtTop | ||
| } | ||
|
|
||
| MbOK { | ||
| description: qsTr("Remove disconnected devices") | ||
| value: qsTr("Press to remove") | ||
| - show: deviceList.disconnectedDevices != 0 | ||
| +//////// GuiMods hide this if added at top | ||
| + show: !settingsAtTop && deviceList.disconnectedDevices != 0 | ||
| editable: true | ||
|
|
||
| function clicked() { |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40~13.orig 2024-07-08 09:45:00 | ||
| +++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40~13 2024-05-14 07:00:12 | ||
| @@ -1,11 +1,48 @@ | ||
| +//////// GuiMods modified order to put Settings, then Notifications at top of list | ||
| + | ||
| import QtQuick 1.1 | ||
| +import "utils.js" as Utils | ||
| import com.victron.velib 1.0 | ||
|
|
||
| MbPage { | ||
| id: root | ||
| title: qsTr("Device List") | ||
|
|
||
| +//////// GuiMods put Settings, Notifications, Remove disconnected... at top of list | ||
| + property VBusItem moveSettings: VBusItem { id: moveSettings; bind: Utils.path("com.victronenergy.settings", "/Settings/GuiMods/MoveSettings")} | ||
| + property bool settingsAtTop: moveSettings.valid && moveSettings.value === 1 | ||
| + | ||
| model: VisualModels { | ||
| +//////// GuiMods put Settings, Notifications, Remove disconnected... at top of list | ||
| + VisibleItemModel { | ||
| + MbSubMenu { | ||
| + description: qsTr("Settings") | ||
| + subpage: Component { PageSettings {} } | ||
| + show: settingsAtTop | ||
| + } | ||
| + | ||
| + MbSubMenu { | ||
| + id: menuNotificationsTop | ||
| + description: qsTr("Notifications") | ||
| + item: VBusItem { value: menuNotifications.subpage.summary } | ||
| + subpage: PageNotifications { } | ||
| + show: settingsAtTop | ||
| + } | ||
| + | ||
| + MbOK { | ||
| + description: qsTr("Remove disconnected devices") | ||
| + value: qsTr("Press to remove") | ||
| + show: settingsAtTop && deviceList.disconnectedDevices != 0 | ||
| + editable: true | ||
| + | ||
| + function clicked() { | ||
| + listview.decrementCurrentIndex() | ||
| + deviceList.removeDisconnected() | ||
| + } | ||
| + } | ||
| + } | ||
| +//////// end GuiMods put Settings, Notifications, Remove disconnected... at top of list | ||
| + | ||
| VisualDataModel { | ||
| model: VeSortFilterProxyModel { | ||
| model: DeviceList { | ||
| @@ -33,17 +70,22 @@ | ||
| description: qsTr("Notifications") | ||
| item: VBusItem { value: menuNotifications.subpage.summary } | ||
| subpage: PageNotifications { } | ||
| +//////// GuiMods hide this if added at top | ||
| + show: !settingsAtTop | ||
| } | ||
|
|
||
| MbSubMenu { | ||
| description: qsTr("Settings") | ||
| subpage: Component { PageSettings {} } | ||
| +//////// GuiMods hide this if added at top | ||
| + show: !settingsAtTop | ||
| } | ||
|
|
||
| MbOK { | ||
| description: qsTr("Remove disconnected devices") | ||
| value: qsTr("Press to remove") | ||
| - show: deviceList.disconnectedDevices != 0 | ||
| +//////// GuiMods hide this if added at top | ||
| + show: !settingsAtTop && deviceList.disconnectedDevices != 0 | ||
| editable: true | ||
|
|
||
| function clicked() { |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40~35.orig 2024-07-08 09:45:00 | ||
| +++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/PageMain.qml-v3.40~35 2024-05-17 07:21:07 | ||
| @@ -1,11 +1,48 @@ | ||
| +//////// GuiMods modified order to put Settings, then Notifications at top of list | ||
| + | ||
| import QtQuick 1.1 | ||
| +import "utils.js" as Utils | ||
| import com.victron.velib 1.0 | ||
|
|
||
| MbPage { | ||
| id: root | ||
| title: qsTr("Device List") | ||
|
|
||
| +//////// GuiMods put Settings, Notifications, Remove disconnected... at top of list | ||
| + property VBusItem moveSettings: VBusItem { id: moveSettings; bind: Utils.path("com.victronenergy.settings", "/Settings/GuiMods/MoveSettings")} | ||
| + property bool settingsAtTop: moveSettings.valid && moveSettings.value === 1 | ||
| + | ||
| model: VisualModels { | ||
| +//////// GuiMods put Settings, Notifications, Remove disconnected... at top of list | ||
| + VisibleItemModel { | ||
| + MbSubMenu { | ||
| + description: qsTr("Settings") | ||
| + subpage: Component { PageSettings {} } | ||
| + show: settingsAtTop | ||
| + } | ||
| + | ||
| + MbSubMenu { | ||
| + id: menuNotificationsTop | ||
| + description: qsTr("Notifications") | ||
| + item: VBusItem { value: menuNotifications.subpage.summary } | ||
| + subpage: PageNotifications { } | ||
| + show: settingsAtTop | ||
| + } | ||
| + | ||
| + MbOK { | ||
| + description: qsTr("Remove disconnected devices") | ||
| + value: qsTr("Press to remove") | ||
| + show: settingsAtTop && deviceList.disconnectedDevices != 0 | ||
| + editable: true | ||
| + | ||
| + function clicked() { | ||
| + listview.decrementCurrentIndex() | ||
| + deviceList.removeDisconnected() | ||
| + } | ||
| + } | ||
| + } | ||
| +//////// end GuiMods put Settings, Notifications, Remove disconnected... at top of list | ||
| + | ||
| VisualDataModel { | ||
| model: VeSortFilterProxyModel { | ||
| model: DeviceList { | ||
| @@ -33,17 +70,22 @@ | ||
| description: qsTr("Notifications") | ||
| item: VBusItem { value: menuNotifications.subpage.summary } | ||
| subpage: PageNotifications { } | ||
| +//////// GuiMods hide this if added at top | ||
| + show: !settingsAtTop | ||
| } | ||
|
|
||
| MbSubMenu { | ||
| description: qsTr("Settings") | ||
| subpage: Component { PageSettings {} } | ||
| +//////// GuiMods hide this if added at top | ||
| + show: !settingsAtTop | ||
| } | ||
|
|
||
| MbOK { | ||
| description: qsTr("Remove disconnected devices") | ||
| value: qsTr("Press to remove") | ||
| - show: deviceList.disconnectedDevices != 0 | ||
| +//////// GuiMods hide this if added at top | ||
| + show: !settingsAtTop && deviceList.disconnectedDevices != 0 | ||
| editable: true | ||
|
|
||
| function clicked() { | ||
| @@ -155,7 +197,8 @@ | ||
| page = vebusPage | ||
| break; | ||
| case DBusService.DBUS_SERVICE_MULTI_RS: | ||
| - return; | ||
| + page = multiRsPage | ||
| + break; | ||
| case DBusService.DBUS_SERVICE_BATTERY: | ||
| page = batteryPage | ||
| break; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
FileSets/PatchSource/attributes.csv.patch → ...PatchSource/attributes.csv-v3.40~35.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/attributes.csv.orig 2024-06-28 07:42:21 | ||
| +++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/attributes.csv 2024-06-14 08:59:55 | ||
| @@ -485 +485 @@ | ||
| --- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/attributes.csv-v3.40~35.orig 2024-07-08 00:41:45 | ||
| +++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/attributes.csv-v3.40~35 2024-07-08 09:11:43 | ||
| @@ -490 +490 @@ | ||
| -com.victronenergy.digitalinput,/Type,i,2=Door;3=Bilge pump;4=Bilge alarm;5=Burglar alarm;6=Smoke alarm;7=Fire alarm;8=CO2 alarm;9=Generator,3424,uint16,1,R | ||
| +com.victronenergy.digitalinput,/Type,i,2=Door;3=Bilge pump;4=Bilge alarm;5=Burglar alarm;6=Smoke alarm;7=Fire alarm;8=CO2 alarm;9=Generator,3424,uint16,1,R;11=ExtTransferSwitch,3424,uint16,1,R |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| -U 0 |
File renamed without changes.
File renamed without changes.
Oops, something went wrong.