internal/tray: change connection status item to be a connecction toggle instead (#138)

* internal/tray: change connection status item to eb a connection toggle

* internal/ui: hook up tray menu connection toggle

* meta: add v0.12.7 to metainfo

Author: DeedleFake

Diff for: dev.deedles.Trayscale.metainfo.xml

@@ -54,6 +54,11 @@
 	<content_rating type="oars-1.1" />
 
 	<releases>
+		<release version="v0.12.7" date="2024-07-09">
+			<description>
+				<ul>Add a connection toggle to the tray icon menu.</ul>
+			</description>
+		</release>
 		<release version="v0.12.6" date="2024-07-03">
 			<description>
 				<ul>Add online status indicators to peer list.</ul>

Diff for: internal/tray/tray.go

@@ -24,47 +24,50 @@ func statusIcon(online bool) []byte {
 }
 
 type Tray struct {
-	showItem                 *systray.MenuItem
-	quitItem                 *systray.MenuItem
-	selfNodeItem             *systray.MenuItem
-	connectionStatusMenuItem *systray.MenuItem
+	connToggleItem *systray.MenuItem
+	selfNodeItem   *systray.MenuItem
+	showItem       *systray.MenuItem
+	quitItem       *systray.MenuItem
 }
 
 func New(online bool) *Tray {
 	systray.SetIcon(statusIcon(online))
 	systray.SetTitle("Trayscale")
 
+	connToggleItem := systray.AddMenuItem(connToggleText(online), "")
 	selfNodeItem := systray.AddMenuItem("", "")
-	connectionStatusMenuItem := systray.AddMenuItem(connectionStatusText(online), "")
-	connectionStatusMenuItem.Disable()
 	systray.AddSeparator()
 	showWindow := systray.AddMenuItem("Show", "")
 	systray.AddSeparator()
 	quit := systray.AddMenuItem("Quit", "")
 
 	return &Tray{
-		showItem:                 showWindow,
-		quitItem:                 quit,
-		selfNodeItem:             selfNodeItem,
-		connectionStatusMenuItem: connectionStatusMenuItem,
+		connToggleItem: connToggleItem,
+		selfNodeItem:   selfNodeItem,
+		showItem:       showWindow,
+		quitItem:       quit,
 	}
 }
 
-func (t *Tray) QuitChan() <-chan struct{} {
-	return t.quitItem.ClickedCh
+func (t *Tray) ConnToggleChan() <-chan struct{} {
+	return t.connToggleItem.ClickedCh
+}
+
+func (t *Tray) SelfNodeChan() <-chan struct{} {
+	return t.selfNodeItem.ClickedCh
 }
 
 func (t *Tray) ShowChan() <-chan struct{} {
 	return t.showItem.ClickedCh
 }
 
-func (t *Tray) SelfNodeChan() <-chan struct{} {
-	return t.selfNodeItem.ClickedCh
+func (t *Tray) QuitChan() <-chan struct{} {
+	return t.quitItem.ClickedCh
 }
 
 func (t *Tray) setOnlineStatus(online bool) {
 	systray.SetIcon(statusIcon(online))
-	t.connectionStatusMenuItem.SetTitle(connectionStatusText(online))
+	t.connToggleItem.SetTitle(connToggleText(online))
 }
 
 func (t *Tray) Update(s tsutil.Status, previousOnlineStatus bool) {
@@ -119,10 +122,10 @@ func selfTitle(s tsutil.Status) (string, bool) {
 	return fmt.Sprintf("%v (%v)", tsutil.DNSOrQuoteHostname(s.Status, s.Status.Self), addr), true
 }
 
-func connectionStatusText(online bool) string {
+func connToggleText(online bool) string {
 	if online {
-		return "Connected"
+		return "Disconnect"
 	}
 
-	return "Disconnected"
+	return "Connect"
 }

Diff for: internal/ui/app.go

@@ -356,6 +356,36 @@ func (a *App) initTray(ctx context.Context) {
 		case <-ctx.Done():
 			return
 
+		case <-a.tray.ConnToggleChan():
+			glib.IdleAdd(func() {
+				ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
+				defer cancel()
+
+				f := a.stopTS
+				if !a.online {
+					f = a.startTS
+				}
+
+				err := f(ctx)
+				if err != nil {
+					slog.Error("set Tailscale status from tray", "err", err)
+					return
+				}
+			})
+
+		case <-a.tray.SelfNodeChan():
+			glib.IdleAdd(func() {
+				s := <-a.poller.Get()
+				addr, ok := s.SelfAddr()
+				if !ok {
+					return
+				}
+				a.clip(glib.NewValue(addr.String()))
+				if a.win != nil {
+					a.notify("Trayscale", "Copied address to clipboard")
+				}
+			})
+
 		case <-a.tray.ShowChan():
 			glib.IdleAdd(func() {
 				if a.app != nil {
@@ -365,17 +395,6 @@ func (a *App) initTray(ctx context.Context) {
 
 		case <-a.tray.QuitChan():
 			a.Quit()
-
-		case <-a.tray.SelfNodeChan():
-			s := <-a.poller.Get()
-			addr, ok := s.SelfAddr()
-			if !ok {
-				continue
-			}
-			a.clip(glib.NewValue(addr.String()))
-			if a.win != nil {
-				a.notify("Trayscale", "Copied address to clipboard")
-			}
 		}
 	}
 }