zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-08-15 18:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed extra 's' from all services. Made the noctalia color scheme the default

Browse Source
This commit is contained in:
quadbyte
2025-08-17 05:44:59 -04:00
parent b05abca3c1
commit f5a192baba
24 changed files with 79 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Background/Background.qml
+2 -2
View File
@@ -9,8 +9,8 @@ Variants {
delegate: PanelWindow {
required property ShellScreen modelData
property string wallpaperSource: WallpapersService.currentWallpaper !== ""
&& !Settings.data.wallpaper.swww.enabled ? WallpapersService.currentWallpaper : ""
property string wallpaperSource: WallpaperService.currentWallpaper !== ""
&& !Settings.data.wallpaper.swww.enabled ? WallpaperService.currentWallpaper : ""
visible: wallpaperSource !== "" && !Settings.data.wallpaper.swww.enabled
Modules/Background/Overview.qml
+2 -2
View File
@@ -22,8 +22,8 @@ NLoader {
delegate: PanelWindow {
required property ShellScreen modelData
property string wallpaperSource: WallpapersService.currentWallpaper !== ""
&& !Settings.data.wallpaper.swww.enabled ? WallpapersService.currentWallpaper : ""
property string wallpaperSource: WallpaperService.currentWallpaper !== ""
&& !Settings.data.wallpaper.swww.enabled ? WallpaperService.currentWallpaper : ""
visible: wallpaperSource !== "" && !Settings.data.wallpaper.swww.enabled
color: "transparent"
Modules/Background/WallpaperPicker.qml
-10
View File
@@ -1,10 +0,0 @@
pragma Singleton
import QtQuick
import Quickshell
import qs.Commons
import qs.Services
Item {
id: root
}
Modules/Bar/SystemMonitor.qml
+3 -3
View File
@@ -28,7 +28,7 @@ Row {
NText {
id: cpuUsageText
text: `${SystemStatsService.cpuUsage}%`
text: `${SystemStatService.cpuUsage}%`
font.pointSize: Style.fontSizeReduced * scaling
font.weight: Style.fontWeightBold
anchors.verticalCenter: parent.verticalCenter
@@ -52,7 +52,7 @@ Row {
}
NText {
text: `${SystemStatsService.cpuTemp}°C`
text: `${SystemStatService.cpuTemp}°C`
font.pointSize: Style.fontSizeReduced * scaling
font.weight: Style.fontWeightBold
anchors.verticalCenter: parent.verticalCenter
@@ -75,7 +75,7 @@ Row {
}
NText {
text: `${SystemStatsService.memoryUsageGb}G`
text: `${SystemStatService.memoryUsageGb}G`
font.pointSize: Style.fontSizeReduced * scaling
font.weight: Style.fontWeightBold
anchors.verticalCenter: parent.verticalCenter
Modules/Bar/Workspace.qml
+6 -6
View File
@@ -43,8 +43,8 @@ Item {
Component.onCompleted: {
localWorkspaces.clear()
for (var i = 0; i < WorkspacesService.workspaces.count; i++) {
const ws = WorkspacesService.workspaces.get(i)
for (var i = 0; i < WorkspaceService.workspaces.count; i++) {
const ws = WorkspaceService.workspaces.get(i)
if (ws.output.toLowerCase() === screen.name.toLowerCase()) {
localWorkspaces.append(ws)
}
@@ -54,11 +54,11 @@ Item {
}
Connections {
target: WorkspacesService
target: WorkspaceService
function onWorkspacesChanged() {
localWorkspaces.clear()
for (var i = 0; i < WorkspacesService.workspaces.count; i++) {
const ws = WorkspacesService.workspaces.get(i)
for (var i = 0; i < WorkspaceService.workspaces.count; i++) {
const ws = WorkspaceService.workspaces.get(i)
if (ws.output.toLowerCase() === screen.name.toLowerCase()) {
localWorkspaces.append(ws)
}
@@ -182,7 +182,7 @@ Item {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
WorkspacesService.switchToWorkspace(model.idx)
WorkspaceService.switchToWorkspace(model.idx)
}
hoverEnabled: true
}
Modules/LockScreen/LockScreen.qml
+1 -1
View File
@@ -96,7 +96,7 @@ WlSessionLock {
id: lockBgImage
anchors.fill: parent
fillMode: Image.PreserveAspectCrop
source: WallpapersService.currentWallpaper !== "" ? WallpapersService.currentWallpaper : ""
source: WallpaperService.currentWallpaper !== "" ? WallpaperService.currentWallpaper : ""
cache: true
smooth: true
mipmap: false
Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
+5 -5
View File
@@ -67,7 +67,7 @@ ColumnLayout {
// When the list of available schemes changes, clear the cache.
// The Repeater below will automatically re-create the FileViews.
Connections {
target: ColorSchemesService
target: ColorSchemeService
function onSchemesChanged() {
schemeColorsCache = {}
}
@@ -79,7 +79,7 @@ ColumnLayout {
id: fileLoaders
Repeater {
model: ColorSchemesService.schemes
model: ColorSchemeService.schemes
// The delegate is a Component, which correctly wraps the non-visual FileView
delegate: Item {
@@ -133,7 +133,7 @@ ColumnLayout {
onToggled: checked => {
Settings.data.colorSchemes.useWallpaperColors = checked
if (Settings.data.colorSchemes.useWallpaperColors) {
ColorSchemesService.changedWallpaper()
ColorSchemeService.changedWallpaper()
}
}
}
@@ -178,7 +178,7 @@ ColumnLayout {
Layout.fillWidth: true
Repeater {
model: ColorSchemesService.schemes
model: ColorSchemeService.schemes
Rectangle {
id: schemeCard
@@ -201,7 +201,7 @@ ColumnLayout {
// TBC: broken uncheck useWallpaperColors
Settings.data.colorSchemes.useWallpaperColors = false
Settings.data.colorSchemes.predefinedScheme = schemePath
ColorSchemesService.applyScheme(schemePath)
ColorSchemeService.applyScheme(schemePath)
}
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml
+7 -7
View File
@@ -49,7 +49,7 @@ Item {
id: currentWallpaperImage
anchors.fill: parent
anchors.margins: Style.marginSmall * scaling
imagePath: WallpapersService.currentWallpaper
imagePath: WallpaperService.currentWallpaper
fallbackIcon: "image"
borderColor: Color.mOutline
borderWidth: Math.max(1, Style.borderThin * scaling)
@@ -97,7 +97,7 @@ Item {
icon: "refresh"
tooltipText: "Refresh wallpaper list"
onClicked: {
WallpapersService.loadWallpapers()
WallpaperService.listWallpapers()
}
Layout.alignment: Qt.AlignTop | Qt.AlignRight
}
@@ -108,14 +108,14 @@ Item {
Layout.fillWidth: true
Layout.preferredHeight: {
return Math.ceil(
WallpapersService.wallpaperList.length / wallpaperGridView.columns) * wallpaperGridView.cellHeight
WallpaperService.wallpaperList.length / wallpaperGridView.columns) * wallpaperGridView.cellHeight
}
GridView {
id: wallpaperGridView
anchors.fill: parent
clip: true
model: WallpapersService.wallpaperList
model: WallpaperService.wallpaperList
boundsBehavior: Flickable.StopAtBounds
flickableDirection: Flickable.AutoFlickDirection
@@ -136,7 +136,7 @@ Item {
delegate: Rectangle {
id: wallpaperItem
property string wallpaperPath: modelData
property bool isSelected: wallpaperPath === WallpapersService.currentWallpaper
property bool isSelected: wallpaperPath === WallpaperService.currentWallpaper
width: wallpaperGridView.itemSize
height: Math.floor(wallpaperGridView.itemSize * 0.67)
@@ -197,7 +197,7 @@ Item {
acceptedButtons: Qt.LeftButton
hoverEnabled: true
onClicked: {
WallpapersService.changeWallpaper(wallpaperPath)
WallpaperService.changeWallpaper(wallpaperPath)
}
}
}
@@ -210,7 +210,7 @@ Item {
radius: Style.radiusMedium * scaling
border.color: Color.mOutline
border.width: Math.max(1, Style.borderThin * scaling)
visible: WallpapersService.wallpaperList.length === 0 && !WallpapersService.scanning
visible: WallpaperService.wallpaperList.length === 0 && !WallpaperService.scanning
ColumnLayout {
anchors.centerIn: parent
Modules/SidePanel/Cards/SystemMonitorCard.qml
+4 -4
View File
@@ -28,7 +28,7 @@ NBox {
}
NCircleStat {
value: SystemStatsService.cpuUsage
value: SystemStatService.cpuUsage
icon: "speed"
flat: true
contentScale: 0.8
@@ -36,7 +36,7 @@ NBox {
height: 68 * scaling
}
NCircleStat {
value: SystemStatsService.cpuTemp
value: SystemStatService.cpuTemp
suffix: "°C"
icon: "device_thermostat"
flat: true
@@ -45,7 +45,7 @@ NBox {
height: 68 * scaling
}
NCircleStat {
value: SystemStatsService.memoryUsagePer
value: SystemStatService.memoryUsagePer
icon: "memory"
flat: true
contentScale: 0.8
@@ -53,7 +53,7 @@ NBox {
height: 68 * scaling
}
NCircleStat {
value: SystemStatsService.diskUsage
value: SystemStatService.diskUsage
icon: "hard_drive"
flat: true
contentScale: 0.8