diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-24 17:10:05 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-24 17:10:05 +0200 |
commit | 8e7bf9c2ffe93cbf810054d7ec0684a78ceb76e0 (patch) | |
tree | 87018522ea5c3a623ee2bbba5cd82bd144f29955 /ui/tunnelspage.go | |
parent | ui: introduce system icon loading (diff) | |
download | wireguard-windows-8e7bf9c2ffe93cbf810054d7ec0684a78ceb76e0.tar.xz wireguard-windows-8e7bf9c2ffe93cbf810054d7ec0684a78ceb76e0.zip |
Revert "ui: introduce system icon loading"
This reverts commit 8d29c7136535524e387091a7387a33a243062f2b.
Diffstat (limited to 'ui/tunnelspage.go')
-rw-r--r-- | ui/tunnelspage.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go index 48a25425..ac778b3a 100644 --- a/ui/tunnelspage.go +++ b/ui/tunnelspage.go @@ -58,23 +58,18 @@ func NewTunnelsPage() (*TunnelsPage, error) { toolBarContainer, _ := walk.NewComposite(tunnelsContainer) toolBarContainer.SetLayout(walk.NewHBoxLayout()) - tunnelsToolBar, _ := walk.NewToolBarWithOrientationAndButtonStyle(toolBarContainer, walk.Horizontal, walk.ToolBarButtonImageOnly) - imageList, _ := walk.NewImageList(walk.Size{32, 32}, 0) - tunnelsToolBar.SetImageList(imageList) + tunnelsToolBar, _ := walk.NewToolBarWithOrientationAndButtonStyle(toolBarContainer, walk.Horizontal, walk.ToolBarButtonTextOnly) 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() @@ -82,18 +77,18 @@ func NewTunnelsPage() (*TunnelsPage, error) { addMenu.Actions().Add(addAction) addMenu.Actions().Add(importAction) addMenuAction, _ := tunnelsToolBar.Actions().AddMenu(addMenu) - setIconOnAction(tp.AsWindowBase(), addMenuAction, systemIconAddTunnel) + addMenuAction.SetText("➕") deleteAction := walk.NewAction() tunnelsToolBar.Actions().Add(deleteAction) - setIconOnAction(tp.AsWindowBase(), deleteAction, systemIconDeleteTunnel) + deleteAction.SetText("➖") deleteAction.Triggered().Attach(tp.onDelete) settingsMenu, _ := walk.NewMenu() tp.AddDisposable(settingsMenu) settingsMenu.Actions().Add(exportTunnelsAction) settingsMenuAction, _ := tunnelsToolBar.Actions().AddMenu(settingsMenu) - setIconOnAction(tp.AsWindowBase(), settingsMenuAction, systemIconExportTunnels) + settingsMenuAction.SetText("⚙") } currentTunnelContainer, _ := walk.NewComposite(tp) |