Skip to content

Commit

Permalink
add support for v3.40~39; more patched files
Browse files Browse the repository at this point in the history
  • Loading branch information
kwindrem committed Jul 13, 2024
1 parent 0178703 commit d24baf3
Show file tree
Hide file tree
Showing 793 changed files with 16,367 additions and 14,701 deletions.
File renamed without changes.
File renamed without changes.
59 changes: 59 additions & 0 deletions FileSets/PatchSource/Battery.qml-v3.40~32.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/Battery.qml-v3.40~32.orig 2024-07-09 10:19:41
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/Battery.qml-v3.40~32 2024-05-14 07:00:12
@@ -6,9 +6,14 @@
width: 145
height: 101

+////// GuiMods — DarkMode
+ property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
+ property bool darkMode: darkModeItem.valid && darkModeItem.value == 1
+
property real soc: 80
- property string color: "#4789d0"
- property string emptyColor: "#1abc9c"
+////// GuiMods — DarkMode
+ property string color: !darkMode ? "#4789d0" : "#234468"
+ property string emptyColor: !darkMode ? "#1abc9c" : "#0d5e4e"
property alias values: _values.children

SvgRectangle {
@@ -38,7 +43,8 @@
id: background

// NOTE: to remove the bottom of the terminals
- border {width: 2; color: "white"}
+////// GuiMods — DarkMode
+ border {width: 2; color: !darkMode ? "white" : "#202020"}
height: root.height - leftTerminal.height
width: root.width
y: leftTerminal.height - 1
@@ -63,7 +69,8 @@
height: parent.height
width: parent.width * 0.7
anchors.centerIn: parent
- color: "#ffffff"
+////// GuiMods — DarkMode
+ color: !darkMode ? "#ffffff" : "#202020"
opacity: 0.06
}
}
@@ -92,7 +99,8 @@
font.pixelSize: 13; font.bold: true
anchors.centerIn: leftTerminal
anchors.verticalCenterOffset: 12
- color: "#fff"
+////// GuiMods — DarkMode
+ color: !darkMode ? "#fff" : "#e1e1e1"
}

Text {
@@ -100,7 +108,8 @@
font.pixelSize: 13; font.bold: true
anchors.centerIn: rightTerminal
anchors.verticalCenterOffset: 12
- color: "#fff"
+////// GuiMods — DarkMode
+ color: !darkMode ? "#fff" : "#e1e1e1"
}

Item {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
38 changes: 38 additions & 0 deletions FileSets/PatchSource/MbEditBox.qml.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbEditBox.qml.orig 2024-07-09 10:19:44
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbEditBox.qml 2024-05-14 07:00:12
@@ -7,6 +7,10 @@
cornerMark: !readonly && !editMode
height: expanded.y + expanded.height + 1

+////// GuiMods — DarkMode
+ property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
+ property bool darkMode: darkModeItem.valid && darkModeItem.value == 1
+
property alias maximumLength: ti.maximumLength
property variant tmpValue
property string matchString: "0123456789 abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~!@#$%^&*()-_=+[]{}\\;:|/.,<>?"
@@ -240,10 +244,12 @@

MbBackgroundRect {
id: greytag
- color: editMode ? "#fff": "#ddd"
+////// GuiMods — DarkMode
+ color: !darkMode ? (editMode ? "#fff": "#ddd") : (editMode ? "#747474": "#4b4b4b")
width: ti.width + 2 * style.marginDefault
height: ti.height + 6
- border.color: "#ddd"
+////// GuiMods — DarkMode
+ border.color: !darkMode ? "#ddd" : "#4b4b4b"
border.width: editMode ? 1 : 0
anchors.centerIn: ti
}
@@ -273,6 +279,9 @@
topMargin: (defaultHeight - height) / 2
}

+////// GuiMods — DarkMode
+ color: !darkMode ? "#000000" : "#fdfdfd"
+
text: editMode ? _editText : item.text
// When editing the it is nice to have a fix with font, so when changing
// digits the text does change in length all the time. However this fonts
File renamed without changes.
23 changes: 23 additions & 0 deletions FileSets/PatchSource/MbEditBoxDateTime.qml.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbEditBoxDateTime.qml.orig 2024-07-09 10:19:45
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbEditBoxDateTime.qml 2024-05-14 07:00:12
@@ -3,6 +3,10 @@
MbEditBox {
id: root

+////// GuiMods — DarkMode
+ property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
+ property bool darkMode: darkModeItem.valid && darkModeItem.value == 1
+
property string format: "yyyy-MM-dd hh:mm"
property bool utc: false

@@ -12,7 +16,8 @@
overwriteMode: true
numericOnlyLayout: true
upDownText: qsTr("Select number")
- textInput.color: editMode ? (vePlatform.secondsFromString(_editText, format) !== -1 ? "black" : "red") : "black"
+////// GuiMods — DarkMode
+ textInput.color: editMode ? (vePlatform.secondsFromString(_editText, format) !== -1 ? (!darkMode ? "#000000" : "#fdfdfd") : "red") : (!darkMode ? "#000000" : "#fdfdfd")

// note: overwritten by MbEditBoxTime!
function getTimeSeconds(str) {
File renamed without changes.
File renamed without changes.
23 changes: 23 additions & 0 deletions FileSets/PatchSource/MbItem.qml.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItem.qml.orig 2024-07-09 10:19:45
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItem.qml 2024-05-14 07:00:12
@@ -14,6 +14,10 @@
height: defaultHeight
property bool show: user.accessLevel >= showAccessLevel

+////// GuiMods — DarkMode
+ property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
+ property bool darkMode: darkModeItem.valid && darkModeItem.value == 1
+
property int defaultHeight: style.itemHeight

property bool editMode
@@ -104,7 +108,8 @@
MbIcon {
id: cornerMarkIcon

- iconId: "icon-items-corner" + (root.ListView.isCurrentItem ? "-active" : "")
+////// GuiMods — DarkMode
+ iconId: "icon-items-corner" + (root.ListView.isCurrentItem || darkMode ? "-active" : "")
visible: cornerMark
anchors {
right: parent.right; rightMargin: 1
File renamed without changes.
File renamed without changes.
20 changes: 20 additions & 0 deletions FileSets/PatchSource/MbItemDigitalInput.qml-v2.94.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItemDigitalInput.qml-v2.94.orig 2024-07-09 10:19:46
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItemDigitalInput.qml-v2.94 2024-03-07 00:11:36
@@ -1,3 +1,5 @@
+//// modified for ExtTransferSwitch package
+
import QtQuick 1.1

MbItemOptions {
@@ -14,7 +16,10 @@
MbOption { description: qsTr("Smoke alarm"); value: 6 },
MbOption { description: qsTr("Fire alarm"); value: 7 },
MbOption { description: qsTr("CO2 alarm"); value: 8 },
- MbOption { description: qsTr("Generator"); value: 9 }
+ MbOption { description: qsTr("Generator"); value: 9 },
+ MbOption { description: qsTr("Generic I/O"); value: 10 },
+//// added for ExtTransferSwitch package
+ MbOption { description: qsTr("External transfer switch"); value: 11 }
]
onValueChanged: {
if (valid) {
File renamed without changes.
21 changes: 21 additions & 0 deletions FileSets/PatchSource/MbItemDigitalInput.qml-v3.40~35.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40~35.orig 2024-07-09 10:19:45
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbItemDigitalInput.qml-v3.40~35 2024-05-14 07:00:12
@@ -1,3 +1,5 @@
+//// modified for ExtTransferSwitch package
+
import QtQuick 1.1

MbItemOptions {
@@ -14,8 +16,11 @@
MbOption { description: qsTr("Smoke alarm"); value: 6 },
MbOption { description: qsTr("Fire alarm"); value: 7 },
MbOption { description: qsTr("CO2 alarm"); value: 8 },
+ MbOption { description: qsTr("Generic I/O"); value: 10 },
MbOption { description: qsTr("Generator"); value: 9 },
- MbOption { description: qsTr("Touch input control"); value: 11 }
+ MbOption { description: qsTr("Touch input control"); value: 11 },
+//// added for ExtTransferSwitch package
+ MbOption { description: qsTr("External transfer switch"); value: 12 }
]
onValueChanged: {
if (valid) {
File renamed without changes.
File renamed without changes.
34 changes: 34 additions & 0 deletions FileSets/PatchSource/MbSpinBox.qml-v2.73.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml-v2.73.orig 2024-07-09 10:19:46
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml-v2.73 2023-05-19 11:18:50
@@ -1,3 +1,5 @@
+////// GuiMods — added DarkMode
+
import QtQuick 1.1
import Qt.labs.components.native 1.0
import com.victron.velib 1.0
@@ -6,6 +8,10 @@
id: root
cornerMark: !readOnly && !spinbox.enabled

+////// GuiMods — DarkMode
+ property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
+ property bool darkMode: darkModeItem.valid && darkModeItem.value == 1
+
property bool valid: vItem.value !== undefined
property alias bind: vItem.bind
property string description
@@ -82,10 +88,12 @@

MbBackgroundRect {
id: graytag
- color: !spinbox.enabled? "#ddd": "#fff"
+////// GuiMods — DarkMode
+ color: !darkMode ? (!spinbox.enabled ? "#ddd": "#fff") : (!spinbox.enabled ? "#4b4b4b": "#747474")
height: spinbox.height + 6
width: spinbox.width + unit.width + 10
- border.color: "#ddd"
+////// GuiMods — DarkMode
+ border.color: !darkMode ? "#ddd" : "#4b4b4b"
border.width: spinbox.enabled ? 1 : 0
anchors {
right: parent.right; rightMargin: style.marginDefault
File renamed without changes.
File renamed without changes.
34 changes: 34 additions & 0 deletions FileSets/PatchSource/MbSpinBox.qml-v2.89.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml-v2.89.orig 2024-07-09 10:19:46
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml-v2.89 2023-05-19 11:20:34
@@ -1,3 +1,5 @@
+////// GuiMods — added DarkMode
+
import QtQuick 1.1
import Qt.labs.components.native 1.0
import com.victron.velib 1.0
@@ -6,6 +8,10 @@
id: root
cornerMark: !readOnly && !spinbox.enabled

+////// GuiMods — DarkMode
+ property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
+ property bool darkMode: darkModeItem.valid && darkModeItem.value == 1
+
property bool valid: vItem.value !== undefined
property alias bind: vItem.bind
property string description
@@ -82,10 +88,12 @@

MbBackgroundRect {
id: graytag
- color: !spinbox.enabled? "#ddd": "#fff"
+////// GuiMods — DarkMode
+ color: !darkMode ? (!spinbox.enabled ? "#ddd": "#fff") : (!spinbox.enabled ? "#4b4b4b": "#747474")
height: spinbox.height + 6
width: spinbox.width + unit.width + 10
- border.color: "#ddd"
+////// GuiMods — DarkMode
+ border.color: !darkMode ? "#ddd" : "#4b4b4b"
border.width: spinbox.enabled ? 1 : 0
anchors {
right: parent.right; rightMargin: style.marginDefault
File renamed without changes.
File renamed without changes.
28 changes: 28 additions & 0 deletions FileSets/PatchSource/MbSpinBox.qml-v3.40~35.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml-v3.40~35.orig 2024-07-09 10:19:46
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml-v3.40~35 2024-05-14 07:00:12
@@ -6,6 +6,10 @@
id: root
cornerMark: !readOnly && !spinbox.enabled

+////// GuiMods — DarkMode
+ property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
+ property bool darkMode: darkModeItem.valid && darkModeItem.value == 1
+
property string description
property bool readOnly: !userHasWriteAccess
property VBusItem item: VBusItem {
@@ -71,10 +75,12 @@

MbBackgroundRect {
id: graytag
- color: !spinbox.enabled? "#ddd": "#fff"
+////// GuiMods — DarkMode
+ color: !darkMode ? (!spinbox.enabled ? "#ddd": "#fff") : (!spinbox.enabled ? "#4b4b4b": "#747474")
height: spinbox.height + 6
width: spinbox.width + unit.width + 10
- border.color: "#ddd"
+////// GuiMods — DarkMode
+ border.color: !darkMode ? "#ddd" : "#4b4b4b"
border.width: spinbox.enabled ? 1 : 0
anchors {
right: parent.right; rightMargin: style.marginDefault
28 changes: 28 additions & 0 deletions FileSets/PatchSource/MbSpinBox.qml.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml.orig 2024-07-09 10:19:46
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbSpinBox.qml 2024-05-14 07:00:12
@@ -6,6 +6,10 @@
id: root
cornerMark: !readOnly && !spinbox.enabled

+////// GuiMods — DarkMode
+ property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
+ property bool darkMode: darkModeItem.valid && darkModeItem.value == 1
+
property string description
property bool readOnly: !userHasWriteAccess
property VBusItem item: VBusItem {
@@ -71,10 +75,12 @@

MbBackgroundRect {
id: graytag
- color: !spinbox.enabled? "#ddd": "#fff"
+////// GuiMods — DarkMode
+ color: !darkMode ? (!spinbox.enabled ? "#ddd": "#fff") : (!spinbox.enabled ? "#4b4b4b": "#747474")
height: spinbox.height + 6
width: spinbox.width + unit.width + 10
- border.color: "#ddd"
+////// GuiMods — DarkMode
+ border.color: !darkMode ? "#ddd" : "#4b4b4b"
border.width: spinbox.enabled ? 1 : 0
anchors {
right: parent.right; rightMargin: style.marginDefault
File renamed without changes.
File renamed without changes.
43 changes: 43 additions & 0 deletions FileSets/PatchSource/MbStyle.qml-v2.94.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
--- /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbStyle.qml-v2.94.orig 2024-07-09 10:19:47
+++ /Users/Kevin/GitHub/GuiMods.copy/FileSets/PatchSource/MbStyle.qml-v2.94 2023-05-19 11:06:05
@@ -4,6 +4,10 @@
* common style properties
*/
QtObject {
+////// GuiMods — DarkMode
+ property VBusItem darkModeItem: VBusItem { bind: "com.victronenergy.settings/Settings/GuiMods/DarkMode" }
+ property bool darkMode: darkModeItem.valid && darkModeItem.value == 1
+
property bool isCurrentItem

// Default MbItem size
@@ -13,19 +17,22 @@
property string fontFamily: "DejaVu Sans Condensed"
property int fontPixelSize: 16

- property string borderColor: "#ddd"
- property string backgroundColor: isCurrentItem ? '#4790d0' : 'transparent'
- property string backgroundColorService: isCurrentItem ? "#2969a1" : '#ffe9b7'
+////// GuiMods — DarkMode
+ property string borderColor: !darkMode ? "#ddd" : "#4b4b4b"
+ property string backgroundColor: isCurrentItem ? (!darkMode ? '#4790d0' : '#234468') : 'transparent'
+ property string backgroundColorService: !darkMode ? (isCurrentItem ? "#2969a1" : '#ffe9b7') : (isCurrentItem ? "#234468" : '#7f745b')
property string backgroundColorComponent: borderColor

// Text mainly used for description etc.
- property string textColor: "#000000"
- property string textColorSelected: "#FFFFFF"
+////// GuiMods — DarkMode
+ property string textColor: !darkMode ? "#000000" : "#fdfdfd"
+ property string textColorSelected: !darkMode ? "#FFFFFF" : "#fdfdfd"

// Color typically used for values
- property string valueColor: "#333333"
+////// GuiMods — DarkMode
+ property string valueColor: !darkMode ? "#333333" : "#fdfdfd"
property int valueHorizontalAlignment: Text.AlignRight
- property string color2: "#333333"
+ property string color2: !darkMode ? "#333333" : "#fdfdfd"

property int marginDefault: 8
// margin between MbItem border and components for bottom / top
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit d24baf3

Please sign in to comment.