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-20 11:40:16 -04:00
parent c0a068ddc0
commit 0fca050ce3
8 changed files with 93 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Modules/AppLauncher/Calculator.qml
View file

@ -34,20 +34,15 @@ QtObject {
} else {
// Fallback to basic evaluation
console.log("AdvancedMath not available, using basic eval")
// Basic preprocessing for common functions
var processed = expression.trim()
.replace(/\bpi\b/gi, Math.PI)
.replace(/\be\b/gi, Math.E)
.replace(/\bsqrt\s*\(/g, 'Math.sqrt(')
.replace(/\bsin\s*\(/g, 'Math.sin(')
.replace(/\bcos\s*\(/g, 'Math.cos(')
.replace(/\btan\s*\(/g, 'Math.tan(')
.replace(/\blog\s*\(/g, 'Math.log10(')
.replace(/\bln\s*\(/g, 'Math.log(')
.replace(/\bexp\s*\(/g, 'Math.exp(')
.replace(/\bpow\s*\(/g, 'Math.pow(')
.replace(/\babs\s*\(/g, 'Math.abs(')
var processed = expression.trim(
).replace(/\bpi\b/gi,
Math.PI).replace(/\be\b/gi,
Math.E).replace(/\bsqrt\s*\(/g,
'Math.sqrt(').replace(/\bsin\s*\(/g,
'Math.sin(').replace(/\bcos\s*\(/g,
'Math.cos(').replace(/\btan\s*\(/g, 'Math.tan(').replace(/\blog\s*\(/g, 'Math.log10(').replace(/\bln\s*\(/g, 'Math.log(').replace(/\bexp\s*\(/g, 'Math.exp(').replace(/\bpow\s*\(/g, 'Math.pow(').replace(/\babs\s*\(/g, 'Math.abs(')
// Sanitize and evaluate
if (!/^[0-9+\-*/().\s\w,]+$/.test(processed)) {
@ -90,15 +85,13 @@ QtObject {
"name": "Invalid expression",
"content": evaluation.error,
"icon": "error",
"execute": function () {
// Do nothing for invalid expressions
"execute": function () {// Do nothing for invalid expressions
}
}
}
const displayName = searchContext === "calc"
? `${expression} = ${evaluation.displayResult}`
: `${expression} = ${evaluation.displayResult}`
const displayName = searchContext
=== "calc" ? `${expression} = ${evaluation.displayResult}` : `${expression} = ${evaluation.displayResult}`
return {
"isCalculator": true,
@ -110,12 +103,10 @@ QtObject {
"execute": function () {
Quickshell.clipboardText = evaluation.displayResult
// Also copy using shell command for better compatibility
Quickshell.execDetached(["sh", "-lc", `printf %s ${evaluation.displayResult} | wl-copy -t text/plain;charset=utf-8`])
Quickshell.execDetached([
"notify-send",
"Calculator",
`${expression} = ${evaluation.displayResult} (copied to clipboard)`
])
Quickshell.execDetached(
["sh", "-lc", `printf %s ${evaluation.displayResult} | wl-copy -t text/plain;charset=utf-8`])
Quickshell.execDetached(
["notify-send", "Calculator", `${expression} = ${evaluation.displayResult} (copied to clipboard)`])
}
}
}
@ -127,8 +118,7 @@ QtObject {
"name": "Calculator",
"content": "Try: sqrt(16), sin(1), cos(0), pi*2, exp(1), pow(2,8), abs(-5)",
"icon": "calculate",
"execute": function () {
// Do nothing for placeholder
"execute": function () {// Do nothing for placeholder
}
}
}
@ -149,7 +139,7 @@ QtObject {
// Handle direct math expressions after ">"
const mathExpr = query.slice(1).trim()
const evaluation = evaluate(mathExpr)
if (evaluation.isValid) {
results.push(createEntry(mathExpr, "direct"))
}

11
Modules/AppLauncher/ClipboardHistory.qml
View file

@ -58,8 +58,9 @@ QtObject {
"type": 'text',
"timestamp": clip.timestamp,
"index": index,
"textData": textContent, // Store the text data for the execute function
"execute": function () {
"textData": textContent,
"execute"// Store the text data for the execute function
: function () {
const text = this.textData || clip.content || clip
Quickshell.clipboardText = String(text)
copyText(String(text))
@ -77,8 +78,7 @@ QtObject {
"name": "No clipboard history",
"content": "No matching clipboard entries found",
"icon": "content_paste_off",
"execute": function () {
// Do nothing for empty state
"execute": function () {// Do nothing for empty state
}
}
}
@ -122,8 +122,7 @@ QtObject {
"name": ">clip",
"content": "Clipboard history - browse and restore clipboard items",
"icon": "content_paste",
"execute": function () {
// This should be handled by the parent component
"execute": function () {// This should be handled by the parent component
}
}
}