update screenshots; use the central clock also in settings

Author: ftl

core/app/app.go

@@ -148,6 +148,7 @@ func (c *Controller) Startup() {
 	c.callHistoryFinder = callhistory.New(c.ServiceStatus.StatusChanged)
 	c.Settings = settings.New(
 		c.OpenConfigurationFile,
+		c.clock,
 		c.openWithExternalApplication,
 		c.callHistoryFinder,
 		c.configuration.Station(),

core/settings/settings.go

@@ -107,9 +107,10 @@ type View interface {
 	SetMultisGoal(string)
 }
 
-func New(configurationFileOpener ConfigurationFileOpener, browserOpener BrowserOpener, callHistory CallHistory, station core.Station, contest core.Contest) *Settings {
+func New(configurationFileOpener ConfigurationFileOpener, clock core.Clock, browserOpener BrowserOpener, callHistory CallHistory, station core.Station, contest core.Contest) *Settings {
 	result := &Settings{
 		writer:                  new(nullWriter),
+		clock:                   clock,
 		view:                    new(nullView),
 		configurationFileOpener: configurationFileOpener,
 		browserOpener:           browserOpener,
@@ -132,6 +133,7 @@ func New(configurationFileOpener ConfigurationFileOpener, browserOpener BrowserO
 
 type Settings struct {
 	writer                         Writer
+	clock                          core.Clock
 	view                           View
 	configurationFileOpener        ConfigurationFileOpener
 	browserOpener                  BrowserOpener
@@ -432,7 +434,7 @@ func (s *Settings) ContestDefinition(contestIdentifier string) *conval.Definitio
 }
 
 func (s *Settings) ProposeContestName(contestIdentifier string) string {
-	year := time.Now().Format("2006") // TODO use the central clock instead of time.Now()!
+	year := s.clock.Now().Format("2006")
 	return fmt.Sprintf("%s %s", contestIdentifier, year)
 }
 
@@ -629,14 +631,14 @@ func (s *Settings) EnterContestStartTime(value string) {
 }
 
 func (s *Settings) SetContestStartTimeToday() {
-	year, month, day := time.Now().Date()
+	year, month, day := s.clock.Now().Date()
 	s.contest.StartTime = time.Date(year, month, day, 0, 0, 0, 0, time.UTC)
 	s.view.HideMessage()
 	s.view.SetContestStartTime(s.formattedContestStartTime())
 }
 
 func (s *Settings) SetContestStartTimeNow() {
-	s.contest.StartTime = time.Now().UTC().Truncate(time.Hour)
+	s.contest.StartTime = s.clock.Now().UTC().Truncate(time.Hour)
 	s.view.HideMessage()
 	s.view.SetContestStartTime(s.formattedContestStartTime())
 }

docs/docu_guide.md

@@ -26,7 +26,7 @@ Use [flameshot](https://flameshot.org) to take the screenshots. Use the light mo
   - only 'My Exchange' for CWT -> [contest_settings_my_exchange_cwt](screenshots/contest_settings_myexchange_cwt.png)
   - only 'My Exchange' for RST + serial, 'Gen. Report' selected
   - only 'My Exchange' for RST + serial, 'Gen. Report' not selected
-- 'New Contest'
+- 'New Contest' -> [new_cwt](screenshots/new_cwt.png)
 - 'Macros'
 - 'QSO-Rate', with some numbered bullet points to explain the graphic's components:
   - the ciruclar time indicator