Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NERODevelopment/content/App.qml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import NERO
Window {
width: 800
height: 480
color: Theme.getColor("background")
color: Theme.background

visible: true
title: "NERO"
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/Arrow.qml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Item {
property variant stops: []
property int arrowWidth: 2
property real angle: -Math.PI / 6
property string arrowColor: Theme.getColor("primaryForeground")
property string arrowColor: Theme.primaryForeground

property real x1: stops[stops.length - 2].x
property real y1: stops[stops.length - 2].y
Expand Down
10 changes: 5 additions & 5 deletions NERODevelopment/content/Battery.qml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Rectangle {
property int maxValue: 100
property int fillMargin: height / 20

property string fillColor: battery.value > 70 ? Theme.getColor("goodStatus") : battery.value
> 40 ? Theme.getColor("cautionStatus") : Theme.getColor("criticalStatus")
property string fillColor: battery.value > 70 ? Theme.goodStatus : battery.value
> 40 ? Theme.cautionStatus : Theme.criticalStatus
width: height / 2
color: Theme.getColor("transparent")
color: "transparent"

Rectangle {
id: topOutlet
Expand All @@ -38,7 +38,7 @@ Rectangle {
fill: parent
margins: battery.fillMargin
}
color: Theme.getColor("background")
color: Theme.background
z: 0
}

Expand All @@ -53,7 +53,7 @@ Rectangle {
},
GradientStop {
position: 1.0
color: Theme.getColor("fillGradientStop")
color: Theme.fillGradientStop
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/BatteryValueComponent.qml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Item {
property string title: "Charge State"
property int horizontalIconSpacing: width * 0.1
property int labelVerticalSpacing: height * 0.1
property string labelColor: Theme.getColor("accentForeground")
property string labelColor: Theme.accentForeground
property int horizontalPadding: width * 0.1
property int radius
property int valueFontSize
Expand Down
6 changes: 3 additions & 3 deletions NERODevelopment/content/CriticalFaultIcon.qml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Item {
ShapePath {
id: triangle
dashPattern: 5.6
fillColor: Theme.getColor("criticalStatus")
strokeColor: Theme.getColor("transparent")
fillColor: Theme.criticalStatus
strokeColor: "transparent"
strokeWidth: 1
capStyle: ShapePath.RoundCap

Expand All @@ -45,7 +45,7 @@ Item {
id: text1
x: (shape.width) / 2 - font.pixelSize / 8
y: (shape.height - (font.pixelSize * 1.2))
color: Theme.getColor("primaryForeground")
color: Theme.primaryForeground
text: qsTr("!")
font.pixelSize: .75 * shape.width
}
Expand Down
18 changes: 9 additions & 9 deletions NERODevelopment/content/DescriptionModal.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Rectangle {

width: dimension * 2
height: dimension
color: Theme.getColor("popoverBackground")
color: Theme.popoverBackground
radius: 20

Rectangle {
Expand All @@ -22,9 +22,9 @@ Rectangle {
x: dimension / 10
y: -width / 2
radius: width / 2
color: Theme.getColor("backgroundPicture")
color: Theme.backgroundPicture

border.color: Theme.getColor("popoverBackground")
border.color: Theme.popoverBackground
border.width: 10
clip: true // This enables clipping of content outside the rectangle

Expand All @@ -45,7 +45,7 @@ Rectangle {
width: modalPic.width
height: modalPic.height
radius: modalPic.radius
color: Theme.getColor("popoverBackground")
color: Theme.popoverBackground
}
}
}
Expand All @@ -54,7 +54,7 @@ Rectangle {

Text {
id: modalTitle
color: Theme.getColor("blackForeground")
color: Theme.blackForeground
font.pixelSize: dimension / 6
font.bold: true
wrapMode: Text.WordWrap
Expand All @@ -64,7 +64,7 @@ Rectangle {

Text {
id: modalDescription
color: Theme.getColor("blackForeground")
color: Theme.blackForeground
font.pixelSize: dimension / 11
wrapMode: Text.WordWrap
width: (parent.width - modalDescription.x) - modal.offset
Expand All @@ -77,8 +77,8 @@ Rectangle {
height: parent.height / 5
width: parent.width / 3
background: Rectangle {
color: Theme.getColor("descriptionButtonBackground")
border.color: Theme.getColor("accentBlue")
color: Theme.descriptionButtonBackground
border.color: Theme.accentBlue
border.width: 3
radius: 10
}
Expand All @@ -88,7 +88,7 @@ Rectangle {
font.pixelSize: parent.height / 15
onClicked: closeModal()
Component.onCompleted: {
modalButton.contentItem.color = Theme.getColor("descriptionButtonForeground")
modalButton.contentItem.color = Theme.descriptionButtonForeground
}
}

Expand Down
34 changes: 17 additions & 17 deletions NERODevelopment/content/DetailDisplay.qml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Rectangle {
property bool highlight: false
height: 60
width: 250
color: Theme.getColor("background")
color: Theme.background

onStatusChanged: {
console.log("Changing status")
Expand Down Expand Up @@ -41,13 +41,13 @@ Rectangle {
SequentialAnimation on color {
loops: Animation.Infinite
ColorAnimation {
from: Theme.getColor("primaryDetailGradient")
to: Theme.getColor("secondaryDetailGradient")
from: Theme.primaryDetailGradient
to: Theme.secondaryDetailGradient
duration: 1500
}
ColorAnimation {
from: Theme.getColor("secondaryDetailGradient")
to: Theme.getColor("primaryDetailGradient")
from: Theme.secondaryDetailGradient
to: Theme.primaryDetailGradient
duration: 3000
}
}
Expand All @@ -58,35 +58,35 @@ Rectangle {
SequentialAnimation on color {
loops: Animation.Infinite
ColorAnimation {
from: Theme.getColor("primaryDetailGradient")
to: Theme.getColor("primaryDetailGradient")
from: Theme.primaryDetailGradient
to: Theme.primaryDetailGradient
duration: 1500
}
ColorAnimation {
from: Theme.getColor("primaryDetailGradient")
to: Theme.getColor("secondaryDetailGradient")
from: Theme.primaryDetailGradient
to: Theme.secondaryDetailGradient
duration: 1500
}
ColorAnimation {
from: Theme.getColor("secondaryDetailGradient")
to: Theme.getColor("primaryDetailGradient")
from: Theme.secondaryDetailGradient
to: Theme.primaryDetailGradient
duration: 1500
}
}
}
}
}
color: Theme.getColor("transparent")
color: "transparent"

border.color: Theme.getColor("transparent")
border.color: "transparent"
width: Math.max(parent.width * 0.6,
taskText.implicitWidth) // Ensure minimum width
height: parent.height
radius: 10

LabelText {
id: taskText
color: Theme.getColor("primaryForeground")
color: Theme.primaryForeground
text: detailDisplay.shutdownFlowTask
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
Expand All @@ -97,19 +97,19 @@ Rectangle {

Rectangle {
id: statusDisplayContainer
color: status == 0 ? Theme.getColor("transparent") : (status === 1 ? Theme.getColor("goodStatus") : (status === 2 ? Theme.getColor("criticalStatus") : Theme.getColor("transparent")))
color: status == 0 ? "transparent" : (status === 1 ? Theme.goodStatus : (status === 2 ? Theme.criticalStatus : "transparent"))
width: Math.max(parent.width * 0.4,
statusText.implicitWidth + 20) // Ensure minimum width
height: parent.height
anchors.left: taskDisplay.right
radius: 10
border.color: status == 0 ? Theme.getColor("primaryForeground") : Theme.getColor("transparent")
border.color: status == 0 ? Theme.primaryForeground : "transparent"
border.width: status == 0 ? 3 : 0

LabelText {
id: statusText
visible: !clear
color: Theme.getColor("inverseForeground")
color: Theme.inverseForeground
text: detailDisplay.statusDisplay
anchors.centerIn: parent
}
Expand Down
12 changes: 6 additions & 6 deletions NERODevelopment/content/DirectionView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,35 @@ Item {

Rectangle {
id: rectangle
color: forward ? Theme.getColor("directionBackground") : Theme.getColor("transparent")
color: forward ? Theme.directionBackground : "transparent"
Layout.fillHeight: true
Layout.preferredWidth: parent.width / 2 - 20
border.color: forward ? Theme.getColor("transparent") : Theme.getColor("primaryForeground")
border.color: forward ? "transparent" : Theme.primaryForeground
border.width: 2
radius: directionView.radius

Text {
anchors.centerIn: parent
font.pixelSize: Math.min(parent.width, parent.height) / 1.5
text: "D"
color: forward ? Theme.getColor("inverseForeground") : Theme.getColor("primaryForeground")
color: forward ? Theme.inverseForeground : Theme.primaryForeground
font.family: webFont.name
}
}

Rectangle {
id: rectangle1
color: forward ? Theme.getColor("transparent") : Theme.getColor("directionBackground")
color: forward ? "transparent" : Theme.directionBackground
Layout.fillHeight: true
Layout.preferredWidth: parent.width / 2 - 20
border.color: forward ? Theme.getColor("primaryForeground") : Theme.getColor("transparent")
border.color: forward ? Theme.primaryForeground : "transparent"
border.width: 2
radius: directionView.radius

Text {
anchors.centerIn: parent
font.pixelSize: Math.min(parent.width, parent.height) / 1.5
color: forward ? Theme.getColor("primaryForeground") : Theme.getColor("inverseForeground")
color: forward ? Theme.primaryForeground : Theme.inverseForeground
font.family: webFont.name
text: "R"
}
Expand Down
8 changes: 4 additions & 4 deletions NERODevelopment/content/FaultDialog.qml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ Popup {
rightInset: 0
bottomInset: 0
Overlay.modal: Rectangle {
color: Theme.getColor("transparent")
color: "transparent"
}

anchors.centerIn: Overlay.overlay

contentItem: Rectangle {
anchors.fill: parent
color: Theme.getColor("popoverBackground")
color: Theme.popoverBackground
radius: 20

Text {
id: modalTitle
color: Theme.getColor("inverseForeground")
color: Theme.inverseForeground
font.pixelSize: dimension / 6
font.bold: true
wrapMode: Text.WordWrap
Expand All @@ -43,7 +43,7 @@ Popup {

Text {
id: modalDescription
color: Theme.getColor("inverseForeground")
color: Theme.inverseForeground
font.pixelSize: dimension / 11
wrapMode: Text.WordWrap
anchors.left: parent.left
Expand Down
6 changes: 3 additions & 3 deletions NERODevelopment/content/HomeIcon.qml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import NERO

Rectangle {
id: root
color: Theme.getColor("transparent")
color: "transparent"

property bool highlighted: false
property string text: "Off"
Expand All @@ -25,11 +25,11 @@ Rectangle {
gradient: Gradient {
GradientStop {
position: 0.0
color: highlighted ? Theme.getColor("iconHighlightedBackground") : Theme.getColor("iconBackground")
color: highlighted ? Theme.iconHighlightedBackground : Theme.iconBackground
}
GradientStop {
position: 1.0
color: highlighted ? Theme.getColor("iconHighlightedGradientStop") : Theme.getColor("iconGradientStop")
color: highlighted ? Theme.iconHighlightedGradientStop : Theme.iconGradientStop
}
}

Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/HomeMenuItem.qml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import NERO
Rectangle {
property bool highlighted: false
property string text: "Off"
color: Theme.getColor("transparent")
color: "transparent"
border.width: highlighted ? 2 : 1

border.color: highlighted ? Theme.getColor("primaryForeground") : Theme.getColor("transparent")
border.color: highlighted ? Theme.primaryForeground : "transparent"
height: label.implicitHeight
width: parent.width

Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/LabelText.qml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ import NERO
Text {
font.family: webFont.name
font.pixelSize: 24
color: Theme.getColor("primaryForeground")
color: Theme.primaryForeground
}
6 changes: 3 additions & 3 deletions NERODevelopment/content/LabeledComponent.qml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ Rectangle {
stops: [
GradientStop {
position: 1.0
color: Theme.getColor("transparent")
color: "transparent"
},
GradientStop {
position: 0.5
color: Theme.getColor("iconBackground")
color: Theme.iconBackground
}
]
}
Expand Down Expand Up @@ -84,7 +84,7 @@ Rectangle {

LabelText {
text: labelComponent.valueUnit
color: Theme.getColor("mutedForeground")
color: Theme.mutedForeground
font.pixelSize: labelComponent.unitFontSize
anchors.bottom: labelComponent.unitAnchorBottom ? parent.bottom : null
}
Expand Down
Loading