extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-03-03 17:31:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

[client] Use go build to embed less icons (#3351)

Browse Source
This commit is contained in:
Carlos Hernandez 2025-02-20 02:55:44 -07:00 committed by GitHub
parent 7e6beee7f6
commit 33cf9535b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 99 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
client/ui/client_ui.go
View File

@ -83,7 +83,7 @@ func main() {
} }
a := app.NewWithID("NetBird") a := app.NewWithID("NetBird")
a.SetIcon(fyne.NewStaticResource("netbird", iconDisconnectedPNG)) a.SetIcon(fyne.NewStaticResource("netbird", iconDisconnected))
if errorMSG != "" { if errorMSG != "" {
showErrorMSG(errorMSG) showErrorMSG(errorMSG)
@ -115,96 +115,24 @@ func main() {
} }
} }
//go:embed netbird.ico
var iconAboutICO []byte
//go:embed netbird.png
var iconAboutPNG []byte
//go:embed netbird-systemtray-connected.ico
var iconConnectedICO []byte
//go:embed netbird-systemtray-connected.png
var iconConnectedPNG []byte
//go:embed netbird-systemtray-connected-macos.png //go:embed netbird-systemtray-connected-macos.png
var iconConnectedMacOS []byte var iconConnectedMacOS []byte
//go:embed netbird-systemtray-connected-dark.ico
var iconConnectedDarkICO []byte
//go:embed netbird-systemtray-connected-dark.png
var iconConnectedDarkPNG []byte
//go:embed netbird-systemtray-disconnected.ico
var iconDisconnectedICO []byte
//go:embed netbird-systemtray-disconnected.png
var iconDisconnectedPNG []byte
//go:embed netbird-systemtray-disconnected-macos.png //go:embed netbird-systemtray-disconnected-macos.png
var iconDisconnectedMacOS []byte var iconDisconnectedMacOS []byte
//go:embed netbird-systemtray-update-disconnected.ico
var iconUpdateDisconnectedICO []byte
//go:embed netbird-systemtray-update-disconnected.png
var iconUpdateDisconnectedPNG []byte
//go:embed netbird-systemtray-update-disconnected-macos.png //go:embed netbird-systemtray-update-disconnected-macos.png
var iconUpdateDisconnectedMacOS []byte var iconUpdateDisconnectedMacOS []byte
//go:embed netbird-systemtray-update-disconnected-dark.ico
var iconUpdateDisconnectedDarkICO []byte
//go:embed netbird-systemtray-update-disconnected-dark.png
var iconUpdateDisconnectedDarkPNG []byte
//go:embed netbird-systemtray-update-connected.ico
var iconUpdateConnectedICO []byte
//go:embed netbird-systemtray-update-connected.png
var iconUpdateConnectedPNG []byte
//go:embed netbird-systemtray-update-connected-macos.png //go:embed netbird-systemtray-update-connected-macos.png
var iconUpdateConnectedMacOS []byte var iconUpdateConnectedMacOS []byte
//go:embed netbird-systemtray-update-connected-dark.ico
var iconUpdateConnectedDarkICO []byte
//go:embed netbird-systemtray-update-connected-dark.png
var iconUpdateConnectedDarkPNG []byte
//go:embed netbird-systemtray-connecting.ico
var iconConnectingICO []byte
//go:embed netbird-systemtray-connecting.png
var iconConnectingPNG []byte
//go:embed netbird-systemtray-connecting-macos.png //go:embed netbird-systemtray-connecting-macos.png
var iconConnectingMacOS []byte var iconConnectingMacOS []byte
//go:embed netbird-systemtray-connecting-dark.ico
var iconConnectingDarkICO []byte
//go:embed netbird-systemtray-connecting-dark.png
var iconConnectingDarkPNG []byte
//go:embed netbird-systemtray-error.ico
var iconErrorICO []byte
//go:embed netbird-systemtray-error.png
var iconErrorPNG []byte
//go:embed netbird-systemtray-error-macos.png //go:embed netbird-systemtray-error-macos.png
var iconErrorMacOS []byte var iconErrorMacOS []byte
//go:embed netbird-systemtray-error-dark.ico
var iconErrorDarkICO []byte
//go:embed netbird-systemtray-error-dark.png
var iconErrorDarkPNG []byte
type serviceClient struct { type serviceClient struct {
ctx context.Context ctx context.Context
addr string addr string
@ -298,40 +226,21 @@ func newServiceClient(addr string, a fyne.App, showSettings bool, showRoutes boo
} }
func (s *serviceClient) setNewIcons() { func (s *serviceClient) setNewIcons() {
if runtime.GOOS == "windows" { s.icAbout = iconAbout
s.icAbout = iconAboutICO
if s.app.Settings().ThemeVariant() == theme.VariantDark { if s.app.Settings().ThemeVariant() == theme.VariantDark {
s.icConnected = iconConnectedDarkICO s.icConnected = iconConnectedDark
s.icDisconnected = iconDisconnectedICO s.icDisconnected = iconDisconnected
s.icUpdateConnected = iconUpdateConnectedDarkICO s.icUpdateConnected = iconUpdateConnectedDark
s.icUpdateDisconnected = iconUpdateDisconnectedDarkICO s.icUpdateDisconnected = iconUpdateDisconnectedDark
s.icConnecting = iconConnectingDarkICO s.icConnecting = iconConnectingDark
s.icError = iconErrorDarkICO s.icError = iconErrorDark
} else { } else {
s.icConnected = iconConnectedICO s.icConnected = iconConnected
s.icDisconnected = iconDisconnectedICO s.icDisconnected = iconDisconnected
s.icUpdateConnected = iconUpdateConnectedICO s.icUpdateConnected = iconUpdateConnected
s.icUpdateDisconnected = iconUpdateDisconnectedICO s.icUpdateDisconnected = iconUpdateDisconnected
s.icConnecting = iconConnectingICO s.icConnecting = iconConnecting
s.icError = iconErrorICO s.icError = iconError
}
} else {
s.icAbout = iconAboutPNG
if s.app.Settings().ThemeVariant() == theme.VariantDark {
s.icConnected = iconConnectedDarkPNG
s.icDisconnected = iconDisconnectedPNG
s.icUpdateConnected = iconUpdateConnectedDarkPNG
s.icUpdateDisconnected = iconUpdateDisconnectedDarkPNG
s.icConnecting = iconConnectingDarkPNG
s.icError = iconErrorDarkPNG
} else {
s.icConnected = iconConnectedPNG
s.icDisconnected = iconDisconnectedPNG
s.icUpdateConnected = iconUpdateConnectedPNG
s.icUpdateDisconnected = iconUpdateDisconnectedPNG
s.icConnecting = iconConnectingPNG
s.icError = iconErrorPNG
}
} }
} }
@ -622,7 +531,6 @@ func (s *serviceClient) updateStatus() error {
Stop: backoff.Stop, Stop: backoff.Stop,
Clock: backoff.SystemClock, Clock: backoff.SystemClock,
}) })
if err != nil { if err != nil {
return err return err
} }

43
client/ui/icons.go Normal file
View File

@ -0,0 +1,43 @@
//go:build !(linux && 386) && !windows
package main
import (
_ "embed"
)
//go:embed netbird.png
var iconAbout []byte
//go:embed netbird-systemtray-connected.png
var iconConnected []byte
//go:embed netbird-systemtray-connected-dark.png
var iconConnectedDark []byte
//go:embed netbird-systemtray-disconnected.png
var iconDisconnected []byte
//go:embed netbird-systemtray-update-disconnected.png
var iconUpdateDisconnected []byte
//go:embed netbird-systemtray-update-disconnected-dark.png
var iconUpdateDisconnectedDark []byte
//go:embed netbird-systemtray-update-connected.png
var iconUpdateConnected []byte
//go:embed netbird-systemtray-update-connected-dark.png
var iconUpdateConnectedDark []byte
//go:embed netbird-systemtray-connecting.png
var iconConnecting []byte
//go:embed netbird-systemtray-connecting-dark.png
var iconConnectingDark []byte
//go:embed netbird-systemtray-error.png
var iconError []byte
//go:embed netbird-systemtray-error-dark.png
var iconErrorDark []byte

41
client/ui/icons_windows.go Normal file
View File

@ -0,0 +1,41 @@
package main
import (
_ "embed"
)
//go:embed netbird.ico
var iconAbout []byte
//go:embed netbird-systemtray-connected.ico
var iconConnected []byte
//go:embed netbird-systemtray-connected-dark.ico
var iconConnectedDark []byte
//go:embed netbird-systemtray-disconnected.ico
var iconDisconnected []byte
//go:embed netbird-systemtray-update-disconnected.ico
var iconUpdateDisconnected []byte
//go:embed netbird-systemtray-update-disconnected-dark.ico
var iconUpdateDisconnectedDark []byte
//go:embed netbird-systemtray-update-connected.ico
var iconUpdateConnected []byte
//go:embed netbird-systemtray-update-connected-dark.ico
var iconUpdateConnectedDark []byte
//go:embed netbird-systemtray-connecting.ico
var iconConnecting []byte
//go:embed netbird-systemtray-connecting-dark.ico
var iconConnectingDark []byte
//go:embed netbird-systemtray-error.ico
var iconError []byte
//go:embed netbird-systemtray-error-dark.ico
var iconErrorDark []byte