From df2e2fb78d353e041e8772dcd62e310447120b33 Mon Sep 17 00:00:00 2001 From: Steven Honson Date: Sat, 11 May 2019 22:04:08 +1000 Subject: ui: tunnel cloning Allows a tunnel to be cloned verbatim. It's not part of the toolbar or with a shortcut, as it's a rather obscure action. Signed-off-by: Steven Honson [zx2c4: removed from toolbar and shortcut] --- ui/editdialog.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'ui/editdialog.go') diff --git a/ui/editdialog.go b/ui/editdialog.go index ba868893..b4ed8ebe 100644 --- a/ui/editdialog.go +++ b/ui/editdialog.go @@ -27,7 +27,7 @@ type EditDialog struct { blockUntunneledTraficCheckGuard bool } -func runTunnelEditDialog(owner walk.Form, tunnel *service.Tunnel) *conf.Config { +func runTunnelEditDialog(owner walk.Form, tunnel *service.Tunnel, clone bool) *conf.Config { var ( title string name string @@ -35,14 +35,21 @@ func runTunnelEditDialog(owner walk.Form, tunnel *service.Tunnel) *conf.Config { dlg := &EditDialog{} + if tunnel == nil || clone { + title = "Create new tunnel" + } else { + title = "Edit tunnel" + } + if tunnel == nil { // Creating a new tunnel, create a new private key and use the default template - title = "Create new tunnel" pk, _ := conf.NewPrivateKey() dlg.config = conf.Config{Interface: conf.Interface{PrivateKey: *pk}} } else { - title = "Edit tunnel" name = tunnel.Name + if clone { + name += "-copy" + } dlg.config, _ = tunnel.StoredConfig() } @@ -107,7 +114,7 @@ func runTunnelEditDialog(owner walk.Form, tunnel *service.Tunnel) *conf.Config { dlg.syntaxEdit.BlockUntunneledTrafficStateChanged().Attach(dlg.onBlockUntunneledTrafficStateChanged) dlg.syntaxEdit.SetText(dlg.config.ToWgQuick()) - if tunnel != nil { + if tunnel != nil && !clone { dlg.nameEdit.SetFocus() //TODO: This works around a walk issue with scrolling in weird ways . We should fix this in walk instead of here. dlg.Starting().Attach(func() { -- cgit v1.2.3-59-g8ed1b