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

feat (about/version): added fallback to board_name if product_family is N/A

Browse Source
This commit is contained in:
D3rJust1n
2026-03-06 21:58:51 +01:00
parent c685b70f10
commit 6d7d5dfcd5
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Panels/Settings/Tabs/About/VersionSubTab.qml
+30 -3
View File
@@ -33,6 +33,7 @@ ColumnLayout {
property string commitInfo: ""
property string qsVersion: ""
property string qsRevision: ""
property string boardNameFallback: ""
readonly property bool isGitVersion: root.currentVersion.endsWith("-git")
readonly property int gigaB: (1024 * 1024 * 1024)
@@ -157,7 +158,8 @@ ColumnLayout {
info += "OS: " + (os?.result?.prettyName || "N/A") + "\n";
info += "Kernel: " + (kernel?.result?.release || "N/A") + "\n";
info += "Host: " + (title?.result?.hostName || "N/A") + "\n";
info += "Product: " + (product?.result?.name || "N/A") + "\n";
const productName = product?.result?.name;
info += "Product: " + ((!productName || productName === "N/A") ? (root.boardNameFallback || "N/A") : productName) + "\n";
info += "CPU: " + (cpu?.result?.cpu || "N/A") + "\n";
if (gpu?.result && Array.isArray(gpu.result) && gpu.result.length > 0) {
info += "GPU: " + gpu.result.map(g => g.name || "Unknown").join(", ") + "\n";
@@ -186,6 +188,9 @@ ColumnLayout {
// Check if fastfetch is available before trying to run it
checkFastfetchProcess.running = true;
qsVersionProcess.running = true;
boardNameProcess.running = true;
Logger.d("VersionSubTab", "Current version:", root.currentVersion);
Logger.d("VersionSubTab", "Is git version:", root.isGitVersion);
@@ -270,6 +275,24 @@ ColumnLayout {
stderr: StdioCollector {}
}
Process {
id: boardNameProcess
command: ["cat", "/sys/class/dmi/id/board_name"]
running: false
onExited: function(exitCode) {
if (exitCode === 0) {
var output = stdout.text.trim();
if (output && output !== "" && output !== "N/A") {
root.boardNameFallback = output;
}
}
}
stdout: StdioCollector {}
stderr: StdioCollector {}
}
// Check if fastfetch is available before attempting to run it
Process {
id: checkFastfetchProcess
@@ -711,8 +734,12 @@ ColumnLayout {
}
NText {
text: {
const title = root.getModule("Host");
return title?.result?.name || "N/A";
const host = root.getModule("Host");
const name = host?.result?.name;
if (!name || name === "N/A" || name === "") {
return root.boardNameFallback || "N/A";
}
return name;
}
color: Color.mOnSurface
pointSize: sysInfo.textSize