aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-05-05 17:05:26 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-05-05 17:05:26 +0200
commit0e674c3ab36a5406eafadd6937aece714d4db03c (patch)
treed19c927a7c7391d43adc5e7453a6435aba851639
parentui: use context menus for all shortcuts (diff)
downloadwireguard-windows-0e674c3ab36a5406eafadd6937aece714d4db03c.tar.xz
wireguard-windows-0e674c3ab36a5406eafadd6937aece714d4db03c.zip
ui: attach shortcuts to their windows
-rw-r--r--ui/logpage.go2
-rw-r--r--ui/tunnelspage.go3
-rw-r--r--ui/ui.go3
3 files changed, 8 insertions, 0 deletions
diff --git a/ui/logpage.go b/ui/logpage.go
index ddd0a70e..6aa22698 100644
--- a/ui/logpage.go
+++ b/ui/logpage.go
@@ -69,6 +69,8 @@ func NewLogPage() (*LogPage, error) {
selectAllAction.SetEnabled(len(lp.logView.SelectedIndexes()) < len(lp.model.items))
}
lp.logView.SelectedIndexesChanged().Attach(setSelectionStatus)
+ contextMenu.Actions().AttachShortcuts(lp.logView)
+ contextMenu.Actions().AttachShortcuts(lp)
stampCol := walk.NewTableViewColumn()
stampCol.SetName("Stamp")
diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go
index 6069aee2..8bcf6aaa 100644
--- a/ui/tunnelspage.go
+++ b/ui/tunnelspage.go
@@ -220,6 +220,9 @@ func (tp *TunnelsPage) CreateToolbar() {
contextMenu.Actions().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)
diff --git a/ui/ui.go b/ui/ui.go
index 14b6cbb4..f9519282 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -90,6 +90,9 @@ func RunUI() {
}
}()
+ mtw.Starting().Attach(func() {
+ mtw.tunnelsPage.SetFocus()
+ })
mtw.Run()
tray.Dispose()
mtw.Dispose()