-nofs to disable file search
This commit is contained in:
BIN
bin/nwg-drawer
BIN
bin/nwg-drawer
Binary file not shown.
8
main.go
8
main.go
@@ -111,6 +111,7 @@ var fileManager = flag.String("fm", "thunar", "File Manager")
|
|||||||
var term = flag.String("term", "alacritty", "Terminal emulator")
|
var term = flag.String("term", "alacritty", "Terminal emulator")
|
||||||
var nameLimit = flag.Int("fslen", 80, "File Search name length Limit")
|
var nameLimit = flag.Int("fslen", 80, "File Search name length Limit")
|
||||||
var noCats = flag.Bool("nocats", false, "Disable filtering by category")
|
var noCats = flag.Bool("nocats", false, "Disable filtering by category")
|
||||||
|
var noFS = flag.Bool("nofs", false, "Disable file search")
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
timeStart := time.Now()
|
timeStart := time.Now()
|
||||||
@@ -256,7 +257,6 @@ func main() {
|
|||||||
return false
|
return false
|
||||||
case gdk.KEY_downarrow, gdk.KEY_Up, gdk.KEY_Down, gdk.KEY_Left, gdk.KEY_Right, gdk.KEY_Tab,
|
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:
|
gdk.KEY_Return, gdk.KEY_Page_Up, gdk.KEY_Page_Down, gdk.KEY_Home, gdk.KEY_End:
|
||||||
//searchEntry.SetText("")
|
|
||||||
return false
|
return false
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@@ -346,11 +346,13 @@ func main() {
|
|||||||
resultsWrapper.PackStart(placeholder, true, true, 0)
|
resultsWrapper.PackStart(placeholder, true, true, 0)
|
||||||
placeholder.SetSizeRequest(20, 20)
|
placeholder.SetSizeRequest(20, 20)
|
||||||
|
|
||||||
|
if !*noFS {
|
||||||
wrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
|
wrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
|
||||||
fileSearchResultWrapper, _ = gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
|
fileSearchResultWrapper, _ = gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
|
||||||
fileSearchResultWrapper.SetProperty("name", "files-box")
|
fileSearchResultWrapper.SetProperty("name", "files-box")
|
||||||
wrapper.PackStart(fileSearchResultWrapper, true, false, 0)
|
wrapper.PackStart(fileSearchResultWrapper, true, false, 0)
|
||||||
resultsWrapper.PackEnd(wrapper, false, false, 10)
|
resultsWrapper.PackEnd(wrapper, false, false, 10)
|
||||||
|
}
|
||||||
|
|
||||||
statusLineWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
|
statusLineWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
|
||||||
outerVBox.PackStart(statusLineWrapper, false, false, 10)
|
outerVBox.PackStart(statusLineWrapper, false, false, 10)
|
||||||
@@ -358,11 +360,13 @@ func main() {
|
|||||||
statusLineWrapper.PackStart(statusLabel, true, false, 0)
|
statusLineWrapper.PackStart(statusLabel, true, false, 0)
|
||||||
|
|
||||||
win.ShowAll()
|
win.ShowAll()
|
||||||
|
if !*noFS {
|
||||||
fileSearchResultWrapper.SetSizeRequest(appFlowBox.GetAllocatedWidth(), 1)
|
fileSearchResultWrapper.SetSizeRequest(appFlowBox.GetAllocatedWidth(), 1)
|
||||||
|
fileSearchResultWrapper.Hide()
|
||||||
|
}
|
||||||
if !*noCats {
|
if !*noCats {
|
||||||
categoriesWrapper.SetSizeRequest(1, categoriesWrapper.GetAllocatedHeight()*2)
|
categoriesWrapper.SetSizeRequest(1, categoriesWrapper.GetAllocatedHeight()*2)
|
||||||
}
|
}
|
||||||
fileSearchResultWrapper.Hide()
|
|
||||||
|
|
||||||
t := time.Now()
|
t := time.Now()
|
||||||
println(fmt.Sprintf("UI created in %v ms. Thank you for your patience.", t.Sub(timeStart).Milliseconds()))
|
println(fmt.Sprintf("UI created in %v ms. Thank you for your patience.", t.Sub(timeStart).Milliseconds()))
|
||||||
|
|||||||
@@ -319,13 +319,17 @@ func setUpSearchEntry() *gtk.SearchEntry {
|
|||||||
phrase, _ = searchEntry.GetText()
|
phrase, _ = searchEntry.GetText()
|
||||||
if len(phrase) > 0 {
|
if len(phrase) > 0 {
|
||||||
|
|
||||||
|
// search apps
|
||||||
appFlowBox = setUpAppsFlowBox(nil, phrase)
|
appFlowBox = setUpAppsFlowBox(nil, phrase)
|
||||||
|
|
||||||
if len(phrase) > 2 {
|
// search files
|
||||||
|
if !*noFS && len(phrase) > 2 {
|
||||||
if fileSearchResultFlowBox != nil {
|
if fileSearchResultFlowBox != nil {
|
||||||
fileSearchResultFlowBox.Destroy()
|
fileSearchResultFlowBox.Destroy()
|
||||||
}
|
}
|
||||||
|
|
||||||
fileSearchResultFlowBox = setUpFileSearchResultContainer()
|
fileSearchResultFlowBox = setUpFileSearchResultContainer()
|
||||||
|
|
||||||
for key := range userDirsMap {
|
for key := range userDirsMap {
|
||||||
if key != "home" {
|
if key != "home" {
|
||||||
fileSearchResults = nil
|
fileSearchResults = nil
|
||||||
@@ -337,18 +341,26 @@ func setUpSearchEntry() *gtk.SearchEntry {
|
|||||||
statusLabel.SetText("0 results")
|
statusLabel.SetText("0 results")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
// search phrase too short
|
||||||
if fileSearchResultFlowBox != nil {
|
if fileSearchResultFlowBox != nil {
|
||||||
fileSearchResultFlowBox.Destroy()
|
fileSearchResultFlowBox.Destroy()
|
||||||
}
|
}
|
||||||
|
if fileSearchResultWrapper != nil {
|
||||||
fileSearchResultWrapper.Hide()
|
fileSearchResultWrapper.Hide()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
|
// clear search results
|
||||||
|
appFlowBox = setUpAppsFlowBox(nil, "")
|
||||||
|
|
||||||
if fileSearchResultFlowBox != nil {
|
if fileSearchResultFlowBox != nil {
|
||||||
fileSearchResultFlowBox.Destroy()
|
fileSearchResultFlowBox.Destroy()
|
||||||
}
|
}
|
||||||
appFlowBox = setUpAppsFlowBox(nil, "")
|
|
||||||
|
if fileSearchResultWrapper != nil {
|
||||||
fileSearchResultWrapper.Hide()
|
fileSearchResultWrapper.Hide()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
searchEntry.Connect("focus-in-event", func() {
|
searchEntry.Connect("focus-in-event", func() {
|
||||||
searchEntry.SetText("")
|
searchEntry.SetText("")
|
||||||
|
|||||||
Reference in New Issue
Block a user