Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b61e665c71 | ||
|
|
8408c669ef | ||
|
|
d66066c3b6 | ||
|
|
dac55cdd0d | ||
|
|
03365d24e5 | ||
|
|
8e58654336 |
18
main.go
18
main.go
@@ -21,7 +21,7 @@ import (
|
||||
"github.com/gotk3/gotk3/gtk"
|
||||
)
|
||||
|
||||
const version = "0.4.1"
|
||||
const version = "0.4.2"
|
||||
|
||||
var (
|
||||
appDirs []string
|
||||
@@ -114,18 +114,10 @@ func defaultTermIfBlank(s, fallback string) string {
|
||||
return s
|
||||
}
|
||||
|
||||
func defaultStringIfBlank(s, fallback string) string {
|
||||
s = strings.TrimSpace(s)
|
||||
if s == "" {
|
||||
return fallback
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
func validateWm() {
|
||||
if !(*wm == "sway" || *wm == "hyprland") && *wm != "" {
|
||||
if !(*wm == "sway" || *wm == "hyprland" || *wm == "Hyprland") && *wm != "" {
|
||||
*wm = ""
|
||||
log.Warn("-wm argument supports only sway or hyprland string.")
|
||||
log.Warn("-wm argument supports only 'sway' or 'hyprland' string.")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -149,7 +141,7 @@ var itemSpacing = flag.Uint("spacing", 20, "icon spacing")
|
||||
var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"")
|
||||
var fileManager = flag.String("fm", "thunar", "File Manager")
|
||||
var term = flag.String("term", defaultTermIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
|
||||
var wm = flag.String("wm", defaultStringIfBlank(os.Getenv("XDG_CURRENT_DESKTOP"), ""), "Use swaymsg (with 'sway' argument) or hyprctl (with 'hyprland')")
|
||||
var wm = flag.String("wm", "", "Use swaymsg (with 'sway' argument) or hyprctl (with 'hyprland')")
|
||||
var nameLimit = flag.Int("fslen", 80, "File Search name LENgth Limit")
|
||||
var noCats = flag.Bool("nocats", false, "Disable filtering by category")
|
||||
var noFS = flag.Bool("nofs", false, "Disable file search")
|
||||
@@ -542,8 +534,10 @@ func main() {
|
||||
}
|
||||
|
||||
statusLineWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
|
||||
statusLineWrapper.SetProperty("name", "status-line-wrapper")
|
||||
outerVBox.PackStart(statusLineWrapper, false, false, 10)
|
||||
statusLabel, _ = gtk.LabelNew(status)
|
||||
statusLabel.SetProperty("name", "status-label")
|
||||
statusLineWrapper.PackStart(statusLabel, true, false, 0)
|
||||
|
||||
win.ShowAll()
|
||||
|
||||
2
tools.go
2
tools.go
@@ -585,7 +585,7 @@ func launch(command string, terminal bool) {
|
||||
cmd = exec.Command(prefixCommand, args...)
|
||||
} else if *wm == "sway" {
|
||||
cmd = exec.Command("swaymsg", "exec", strings.Join(elements, " "))
|
||||
} else if *wm == "hyprland" {
|
||||
} else if *wm == "hyprland" || *wm == "Hyprland" {
|
||||
cmd = exec.Command("hyprctl", "dispatch", "exec", strings.Join(elements, " "))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user