mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2025-12-07 05:55:37 -05:00
App launcher fixes
This commit is contained in:
bbedward
213
Services/AppSearchService.qml
Normal file
213
Services/AppSearchService.qml
Normal file
@@ -0,0 +1,213 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
pragma Singleton
|
||||
pragma ComponentBehavior: Bound
|
||||
|
||||
Singleton {
|
||||
id: root
|
||||
|
||||
property list<DesktopEntry> applications: []
|
||||
property var applicationsByName: ({})
|
||||
property var applicationsByExec: ({})
|
||||
property bool ready: false
|
||||
|
||||
Component.onCompleted: {
|
||||
loadApplications()
|
||||
}
|
||||
|
||||
function loadApplications() {
|
||||
var allApps = Array.from(DesktopEntries.applications.values)
|
||||
|
||||
// Debug: Check what properties are available
|
||||
if (allApps.length > 0) {
|
||||
var firstApp = allApps[0]
|
||||
console.log("AppSearchService: Sample DesktopEntry properties:")
|
||||
console.log(" name:", firstApp.name)
|
||||
console.log(" id:", firstApp.id)
|
||||
if (firstApp.exec !== undefined) console.log(" exec:", firstApp.exec)
|
||||
if (firstApp.execString !== undefined) console.log(" execString:", firstApp.execString)
|
||||
if (firstApp.executable !== undefined) console.log(" executable:", firstApp.executable)
|
||||
if (firstApp.command !== undefined) console.log(" command:", firstApp.command)
|
||||
}
|
||||
|
||||
applications = allApps
|
||||
.filter(app => !app.noDisplay)
|
||||
.sort((a, b) => a.name.localeCompare(b.name))
|
||||
|
||||
// Build lookup maps
|
||||
var byName = {}
|
||||
var byExec = {}
|
||||
|
||||
for (var i = 0; i < applications.length; i++) {
|
||||
var app = applications[i]
|
||||
byName[app.name.toLowerCase()] = app
|
||||
|
||||
// Clean exec string for lookup
|
||||
var execProp = app.execString || ""
|
||||
var cleanExec = execProp ? execProp.replace(/%[fFuU]/g, "").trim() : ""
|
||||
if (cleanExec) {
|
||||
byExec[cleanExec] = app
|
||||
}
|
||||
}
|
||||
|
||||
applicationsByName = byName
|
||||
applicationsByExec = byExec
|
||||
ready = true
|
||||
|
||||
console.log("AppSearchService: Loaded", applications.length, "applications")
|
||||
}
|
||||
|
||||
function searchApplications(query) {
|
||||
if (!query || query.length === 0) {
|
||||
return applications
|
||||
}
|
||||
|
||||
var lowerQuery = query.toLowerCase()
|
||||
var results = []
|
||||
|
||||
for (var i = 0; i < applications.length; i++) {
|
||||
var app = applications[i]
|
||||
var score = 0
|
||||
|
||||
// Check name
|
||||
var nameLower = app.name.toLowerCase()
|
||||
if (nameLower === lowerQuery) {
|
||||
score = 1000
|
||||
} else if (nameLower.startsWith(lowerQuery)) {
|
||||
score = 500
|
||||
} else if (nameLower.includes(lowerQuery)) {
|
||||
score = 100
|
||||
}
|
||||
|
||||
// Check comment/description
|
||||
if (app.comment) {
|
||||
var commentLower = app.comment.toLowerCase()
|
||||
if (commentLower.includes(lowerQuery)) {
|
||||
score += 50
|
||||
}
|
||||
}
|
||||
|
||||
// Check generic name
|
||||
if (app.genericName) {
|
||||
var genericLower = app.genericName.toLowerCase()
|
||||
if (genericLower.includes(lowerQuery)) {
|
||||
score += 25
|
||||
}
|
||||
}
|
||||
|
||||
// Check keywords
|
||||
if (app.keywords && app.keywords.length > 0) {
|
||||
for (var j = 0; j < app.keywords.length; j++) {
|
||||
if (app.keywords[j].toLowerCase().includes(lowerQuery)) {
|
||||
score += 10
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (score > 0) {
|
||||
results.push({
|
||||
app: app,
|
||||
score: score
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Sort by score descending
|
||||
results.sort((a, b) => b.score - a.score)
|
||||
|
||||
// Return just the apps
|
||||
return results.map(r => r.app)
|
||||
}
|
||||
|
||||
function getAppByName(name) {
|
||||
return applicationsByName[name.toLowerCase()] || null
|
||||
}
|
||||
|
||||
function getAppByExec(exec) {
|
||||
var cleanExec = exec.replace(/%[fFuU]/g, "").trim()
|
||||
return applicationsByExec[cleanExec] || null
|
||||
}
|
||||
|
||||
function getCategoriesForApp(app) {
|
||||
if (!app || !app.categories) return []
|
||||
|
||||
var categoryMap = {
|
||||
"AudioVideo": "Media",
|
||||
"Audio": "Media",
|
||||
"Video": "Media",
|
||||
"Development": "Development",
|
||||
"TextEditor": "Development",
|
||||
"IDE": "Development",
|
||||
"Education": "Education",
|
||||
"Game": "Games",
|
||||
"Graphics": "Graphics",
|
||||
"Photography": "Graphics",
|
||||
"Network": "Internet",
|
||||
"WebBrowser": "Internet",
|
||||
"Email": "Internet",
|
||||
"Office": "Office",
|
||||
"WordProcessor": "Office",
|
||||
"Spreadsheet": "Office",
|
||||
"Presentation": "Office",
|
||||
"Science": "Science",
|
||||
"Settings": "Settings",
|
||||
"System": "System",
|
||||
"Utility": "Utilities",
|
||||
"Accessories": "Utilities",
|
||||
"FileManager": "Utilities",
|
||||
"TerminalEmulator": "Utilities"
|
||||
}
|
||||
|
||||
var mappedCategories = new Set()
|
||||
|
||||
for (var i = 0; i < app.categories.length; i++) {
|
||||
var cat = app.categories[i]
|
||||
if (categoryMap[cat]) {
|
||||
mappedCategories.add(categoryMap[cat])
|
||||
}
|
||||
}
|
||||
|
||||
return Array.from(mappedCategories)
|
||||
}
|
||||
|
||||
function getAllCategories() {
|
||||
var categories = new Set(["All"])
|
||||
|
||||
for (var i = 0; i < applications.length; i++) {
|
||||
var appCategories = getCategoriesForApp(applications[i])
|
||||
appCategories.forEach(cat => categories.add(cat))
|
||||
}
|
||||
|
||||
return Array.from(categories).sort()
|
||||
}
|
||||
|
||||
function getAppsInCategory(category) {
|
||||
if (category === "All") {
|
||||
return applications
|
||||
}
|
||||
|
||||
return applications.filter(app => {
|
||||
var appCategories = getCategoriesForApp(app)
|
||||
return appCategories.includes(category)
|
||||
})
|
||||
}
|
||||
|
||||
function launchApp(app) {
|
||||
if (!app) {
|
||||
console.warn("AppSearchService: Cannot launch app, app is null")
|
||||
return false
|
||||
}
|
||||
|
||||
// DesktopEntry objects have an execute() method
|
||||
if (typeof app.execute === "function") {
|
||||
app.execute()
|
||||
return true
|
||||
}
|
||||
|
||||
console.warn("AppSearchService: Cannot launch app, no execute method")
|
||||
return false
|
||||
}
|
||||
}
|
||||
20
Services/LauncherService.qml
Normal file
20
Services/LauncherService.qml
Normal file
@@ -0,0 +1,20 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
pragma Singleton
|
||||
pragma ComponentBehavior: Bound
|
||||
|
||||
Singleton {
|
||||
id: root
|
||||
|
||||
signal showAppLauncher()
|
||||
signal hideAppLauncher()
|
||||
signal toggleAppLauncher()
|
||||
|
||||
signal showSpotlight()
|
||||
signal hideSpotlight()
|
||||
signal toggleSpotlight()
|
||||
|
||||
signal showClipboardHistory()
|
||||
signal hideClipboardHistory()
|
||||
signal toggleClipboardHistory()
|
||||
}
|
||||
91
Services/PreferencesService.qml
Normal file
91
Services/PreferencesService.qml
Normal file
@@ -0,0 +1,91 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Io
|
||||
pragma Singleton
|
||||
pragma ComponentBehavior: Bound
|
||||
|
||||
Singleton {
|
||||
id: root
|
||||
|
||||
property string configDir: (Quickshell.env["XDG_CONFIG_HOME"] || Quickshell.env["HOME"] + "/.config") + "/DankMaterialShell"
|
||||
property string recentAppsFile: configDir + "/recentApps.json"
|
||||
property int maxRecentApps: 10
|
||||
property var recentApps: []
|
||||
|
||||
// Create config directory on startup
|
||||
Process {
|
||||
id: mkdirProcess
|
||||
command: ["mkdir", "-p", root.configDir]
|
||||
running: true
|
||||
onExited: {
|
||||
loadRecentApps()
|
||||
}
|
||||
}
|
||||
|
||||
FileView {
|
||||
id: recentAppsFileView
|
||||
path: root.recentAppsFile
|
||||
|
||||
onTextChanged: {
|
||||
if (text && text.length > 0) {
|
||||
try {
|
||||
var data = JSON.parse(text)
|
||||
if (Array.isArray(data)) {
|
||||
root.recentApps = data
|
||||
}
|
||||
} catch (e) {
|
||||
console.log("PreferencesService: Invalid recent apps format")
|
||||
root.recentApps = []
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function loadRecentApps() {
|
||||
// FileView will automatically load and trigger onTextChanged
|
||||
if (!recentAppsFileView.text || recentAppsFileView.text.length === 0) {
|
||||
recentApps = []
|
||||
}
|
||||
}
|
||||
|
||||
function saveRecentApps() {
|
||||
recentAppsFileView.text = JSON.stringify(recentApps, null, 2)
|
||||
}
|
||||
|
||||
function addRecentApp(app) {
|
||||
if (!app) return
|
||||
|
||||
var execProp = app.execString || ""
|
||||
if (!execProp) return
|
||||
|
||||
// Create a minimal app object to store
|
||||
var appData = {
|
||||
name: app.name,
|
||||
exec: execProp,
|
||||
icon: app.icon || "application-x-executable",
|
||||
comment: app.comment || ""
|
||||
}
|
||||
|
||||
// Remove existing entry if present
|
||||
recentApps = recentApps.filter(a => a.exec !== execProp)
|
||||
|
||||
// Add to front
|
||||
recentApps.unshift(appData)
|
||||
|
||||
// Limit size
|
||||
if (recentApps.length > maxRecentApps) {
|
||||
recentApps = recentApps.slice(0, maxRecentApps)
|
||||
}
|
||||
|
||||
saveRecentApps()
|
||||
}
|
||||
|
||||
function getRecentApps() {
|
||||
return recentApps
|
||||
}
|
||||
|
||||
function clearRecentApps() {
|
||||
recentApps = []
|
||||
saveRecentApps()
|
||||
}
|
||||
}
|
||||
@@ -8,4 +8,7 @@ singleton AudioService 1.0 AudioService.qml
|
||||
singleton BluetoothService 1.0 BluetoothService.qml
|
||||
singleton BrightnessService 1.0 BrightnessService.qml
|
||||
singleton BatteryService 1.0 BatteryService.qml
|
||||
singleton SystemMonitorService 1.0 SystemMonitorService.qml
|
||||
singleton SystemMonitorService 1.0 SystemMonitorService.qml
|
||||
singleton AppSearchService 1.0 AppSearchService.qml
|
||||
singleton PreferencesService 1.0 PreferencesService.qml
|
||||
singleton LauncherService 1.0 LauncherService.qml
|
||||
Reference in New Issue
Block a user