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

Merge branch 'dev' of https://github.com/noctalia-dev/noctalia-shell into dev

Browse source
This commit is contained in:
Ly-sec 2025-08-19 22:52:19 +02:00
commit 449f565f3f
17 changed files with 471 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Commons/Settings.qml
View file

@ -109,7 +109,7 @@ Singleton {
property JsonObject bar property JsonObject bar
bar: JsonObject { bar: JsonObject {
property string position: "top" // Possible values: "top", "bottom" property string position: "top" // Possible values: "top", "bottom"
property bool showActiveWindow: true property bool showActiveWindow: true
property bool showSystemInfo: false property bool showSystemInfo: false
property bool showMedia: false property bool showMedia: false

192
Helpers/sha256.js Normal file
View file

@ -0,0 +1,192 @@
function sha256(message) {
// SHA-256 constants
const K = [
0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
];
// Initial hash values
let h0 = 0x6a09e667;
let h1 = 0xbb67ae85;
let h2 = 0x3c6ef372;
let h3 = 0xa54ff53a;
let h4 = 0x510e527f;
let h5 = 0x9b05688c;
let h6 = 0x1f83d9ab;
let h7 = 0x5be0cd19;
// Convert string to UTF-8 bytes manually
const msgBytes = stringToUtf8Bytes(message);
const msgLength = msgBytes.length;
const bitLength = msgLength * 8;
// Calculate padding
// Message + 1 bit (0x80) + padding zeros + 8 bytes for length = multiple of 64 bytes
const totalBitsNeeded = bitLength + 1 + 64; // message bits + padding bit + 64-bit length
const totalBytesNeeded = Math.ceil(totalBitsNeeded / 8);
const paddedLength = Math.ceil(totalBytesNeeded / 64) * 64; // Round up to multiple of 64
const paddedMsg = new Array(paddedLength).fill(0);
// Copy original message
for (let i = 0; i < msgLength; i++) {
paddedMsg[i] = msgBytes[i];
}
// Add padding bit (0x80 = 10000000 in binary)
paddedMsg[msgLength] = 0x80;
// Add length as 64-bit big-endian integer at the end
// JavaScript numbers are not precise enough for 64-bit integers, so we handle high/low separately
const highBits = Math.floor(bitLength / 0x100000000);
const lowBits = bitLength % 0x100000000;
// Write 64-bit length in big-endian format
paddedMsg[paddedLength - 8] = (highBits >>> 24) & 0xFF;
paddedMsg[paddedLength - 7] = (highBits >>> 16) & 0xFF;
paddedMsg[paddedLength - 6] = (highBits >>> 8) & 0xFF;
paddedMsg[paddedLength - 5] = highBits & 0xFF;
paddedMsg[paddedLength - 4] = (lowBits >>> 24) & 0xFF;
paddedMsg[paddedLength - 3] = (lowBits >>> 16) & 0xFF;
paddedMsg[paddedLength - 2] = (lowBits >>> 8) & 0xFF;
paddedMsg[paddedLength - 1] = lowBits & 0xFF;
// Process message in 512-bit (64-byte) chunks
for (let chunk = 0; chunk < paddedLength; chunk += 64) {
const w = new Array(64);
// Break chunk into sixteen 32-bit big-endian words
for (let i = 0; i < 16; i++) {
const offset = chunk + i * 4;
w[i] = (paddedMsg[offset] << 24) |
(paddedMsg[offset + 1] << 16) |
(paddedMsg[offset + 2] << 8) |
paddedMsg[offset + 3];
// Ensure unsigned 32-bit
w[i] = w[i] >>> 0;
}
// Extend the sixteen 32-bit words into sixty-four 32-bit words
for (let i = 16; i < 64; i++) {
const s0 = rightRotate(w[i - 15], 7) ^ rightRotate(w[i - 15], 18) ^ (w[i - 15] >>> 3);
const s1 = rightRotate(w[i - 2], 17) ^ rightRotate(w[i - 2], 19) ^ (w[i - 2] >>> 10);
w[i] = (w[i - 16] + s0 + w[i - 7] + s1) >>> 0;
}
// Initialize working variables for this chunk
let a = h0, b = h1, c = h2, d = h3, e = h4, f = h5, g = h6, h = h7;
// Main loop
for (let i = 0; i < 64; i++) {
const S1 = rightRotate(e, 6) ^ rightRotate(e, 11) ^ rightRotate(e, 25);
const ch = (e & f) ^ (~e & g);
const temp1 = (h + S1 + ch + K[i] + w[i]) >>> 0;
const S0 = rightRotate(a, 2) ^ rightRotate(a, 13) ^ rightRotate(a, 22);
const maj = (a & b) ^ (a & c) ^ (b & c);
const temp2 = (S0 + maj) >>> 0;
h = g;
g = f;
f = e;
e = (d + temp1) >>> 0;
d = c;
c = b;
b = a;
a = (temp1 + temp2) >>> 0;
}
// Add this chunk's hash to result so far
h0 = (h0 + a) >>> 0;
h1 = (h1 + b) >>> 0;
h2 = (h2 + c) >>> 0;
h3 = (h3 + d) >>> 0;
h4 = (h4 + e) >>> 0;
h5 = (h5 + f) >>> 0;
h6 = (h6 + g) >>> 0;
h7 = (h7 + h) >>> 0;
}
// Produce the final hash value as a hex string
return [h0, h1, h2, h3, h4, h5, h6, h7]
.map(h => h.toString(16).padStart(8, '0'))
.join('');
}
function stringToUtf8Bytes(str) {
const bytes = [];
for (let i = 0; i < str.length; i++) {
let code = str.charCodeAt(i);
if (code < 0x80) {
// 1-byte character (ASCII)
bytes.push(code);
} else if (code < 0x800) {
// 2-byte character
bytes.push(0xC0 | (code >> 6));
bytes.push(0x80 | (code & 0x3F));
} else if (code < 0xD800 || code > 0xDFFF) {
// 3-byte character (not surrogate)
bytes.push(0xE0 | (code >> 12));
bytes.push(0x80 | ((code >> 6) & 0x3F));
bytes.push(0x80 | (code & 0x3F));
} else {
// 4-byte character (surrogate pair)
i++; // Move to next character
const code2 = str.charCodeAt(i);
const codePoint = 0x10000 + (((code & 0x3FF) << 10) | (code2 & 0x3FF));
bytes.push(0xF0 | (codePoint >> 18));
bytes.push(0x80 | ((codePoint >> 12) & 0x3F));
bytes.push(0x80 | ((codePoint >> 6) & 0x3F));
bytes.push(0x80 | (codePoint & 0x3F));
}
}
return bytes;
}
function rightRotate(value, amount) {
return ((value >>> amount) | (value << (32 - amount))) >>> 0;
}
// Test function to verify implementation
// function testSHA256() {
// const tests = [
// {
// input: "",
// expected:
// "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
// },
// {
// input: "Hello World",
// expected:
// "a591a6d40bf420404a011733cfb7b190d62c65bf0bcda32b57b277d9ad9f146e",
// },
// {
// input: "abc",
// expected:
// "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
// },
// {
// input: "The quick brown fox jumps over the lazy dog",
// expected:
// "d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592",
// },
// ];
// console.log("Running SHA-256 tests:");
// tests.forEach((test, i) => {
// const result = Crypto.sha256(test.input);
// const passed = result === test.expected;
// console.log(`Test ${i + 1}: ${passed ? "PASS" : "FAIL"}`);
// if (!passed) {
// console.log(` Input: "${test.input}"`);
// console.log(` Expected: ${test.expected}`);
// console.log(` Got: ${result}`);
// }
// });
// }

10
Modules/Background/ScreenCorners.qml
View file

@ -43,12 +43,10 @@ NLoader {
} }
margins { margins {
top: (Settings.data.bar.monitors.includes(modelData.name) top: (Settings.data.bar.monitors.includes(modelData.name) || (Settings.data.bar.monitors.length === 0))
|| (Settings.data.bar.monitors.length === 0)) && Settings.data.bar.position === "top" && Settings.data.bar.position === "top" ? Math.floor(Style.barHeight * scaling) : 0
? Math.floor(Style.barHeight * scaling) : 0 bottom: (Settings.data.bar.monitors.includes(modelData.name) || (Settings.data.bar.monitors.length === 0))
bottom: (Settings.data.bar.monitors.includes(modelData.name) && Settings.data.bar.position === "bottom" ? Math.floor(Style.barHeight * scaling) : 0
|| (Settings.data.bar.monitors.length === 0)) && Settings.data.bar.position === "bottom"
? Math.floor(Style.barHeight * scaling) : 0
} }
// Source we want to show only as a ring // Source we want to show only as a ring

8
Modules/Bar/BluetoothMenu.qml
View file

@ -76,10 +76,10 @@ NLoader {
anchors { anchors {
right: parent.right right: parent.right
rightMargin: Style.marginXS * scaling rightMargin: Style.marginXS * scaling
top: Settings.data.bar.position === "top" ? parent.top : undefined top: Settings.data.bar.position === "top" ? parent.top : undefined
bottom: Settings.data.bar.position === "bottom" ? parent.bottom : undefined bottom: Settings.data.bar.position === "bottom" ? parent.bottom : undefined
topMargin: Settings.data.bar.position === "top" ? Style.marginXS * scaling : undefined topMargin: Settings.data.bar.position === "top" ? Style.marginXS * scaling : undefined
bottomMargin: Settings.data.bar.position === "bottom" ? Style.barHeight * scaling + Style.marginXS * scaling : undefined bottomMargin: Settings.data.bar.position === "bottom" ? Style.barHeight * scaling + Style.marginXS * scaling : undefined
} }
// Animation properties // Animation properties

8
Modules/Bar/WiFiMenu.qml
View file

@ -91,10 +91,10 @@ NLoader {
anchors { anchors {
right: parent.right right: parent.right
rightMargin: Style.marginXS * scaling rightMargin: Style.marginXS * scaling
top: Settings.data.bar.position === "top" ? parent.top : undefined top: Settings.data.bar.position === "top" ? parent.top : undefined
bottom: Settings.data.bar.position === "bottom" ? parent.bottom : undefined bottom: Settings.data.bar.position === "bottom" ? parent.bottom : undefined
topMargin: Settings.data.bar.position === "top" ? Style.marginXS * scaling : undefined topMargin: Settings.data.bar.position === "top" ? Style.marginXS * scaling : undefined
bottomMargin: Settings.data.bar.position === "bottom" ? Style.barHeight * scaling + Style.marginXS * scaling : undefined bottomMargin: Settings.data.bar.position === "bottom" ? Style.barHeight * scaling + Style.marginXS * scaling : undefined
} }
// Animation properties // Animation properties

10
Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
View file

@ -347,15 +347,15 @@ ColumnLayout {
command: ["which", "matugen"] command: ["which", "matugen"]
running: false running: false
onExited: function(exitCode) { onExited: function (exitCode) {
if (exitCode === 0) { if (exitCode === 0) {
// Matugen exists, enable it // Matugen exists, enable it
Settings.data.colorSchemes.useWallpaperColors = true Settings.data.colorSchemes.useWallpaperColors = true
ColorSchemeService.changedWallpaper() ColorSchemeService.changedWallpaper()
ToastService.showNotice("Matugen", "Enabled!") ToastService.showNotice("Matugen", "Enabled!")
} else { } else {
// Matugen not found // Matugen not found
ToastService.showWarning("Matugen", "Not installed!") ToastService.showWarning("Matugen", "Not installed!")
} }
} }

118
Modules/SettingsPanel/Tabs/NetworkTab.qml
View file

@ -8,69 +8,69 @@ import qs.Services
import qs.Widgets import qs.Widgets
ColumnLayout { ColumnLayout {
id: root id: root
spacing: 0 spacing: 0
ScrollView { ScrollView {
id: scrollView id: scrollView
Layout.fillWidth: true
Layout.fillHeight: true
padding: Style.marginM * scaling
clip: true
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
ScrollBar.vertical.policy: ScrollBar.AsNeeded
ColumnLayout {
width: scrollView.availableWidth
spacing: 0
Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.preferredHeight: 0
padding: Style.marginM * scaling }
clip: true
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff ColumnLayout {
ScrollBar.vertical.policy: ScrollBar.AsNeeded spacing: Style.marginL * scaling
Layout.fillWidth: true
ColumnLayout { NText {
width: scrollView.availableWidth text: "Interfaces"
spacing: 0 font.pointSize: Style.fontSizeXXL * scaling
font.weight: Style.fontWeightBold
Item { color: Color.mOnSurface
Layout.fillWidth: true
Layout.preferredHeight: 0
}
ColumnLayout {
spacing: Style.marginL * scaling
Layout.fillWidth: true
NText {
text: "Interfaces"
font.pointSize: Style.fontSizeXXL * scaling
font.weight: Style.fontWeightBold
color: Color.mOnSurface
}
NToggle {
label: "WiFi Enabled"
description: "Enable WiFi connectivity."
checked: Settings.data.network.wifiEnabled
onToggled: checked => {
Settings.data.network.wifiEnabled = checked
NetworkService.setWifiEnabled(checked)
if (checked) {
ToastService.showNotice("WiFi", "Enabled")
} else {
ToastService.showNotice("WiFi", "Disabled")
}
}
}
NToggle {
label: "Bluetooth Enabled"
description: "Enable Bluetooth connectivity."
checked: Settings.data.network.bluetoothEnabled
onToggled: checked => {
Settings.data.network.bluetoothEnabled = checked
BluetoothService.setBluetoothEnabled(checked)
if (checked) {
ToastService.showNotice("Bluetooth", "Enabled")
} else {
ToastService.showNotice("Bluetooth", "Disabled")
}
}
}
}
} }
NToggle {
label: "WiFi Enabled"
description: "Enable WiFi connectivity."
checked: Settings.data.network.wifiEnabled
onToggled: checked => {
Settings.data.network.wifiEnabled = checked
NetworkService.setWifiEnabled(checked)
if (checked) {
ToastService.showNotice("WiFi", "Enabled")
} else {
ToastService.showNotice("WiFi", "Disabled")
}
}
}
NToggle {
label: "Bluetooth Enabled"
description: "Enable Bluetooth connectivity."
checked: Settings.data.network.bluetoothEnabled
onToggled: checked => {
Settings.data.network.bluetoothEnabled = checked
BluetoothService.setBluetoothEnabled(checked)
if (checked) {
ToastService.showNotice("Bluetooth", "Enabled")
} else {
ToastService.showNotice("Bluetooth", "Disabled")
}
}
}
}
} }
}
} }

10
Modules/SettingsPanel/Tabs/WallpaperTab.qml
View file

@ -349,15 +349,15 @@ ColumnLayout {
command: ["which", "swww"] command: ["which", "swww"]
running: false running: false
onExited: function(exitCode) { onExited: function (exitCode) {
if (exitCode === 0) { if (exitCode === 0) {
// SWWW exists, enable it // SWWW exists, enable it
Settings.data.wallpaper.swww.enabled = true Settings.data.wallpaper.swww.enabled = true
WallpaperService.startSWWWDaemon() WallpaperService.startSWWWDaemon()
ToastService.showNotice("SWWW", "Enabled!") ToastService.showNotice("SWWW", "Enabled!")
} else { } else {
// SWWW not found // SWWW not found
ToastService.showWarning("SWWW", "Not installed!") ToastService.showWarning("SWWW", "Not installed!")
} }
} }

4
Modules/Toast/ToastManager.qml
View file

@ -48,9 +48,7 @@ Variants {
targetY: Style.marginS * scaling targetY: Style.marginS * scaling
// Hidden position based on bar location // Hidden position based on bar location
hiddenY: Settings.data.bar.position === "top" hiddenY: Settings.data.bar.position === "top" ? -toast.height - 20 : toast.height + 20
? -toast.height - 20
: toast.height + 20
Component.onCompleted: { Component.onCompleted: {
// Register this toast with the service // Register this toast with the service

31
README.md
View file

@ -25,19 +25,12 @@ A sleek, minimal, and thoughtfully crafted desktop shell for Wayland using **Qui
## Preview ## Preview
<details>
<summary>Click to expand preview images</summary>
![SidePanel](https://noctalia.dev/assets/SidePanel.png)
</br>
![SettingsPanel](https://noctalia.dev/assets/SettingsPanel.png)
</br>
![Applauncher](https://noctalia.dev/assets/AppLauncher.png) ![Applauncher](https://noctalia.dev/assets/AppLauncher.png)
</details> ![SettingsPanel](https://noctalia.dev/assets/SettingsPanel.png)
<br>
Support for Dark or Light color schemes.
![SidePanel](https://noctalia.dev/assets/SidePanel.png)
--- ---
@ -71,7 +64,6 @@ A sleek, minimal, and thoughtfully crafted desktop shell for Wayland using **Qui
- `quickshell-git` - Core shell framework - `quickshell-git` - Core shell framework
- `ttf-material-symbols-variable-git` - Icon font for UI elements - `ttf-material-symbols-variable-git` - Icon font for UI elements
- `xdg-desktop-portal-gnome` - Desktop integration (or alternative portal) - `xdg-desktop-portal-gnome` - Desktop integration (or alternative portal)
- `sha256sum` - To generate checksums for wallpaper caching
### Optional ### Optional
@ -94,7 +86,7 @@ A sleek, minimal, and thoughtfully crafted desktop shell for Wayland using **Qui
yay -S quickshell-git yay -S quickshell-git
# Download and install Noctalia # Download and install Noctalia
mkdir -p ~/.config/quickshell && curl -sL https://github.com/noctalia-dev/noctalia-shell/releases/latest/download/noctalia-shell-latest.tar.gz | tar -xz --strip-components=1 -C ~/.config/quickshell/ mkdir -p ~/.config/quickshell && curl -sL https://github.com/noctalia-dev/noctalia-shell/archive/refs/heads/main.tar.gz | tar -xz --strip-components=1 -C ~/.config/quickshell
``` ```
### Usage ### Usage
@ -153,7 +145,6 @@ The launcher supports special commands for enhanced functionality:
| Error | `#e9899d` | Soft rose red | | Error | `#e9899d` | Soft rose red |
| On Error | `#1e1418` | Dark text on error | | On Error | `#1e1418` | Dark text on error |
| Outline | `#4d445a` | Purple-tinted outline | | Outline | `#4d445a` | Purple-tinted outline |
| Outline Variant | `#342c42` | Variant outline color |
| Shadow | `#120f18` | Deep purple-tinted shadow | | Shadow | `#120f18` | Deep purple-tinted shadow |
</details> </details>
@ -234,15 +225,15 @@ Contributions are welcome! Don't worry about being perfect - every contribution
--- ---
## Acknowledgment ## 💜 Credits
Special thanks to the creators of [**Caelestia**](https://github.com/caelestia-dots/shell) and [**DankMaterialShell**](https://github.com/AvengeMedia/DankMaterialShell) for their inspirational designs and clever implementation techniques. A heartfelt thank you to our incredible community of [**contributors**](https://github.com/noctalia-dev/noctalia-shell/graphs/contributors). We are immensely grateful for your dedicated participation and the constructive feedback you've provided, which continue to shape and improve our project for everyone.
--- ---
## 💜 Credits ## Acknowledgment
Huge thanks to [**@ferrreo**](https://github.com/ferrreo) and [**@quadbyte**](https://github.com/quadbyte) for their contributions and the cool features they added! Special thanks to the creators of [**Caelestia**](https://github.com/caelestia-dots/shell) and [**DankMaterialShell**](https://github.com/AvengeMedia/DankMaterialShell) for their inspirational designs and clever implementation techniques.
--- ---
@ -252,10 +243,6 @@ While I actually didn't want to accept donations, more and more people are askin
[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R01IX85B) [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R01IX85B)
---
#### Special Thanks
Thank you to everyone who supports me and this project 💜! Thank you to everyone who supports me and this project 💜!
* Gohma * Gohma

1
Services/ScalingService.qml
View file

@ -20,6 +20,7 @@ Singleton {
} }
} }
} catch (e) { } catch (e) {
//Logger.warn(e) //Logger.warn(e)
} }

165
Services/ToastService.qml
View file

@ -26,48 +26,59 @@ QtObject {
// Utility function to check if a command exists and show appropriate toast // Utility function to check if a command exists and show appropriate toast
function checkCommandAndToast(command, successMessage, failMessage, onSuccess = null) { function checkCommandAndToast(command, successMessage, failMessage, onSuccess = null) {
var checkProcess = Qt.createQmlObject(` var checkProcess = Qt.createQmlObject(`
import QtQuick import QtQuick
import Quickshell.Io import Quickshell.Io
Process { Process {
id: checkProc id: checkProc
command: ["which", "${command}"] command: ["which", "${command}"]
running: true running: true
property var onSuccessCallback: null property var onSuccessCallback: null
property bool hasFinished: false property bool hasFinished: false
onExited: { onExited: {
if (!hasFinished) { if (!hasFinished) {
hasFinished = true hasFinished = true
if (exitCode === 0) { if (exitCode === 0) {
ToastService.showNotice("${successMessage}") ToastService.showNotice("${successMessage}")
if (onSuccessCallback) onSuccessCallback() if (onSuccessCallback) onSuccessCallback()
} else { } else {
ToastService.showWarning("${failMessage}") ToastService.showWarning("${failMessage}")
} }
checkProc.destroy() checkProc.destroy()
} }
} }
// Fallback collectors to prevent issues // Fallback collectors to prevent issues
stdout: StdioCollector {} stdout: StdioCollector {}
stderr: StdioCollector {} stderr: StdioCollector {}
} }
`, root) `, root)
checkProcess.onSuccessCallback = onSuccess checkProcess.onSuccessCallback = onSuccess
} }
// Simple function to show a random toast (useful for testing or fun messages) // Simple function to show a random toast (useful for testing or fun messages)
function showRandomToast() { function showRandomToast() {
var messages = [ var messages = [{
{ type: "notice", text: "Everything is working smoothly!" }, "type": "notice",
{ type: "notice", text: "Noctalia is looking great today!" }, "text": "Everything is working smoothly!"
{ type: "notice", text: "Your desktop setup is amazing!" }, }, {
{ type: "warning", text: "Don't forget to take a break!" }, "type": "notice",
{ type: "notice", text: "Configuration saved successfully!" }, "text": "Noctalia is looking great today!"
{ type: "warning", text: "Remember to backup your settings!" } }, {
] "type": "notice",
"text": "Your desktop setup is amazing!"
}, {
"type": "warning",
"text": "Don't forget to take a break!"
}, {
"type": "notice",
"text": "Configuration saved successfully!"
}, {
"type": "warning",
"text": "Remember to backup your settings!"
}]
var randomMessage = messages[Math.floor(Math.random() * messages.length)] var randomMessage = messages[Math.floor(Math.random() * messages.length)]
showToast(randomMessage.text, randomMessage.type) showToast(randomMessage.text, randomMessage.type)
@ -86,33 +97,33 @@ QtObject {
function runCommandWithToast(command, args, successMessage, failMessage, onSuccess = null) { function runCommandWithToast(command, args, successMessage, failMessage, onSuccess = null) {
var fullCommand = [command].concat(args || []) var fullCommand = [command].concat(args || [])
var runProcess = Qt.createQmlObject(` var runProcess = Qt.createQmlObject(`
import QtQuick import QtQuick
import Quickshell.Io import Quickshell.Io
Process { Process {
id: runProc id: runProc
command: ${JSON.stringify(fullCommand)} command: ${JSON.stringify(fullCommand)}
running: true running: true
property var onSuccessCallback: null property var onSuccessCallback: null
property bool hasFinished: false property bool hasFinished: false
onExited: { onExited: {
if (!hasFinished) { if (!hasFinished) {
hasFinished = true hasFinished = true
if (exitCode === 0) { if (exitCode === 0) {
ToastService.showNotice("${successMessage}") ToastService.showNotice("${successMessage}")
if (onSuccessCallback) onSuccessCallback() if (onSuccessCallback) onSuccessCallback()
} else { } else {
ToastService.showWarning("${failMessage}") ToastService.showWarning("${failMessage}")
} }
runProc.destroy() runProc.destroy()
} }
} }
stdout: StdioCollector {} stdout: StdioCollector {}
stderr: StdioCollector {} stderr: StdioCollector {}
} }
`, root) `, root)
runProcess.onSuccessCallback = onSuccess runProcess.onSuccessCallback = onSuccess
} }
@ -125,32 +136,30 @@ QtObject {
// Show toast after a delay (useful for delayed feedback) // Show toast after a delay (useful for delayed feedback)
function delayedToast(message, type = "notice", delayMs = 1000) { function delayedToast(message, type = "notice", delayMs = 1000) {
var timer = Qt.createQmlObject(` var timer = Qt.createQmlObject(`
import QtQuick import QtQuick
Timer { Timer {
interval: ${delayMs} interval: ${delayMs}
repeat: false repeat: false
running: true running: true
onTriggered: { onTriggered: {
ToastService.showToast("${message}", "${type}") ToastService.showToast("${message}", "${type}")
destroy() destroy()
} }
} }
`, root) `, root)
} }
// Generic method to show a toast // Generic method to show a toast
function showToast(label, description = "", type = "notice", persistent = false, duration = 3000) { function showToast(label, description = "", type = "notice", persistent = false, duration = 3000) {
var toastData = { var toastData = {
label: label, "label": label,
description: description, "description": description,
type: type, "type": type,
persistent: persistent, "persistent": persistent,
duration: duration, "duration": duration,
timestamp: Date.now() "timestamp": Date.now()
} }
// Add to queue // Add to queue
messageQueue.push(toastData) messageQueue.push(toastData)
@ -175,8 +184,6 @@ QtObject {
var toastData = messageQueue.shift() var toastData = messageQueue.shift()
isShowingToast = true isShowingToast = true
// Configure and show toast // Configure and show toast
currentToast.label = toastData.label currentToast.label = toastData.label
currentToast.description = toastData.description currentToast.description = toastData.description
@ -192,7 +199,7 @@ QtObject {
isShowingToast = false isShowingToast = false
// Small delay before showing next toast // Small delay before showing next toast
Qt.callLater(function() { Qt.callLater(function () {
processQueue() processQueue()
}) })
} }

14
Widgets/NImageCached.qml
View file

@ -4,6 +4,7 @@ import QtQuick
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io
import qs.Commons import qs.Commons
import "../Helpers/sha256.js" as Crypto
Image { Image {
id: root id: root
@ -20,8 +21,8 @@ Image {
smooth: true smooth: true
onImagePathChanged: { onImagePathChanged: {
if (imagePath) { if (imagePath) {
hashProcess.command = ["sha256sum", imagePath] imageHash = Crypto.sha256(imagePath)
hashProcess.running = true Logger.log("NImageCached", imagePath, imageHash)
} else { } else {
source = "" source = ""
imageHash = "" imageHash = ""
@ -47,13 +48,4 @@ Image {
}) })
} }
} }
Process {
id: hashProcess
stdout: StdioCollector {
onStreamFinished: {
root.imageHash = text.split(" ")[0]
}
}
}
} }

29
Widgets/NToast.qml
View file

@ -20,7 +20,7 @@ Item {
property real targetY: 0 property real targetY: 0
property real hiddenY: -height - 20 property real hiddenY: -height - 20
signal dismissed() signal dismissed
width: Math.min(500 * scaling, parent.width * 0.8) width: Math.min(500 * scaling, parent.width * 0.8)
height: Math.max(60 * scaling, contentLayout.implicitHeight + Style.marginL * 2 * scaling) height: Math.max(60 * scaling, contentLayout.implicitHeight + Style.marginL * 2 * scaling)
@ -85,9 +85,12 @@ Item {
// Simple colored border all around // Simple colored border all around
border.color: { border.color: {
switch (root.type) { switch (root.type) {
case "warning": return Color.mError case "warning":
case "notice": return Color.mPrimary return Color.mError
default: return Color.mOutline case "notice":
return Color.mPrimary
default:
return Color.mOutline
} }
} }
border.width: Math.max(2, Style.borderM * scaling) border.width: Math.max(2, Style.borderM * scaling)
@ -112,17 +115,23 @@ Item {
id: icon id: icon
text: { text: {
switch (root.type) { switch (root.type) {
case "warning": return "warning" case "warning":
case "notice": return "info" return "warning"
default: return "info" case "notice":
return "info"
default:
return "info"
} }
} }
color: { color: {
switch (root.type) { switch (root.type) {
case "warning": return Color.mError case "warning":
case "notice": return Color.mPrimary return Color.mError
default: return Color.mPrimary case "notice":
return Color.mPrimary
default:
return Color.mPrimary
} }
} }