extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-04-10 18:58:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set the application icon, settings window title and systray tooltip (#523)

Browse Source
This commit is contained in:
Rui Lopes 2022-10-26 13:34:30 +01:00 committed by GitHub
parent 84117a9fb7
commit 5ed61700ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/ui/client_ui.go
View File

@ -8,7 +8,6 @@ import (
"context" "context"
"flag" "flag"
"fmt" "fmt"
"github.com/netbirdio/netbird/client/system"
"os" "os"
"os/exec" "os/exec"
"path" "path"
@ -18,6 +17,8 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/netbirdio/netbird/client/system"
"github.com/cenkalti/backoff/v4" "github.com/cenkalti/backoff/v4"
_ "embed" _ "embed"
@ -61,6 +62,13 @@ func main() {
flag.Parse() flag.Parse()
a := app.New() a := app.New()
if runtime.GOOS == "windows" {
a.SetIcon(fyne.NewStaticResource("netbird", iconDisconnectedICO))
} else {
a.SetIcon(fyne.NewStaticResource("netbird", iconDisconnectedPNG))
}
client := newServiceClient(daemonAddr, a, showSettings) client := newServiceClient(daemonAddr, a, showSettings)
if showSettings { if showSettings {
a.Run() a.Run()
@ -113,7 +121,7 @@ type serviceClient struct {
iLogFile *widget.Entry iLogFile *widget.Entry
iPreSharedKey *widget.Entry iPreSharedKey *widget.Entry
// observable settings over correspondign iMngURL and iPreSharedKey values. // observable settings over corresponding iMngURL and iPreSharedKey values.
managementURL string managementURL string
preSharedKey string preSharedKey string
adminURL string adminURL string
@ -121,7 +129,7 @@ type serviceClient struct {
// newServiceClient instance constructor // newServiceClient instance constructor
// //
// This constructor olso build UI elements for settings window. // This constructor also builds the UI elements for the settings window.
func newServiceClient(addr string, a fyne.App, showSettings bool) *serviceClient { func newServiceClient(addr string, a fyne.App, showSettings bool) *serviceClient {
s := &serviceClient{ s := &serviceClient{
ctx: context.Background(), ctx: context.Background(),
@ -149,7 +157,7 @@ func newServiceClient(addr string, a fyne.App, showSettings bool) *serviceClient
func (s *serviceClient) showUIElements() { func (s *serviceClient) showUIElements() {
// add settings window UI elements. // add settings window UI elements.
s.wSettings = s.app.NewWindow("Settings") s.wSettings = s.app.NewWindow("NetBird Settings")
s.iMngURL = widget.NewEntry() s.iMngURL = widget.NewEntry()
s.iAdminURL = widget.NewEntry() s.iAdminURL = widget.NewEntry()
s.iConfigFile = widget.NewEntry() s.iConfigFile = widget.NewEntry()
@ -326,11 +334,13 @@ func (s *serviceClient) updateStatus() error {
if status.Status == string(internal.StatusConnected) && !s.mUp.Disabled() { if status.Status == string(internal.StatusConnected) && !s.mUp.Disabled() {
systray.SetIcon(s.icConnected) systray.SetIcon(s.icConnected)
systray.SetTooltip("NetBird (Connected)")
s.mStatus.SetTitle("Connected") s.mStatus.SetTitle("Connected")
s.mUp.Disable() s.mUp.Disable()
s.mDown.Enable() s.mDown.Enable()
} else if status.Status != string(internal.StatusConnected) && s.mUp.Disabled() { } else if status.Status != string(internal.StatusConnected) && s.mUp.Disabled() {
systray.SetIcon(s.icDisconnected) systray.SetIcon(s.icDisconnected)
systray.SetTooltip("NetBird (Disconnected)")
s.mStatus.SetTitle("Disconnected") s.mStatus.SetTitle("Disconnected")
s.mDown.Disable() s.mDown.Disable()
s.mUp.Enable() s.mUp.Enable()
@ -355,6 +365,7 @@ func (s *serviceClient) updateStatus() error {
func (s *serviceClient) onTrayReady() { func (s *serviceClient) onTrayReady() {
systray.SetIcon(s.icDisconnected) systray.SetIcon(s.icDisconnected)
systray.SetTooltip("NetBird")
// setup systray menu items // setup systray menu items
s.mStatus = systray.AddMenuItem("Disconnected", "Disconnected") s.mStatus = systray.AddMenuItem("Disconnected", "Disconnected")