diff options
Diffstat (limited to 'gui/internal/ui')
| -rw-r--r-- | gui/internal/ui/plan.go | 20 | ||||
| -rw-r--r-- | gui/internal/ui/settings.go | 13 | ||||
| -rw-r--r-- | gui/internal/ui/window.go | 4 |
3 files changed, 30 insertions, 7 deletions
diff --git a/gui/internal/ui/plan.go b/gui/internal/ui/plan.go index 5daba6a..fe99a18 100644 --- a/gui/internal/ui/plan.go +++ b/gui/internal/ui/plan.go @@ -92,6 +92,10 @@ func newPlanView(w *Window) *planView { p.path.SetMaxWidthChars(20) p.dirs.Connect("notify::selected", p.showPath) p.scan = gtk.NewButtonWithLabel("Scan") + // The one button that starts everything, so it carries the theme's + // accent like Apply does (his request, 2026-09-17). + p.scan.AddCSSClass("suggested-action") + p.scan.SetTooltipText("read the directory and work out what would happen to each file; nothing is touched until Apply") p.selAll = gtk.NewButtonWithLabel("Select all") p.selNone = gtk.NewButtonWithLabel("None") p.apply = gtk.NewButtonWithLabel("Apply") @@ -104,26 +108,28 @@ func newPlanView(w *Window) *planView { bar.SetMarginStart(6) bar.SetMarginEnd(6) bar.SetMarginBottom(6) - bar.Append(gtk.NewLabel("Directory")) - bar.Append(p.dirs) - bar.Append(p.scan) // A filter over the plan: type a few letters of a name, as fzf does, - // and act on what is left. It sits by the Scan button, where the eye - // starts (his request, 2026-09-17). + // and act on what is left. p.filter = gtk.NewSearchEntry() p.filter.SetPlaceholderText("filter") p.filter.SetTooltipText("show only the files whose name or rule has these letters, in order; Select all then checks those") p.filter.SetSizeRequest(200, -1) - bar.Append(p.filter) // The order the plan is read in. It starts as the settings say and can // be changed for this window alone (his request, 2026-09-17). p.sort = gtk.NewDropDownFromStrings(sortItems()) p.sort.SetTooltipText("the order the plan is listed in; Settings has the one a new window starts with") + + // The bar reads as the order of operations: which directory, how it + // will be listed, what of it, where it is on disk - then Scan, and only + // then what to do with what comes back (his request, 2026-09-17). + bar.Append(gtk.NewLabel("Directory")) + bar.Append(p.dirs) bar.Append(gtk.NewLabel("sort")) bar.Append(p.sort) - + bar.Append(p.filter) bar.Append(p.path) + bar.Append(p.scan) bar.Append(p.selAll) bar.Append(p.selNone) bar.Append(p.checkedMenu()) diff --git a/gui/internal/ui/settings.go b/gui/internal/ui/settings.go index e15f60d..73c4072 100644 --- a/gui/internal/ui/settings.go +++ b/gui/internal/ui/settings.go @@ -124,6 +124,19 @@ func (w *Window) showSettings() { box.Append(colours) box.Append(preview) + box.Append(heading("About")) + for i, line := range model.About(Version) { + l := gtk.NewLabel(line) + l.SetXAlign(0) + l.SetWrap(true) + // Selectable so the address can be copied out of the window. + l.SetSelectable(true) + if i > 0 { + l.AddCSSClass("dim-label") + } + box.Append(l) + } + apply := func() { which := model.LayoutSide if layout.Selected() == 1 { diff --git a/gui/internal/ui/window.go b/gui/internal/ui/window.go index ce991d8..5132c12 100644 --- a/gui/internal/ui/window.go +++ b/gui/internal/ui/window.go @@ -20,6 +20,10 @@ import ( "krino/internal/xdg" ) +// Version is what About shows. main stamps it at build time; "dev" is +// what a plain `go build` leaves. +var Version = "dev" + // Window is krino-gui's one window: three tabs, and a status bar. type Window struct { app *gtk.Application |