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

Formatting

Browse source
This commit is contained in:
quadbyte 2025-08-12 12:07:51 -04:00
parent 4ebc4cd299
commit 8a16b6b7f5
8 changed files with 163 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Modules/Background/Background.qml
View file

@ -8,10 +8,11 @@ Variants {
delegate: PanelWindow {
required property ShellScreen modelData
property string wallpaperSource: Wallpapers.currentWallpaper !== "" && !Settings.data.wallpaper.swww.enabled ? Wallpapers.currentWallpaper : ""
property string wallpaperSource: Wallpapers.currentWallpaper !== ""
&& !Settings.data.wallpaper.swww.enabled ? Wallpapers.currentWallpaper : ""
visible: wallpaperSource !== "" && !Settings.data.wallpaper.swww.enabled
// Force update when SWWW setting changes
onVisibleChanged: {
if (visible) {

3
Modules/Background/Overview.qml
View file

@ -9,7 +9,8 @@ Variants {
delegate: PanelWindow {
required property ShellScreen modelData
property string wallpaperSource: Wallpapers.currentWallpaper !== "" && !Settings.data.wallpaper.swww.enabled ? Wallpapers.currentWallpaper : ""
property string wallpaperSource: Wallpapers.currentWallpaper !== ""
&& !Settings.data.wallpaper.swww.enabled ? Wallpapers.currentWallpaper : ""
visible: wallpaperSource !== "" && !Settings.data.wallpaper.swww.enabled
color: "transparent"

6
Modules/Settings/SettingsWindow.qml
View file

@ -46,13 +46,11 @@ NLoader {
"label": "Wallpaper",
"icon": "image",
"source": "Tabs/Wallpaper.qml"
},
{
}, {
"label": "Wallpaper Selector",
"icon": "wallpaper_slideshow",
"source": "Tabs/WallpaperSelector.qml"
},
{
}, {
"label": "Misc",
"icon": "more_horiz",
"source": "Tabs/Misc.qml"

2
Modules/Settings/Tabs/Display.qml
View file

@ -116,4 +116,4 @@ Item {
Layout.fillHeight: true
}
}
}
}

2
Modules/Settings/Tabs/ScreenRecorder.qml
View file

@ -324,4 +324,4 @@ ColumnLayout {
}
}
}
}
}

12
Services/Settings.qml
View file

@ -188,8 +188,14 @@ Singleton {
Connections {
target: adapter.wallpaper
function onIsRandomChanged() { Wallpapers.toggleRandomWallpaper() }
function onRandomIntervalChanged() { Wallpapers.restartRandomWallpaperTimer() }
function onDirectoryChanged() { Wallpapers.loadWallpapers() }
function onIsRandomChanged() {
Wallpapers.toggleRandomWallpaper()
}
function onRandomIntervalChanged() {
Wallpapers.restartRandomWallpaperTimer()
}
function onDirectoryChanged() {
Wallpapers.loadWallpapers()
}
}
}

12
Services/Wallpapers.qml
View file

@ -138,12 +138,12 @@ Singleton {
), "--transition-type", transitionType, "--transition-duration", Settings.data.wallpaper.swww.transitionDuration.toString(
), currentWallpaper]
running: false
onStarted: {
console.log("SWWW: Process started with command:", command.join(" "))
}
onExited: function(exitCode, exitStatus) {
onExited: function (exitCode, exitStatus) {
console.log("SWWW: Process finished with exit code:", exitCode, "status:", exitStatus)
if (exitCode !== 0) {
console.log("SWWW: Process failed. Make sure swww-daemon is running with: swww-daemon")
@ -163,12 +163,12 @@ Singleton {
id: startDaemonProcess
command: ["swww-daemon", "--format", "xrgb"]
running: false
onStarted: {
console.log("SWWW: Daemon start process initiated")
}
onExited: function(exitCode, exitStatus) {
onExited: function (exitCode, exitStatus) {
console.log("SWWW: Daemon start process finished with exit code:", exitCode)
if (exitCode === 0) {
console.log("SWWW: Daemon started successfully")

277
Services/Workspaces.qml
View file

@ -1,5 +1,6 @@
pragma Singleton
pragma ComponentBehavior: Bound
pragma ComponentBehavior
import QtQuick
import Quickshell
@ -8,149 +9,149 @@ import Quickshell.Hyprland
import qs.Services
Singleton {
id: root
id: root
property ListModel workspaces: ListModel {}
property bool isHyprland: false
property bool isNiri: false
property var hlWorkspaces: Hyprland.workspaces.values
// Detect which compositor we're using
Component.onCompleted: {
console.log("WorkspaceManager initializing...");
detectCompositor();
}
property ListModel workspaces: ListModel {}
property bool isHyprland: false
property bool isNiri: false
property var hlWorkspaces: Hyprland.workspaces.values
// Detect which compositor we're using
Component.onCompleted: {
console.log("WorkspaceManager initializing...")
detectCompositor()
}
function detectCompositor() {
try {
try {
if (Hyprland.eventSocketPath) {
console.log("Detected Hyprland compositor");
isHyprland = true;
isNiri = false;
initHyprland();
return;
}
} catch (e) {
console.log("Hyprland not available:", e);
}
if (typeof Niri !== "undefined") {
console.log("Detected Niri service");
isHyprland = false;
isNiri = true;
initNiri();
return;
}
console.log("No supported compositor detected");
} catch (e) {
console.error("Error detecting compositor:", e);
function detectCompositor() {
try {
try {
if (Hyprland.eventSocketPath) {
console.log("Detected Hyprland compositor")
isHyprland = true
isNiri = false
initHyprland()
return
}
}
} catch (e) {
console.log("Hyprland not available:", e)
}
// Initialize Hyprland integration
function initHyprland() {
try {
// Fixes the odd workspace issue.
Hyprland.refreshWorkspaces();
// hlWorkspaces = Hyprland.workspaces.values;
// updateHyprlandWorkspaces();
return true;
} catch (e) {
console.error("Error initializing Hyprland:", e);
isHyprland = false;
return false;
if (typeof Niri !== "undefined") {
console.log("Detected Niri service")
isHyprland = false
isNiri = true
initNiri()
return
}
console.log("No supported compositor detected")
} catch (e) {
console.error("Error detecting compositor:", e)
}
}
// Initialize Hyprland integration
function initHyprland() {
try {
// Fixes the odd workspace issue.
Hyprland.refreshWorkspaces()
// hlWorkspaces = Hyprland.workspaces.values;
// updateHyprlandWorkspaces();
return true
} catch (e) {
console.error("Error initializing Hyprland:", e)
isHyprland = false
return false
}
}
onHlWorkspacesChanged: {
updateHyprlandWorkspaces()
}
Connections {
target: Hyprland.workspaces
function onValuesChanged() {
updateHyprlandWorkspaces()
}
}
Connections {
target: Hyprland
function onRawEvent(event) {
updateHyprlandWorkspaces()
}
}
function updateHyprlandWorkspaces() {
workspaces.clear()
try {
for (var i = 0; i < hlWorkspaces.length; i++) {
const ws = hlWorkspaces[i]
// Only append workspaces with id >= 1
if (ws.id >= 1) {
workspaces.append({
"id": i,
"idx": ws.id,
"name": ws.name || "",
"output": ws.monitor?.name || "",
"isActive": ws.active === true,
"isFocused": ws.focused === true,
"isUrgent": ws.urgent === true
})
}
}
workspacesChanged()
} catch (e) {
console.error("Error updating Hyprland workspaces:", e)
}
}
function initNiri() {
updateNiriWorkspaces()
}
Connections {
target: Niri
function onWorkspacesChanged() {
updateNiriWorkspaces()
}
}
function updateNiriWorkspaces() {
const niriWorkspaces = Niri.workspaces || []
workspaces.clear()
for (var i = 0; i < niriWorkspaces.length; i++) {
const ws = niriWorkspaces[i]
workspaces.append({
"id": ws.id,
"idx": ws.idx || 1,
"name": ws.name || "",
"output": ws.output || "",
"isFocused": ws.isFocused === true,
"isActive": ws.isActive === true,
"isUrgent": ws.isUrgent === true,
"isOccupied": ws.isOccupied === true
})
}
onHlWorkspacesChanged: {
updateHyprlandWorkspaces();
}
workspacesChanged()
}
Connections {
target: Hyprland.workspaces
function onValuesChanged() {
updateHyprlandWorkspaces();
}
function switchToWorkspace(workspaceId) {
if (isHyprland) {
try {
Hyprland.dispatch(`workspace ${workspaceId}`)
} catch (e) {
console.error("Error switching Hyprland workspace:", e)
}
} else if (isNiri) {
try {
Quickshell.execDetached(["niri", "msg", "action", "focus-workspace", workspaceId.toString()])
} catch (e) {
console.error("Error switching Niri workspace:", e)
}
} else {
console.warn("No supported compositor detected for workspace switching")
}
Connections {
target: Hyprland
function onRawEvent(event) {
updateHyprlandWorkspaces();
}
}
function updateHyprlandWorkspaces() {
workspaces.clear();
try {
for (let i = 0; i < hlWorkspaces.length; i++) {
const ws = hlWorkspaces[i];
// Only append workspaces with id >= 1
if (ws.id >= 1) {
workspaces.append({
id: i,
idx: ws.id,
name: ws.name || "",
output: ws.monitor?.name || "",
isActive: ws.active === true,
isFocused: ws.focused === true,
isUrgent: ws.urgent === true
});
}
}
workspacesChanged();
} catch (e) {
console.error("Error updating Hyprland workspaces:", e);
}
}
function initNiri() {
updateNiriWorkspaces();
}
Connections {
target: Niri
function onWorkspacesChanged() {
updateNiriWorkspaces();
}
}
function updateNiriWorkspaces() {
const niriWorkspaces = Niri.workspaces || [];
workspaces.clear();
for (let i = 0; i < niriWorkspaces.length; i++) {
const ws = niriWorkspaces[i];
workspaces.append({
id: ws.id,
idx: ws.idx || 1,
name: ws.name || "",
output: ws.output || "",
isFocused: ws.isFocused === true,
isActive: ws.isActive === true,
isUrgent: ws.isUrgent === true,
isOccupied: ws.isOccupied === true,
});
}
workspacesChanged();
}
function switchToWorkspace(workspaceId) {
if (isHyprland) {
try {
Hyprland.dispatch(`workspace ${workspaceId}`);
} catch (e) {
console.error("Error switching Hyprland workspace:", e);
}
} else if (isNiri) {
try {
Quickshell.execDetached(["niri", "msg", "action", "focus-workspace", workspaceId.toString()]);
} catch (e) {
console.error("Error switching Niri workspace:", e);
}
} else {
console.warn("No supported compositor detected for workspace switching");
}
}
}
}
}