From 1ee2c11bf6232dbe9d9d724424560ff66065b769 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 28 Oct 2019 10:47:43 +0100 Subject: ui: use unicode … MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jason A. Donenfeld --- ui/iconprovider.go | 2 +- ui/logpage.go | 4 ++-- ui/managewindow.go | 2 +- ui/tray.go | 6 +++--- ui/tunnelspage.go | 18 +++++++++--------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ui/iconprovider.go b/ui/iconprovider.go index c38eac69..e5177ac3 100644 --- a/ui/iconprovider.go +++ b/ui/iconprovider.go @@ -100,7 +100,7 @@ func textForState(state manager.TunnelState, withEllipsis bool) (text string) { if withEllipsis { switch state { case manager.TunnelStarting, manager.TunnelStopping: - text += "..." + text += "…" } } return diff --git a/ui/logpage.go b/ui/logpage.go index bdf20c2d..561cf819 100644 --- a/ui/logpage.go +++ b/ui/logpage.go @@ -69,7 +69,7 @@ func NewLogPage() (*LogPage, error) { contextMenu.Actions().Add(selectAllAction) lp.ShortcutActions().Add(selectAllAction) saveAction := walk.NewAction() - saveAction.SetText("&Save to file") + saveAction.SetText("&Save to file…") saveAction.SetShortcut(walk.Shortcut{walk.ModControl, walk.KeyS}) saveAction.Triggered().Attach(lp.onSave) contextMenu.Actions().Add(saveAction) @@ -148,7 +148,7 @@ func (lp *LogPage) onSave() { fd := walk.FileDialog{ Filter: "Text Files (*.txt)|*.txt|All Files (*.*)|*.*", FilePath: fmt.Sprintf("wireguard-log-%s.txt", time.Now().Format("2006-01-02T150405")), - Title: "Export log to file", + Title: "Export log to file…", } form := lp.Form() diff --git a/ui/managewindow.go b/ui/managewindow.go index 0caf2357..542c91b9 100644 --- a/ui/managewindow.go +++ b/ui/managewindow.go @@ -118,7 +118,7 @@ func NewManageTunnelsWindow() (*ManageTunnelsWindow, error) { CbSize: uint32(unsafe.Sizeof(win.MENUITEMINFO{})), FMask: win.MIIM_ID | win.MIIM_STRING | win.MIIM_FTYPE, FType: win.MIIM_STRING, - DwTypeData: windows.StringToUTF16Ptr("&About WireGuard..."), + DwTypeData: windows.StringToUTF16Ptr("&About WireGuard…"), WID: uint32(aboutWireGuardCmd), }) win.InsertMenuItem(systemMenu, 1, true, &win.MENUITEMINFO{ diff --git a/ui/tray.go b/ui/tray.go index 6a91b320..810c759b 100644 --- a/ui/tray.go +++ b/ui/tray.go @@ -80,10 +80,10 @@ func (tray *Tray) setup() error { {label: "Addresses: None", hidden: true}, {separator: true}, {separator: true}, - {label: "&Manage tunnels...", handler: tray.onManageTunnels, enabled: true, defawlt: true}, - {label: "&Import tunnel(s) from file...", handler: tray.onImport, enabled: true}, + {label: "&Manage tunnels…", handler: tray.onManageTunnels, enabled: true, defawlt: true}, + {label: "&Import tunnel(s) from file…", handler: tray.onImport, enabled: true}, {separator: true}, - {label: "&About WireGuard...", handler: tray.onAbout, enabled: true}, + {label: "&About WireGuard…", handler: tray.onAbout, enabled: true}, {label: "E&xit", handler: onQuit, enabled: true}, } { var action *walk.Action diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go index e724705a..5da65770 100644 --- a/ui/tunnelspage.go +++ b/ui/tunnelspage.go @@ -142,7 +142,7 @@ func (tp *TunnelsPage) CreateToolbar() error { } tp.AddDisposable(addMenu) importAction := walk.NewAction() - importAction.SetText("&Import tunnel(s) from file...") + importAction.SetText("&Import tunnel(s) from file…") importActionIcon, _ := loadSystemIcon("imageres", 3, 16) importAction.SetImage(importActionIcon) importAction.SetShortcut(walk.Shortcut{walk.ModControl, walk.KeyO}) @@ -150,7 +150,7 @@ func (tp *TunnelsPage) CreateToolbar() error { importAction.Triggered().Attach(tp.onImport) addMenu.Actions().Add(importAction) addAction := walk.NewAction() - addAction.SetText("Add &empty tunnel...") + addAction.SetText("Add &empty tunnel…") addActionIcon, _ := loadSystemIcon("imageres", 2, 16) addAction.SetImage(addActionIcon) addAction.SetShortcut(walk.Shortcut{walk.ModControl, walk.KeyN}) @@ -178,7 +178,7 @@ func (tp *TunnelsPage) CreateToolbar() error { exportAction := walk.NewAction() exportActionIcon, _ := loadSystemIcon("imageres", 165, 16) // Or "shell32", 45? exportAction.SetImage(exportActionIcon) - exportAction.SetToolTip("Export all tunnels to zip...") + exportAction.SetToolTip("Export all tunnels to zip…") exportAction.Triggered().Attach(tp.onExportTunnels) tp.listToolbar.Actions().Add(exportAction) @@ -201,24 +201,24 @@ func (tp *TunnelsPage) CreateToolbar() error { contextMenu.Actions().Add(toggleAction) contextMenu.Actions().Add(walk.NewSeparatorAction()) importAction2 := walk.NewAction() - importAction2.SetText("&Import tunnel(s) from file...") + importAction2.SetText("&Import tunnel(s) from file…") 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.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.SetText("Export all tunnels to &zip…") exportAction2.Triggered().Attach(tp.onExportTunnels) contextMenu.Actions().Add(exportAction2) contextMenu.Actions().Add(walk.NewSeparatorAction()) editAction := walk.NewAction() - editAction.SetText("Edit &selected tunnel...") + editAction.SetText("Edit &selected tunnel…") editAction.SetShortcut(walk.Shortcut{walk.ModControl, walk.KeyE}) editAction.Triggered().Attach(tp.onEditTunnel) contextMenu.Actions().Add(editAction) @@ -531,7 +531,7 @@ func (tp *TunnelsPage) onSelectAll() { func (tp *TunnelsPage) onImport() { dlg := walk.FileDialog{ Filter: "Configuration Files (*.zip, *.conf)|*.zip;*.conf|All Files (*.*)|*.*", - Title: "Import tunnel(s) from file...", + Title: "Import tunnel(s) from file…", } if ok, _ := dlg.ShowOpenMultiple(tp.Form()); !ok { @@ -544,7 +544,7 @@ func (tp *TunnelsPage) onImport() { func (tp *TunnelsPage) onExportTunnels() { dlg := walk.FileDialog{ Filter: "Configuration ZIP Files (*.zip)|*.zip", - Title: "Export tunnels to zip...", + Title: "Export tunnels to zip…", } if ok, _ := dlg.ShowSave(tp.Form()); !ok { -- cgit v1.2.3-59-g8ed1b