From 01f0a4dfacf6e07247e3effa616de979fd6d8da2 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Thu, 21 Feb 2019 12:56:39 +0100 Subject: [pkg] make the icon brandable Rename the icon to icon.svg/icon.ico instead of having the name of the app in it. - Resolves: #98 --- pkg/systray/notificator.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkg') diff --git a/pkg/systray/notificator.go b/pkg/systray/notificator.go index 760b080..5d0308e 100644 --- a/pkg/systray/notificator.go +++ b/pkg/systray/notificator.go @@ -41,7 +41,7 @@ By using this application, you agree to the Terms of Service available at %[4]s. %[1]v version: %[5]s` missingAuthAgent = `Could not find a polkit authentication agent. Please run one and try again.` errorStartingVPN = `Can't connect to %s: %v` - svgFileName = "riseupvpn.svg" + svgFileName = "icon.svg" ) type notificator struct { @@ -64,7 +64,7 @@ func (n *notificator) donations() { YesNo() n.conf.setNotification() if letsDonate { - open.Run("https://riseup.net/vpn/donate") + open.Run(config.DonateURL) n.conf.setDonated() } } @@ -112,7 +112,7 @@ func getIconPath() string { } if runtime.GOOS == "windows" { - icoPath := `C:\Program Files\` + config.ApplicationName + `\riseupvpn.ico` + icoPath := `C:\Program Files\` + config.ApplicationName + `\icon.ico` if fileExist(icoPath) { return icoPath } @@ -137,7 +137,7 @@ func getIconPath() string { snapPath := os.Getenv("SNAP") if snapPath != "" { - return snapPath + "/snap/gui/riseupvpn.svg" + return snapPath + "/snap/gui/icon.svg" } wd, _ := os.Getwd() @@ -146,12 +146,12 @@ func getIconPath() string { return svgPath } - svgPath = "/usr/share/" + config.BinaryName + "/riseupvpn.svg" + svgPath = "/usr/share/" + config.BinaryName + "/icon.svg" if fileExist(svgPath) { return svgPath } - svgPath = path.Join(gopath, "src", "0xacab.org", "leap", "bitmask-systray", svgFileName) + svgPath = path.Join(gopath, "src", "0xacab.org", "leap", "bitmask-vpn", svgFileName) if fileExist(svgPath) { return svgPath } -- cgit v1.2.3