aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ui
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-03-07 06:27:53 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2019-03-07 20:55:12 +0100
commit9c9c8d13bbc9b58de02271d4690cb20840c1d7c2 (patch)
tree2c825b68c237a877878ffbd626a822b63e2d8fac /ui
parentnames: better casing (diff)
downloadwireguard-windows-9c9c8d13bbc9b58de02271d4690cb20840c1d7c2.tar.xz
wireguard-windows-9c9c8d13bbc9b58de02271d4690cb20840c1d7c2.zip
ui: embed resource the old fashioned way
If we ever get rid of the cgo requirement, we can return to rsrc or some variant of it. But given that win32 GUI stuff benefits from the larger cgo stacks, that seems unlikely. This gives us a bit more latitude to embed all sorts of interesting things in here as well. Clean up the makefile while we're at it and reduce the size of the exe.
Diffstat (limited to 'ui')
-rw-r--r--ui/manifest.xml14
-rw-r--r--ui/ui.go2
2 files changed, 1 insertions, 15 deletions
diff --git a/ui/manifest.xml b/ui/manifest.xml
deleted file mode 100644
index a14c4be4..00000000
--- a/ui/manifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
- <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="wireguard-manager" type="win32"/>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
- </dependentAssembly>
- </dependency>
- <asmv3:application>
- <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
- <dpiAware>true</dpiAware>
- </asmv3:windowsSettings>
- </asmv3:application>
-</assembly>
diff --git a/ui/ui.go b/ui/ui.go
index 2abd6de0..f82d3f4d 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -28,7 +28,7 @@ AllowedIPs = 0.0.0.0/0
`
func RunUI() {
- icon, _ := walk.NewIconFromResourceId(8)
+ icon, _ := walk.NewIconFromResourceId(1)
mw, _ := walk.NewMainWindowWithName("WireGuard")
tray, _ := walk.NewNotifyIcon(mw)