fix launcher for non-uwsm #63

Merged
zach merged 2 commits from fix-uwsm-launcher into main 2026-04-18 01:01:32 +02:00
4 changed files with 22 additions and 8 deletions
Showing only changes of commit e45ecf864a - Show all commits
+1
View File
@@ -206,6 +206,7 @@ Singleton {
return { return {
maxAppsShown: launcher.maxAppsShown, maxAppsShown: launcher.maxAppsShown,
maxWallpapers: launcher.maxWallpapers, maxWallpapers: launcher.maxWallpapers,
uwsm: launcher.uwsm,
actionPrefix: launcher.actionPrefix, actionPrefix: launcher.actionPrefix,
specialPrefix: launcher.specialPrefix, specialPrefix: launcher.specialPrefix,
useFuzzy: { useFuzzy: {
+1
View File
@@ -91,6 +91,7 @@ JsonObject {
property string specialPrefix: "@" property string specialPrefix: "@"
property UseFuzzy useFuzzy: UseFuzzy { property UseFuzzy useFuzzy: UseFuzzy {
} }
property bool uwsm: true
component Sizes: JsonObject { component Sizes: JsonObject {
property int itemHeight: 50 property int itemHeight: 50
+5 -2
View File
@@ -9,17 +9,20 @@ import qs.Paths
Searcher { Searcher {
id: root id: root
readonly property list<string> command: Config.launcher.uwsm ? ["app2unit", "--"] : []
function launch(entry: DesktopEntry): void { function launch(entry: DesktopEntry): void {
appDb.incrementFrequency(entry.id); appDb.incrementFrequency(entry.id);
console.log(root.command);
if (entry.runInTerminal) if (entry.runInTerminal)
Quickshell.execDetached({ Quickshell.execDetached({
command: ["app2unit", "--", ...Config.general.apps.terminal, `${Quickshell.shellDir}/assets/wrap_term_launch.sh`, ...entry.command], command: [...root.command, ...Config.general.apps.terminal, `${Quickshell.shellDir}/assets/wrap_term_launch.sh`, ...entry.command],
workingDirectory: entry.workingDirectory workingDirectory: entry.workingDirectory
}); });
else else
Quickshell.execDetached({ Quickshell.execDetached({
command: ["app2unit", "--", ...entry.command], command: [...root.command, ...entry.command],
workingDirectory: entry.workingDirectory workingDirectory: entry.workingDirectory
}); });
} }
+15 -6
View File
@@ -10,8 +10,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Max apps shown"
min: 1 min: 1
name: "Max apps shown"
object: Config.launcher object: Config.launcher
setting: "maxAppsShown" setting: "maxAppsShown"
} }
@@ -20,8 +20,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Max wallpapers shown"
min: 1 min: 1
name: "Max wallpapers shown"
object: Config.launcher object: Config.launcher
setting: "maxWallpapers" setting: "maxWallpapers"
} }
@@ -43,6 +43,15 @@ SettingsPage {
object: Config.launcher object: Config.launcher
setting: "specialPrefix" setting: "specialPrefix"
} }
Separator {
}
SettingSwitch {
name: "Use UWSM launch command"
object: Config.launcher
setting: "uwsm"
}
} }
SettingsSection { SettingsSection {
@@ -103,8 +112,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Item width"
min: 1 min: 1
name: "Item width"
object: Config.launcher.sizes object: Config.launcher.sizes
setting: "itemWidth" setting: "itemWidth"
} }
@@ -113,8 +122,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Item height"
min: 1 min: 1
name: "Item height"
object: Config.launcher.sizes object: Config.launcher.sizes
setting: "itemHeight" setting: "itemHeight"
} }
@@ -123,8 +132,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Wallpaper width"
min: 1 min: 1
name: "Wallpaper width"
object: Config.launcher.sizes object: Config.launcher.sizes
setting: "wallpaperWidth" setting: "wallpaperWidth"
} }
@@ -133,8 +142,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Wallpaper height"
min: 1 min: 1
name: "Wallpaper height"
object: Config.launcher.sizes object: Config.launcher.sizes
setting: "wallpaperHeight" setting: "wallpaperHeight"
} }