never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed Colors to Color

Browse source 
- some work on the active window
This commit is contained in:
quadbyte 2025-08-16 22:39:11 -04:00
parent ffd9ee8efe
commit 4fcdb1543d
60 changed files with 491 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Modules/SidePanel/Cards/MediaCard.qml
View file

@ -41,12 +41,12 @@ NBox {
text: "album"
font.family: "Material Symbols Outlined"
font.pointSize: Style.fontSizeXXL * 2.5 * scaling
color: Colors.mPrimary
color: Color.mPrimary
Layout.alignment: Qt.AlignHCenter
}
NText {
text: "No media player detected"
color: Colors.mOnSurfaceVariant
color: Color.mOnSurfaceVariant
Layout.alignment: Qt.AlignHCenter
}
@ -77,7 +77,7 @@ NBox {
// implicitWidth: 120 * scaling
// implicitHeight: 30 * scaling
color: "transparent"
border.color: playerSelector.activeFocus ? Colors.mTertiary : Colors.mOutline
border.color: playerSelector.activeFocus ? Color.mTertiary : Color.mOutline
border.width: Math.max(1, Style.borderThin * scaling)
radius: Style.radiusMedium * scaling
}
@ -88,7 +88,7 @@ NBox {
rightPadding: playerSelector.indicator.width + playerSelector.spacing
text: playerSelector.displayText
font.pointSize: Style.fontSizeSmall * scaling
color: Colors.mOnSurface
color: Color.mOnSurface
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
}
@ -99,7 +99,7 @@ NBox {
text: "arrow_drop_down"
font.family: "Material Symbols Outlined"
font.pointSize: Style.fontSizeXL * scaling
color: Colors.mOnSurface
color: Color.mOnSurface
horizontalAlignment: Text.AlignRight
}
@ -120,8 +120,8 @@ NBox {
}
background: Rectangle {
color: Colors.mSurface
border.color: Colors.mOutline
color: Color.mSurface
border.color: Color.mOutline
border.width: Math.max(1, Style.borderThin * scaling)
radius: Style.radiusTiny * scaling
}
@ -132,7 +132,7 @@ NBox {
contentItem: NText {
text: modelData.identity
font.pointSize: Style.fontSizeSmall * scaling
color: highlighted ? Colors.mSurface : Colors.mOnSurface
color: highlighted ? Color.mSurface : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
}
@ -140,7 +140,7 @@ NBox {
background: Rectangle {
width: popup.width - Style.marginSmall * scaling * 2
color: highlighted ? Colors.mTertiary : "transparent"
color: highlighted ? Color.mTertiary : "transparent"
radius: Style.radiusTiny * scaling
}
}
@ -161,8 +161,8 @@ NBox {
width: 90 * scaling
height: 90 * scaling
radius: width * 0.5
color: trackArt.visible ? Colors.mPrimary : "transparent"
border.color: trackArt.visible ? Colors.mOutline : "transparent"
color: trackArt.visible ? Color.mPrimary : "transparent"
border.color: trackArt.visible ? Color.mOutline : "transparent"
border.width: Math.max(1, Style.borderThin * scaling)
clip: true
@ -174,7 +174,7 @@ NBox {
anchors.margins: Style.marginTiny * scaling
imagePath: MediaService.trackArtUrl
fallbackIcon: "music_note"
borderColor: Colors.mOutline
borderColor: Color.mOutline
borderWidth: Math.max(1, Style.borderThin * scaling)
imageRadius: width * 0.5
}
@ -183,7 +183,7 @@ NBox {
NText {
anchors.centerIn: parent
text: "album"
color: Colors.mPrimary
color: Color.mPrimary
font.family: "Material Symbols Outlined"
font.pointSize: Style.fontSizeLarge * 12 * scaling
visible: !trackArt.visible
@ -210,7 +210,7 @@ NBox {
NText {
visible: MediaService.trackArtist !== ""
text: MediaService.trackArtist
color: Colors.mOnSurface
color: Color.mOnSurface
font.pointSize: Style.fontSizeSmall * scaling
elide: Text.ElideRight
Layout.fillWidth: true
@ -219,7 +219,7 @@ NBox {
NText {
visible: MediaService.trackAlbum !== ""
text: MediaService.trackAlbum
color: Colors.mOnSurface
color: Color.mOnSurface
font.pointSize: Style.fontSizeSmall * scaling
elide: Text.ElideRight
Layout.fillWidth: true
@ -235,7 +235,7 @@ NBox {
width: parent.width
height: 4 * scaling
radius: Style.radiusSmall * scaling
color: Colors.mSurface
color: Color.mSurface
Layout.fillWidth: true
property real progressRatio: {
@ -250,7 +250,7 @@ NBox {
width: progressBarBackground.progressRatio * parent.width
height: parent.height
radius: parent.radius
color: Colors.mPrimary
color: Color.mPrimary
Behavior on width {
NumberAnimation {
@ -266,8 +266,8 @@ NBox {
width: 16 * scaling
height: 16 * scaling
radius: width * 0.5
color: Colors.mPrimary
border.color: Colors.mOutline
color: Color.mPrimary
border.color: Color.mOutline
border.width: Math.max(1 * Style.borderMedium * scaling)
x: Math.max(0, Math.min(parent.width - width, progressFill.width - width / 2))
anchors.verticalCenter: parent.verticalCenter
@ -343,7 +343,7 @@ NBox {
width: 300 * scaling
height: 80 * scaling
values: CavaService.values
fillColor: Colors.mOnSurface
fillColor: Color.mOnSurface
Layout.alignment: Qt.AlignHCenter
}
}

4
Modules/SidePanel/Cards/ProfileCard.qml
View file

@ -33,7 +33,7 @@ NBox {
height: Style.baseWidgetSize * 1.25 * scaling
imagePath: Settings.data.general.avatarImage
fallbackIcon: "person"
borderColor: Colors.mPrimary
borderColor: Color.mPrimary
borderWidth: Math.max(1, Style.borderMedium * scaling)
}
@ -46,7 +46,7 @@ NBox {
}
NText {
text: `System Uptime: ${uptimeText}`
color: Colors.mOnSurface
color: Color.mOnSurface
}
}

8
Modules/SidePanel/Cards/WeatherCard.qml
View file

@ -31,7 +31,7 @@ NBox {
LocationService.data.weather.current_weather.weathercode) : ""
font.family: "Material Symbols Outlined"
font.pointSize: Style.fontSizeXXL * 1.5 * scaling
color: Colors.mPrimary
color: Color.mPrimary
}
ColumnLayout {
@ -92,13 +92,13 @@ NBox {
spacing: Style.marginSmall * scaling
NText {
text: Qt.formatDateTime(new Date(LocationService.data.weather.daily.time[index]), "ddd")
color: Colors.mOnSurface
color: Color.mOnSurface
}
NText {
text: LocationService.weatherSymbolFromCode(LocationService.data.weather.daily.weathercode[index])
font.family: "Material Symbols Outlined"
font.pointSize: Style.fontSizeXL * scaling
color: Colors.mPrimary
color: Color.mPrimary
}
NText {
text: {
@ -113,7 +113,7 @@ NBox {
return `${max}°/${min}°`
}
font.pointSize: Style.fontSizeSmall * scaling
color: Colors.mOnSurfaceVariant
color: Color.mOnSurfaceVariant
}
}
}

34
Modules/SidePanel/PowerMenu.qml
View file

@ -26,9 +26,9 @@ NPanel {
width: 160 * scaling
height: 220 * scaling
radius: Style.radiusMedium * scaling
border.color: Colors.mOutline
border.color: Color.mOutline
border.width: Math.max(1, Style.borderThin * scaling)
color: Colors.mSurface
color: Color.mSurface
visible: true
z: 9999
@ -57,7 +57,7 @@ NPanel {
Layout.fillWidth: true
Layout.preferredHeight: Style.barHeight * scaling
radius: Style.radiusSmall * scaling
color: lockButtonArea.containsMouse ? Colors.mTertiary : "transparent"
color: lockButtonArea.containsMouse ? Color.mTertiary : "transparent"
Item {
anchors.left: parent.left
@ -80,7 +80,7 @@ NPanel {
font.variableAxes: {
"wght": (Font.Normal + Font.Bold) / 2.0
}
color: lockButtonArea.containsMouse ? Colors.mOnTertiary : Colors.mOnSurface
color: lockButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1 * scaling
@ -88,7 +88,7 @@ NPanel {
Text {
text: "Lock Screen"
color: lockButtonArea.containsMouse ? Colors.mOnTertiary : Colors.mOnSurface
color: lockButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1 * scaling
@ -117,7 +117,7 @@ NPanel {
Layout.fillWidth: true
Layout.preferredHeight: Style.barHeight * scaling
radius: Style.radiusSmall * scaling
color: suspendButtonArea.containsMouse ? Colors.mTertiary : "transparent"
color: suspendButtonArea.containsMouse ? Color.mTertiary : "transparent"
Item {
anchors.left: parent.left
@ -140,7 +140,7 @@ NPanel {
font.variableAxes: {
"wght": (Font.Normal + Font.Bold) / 2.0
}
color: suspendButtonArea.containsMouse ? Colors.mOnTertiary : Colors.mOnSurface
color: suspendButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1 * scaling
@ -148,7 +148,7 @@ NPanel {
Text {
text: "Suspend"
color: suspendButtonArea.containsMouse ? Colors.mOnTertiary : Colors.mOnSurface
color: suspendButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1 * scaling
@ -175,7 +175,7 @@ NPanel {
Layout.fillWidth: true
Layout.preferredHeight: Style.barHeight * scaling
radius: Style.radiusSmall * scaling
color: rebootButtonArea.containsMouse ? Colors.mTertiary : "transparent"
color: rebootButtonArea.containsMouse ? Color.mTertiary : "transparent"
Item {
anchors.left: parent.left
@ -198,7 +198,7 @@ NPanel {
font.variableAxes: {
"wght": (Font.Normal + Font.Bold) / 2.0
}
color: rebootButtonArea.containsMouse ? Colors.mOnTertiary : Colors.mOnSurface
color: rebootButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1 * scaling
@ -206,7 +206,7 @@ NPanel {
Text {
text: "Reboot"
color: rebootButtonArea.containsMouse ? Colors.mOnTertiary : Colors.mOnSurface
color: rebootButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1 * scaling
@ -233,7 +233,7 @@ NPanel {
Layout.fillWidth: true
Layout.preferredHeight: Style.barHeight * scaling
radius: Style.radiusSmall * scaling
color: logoutButtonArea.containsMouse ? Colors.mTertiary : "transparent"
color: logoutButtonArea.containsMouse ? Color.mTertiary : "transparent"
Item {
anchors.left: parent.left
@ -256,7 +256,7 @@ NPanel {
font.variableAxes: {
"wght": (Font.Normal + Font.Bold) / 2.0
}
color: logoutButtonArea.containsMouse ? Colors.mOnTertiary : Colors.mOnSurface
color: logoutButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1 * scaling
@ -264,7 +264,7 @@ NPanel {
Text {
text: "Logout"
color: logoutButtonArea.containsMouse ? Colors.mOnTertiary : Colors.mOnSurface
color: logoutButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1 * scaling
@ -291,7 +291,7 @@ NPanel {
Layout.fillWidth: true
Layout.preferredHeight: Style.barHeight * scaling
radius: Style.radiusSmall * scaling
color: shutdownButtonArea.containsMouse ? Colors.mTertiary : "transparent"
color: shutdownButtonArea.containsMouse ? Color.mTertiary : "transparent"
Item {
anchors.left: parent.left
@ -314,7 +314,7 @@ NPanel {
font.variableAxes: {
"wght": (Font.Normal + Font.Bold) / 2.0
}
color: shutdownButtonArea.containsMouse ? Colors.mOnTertiary : Colors.mOnSurface
color: shutdownButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1 * scaling
@ -322,7 +322,7 @@ NPanel {
Text {
text: "Shutdown"
color: shutdownButtonArea.containsMouse ? Colors.mOnTertiary : Colors.mOnSurface
color: shutdownButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1 * scaling

4
Modules/SidePanel/SidePanel.qml
View file

@ -81,9 +81,9 @@ NLoader {
// Inline helpers moved to dedicated widgets: NCard and NCircleStat
Rectangle {
id: panelBackground
color: Colors.mSurface
color: Color.mSurface
radius: Style.radiusLarge * scaling
border.color: Colors.mOutlineVariant
border.color: Color.mOutlineVariant
border.width: Math.max(1, Style.borderThin * scaling)
layer.enabled: true
width: 460 * scaling