From 403a6b33a7069bb745fe527084d21b6977c91ecf Mon Sep 17 00:00:00 2001
From: Andy Williams <andy@fyne.io>
Date: Sun, 26 Jan 2025 19:06:18 +0000
Subject: [PATCH] Fix lint errors

---
 desk.go                        | 4 ++--
 internal/ui/desk.go            | 2 +-
 internal/ui/embed_wm.go        | 2 +-
 internal/ui/menu.go            | 2 +-
 internal/ui/screensaver.go     | 6 +++---
 internal/x11/wm/screensaver.go | 2 +-
 test/desktop.go                | 6 ++++--
 test/settings.go               | 5 ++++-
 8 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/desk.go b/desk.go
index 64bf63d5..c04b8193 100644
--- a/desk.go
+++ b/desk.go
@@ -26,8 +26,8 @@ type Desktop interface {
 	Desktop() int
 	SetDesktop(int)
 
-	DelayScreensaver()
-	TriggerScreensaver()
+	DelayScreenSaver()
+	TriggerScreenSaver()
 }
 
 var instance Desktop
diff --git a/internal/ui/desk.go b/internal/ui/desk.go
index 49960324..40e50bfb 100644
--- a/internal/ui/desk.go
+++ b/internal/ui/desk.go
@@ -360,7 +360,7 @@ func (l *desktop) registerShortcuts() {
 		l.calculator)
 	l.AddShortcut(fynedesk.NewShortcut("Lock screen", fyne.KeyL, fynedesk.UserModifier),
 		func() {
-			l.TriggerScreensaver()
+			l.TriggerScreenSaver()
 		})
 }
 
diff --git a/internal/ui/embed_wm.go b/internal/ui/embed_wm.go
index 1f38acc5..73d49688 100644
--- a/internal/ui/embed_wm.go
+++ b/internal/ui/embed_wm.go
@@ -110,7 +110,7 @@ func (e *embededWM) ShowScreensaver(s *saver.ScreenSaver) {
 func (e *embededWM) setWindow(win fyne.Window) fyne.CanvasObject {
 	e.root = win
 
-	return newSaverMonitor(fynedesk.Instance().DelayScreensaver)
+	return newSaverMonitor(fynedesk.Instance().DelayScreenSaver)
 }
 
 type saverMonitor struct {
diff --git a/internal/ui/menu.go b/internal/ui/menu.go
index 5b17b75e..3894efdd 100644
--- a/internal/ui/menu.go
+++ b/internal/ui/menu.go
@@ -113,7 +113,7 @@ func (w *widgetPanel) showAccountMenu(_ fyne.CanvasObject) {
 		w2.Close()
 		go func() {
 			time.Sleep(time.Millisecond * 300)
-			w.desk.TriggerScreensaver()
+			w.desk.TriggerScreenSaver()
 		}()
 	}})
 	if !isEmbed {
diff --git a/internal/ui/screensaver.go b/internal/ui/screensaver.go
index fc640612..9b2a62b5 100644
--- a/internal/ui/screensaver.go
+++ b/internal/ui/screensaver.go
@@ -21,7 +21,7 @@ func (l *desktop) startXscreensaver() {
 	}
 }
 
-func (l *desktop) TriggerScreensaver() {
+func (l *desktop) TriggerScreenSaver() {
 	s := saver.NewScreenSaver(nil)
 	s.ClockFormat = l.settings.ClockFormatting()
 	if l.settings.ScreenSaverClock() {
@@ -36,7 +36,7 @@ func (l *desktop) TriggerScreensaver() {
 
 var lastActivity time.Time
 
-func (l *desktop) DelayScreensaver() {
+func (l *desktop) DelayScreenSaver() {
 	lastActivity = time.Now()
 }
 
@@ -50,7 +50,7 @@ func (l *desktop) watchScreenActivity() {
 			if !idle {
 				idle = true
 
-				l.TriggerScreensaver()
+				l.TriggerScreenSaver()
 			}
 		} else {
 			idle = false
diff --git a/internal/x11/wm/screensaver.go b/internal/x11/wm/screensaver.go
index 7883bd1d..09e60cfe 100644
--- a/internal/x11/wm/screensaver.go
+++ b/internal/x11/wm/screensaver.go
@@ -37,7 +37,7 @@ func (x *x11WM) watchScreensaver() {
 		}
 
 		if info.MsSinceUserInput <= 5500 {
-			fynedesk.Instance().DelayScreensaver()
+			fynedesk.Instance().DelayScreenSaver()
 		}
 	}
 }
diff --git a/test/desktop.go b/test/desktop.go
index 9990286d..5b8f6c5f 100644
--- a/test/desktop.go
+++ b/test/desktop.go
@@ -121,6 +121,8 @@ func (td *Desktop) WindowManager() fynedesk.WindowManager {
 	return td.wm
 }
 
-func (td *Desktop) DelayScreensaver() {}
+// DelayScreenSaver is called each time the user interacts with the system.
+func (td *Desktop) DelayScreenSaver() {}
 
-func (td *Desktop) TriggerScreensaver() {}
+// TriggerScreenSaver can be called to immediately show the screensaver.
+func (td *Desktop) TriggerScreenSaver() {}
diff --git a/test/settings.go b/test/settings.go
index 9cb5b294..a8f36497 100644
--- a/test/settings.go
+++ b/test/settings.go
@@ -158,14 +158,17 @@ func (s *Settings) ClockFormatting() string {
 	return s.clockFormatting
 }
 
+// ScreenSaverClock returns if the text on the screensaver should be a clock.
 func (s *Settings) ScreenSaverClock() bool {
 	return true
 }
 
+// ScreenSaverLabel returns the string to use in the screensaver (if not a clock).
 func (s *Settings) ScreenSaverLabel() string {
-	return "(clock)"
+	return "FyshOS"
 }
 
+// ScreenSaverType returns whether this user should use FyshOS or XScreensaver savers.
 func (s *Settings) ScreenSaverType() string {
 	return "FyshOS"
 }