diff options
Diffstat (limited to '')
| -rw-r--r-- | ui/aboutdialog.go | 2 | ||||
| -rw-r--r-- | ui/confview.go | 56 |
2 files changed, 6 insertions, 52 deletions
diff --git a/ui/aboutdialog.go b/ui/aboutdialog.go index f9be1f90..eaeed96c 100644 --- a/ui/aboutdialog.go +++ b/ui/aboutdialog.go @@ -95,7 +95,7 @@ func runAboutDialog(owner walk.Form) error { return err } detailsLbl.SetTextAlignment(walk.AlignHCenterVNear) - detailsLbl.SetText(l18n.Sprintf("App version: %s\nGo backend version: %s\nGo version: %s-%s\nOperating system: %s\nArchitecture: %s", version.Number, version.ProtoImplementation(), strings.TrimPrefix(runtime.Version(), "go"), runtime.GOARCH, version.OsName(), version.Arch())) + detailsLbl.SetText(l18n.Sprintf("App version: %s\nGo version: %s-%s\nOperating system: %s\nArchitecture: %s", version.Number, strings.TrimPrefix(runtime.Version(), "go"), runtime.GOARCH, version.OsName(), version.Arch())) copyrightLbl, err := walk.NewTextLabel(showingAboutDialog) if err != nil { diff --git a/ui/confview.go b/ui/confview.go index c4e5b8bb..3d16f38f 100644 --- a/ui/confview.go +++ b/ui/confview.go @@ -41,7 +41,6 @@ type labelTextLine struct { type toggleActiveLine struct { composite *walk.Composite button *walk.PushButton - betaTest *walk.CheckBox } type interfaceView struct { @@ -212,12 +211,6 @@ func (tal *toggleActiveLine) widgets() (walk.Widget, walk.Widget) { func (tal *toggleActiveLine) updateGlobal(globalState manager.TunnelState) { tal.button.SetEnabled(globalState == manager.TunnelStarted || globalState == manager.TunnelStopped) - tal.betaTest.SetVisible(globalState == manager.TunnelStopped && IsAdmin && !conf.IsInsiderEnrolled()) - if globalState == manager.TunnelStopped && IsAdmin && !conf.IsInsiderEnrolled() { - tal.composite.Layout().SetMargins(walk.Margins{}) - } else { - tal.composite.Layout().SetMargins(walk.Margins{0, 0, 0, 6}) - } } func (tal *toggleActiveLine) update(state manager.TunnelState) { @@ -253,56 +246,17 @@ func newToggleActiveLine(parent walk.Container) (*toggleActiveLine, error) { return nil, err } disposables.Add(tal.composite) - vlayout := walk.NewVBoxLayout() - vlayout.SetMargins(walk.Margins{}) - vlayout.SetSpacing(0) - tal.composite.SetLayout(vlayout) + layout := walk.NewHBoxLayout() + layout.SetMargins(walk.Margins{0, 0, 0, 6}) + tal.composite.SetLayout(layout) - buttonComposite, err := walk.NewComposite(tal.composite) - if err != nil { - return nil, err - } - hlayout := walk.NewHBoxLayout() - hlayout.SetMargins(walk.Margins{}) - buttonComposite.SetLayout(hlayout) - if tal.button, err = walk.NewPushButton(buttonComposite); err != nil { + if tal.button, err = walk.NewPushButton(tal.composite); err != nil { return nil, err } disposables.Add(tal.button) - walk.NewHSpacer(buttonComposite) + walk.NewHSpacer(tal.composite) tal.update(manager.TunnelStopped) - betaComposite, err := walk.NewComposite(tal.composite) - if err != nil { - return nil, err - } - hlayout = walk.NewHBoxLayout() - hlayout.SetMargins(walk.Margins{}) - betaComposite.SetLayout(hlayout) - if tal.betaTest, err = walk.NewCheckBox(betaComposite); err != nil { - return nil, err - } - tal.betaTest.SetText(l18n.Sprintf("&Test experimental kernel driver")) - tal.betaTest.SetVisible(IsAdmin && !conf.IsInsiderEnrolled()) - const experimentalKernelDriver = "ExperimentalKernelDriver" - tal.betaTest.SetChecked(conf.AdminBool(experimentalKernelDriver)) - tal.betaTest.CheckedChanged().Attach(func() { - if tal.betaTest.Checked() { - if walk.MsgBox(parent.Form(), l18n.Sprintf("Enable experimental kernel driver?"), - l18n.Sprintf("The WireGuard project is currently testing a high performance kernel driver "+ - "called WireGuardNT. It will eventually be enabled by default, but for now the project needs "+ - "testers to try it out. Whether you encounter problems or you find that it works well, please do "+ - "email team@wireguard.com about your experience.\n\nWould you like to enable the experimental "+ - "kernel driver?"), walk.MsgBoxIconQuestion|walk.MsgBoxYesNo) != walk.DlgCmdYes { - tal.betaTest.SetChecked(false) - } - } - if conf.SetAdminBool(experimentalKernelDriver, tal.betaTest.Checked()) != nil { - tal.betaTest.SetChecked(conf.AdminBool(experimentalKernelDriver)) - } - }) - walk.NewHSpacer(betaComposite) - disposables.Spare() return tal, nil |