diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-02 20:59:37 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-02 20:59:52 +0200 |
commit | 4b1a01a8cbc5a00c4eed2497dd1552eba5ccac82 (patch) | |
tree | c5a4116088be7422f7cb165e4a05aff9df6d1329 /ui/tunnelspage.go | |
parent | updater: use /qb!- instead of /qb- (diff) | |
download | wireguard-windows-4b1a01a8cbc5a00c4eed2497dd1552eba5ccac82.tar.xz wireguard-windows-4b1a01a8cbc5a00c4eed2497dd1552eba5ccac82.zip |
ui: use system icons in toolbar
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to '')
-rw-r--r-- | ui/tunnelspage.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go index 10a6c782..c2e555cf 100644 --- a/ui/tunnelspage.go +++ b/ui/tunnelspage.go @@ -70,23 +70,29 @@ func NewTunnelsPage() (*TunnelsPage, error) { tunnelsToolBar, _ := walk.NewToolBarWithOrientationAndButtonStyle(toolBarContainer, walk.Horizontal, walk.ToolBarButtonImageBeforeText) imageSize := walk.Size{tp.DPI() / 6, tp.DPI() / 6} // Dividing by six is the same as dividing by 96 and multiplying by 16. TODO: Use dynamic DPI - imageList, _ := walk.NewImageList(imageSize, walk.RGB(255, 255, 255)) + imageList, _ := walk.NewImageList(imageSize, walk.RGB(0, 0, 0)) tunnelsToolBar.SetImageList(imageList) addMenu, _ := walk.NewMenu() tp.AddDisposable(addMenu) importAction := walk.NewAction() importAction.SetText("Import tunnel(s) from file...") + importActionIcon, _ := loadSystemIcon("imageres", 3) + importActionImage, _ := walk.NewBitmapFromIcon(importActionIcon, imageSize) + importAction.SetImage(importActionImage) importAction.SetShortcut(walk.Shortcut{walk.ModControl, walk.KeyO}) importAction.Triggered().Attach(tp.onImport) addAction := walk.NewAction() addAction.SetText("Add empty tunnel") + addActionIcon, _ := loadSystemIcon("imageres", 2) + addActionImage, _ := walk.NewBitmapFromIcon(addActionIcon, imageSize) + addAction.SetImage(addActionImage) addAction.SetShortcut(walk.Shortcut{walk.ModControl, walk.KeyN}) addAction.Triggered().Attach(tp.onAddTunnel) addMenu.Actions().Add(importAction) addMenu.Actions().Add(addAction) addMenuAction := walk.NewMenuAction(addMenu) - addMenuActionIcon, _ := walk.NewIconFromResourceWithSize("add.ico", imageSize) + addMenuActionIcon, _ := loadSystemIcon("shell32", 149) addMenuActionImage, _ := walk.NewBitmapFromIcon(addMenuActionIcon, imageSize) addMenuAction.SetImage(addMenuActionImage) addMenuAction.SetText("Add Tunnel") @@ -97,7 +103,7 @@ func NewTunnelsPage() (*TunnelsPage, error) { tunnelsToolBar.Actions().Add(walk.NewSeparatorAction()) deleteAction := walk.NewAction() - deleteActionIcon, _ := walk.NewIconFromResourceWithSize("delete.ico", imageSize) + deleteActionIcon, _ := loadSystemIcon("shell32", 131) deleteActionImage, _ := walk.NewBitmapFromIcon(deleteActionIcon, imageSize) deleteAction.SetImage(deleteActionImage) deleteAction.SetShortcut(walk.Shortcut{0, walk.KeyDelete}) @@ -108,7 +114,7 @@ func NewTunnelsPage() (*TunnelsPage, error) { tunnelsToolBar.Actions().Add(walk.NewSeparatorAction()) exportAction := walk.NewAction() - exportActionIcon, _ := walk.NewIconFromResourceWithSize("export.ico", imageSize) + exportActionIcon, _ := loadSystemIcon("imageres", 165) // Or "shell32", 45? exportActionImage, _ := walk.NewBitmapFromIcon(exportActionIcon, imageSize) exportAction.SetImage(exportActionImage) exportAction.SetToolTip("Export all tunnels to zip...") |