Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0810250b3a | ||
|
|
6e76f49729 | ||
|
|
94c94b8b1e | ||
|
|
3d6f3e6e3c | ||
|
|
2e305e6e52 | ||
|
|
0b28592f0f | ||
|
|
8daf645e3b |
BIN
bin/nwg-drawer
BIN
bin/nwg-drawer
Binary file not shown.
21
main.go
21
main.go
@@ -21,7 +21,7 @@ import (
|
||||
"github.com/gotk3/gotk3/gtk"
|
||||
)
|
||||
|
||||
const version = "0.2.0"
|
||||
const version = "0.2.3"
|
||||
|
||||
var (
|
||||
appDirs []string
|
||||
@@ -126,7 +126,7 @@ var columnsNumber = flag.Uint("c", 6, "number of Columns")
|
||||
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", defaultStringIfBlank(os.Getenv("TERM"), "alacritty"), "Terminal emulator")
|
||||
var term = flag.String("term", defaultStringIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
|
||||
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")
|
||||
@@ -162,8 +162,13 @@ func main() {
|
||||
if *resident {
|
||||
// As win.Show() called from inside a goroutine randomly crashes GTK,
|
||||
// let's just set e helper variable here. We'll be checking it with glib.TimeoutAdd.
|
||||
log.Debug("SIGUSR1 received, showing the window")
|
||||
showWindowTrigger = true
|
||||
if !win.IsVisible() {
|
||||
log.Debug("SIGUSR1 received, showing the window")
|
||||
showWindowTrigger = true
|
||||
} else {
|
||||
log.Debug("SIGUSR1 received, hiding the window")
|
||||
restoreStateAndHide()
|
||||
}
|
||||
} else {
|
||||
log.Info("SIGUSR1 received, and I'm not resident, bye bye")
|
||||
gtk.MainQuit()
|
||||
@@ -344,7 +349,7 @@ func main() {
|
||||
gtk.MainQuit()
|
||||
})
|
||||
|
||||
win.Connect("key-press-event", func(window *gtk.Window, event *gdk.Event) bool {
|
||||
win.Connect("key-release-event", func(window *gtk.Window, event *gdk.Event) bool {
|
||||
key := &gdk.EventKey{Event: event}
|
||||
switch key.KeyVal() {
|
||||
case gdk.KEY_Escape:
|
||||
@@ -359,16 +364,16 @@ func main() {
|
||||
restoreStateAndHide()
|
||||
}
|
||||
}
|
||||
return false
|
||||
return true
|
||||
case gdk.KEY_downarrow, gdk.KEY_Up, gdk.KEY_Down, gdk.KEY_Left, gdk.KEY_Right, gdk.KEY_Tab,
|
||||
gdk.KEY_Return, gdk.KEY_Page_Up, gdk.KEY_Page_Down, gdk.KEY_Home, gdk.KEY_End:
|
||||
return false
|
||||
return true
|
||||
|
||||
default:
|
||||
if !searchEntry.IsFocus() {
|
||||
searchEntry.GrabFocusWithoutSelecting()
|
||||
}
|
||||
return false
|
||||
return true
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
8
tools.go
8
tools.go
@@ -559,7 +559,13 @@ func launch(command string, terminal bool) {
|
||||
cmd := exec.Command(elements[cmdIdx], elements[1+cmdIdx:]...)
|
||||
|
||||
if terminal {
|
||||
args := []string{"-e", elements[cmdIdx]}
|
||||
var args []string
|
||||
if *term != "foot" {
|
||||
args = []string{"-e", elements[cmdIdx]}
|
||||
} else {
|
||||
args = []string{elements[cmdIdx]}
|
||||
}
|
||||
|
||||
cmd = exec.Command(*term, args...)
|
||||
}
|
||||
|
||||
|
||||
@@ -77,6 +77,9 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
|
||||
btn.Connect("enter-notify-event", func() {
|
||||
statusLabel.SetText(entry.CommentLoc)
|
||||
})
|
||||
btn.Connect("focus-in-event", func() {
|
||||
statusLabel.SetText(entry.CommentLoc)
|
||||
})
|
||||
flowBox.Add(btn)
|
||||
}
|
||||
pinnedFlowBoxWrapper.PackStart(flowBox, true, false, 0)
|
||||
@@ -272,6 +275,9 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
|
||||
button.Connect("enter-notify-event", func() {
|
||||
statusLabel.SetText(desc)
|
||||
})
|
||||
button.Connect("focus-in-event", func() {
|
||||
statusLabel.SetText(desc)
|
||||
})
|
||||
return button
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user