lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

autoformat

Browse Source
This commit is contained in:
Lemmy
2025-12-25 17:56:33 -05:00
parent 7af94e65e8
commit c07ab79b5a
9 changed files with 90 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Commons/Migrations/Migration33.qml
-1
View File
@@ -24,4 +24,3 @@ QtObject {
return true;
}
}
Modules/LockScreen/LockScreen.qml
-1
View File
@@ -190,7 +190,6 @@ Loader {
resolvedWallpaperPath = originalPath;
}
});
}
// Black backgound, in case image fails to load or takes a while
Services/Media/ScreenRecorderService.qml
+1 -2
View File
@@ -157,8 +157,7 @@ Singleton {
if (stderr.length > 0) {
ToastService.showError(I18n.tr("toast.recording.failed-start"), stderr);
Logger.e(stderr);
}
else {
} else {
ToastService.showError(I18n.tr("toast.recording.failed-start"), I18n.tr("toast.recording.failed-general"));
}
}
Services/Networking/BluetoothService.qml
+2 -1
View File
@@ -203,7 +203,8 @@ BluetoothAgent {
interval: 1000
repeat: false
onTriggered: {
if (adapter) adapter.discovering = true
if (adapter)
adapter.discovering = true;
}
}
Services/Noctalia/GitHubService.qml
+2 -2
View File
@@ -177,8 +177,8 @@ Singleton {
var avatarUrl = contributor.avatar_url;
// Use closure to capture username
(function(uname, url) {
ImageCacheService.getCircularAvatar(url, uname, function(cachedPath, success) {
(function (uname, url) {
ImageCacheService.getCircularAvatar(url, uname, function (cachedPath, success) {
if (success) {
cachedAvatars[uname] = "file://" + cachedPath;
cachedAvatarsChanged();
Services/System/NotificationService.qml
+3 -2
View File
@@ -394,7 +394,8 @@ Singleton {
"timestamp": time,
"progress": 1.0,
"originalImage": image,
"cachedImage": image, // Start with original, update when cached
"cachedImage": image // Start with original, update when cached
,
"actionsJson": JSON.stringify((n.actions || []).map(a => ({
"text": a.text || "Action",
"identifier": a.identifier || ""
@@ -500,7 +501,7 @@ Singleton {
if (!path || !path.startsWith("image://") || !notificationId)
return;
ImageCacheService.getNotificationIcon(path, appName, summary, function(cachedPath, success) {
ImageCacheService.getNotificationIcon(path, appName, summary, function (cachedPath, success) {
if (success && cachedPath) {
updateImagePath(notificationId, "file://" + cachedPath);
}
Services/UI/ImageCacheService.qml
+25 -33
View File
@@ -25,16 +25,7 @@ Singleton {
// Supported image formats - extended list when ImageMagick is available
readonly property var basicImageFilters: ["*.jpg", "*.jpeg", "*.png", "*.gif", "*.bmp"]
readonly property var extendedImageFilters: [
"*.jpg", "*.jpeg", "*.png", "*.gif", "*.bmp",
"*.webp", "*.avif", "*.heic", "*.heif",
"*.tiff", "*.tif", "*.pnm", "*.pgm", "*.ppm", "*.pbm",
"*.svg", "*.svgz",
"*.ico", "*.icns",
"*.jxl", "*.jp2", "*.j2k",
"*.exr", "*.hdr",
"*.dds", "*.tga"
]
readonly property var extendedImageFilters: ["*.jpg", "*.jpeg", "*.png", "*.gif", "*.bmp", "*.webp", "*.avif", "*.heic", "*.heif", "*.tiff", "*.tif", "*.pnm", "*.pgm", "*.ppm", "*.pbm", "*.svg", "*.svgz", "*.ico", "*.icns", "*.jxl", "*.jp2", "*.j2k", "*.exr", "*.hdr", "*.dds", "*.tga"]
readonly property var imageFilters: imageMagickAvailable ? extendedImageFilters : basicImageFilters
// Check if a file format needs conversion (not natively supported by Qt)
@@ -83,11 +74,11 @@ Singleton {
return;
}
getMtime(sourcePath, function(mtime) {
getMtime(sourcePath, function (mtime) {
const cacheKey = generateThumbnailKey(sourcePath, mtime);
const cachedPath = wpThumbDir + cacheKey + ".jpg";
processRequest(cacheKey, cachedPath, sourcePath, callback, function() {
processRequest(cacheKey, cachedPath, sourcePath, callback, function () {
if (imageMagickAvailable) {
startThumbnailProcessing(sourcePath, cachedPath, cacheKey);
} else {
@@ -113,7 +104,7 @@ Singleton {
}
// Fast dimension check - skip processing if image fits screen AND format is Qt-native
getImageDimensions(sourcePath, function(imgWidth, imgHeight) {
getImageDimensions(sourcePath, function (imgWidth, imgHeight) {
const fitsScreen = imgWidth > 0 && imgHeight > 0 && imgWidth <= width && imgHeight <= height;
if (fitsScreen) {
@@ -130,11 +121,11 @@ Singleton {
const targetWidth = fitsScreen ? imgWidth : width;
const targetHeight = fitsScreen ? imgHeight : height;
getMtime(sourcePath, function(mtime) {
getMtime(sourcePath, function (mtime) {
const cacheKey = generateLargeKey(sourcePath, screenName, width, height, mtime);
const cachedPath = wpLargeDir + cacheKey + ".jpg";
processRequest(cacheKey, cachedPath, sourcePath, callback, function() {
processRequest(cacheKey, cachedPath, sourcePath, callback, function () {
startLargeProcessing(sourcePath, cachedPath, targetWidth, targetHeight, cacheKey);
});
});
@@ -159,7 +150,7 @@ Singleton {
const cacheKey = generateNotificationKey(imageUri, appName, summary);
const cachedPath = notificationsDir + cacheKey + ".png";
processRequest(cacheKey, cachedPath, imageUri, callback, function() {
processRequest(cacheKey, cachedPath, imageUri, callback, function () {
// Notifications always use Qt fallback (image:// URIs can't be read by ImageMagick)
queueFallbackProcessing(imageUri, cachedPath, cacheKey, 64);
});
@@ -177,7 +168,7 @@ Singleton {
const cacheKey = username;
const cachedPath = contributorsDir + username + "_circular.png";
processRequest(cacheKey, cachedPath, url, callback, function() {
processRequest(cacheKey, cachedPath, url, callback, function () {
if (imageMagickAvailable) {
downloadAndProcessAvatar(url, username, cachedPath, cacheKey);
} else {
@@ -220,7 +211,7 @@ Singleton {
}
// Check cache first
checkFileExists(cachedPath, function(exists) {
checkFileExists(cachedPath, function (exists) {
if (exists) {
Logger.d("ImageCache", "Cache hit:", cachedPath);
callback(cachedPath, true);
@@ -249,7 +240,7 @@ Singleton {
function notifyCallbacks(cacheKey, path, success) {
const request = pendingRequests[cacheKey];
if (request) {
request.callbacks.forEach(function(cb) {
request.callbacks.forEach(function (cb) {
cb(path, success);
});
delete pendingRequests[cacheKey];
@@ -313,7 +304,7 @@ Singleton {
const downloadProcess = Qt.createQmlObject(processString, root, "DownloadProcess_" + cacheKey);
downloadProcess.command = ["bash", "-c", downloadCmd];
downloadProcess.exited.connect(function(exitCode) {
downloadProcess.exited.connect(function (exitCode) {
downloadProcess.destroy();
if (exitCode !== 0) {
@@ -354,7 +345,7 @@ Singleton {
const processObj = Qt.createQmlObject(processString, root, "CircularProcess_" + cacheKey);
processObj.command = ["bash", "-c", command];
processObj.exited.connect(function(exitCode) {
processObj.exited.connect(function (exitCode) {
// Clean up temp file
Quickshell.execDetached(["rm", "-f", inputPath]);
@@ -399,7 +390,7 @@ Singleton {
processObj.cachedPath = outputPath;
processObj.command = ["bash", "-c", command];
processObj.exited.connect(function(exitCode) {
processObj.exited.connect(function (exitCode) {
if (exitCode !== 0) {
const stderrText = processObj.stderr.text || "";
Logger.e("ImageCache", "Processing failed:", stderrText);
@@ -447,10 +438,11 @@ Singleton {
antialiasing: true
onStatusChanged: {
if (!cacheKey) return;
if (!cacheKey)
return;
if (status === Image.Ready) {
grabToImage(function(result) {
grabToImage(function (result) {
if (result.saveToFile(destPath)) {
Logger.d("ImageCache", "Fallback cache created:", destPath);
root.notifyCallbacks(cacheKey, destPath, true);
@@ -487,11 +479,11 @@ Singleton {
function queueFallbackProcessing(sourcePath, destPath, cacheKey, size) {
fallbackQueue.push({
sourcePath: sourcePath,
destPath: destPath,
cacheKey: cacheKey,
size: size
});
sourcePath: sourcePath,
destPath: destPath,
cacheKey: cacheKey,
size: size
});
if (!fallbackProcessing) {
fallbackProcessing = true;
@@ -521,7 +513,7 @@ Singleton {
try {
const processObj = Qt.createQmlObject(processString, root, "MtimeProcess");
processObj.exited.connect(function(exitCode) {
processObj.exited.connect(function (exitCode) {
const mtime = exitCode === 0 ? processObj.stdout.text.trim() : "";
processObj.destroy();
callback(mtime);
@@ -549,7 +541,7 @@ Singleton {
try {
const processObj = Qt.createQmlObject(processString, root, "FileExistsProcess");
processObj.exited.connect(function(exitCode) {
processObj.exited.connect(function (exitCode) {
processObj.destroy();
callback(exitCode === 0);
});
@@ -576,7 +568,7 @@ Singleton {
try {
const processObj = Qt.createQmlObject(processString, root, "IdentifyProcess");
processObj.exited.connect(function(exitCode) {
processObj.exited.connect(function (exitCode) {
let width = 0, height = 0;
if (exitCode === 0) {
const parts = processObj.stdout.text.trim().split(" ");
@@ -667,7 +659,7 @@ Singleton {
stdout: StdioCollector {}
stderr: StdioCollector {}
onExited: function(exitCode) {
onExited: function (exitCode) {
root.imageMagickAvailable = (exitCode === 0);
root.initialized = true;
if (root.imageMagickAvailable) {
Widgets/NClock.qml
+54 -48
View File
@@ -61,8 +61,10 @@ Item {
anchors.fill: parent
sourceComponent: {
if (root.clockStyle === "analog") return analogClockComponent;
if (root.clockStyle === "binary") return binaryClockComponent;
if (root.clockStyle === "analog")
return analogClockComponent;
if (root.clockStyle === "binary")
return binaryClockComponent;
return digitalClockComponent;
}
@@ -279,11 +281,11 @@ Item {
// Binary Clock Component
component NClockBinary: Item {
property var now
property color backgroundColor
property color backgroundColor
property color clockColor: Color.mOnPrimary
anchors.fill: parent
readonly property int h: now.getHours()
readonly property int m: now.getMinutes()
readonly property int s: now.getSeconds()
@@ -300,61 +302,61 @@ Item {
RowLayout {
anchors.centerIn: parent
spacing: parent.width * 0.05
// Hours
RowLayout {
spacing: parent.parent.width * 0.02
BinaryColumn {
value: Math.floor(h / 10)
bits: 2
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
BinaryColumn {
value: Math.floor(h / 10)
bits: 2
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
}
BinaryColumn {
value: h % 10
bits: 4
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
BinaryColumn {
value: h % 10
bits: 4
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
}
}
// Minutes
RowLayout {
spacing: parent.parent.width * 0.02
BinaryColumn {
value: Math.floor(m / 10)
bits: 3
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
BinaryColumn {
value: Math.floor(m / 10)
bits: 3
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
}
BinaryColumn {
value: m % 10
bits: 4
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
BinaryColumn {
value: m % 10
bits: 4
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
}
}
// Seconds
RowLayout {
spacing: parent.parent.width * 0.02
BinaryColumn {
value: Math.floor(s / 10)
bits: 3
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
BinaryColumn {
value: Math.floor(s / 10)
bits: 3
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
}
BinaryColumn {
value: s % 10
bits: 4
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
BinaryColumn {
value: s % 10
bits: 4
dotSize: root.width * 0.08
activeColor: clockColor
Layout.alignment: Qt.AlignBottom
}
}
}
@@ -367,20 +369,24 @@ Item {
property color activeColor: "white"
spacing: dotSize * 0.4
Repeater {
model: bits
Rectangle {
property int bitIndex: (bits - 1) - index
property bool isActive: (value >> bitIndex) & 1
width: dotSize
height: dotSize
radius: dotSize / 2
color: isActive ? activeColor : Qt.alpha(activeColor, 0.2)
Behavior on color { ColorAnimation { duration: 200 } }
Behavior on color {
ColorAnimation {
duration: 200
}
}
}
}
}
Widgets/NImageCached.qml
+3 -2
View File
@@ -26,8 +26,9 @@ Image {
return;
}
ImageCacheService.getThumbnail(imagePath, function(cachedPath, success) {
if (!root) return; // Component was destroyed
ImageCacheService.getThumbnail(imagePath, function (cachedPath, success) {
if (!root)
return; // Component was destroyed
if (success) {
root.source = cachedPath;
} else {