From 8ffacc0990eb41545f234a9bffa45304d9b4d2c8 Mon Sep 17 00:00:00 2001 From: Abhishek Banthia <8280282+n0shake@users.noreply.github.com> Date: Mon, 1 Jan 2024 18:22:27 -0500 Subject: [PATCH] Revert "Remove option to switch up future slider." This reverts commit a52608ac16c0bbc7e57917b50063a2a497c5329a. --- .../Appearance/AppearanceViewController.swift | 8 +- Clocker/Preferences/Preferences.storyboard | 83 +++++++++++++------ 2 files changed, 66 insertions(+), 25 deletions(-) diff --git a/Clocker/Preferences/Appearance/AppearanceViewController.swift b/Clocker/Preferences/Appearance/AppearanceViewController.swift index c755854..002c6be 100644 --- a/Clocker/Preferences/Appearance/AppearanceViewController.swift +++ b/Clocker/Preferences/Appearance/AppearanceViewController.swift @@ -145,6 +145,7 @@ class AppearanceViewController: ParentViewController { @IBOutlet var timeFormatLabel: NSTextField! @IBOutlet var panelTheme: NSTextField! @IBOutlet var dayDisplayOptionsLabel: NSTextField! + @IBOutlet var showSliderLabel: NSTextField! @IBOutlet var showSunriseLabel: NSTextField! @IBOutlet var largerTextLabel: NSTextField! @IBOutlet var futureSliderRangeLabel: NSTextField! @@ -163,6 +164,7 @@ class AppearanceViewController: ParentViewController { timeFormatLabel.stringValue = "Time Format".localized() panelTheme.stringValue = "Panel Theme".localized() dayDisplayOptionsLabel.stringValue = "Day Display Options".localized() + showSliderLabel.stringValue = "Time Scroller".localized() showSunriseLabel.stringValue = "Show Sunrise/Sunset".localized() largerTextLabel.stringValue = "Larger Text".localized() syncLabel.stringValue = "Enable iCloud Sync".localized() @@ -175,7 +177,7 @@ class AppearanceViewController: ParentViewController { miscelleaneousLabel.stringValue = "Miscellaneous".localized() [timeFormatLabel, panelTheme, - dayDisplayOptionsLabel, + dayDisplayOptionsLabel, showSliderLabel, showSunriseLabel, largerTextLabel, syncLabel, futureSliderRangeLabel, includeDayLabel, includeDateLabel, includePlaceLabel, appDisplayLabel, menubarModeLabel, previewLabel, miscelleaneousLabel].forEach { @@ -266,6 +268,10 @@ class AppearanceViewController: ParentViewController { previewPanelTableView.reloadData() } + @IBAction func showFutureSlider(_: Any) { + refresh(panel: false, floating: true) + } + @IBAction func showSunriseSunset(_ sender: NSSegmentedControl) { Logger.log(object: ["Is It Displayed": sender.selectedSegment == 0 ? "YES" : "NO"], for: "Sunrise Sunset") previewPanelTableView.reloadData() diff --git a/Clocker/Preferences/Preferences.storyboard b/Clocker/Preferences/Preferences.storyboard index 44ba963..2946339 100644 --- a/Clocker/Preferences/Preferences.storyboard +++ b/Clocker/Preferences/Preferences.storyboard @@ -1,8 +1,8 @@ - + - + @@ -1317,7 +1317,7 @@ - + @@ -1331,7 +1331,7 @@ - + @@ -1342,7 +1342,7 @@ - + @@ -1352,8 +1352,27 @@ + + + + + + + + + + + + + + + + + + + - + @@ -1366,6 +1385,17 @@ + + + + + + + + + + + @@ -1387,10 +1417,13 @@ + + + @@ -1398,7 +1431,7 @@ - + @@ -1411,10 +1444,11 @@ + - + @@ -1448,6 +1482,7 @@ + @@ -1470,7 +1505,7 @@ - + @@ -1478,7 +1513,7 @@ - + @@ -1535,13 +1570,13 @@ DQ - + - - + + - + @@ -1625,20 +1660,20 @@ DQ - - + - + - + @@ -1686,7 +1721,7 @@ DQ