Latest systray with new import etc

fyne-io · Mar 7, 2022 · 070c7ae · 070c7ae
1 parent b82b7bb
commit 070c7ae
Show file tree

Hide file tree

Showing 24 changed files with 110 additions and 49 deletions.
diff --git a/app/app_darwin.go b/app/app_darwin.go
@@ -37,10 +37,18 @@ func (a *fyneApp) SendNotification(n *fyne.Notification) {
 	fallbackNotification(n.Title, n.Content)
 }
 
+// SetSystemTrayMenu creates a system tray item and attaches the specified menu.
+// By default this will use the application icon.
 func (a *fyneApp) SetSystemTrayMenu(menu *fyne.Menu) {
 	a.Driver().(systrayDriver).SetSystemTrayMenu(menu)
 }
 
+// SetSystemTrayIcon sets a custom image for the system tray icon.
+// You should have previously called `SetSystemTrayMenu` to initialise the menu icon.
+func (a *fyneApp) SetSystemTrayIcon(icon fyne.Resource) {
+	a.Driver().(systrayDriver).SetSystemTrayIcon(icon)
+}
+
 func escapeNotificationString(in string) string {
 	noSlash := strings.ReplaceAll(in, "\\", "\\\\")
 	return strings.ReplaceAll(noSlash, "\"", "\\\"")

diff --git a/app/app_windows.go b/app/app_windows.go
@@ -83,10 +83,18 @@ func (a *fyneApp) SendNotification(n *fyne.Notification) {
 	go runScript("notify", script)
 }
 
+// SetSystemTrayMenu creates a system tray item and attaches the specified menu.
+// By default this will use the application icon.
 func (a *fyneApp) SetSystemTrayMenu(menu *fyne.Menu) {
 	a.Driver().(systrayDriver).SetSystemTrayMenu(menu)
 }
 
+// SetSystemTrayIcon sets a custom image for the system tray icon.
+// You should have previously called `SetSystemTrayMenu` to initialise the menu icon.
+func (a *fyneApp) SetSystemTrayIcon(icon fyne.Resource) {
+	a.Driver().(systrayDriver).SetSystemTrayIcon(icon)
+}
+
 func escapeNotificationString(in string) string {
 	noSlash := strings.ReplaceAll(in, "`", "``")
 	return strings.ReplaceAll(noSlash, "\"", "`\"")

diff --git a/go.mod b/go.mod
@@ -3,14 +3,14 @@ module fyne.io/fyne/v2
 go 1.14
 
 require (
+	fyne.io/systray v1.1.1-0.20220307102710-0121a6d9ce01
 	github.com/BurntSushi/toml v1.0.0
 	github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9
 	github.com/akavel/rsrc v0.8.0 // indirect
 	github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe
 	github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504
-	github.com/fyne-io/systray v1.1.1-0.20220306152635-ed046166dd6b
 	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6
 	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec
 	github.com/go-ole/go-ole v1.2.6

diff --git a/go.sum b/go.sum
@@ -37,6 +37,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+fyne.io/systray v1.1.1-0.20220307102710-0121a6d9ce01 h1:kKqpTktxesuGT4+Dv1aYiVse688saMLeWPDRihIw+zI=
+fyne.io/systray v1.1.1-0.20220307102710-0121a6d9ce01/go.mod h1:N4ZU0i34X+n8soFRlBNkmJTunw9wD+9jIP19fSZpjSI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU=
 github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
@@ -84,8 +86,6 @@ github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe h1:A/wiwvQ0CAjPkuJyt
 github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg=
 github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504 h1:+31CdF/okdokeFNoy9L/2PccG3JFidQT3ev64/r4pYU=
 github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504/go.mod h1:gLRWYfYnMA9TONeppRSikMdXlHQ97xVsPojddUv3b/E=
-github.com/fyne-io/systray v1.1.1-0.20220306152635-ed046166dd6b h1:7kfhvRMwRg3t/gWnBbqdi6+4OwQntdQBGRb3mMTHB9M=
-github.com/fyne-io/systray v1.1.1-0.20220306152635-ed046166dd6b/go.mod h1:s+heIP7MbDGp0rLQhw1yEpMEaf0d3y3XQ75K68Esobs=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk=
 github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=

diff --git a/internal/driver/glfw/driver_desktop.go b/internal/driver/glfw/driver_desktop.go
@@ -4,7 +4,7 @@
 package glfw
 
 import (
-	"github.com/fyne-io/systray"
+	"fyne.io/systray"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/theme"

diff --git a/vendor/github.com/fyne-io/systray/.gitignore → vendor/fyne.io/systray/.gitignore b/vendor/github.com/fyne-io/systray/.gitignore → vendor/fyne.io/systray/.gitignore
diff --git a/...r/github.com/fyne-io/systray/CHANGELOG.md → vendor/fyne.io/systray/CHANGELOG.md b/...r/github.com/fyne-io/systray/CHANGELOG.md → vendor/fyne.io/systray/CHANGELOG.md
diff --git a/vendor/github.com/fyne-io/systray/LICENSE → vendor/fyne.io/systray/LICENSE b/vendor/github.com/fyne-io/systray/LICENSE → vendor/fyne.io/systray/LICENSE
diff --git a/vendor/github.com/fyne-io/systray/Makefile → vendor/fyne.io/systray/Makefile b/vendor/github.com/fyne-io/systray/Makefile → vendor/fyne.io/systray/Makefile
diff --git a/vendor/github.com/fyne-io/systray/README.md → vendor/fyne.io/systray/README.md b/vendor/github.com/fyne-io/systray/README.md → vendor/fyne.io/systray/README.md
diff --git a/vendor/github.com/fyne-io/systray/go.mod → vendor/fyne.io/systray/go.mod b/vendor/github.com/fyne-io/systray/go.mod → vendor/fyne.io/systray/go.mod
diff --git a/vendor/github.com/fyne-io/systray/go.sum → vendor/fyne.io/systray/go.sum b/vendor/github.com/fyne-io/systray/go.sum → vendor/fyne.io/systray/go.sum
diff --git a/...tray/internal/generated/menu/dbus_menu.go → ...tray/internal/generated/menu/dbus_menu.go b/...tray/internal/generated/menu/dbus_menu.go → ...tray/internal/generated/menu/dbus_menu.go
diff --git a/...enerated/notifier/status_notifier_item.go → ...enerated/notifier/status_notifier_item.go b/...enerated/notifier/status_notifier_item.go → ...enerated/notifier/status_notifier_item.go
diff --git a/vendor/github.com/fyne-io/systray/systray.go → vendor/fyne.io/systray/systray.go b/vendor/github.com/fyne-io/systray/systray.go → vendor/fyne.io/systray/systray.go
diff --git a/vendor/github.com/fyne-io/systray/systray.h → vendor/fyne.io/systray/systray.h b/vendor/github.com/fyne-io/systray/systray.h → vendor/fyne.io/systray/systray.h
diff --git a/...hub.com/fyne-io/systray/systray_darwin.go → vendor/fyne.io/systray/systray_darwin.go b/...hub.com/fyne-io/systray/systray_darwin.go → vendor/fyne.io/systray/systray_darwin.go
diff --git a/...thub.com/fyne-io/systray/systray_darwin.m → vendor/fyne.io/systray/systray_darwin.m b/...thub.com/fyne-io/systray/systray_darwin.m → vendor/fyne.io/systray/systray_darwin.m
diff --git a/...thub.com/fyne-io/systray/systray_linux.go → vendor/fyne.io/systray/systray_linux.go b/...thub.com/fyne-io/systray/systray_linux.go → vendor/fyne.io/systray/systray_linux.go
diff --git a/...com/fyne-io/systray/systray_menu_linux.go → vendor/fyne.io/systray/systray_menu_linux.go b/...com/fyne-io/systray/systray_menu_linux.go → vendor/fyne.io/systray/systray_menu_linux.go
diff --git a/...ub.com/fyne-io/systray/systray_windows.go → vendor/fyne.io/systray/systray_windows.go b/...ub.com/fyne-io/systray/systray_windows.go → vendor/fyne.io/systray/systray_windows.go
diff --git a/vendor/github.com/godbus/dbus/v5/introspect/introspect.go b/vendor/github.com/godbus/dbus/v5/introspect/introspect.go
diff --git a/vendor/github.com/godbus/dbus/v5/prop/prop.go b/vendor/github.com/godbus/dbus/v5/prop/prop.go