diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-24 15:59:55 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-24 17:08:10 +0200 |
| commit | c1e02896c1c5a08b155424c7a692097ec7cf2d14 (patch) | |
| tree | 34edf25f46cc9be37e4496896097d9de879ec02d /ui/tunnelspage.go | |
| parent | Revert "ui: reduce icon overlay size" (diff) | |
| download | wireguard-windows-c1e02896c1c5a08b155424c7a692097ec7cf2d14.tar.xz wireguard-windows-c1e02896c1c5a08b155424c7a692097ec7cf2d14.zip | |
ui: introduce system icon loading
This looks clearly worse in basically all ways and should be reverted.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/tunnelspage.go')
| -rw-r--r-- | ui/tunnelspage.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go index ac778b3a..48a25425 100644 --- a/ui/tunnelspage.go +++ b/ui/tunnelspage.go @@ -58,18 +58,23 @@ func NewTunnelsPage() (*TunnelsPage, error) { toolBarContainer, _ := walk.NewComposite(tunnelsContainer) toolBarContainer.SetLayout(walk.NewHBoxLayout()) - tunnelsToolBar, _ := walk.NewToolBarWithOrientationAndButtonStyle(toolBarContainer, walk.Horizontal, walk.ToolBarButtonTextOnly) + tunnelsToolBar, _ := walk.NewToolBarWithOrientationAndButtonStyle(toolBarContainer, walk.Horizontal, walk.ToolBarButtonImageOnly) + imageList, _ := walk.NewImageList(walk.Size{32, 32}, 0) + tunnelsToolBar.SetImageList(imageList) importAction := walk.NewAction() importAction.SetText("Import tunnels from file...") + setIconOnAction(tp.AsWindowBase(), importAction, systemIconAddTunnelFromFile) importAction.Triggered().Attach(tp.onImport) addAction := walk.NewAction() addAction.SetText("Add empty tunnel") + setIconOnAction(tp.AsWindowBase(), addAction, systemIconAddTunnelFromScratch) addAction.Triggered().Attach(tp.onAddTunnel) exportTunnelsAction := walk.NewAction() exportTunnelsAction.SetText("Export tunnels to zip...") + setIconOnAction(tp.AsWindowBase(), exportTunnelsAction, systemIconSaveTunnelsToZip) exportTunnelsAction.Triggered().Attach(tp.onExportTunnels) addMenu, _ := walk.NewMenu() @@ -77,18 +82,18 @@ func NewTunnelsPage() (*TunnelsPage, error) { addMenu.Actions().Add(addAction) addMenu.Actions().Add(importAction) addMenuAction, _ := tunnelsToolBar.Actions().AddMenu(addMenu) - addMenuAction.SetText("➕") + setIconOnAction(tp.AsWindowBase(), addMenuAction, systemIconAddTunnel) deleteAction := walk.NewAction() tunnelsToolBar.Actions().Add(deleteAction) - deleteAction.SetText("➖") + setIconOnAction(tp.AsWindowBase(), deleteAction, systemIconDeleteTunnel) deleteAction.Triggered().Attach(tp.onDelete) settingsMenu, _ := walk.NewMenu() tp.AddDisposable(settingsMenu) settingsMenu.Actions().Add(exportTunnelsAction) settingsMenuAction, _ := tunnelsToolBar.Actions().AddMenu(settingsMenu) - settingsMenuAction.SetText("⚙") + setIconOnAction(tp.AsWindowBase(), settingsMenuAction, systemIconExportTunnels) } currentTunnelContainer, _ := walk.NewComposite(tp) |