From ee7592f8f46660260b6d265d69410c8e6617f4fa Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 19 Jun 2019 19:32:15 +0200 Subject: ui: bind shortcuts using new api --- ui/tunnelspage.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ui/tunnelspage.go') diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go index ab3e2d48..26a0a291 100644 --- a/ui/tunnelspage.go +++ b/ui/tunnelspage.go @@ -185,11 +185,13 @@ func (tp *TunnelsPage) CreateToolbar() { importAction2.SetShortcut(walk.Shortcut{walk.ModControl, walk.KeyO}) importAction2.Triggered().Attach(tp.onImport) contextMenu.Actions().Add(importAction2) + tp.ShortcutActions().Add(importAction2) addAction2 := walk.NewAction() addAction2.SetText("Add empty tunnel...") addAction2.SetShortcut(walk.Shortcut{walk.ModControl, walk.KeyN}) addAction2.Triggered().Attach(tp.onAddTunnel) contextMenu.Actions().Add(addAction2) + tp.ShortcutActions().Add(addAction2) exportAction2 := walk.NewAction() exportAction2.SetText("Export all tunnels to zip...") exportAction2.Triggered().Attach(tp.onExportTunnels) @@ -200,6 +202,7 @@ func (tp *TunnelsPage) CreateToolbar() { editAction.SetShortcut(walk.Shortcut{walk.ModControl, walk.KeyE}) editAction.Triggered().Attach(tp.onEditTunnel) contextMenu.Actions().Add(editAction) + tp.ShortcutActions().Add(editAction) cloneAction := walk.NewAction() cloneAction.SetText("Clone selected tunnel...") cloneAction.Triggered().Attach(tp.onCloneTunnel) @@ -209,17 +212,16 @@ func (tp *TunnelsPage) CreateToolbar() { deleteAction2.SetShortcut(walk.Shortcut{0, walk.KeyDelete}) deleteAction2.Triggered().Attach(tp.onDelete) contextMenu.Actions().Add(deleteAction2) + tp.listView.ShortcutActions().Add(deleteAction2) tp.listView.SetContextMenu(contextMenu) selectAllAction := walk.NewAction() selectAllAction.SetText("Select all") selectAllAction.SetShortcut(walk.Shortcut{walk.ModControl, walk.KeyA}) selectAllAction.Triggered().Attach(tp.onSelectAll) contextMenu.Actions().Add(selectAllAction) + tp.listView.ShortcutActions().Add(selectAllAction) tp.listView.SetContextMenu(contextMenu) - contextMenu.Actions().AttachShortcuts(tp.listView) - contextMenu.Actions().AttachShortcuts(tp) - setSelectionOrientedOptions := func() { selected := len(tp.listView.SelectedIndexes()) all := len(tp.listView.model.tunnels) -- cgit v1.2.3-59-g8ed1b