|
|
|
@ -23,9 +23,7 @@ class ParentPanelController: NSWindowController { |
|
|
|
|
|
|
|
|
|
|
|
var dateFormatter = DateFormatter() |
|
|
|
var dateFormatter = DateFormatter() |
|
|
|
|
|
|
|
|
|
|
|
var futureSliderValue: Int { |
|
|
|
var futureSliderValue: Int = 0 |
|
|
|
return futureSlider.integerValue |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var parentTimer: Repeater? |
|
|
|
var parentTimer: Repeater? |
|
|
|
|
|
|
|
|
|
|
|
@ -50,12 +48,8 @@ class ParentPanelController: NSWindowController { |
|
|
|
|
|
|
|
|
|
|
|
@IBOutlet var stackView: NSStackView! |
|
|
|
@IBOutlet var stackView: NSStackView! |
|
|
|
|
|
|
|
|
|
|
|
@IBOutlet var futureSlider: NSSlider! |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@IBOutlet var scrollViewHeight: NSLayoutConstraint! |
|
|
|
@IBOutlet var scrollViewHeight: NSLayoutConstraint! |
|
|
|
|
|
|
|
|
|
|
|
@IBOutlet var futureSliderView: NSView! |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@IBOutlet var reviewView: NSView! |
|
|
|
@IBOutlet var reviewView: NSView! |
|
|
|
|
|
|
|
|
|
|
|
@IBOutlet var leftField: NSTextField! |
|
|
|
@IBOutlet var leftField: NSTextField! |
|
|
|
@ -72,8 +66,6 @@ class ParentPanelController: NSWindowController { |
|
|
|
|
|
|
|
|
|
|
|
@IBOutlet var pinButton: NSButton! |
|
|
|
@IBOutlet var pinButton: NSButton! |
|
|
|
|
|
|
|
|
|
|
|
@IBOutlet var sliderDatePicker: NSDatePicker! |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@IBOutlet var roundedDateView: NSView! |
|
|
|
@IBOutlet var roundedDateView: NSView! |
|
|
|
|
|
|
|
|
|
|
|
// Modern Slider |
|
|
|
// Modern Slider |
|
|
|
@ -179,7 +171,6 @@ class ParentPanelController: NSWindowController { |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
// Setup layers |
|
|
|
// Setup layers |
|
|
|
futureSliderView.wantsLayer = true |
|
|
|
|
|
|
|
reviewView.wantsLayer = true |
|
|
|
reviewView.wantsLayer = true |
|
|
|
|
|
|
|
|
|
|
|
// Setup notifications |
|
|
|
// Setup notifications |
|
|
|
@ -210,9 +201,6 @@ class ParentPanelController: NSWindowController { |
|
|
|
// Setup colors based on the curren theme |
|
|
|
// Setup colors based on the curren theme |
|
|
|
themeChanged() |
|
|
|
themeChanged() |
|
|
|
|
|
|
|
|
|
|
|
//TODO: Always hide the legacy slider view. Delete this once v24.01 stabilizes. |
|
|
|
|
|
|
|
futureSliderView.isHidden = true |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// UI adjustments based on user preferences |
|
|
|
// UI adjustments based on user preferences |
|
|
|
if DataStore.shared().timezones().isEmpty || DataStore.shared().shouldDisplay(.futureSlider) == false { |
|
|
|
if DataStore.shared().timezones().isEmpty || DataStore.shared().shouldDisplay(.futureSlider) == false { |
|
|
|
|
|
|
|
|
|
|
|
@ -310,18 +298,6 @@ class ParentPanelController: NSWindowController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private func adjustFutureSliderBasedOnPreferences() { |
|
|
|
private func adjustFutureSliderBasedOnPreferences() { |
|
|
|
// Setting up Slider's Date Picker |
|
|
|
|
|
|
|
sliderDatePicker.minDate = Date() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
guard let sliderRange = DataStore.shared().retrieve(key: UserDefaultKeys.futureSliderRange) as? NSNumber else { |
|
|
|
|
|
|
|
sliderDatePicker.maxDate = Date(timeInterval: 1 * 24 * 60 * 60, since: Date()) |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sliderDatePicker.maxDate = Date(timeInterval: (sliderRange.doubleValue + 1) * 24 * 60 * 60, since: Date()) |
|
|
|
|
|
|
|
futureSlider.maxValue = (sliderRange.doubleValue + 1) * 24 * 60 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
futureSlider.integerValue = 0 |
|
|
|
|
|
|
|
setTimezoneDatasourceSlider(sliderValue: 0) |
|
|
|
setTimezoneDatasourceSlider(sliderValue: 0) |
|
|
|
updateTableContent() |
|
|
|
updateTableContent() |
|
|
|
} |
|
|
|
} |
|
|
|
@ -358,8 +334,6 @@ class ParentPanelController: NSWindowController { |
|
|
|
|
|
|
|
|
|
|
|
let rightButtonAttributedTitle = NSAttributedString(string: rightButton.title, attributes: styleAttributes) |
|
|
|
let rightButtonAttributedTitle = NSAttributedString(string: rightButton.title, attributes: styleAttributes) |
|
|
|
rightButton.attributedTitle = rightButtonAttributedTitle |
|
|
|
rightButton.attributedTitle = rightButtonAttributedTitle |
|
|
|
|
|
|
|
|
|
|
|
futureSliderView.layer?.backgroundColor = NSColor.clear.cgColor |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@objc func themeChanged() { |
|
|
|
@objc func themeChanged() { |
|
|
|
@ -375,8 +349,6 @@ class ParentPanelController: NSWindowController { |
|
|
|
sharingButton.image = sharedThemer.sharingImage() |
|
|
|
sharingButton.image = sharedThemer.sharingImage() |
|
|
|
sharingButton.alternateImage = sharedThemer.sharingImageAlternate() |
|
|
|
sharingButton.alternateImage = sharedThemer.sharingImageAlternate() |
|
|
|
|
|
|
|
|
|
|
|
sliderDatePicker.textColor = sharedThemer.mainTextColor() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if roundedDateView != nil { |
|
|
|
if roundedDateView != nil { |
|
|
|
roundedDateView.layer?.backgroundColor = Themer.shared().textBackgroundColor().cgColor |
|
|
|
roundedDateView.layer?.backgroundColor = Themer.shared().textBackgroundColor().cgColor |
|
|
|
} |
|
|
|
} |
|
|
|
@ -540,24 +512,8 @@ class ParentPanelController: NSWindowController { |
|
|
|
window?.alphaValue = 1.0 |
|
|
|
window?.alphaValue = 1.0 |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@IBAction func sliderMoved(_: Any) { |
|
|
|
|
|
|
|
let currentCalendar = Calendar(identifier: .gregorian) |
|
|
|
|
|
|
|
guard let newDate = currentCalendar.date(byAdding: .minute, |
|
|
|
|
|
|
|
value: Int(futureSlider.doubleValue), |
|
|
|
|
|
|
|
to: Date()) |
|
|
|
|
|
|
|
else { |
|
|
|
|
|
|
|
assertionFailure("Data was unexpectedly nil") |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setTimezoneDatasourceSlider(sliderValue: futureSliderValue) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sliderDatePicker.dateValue = newDate |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mainTableView.reloadData() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func setTimezoneDatasourceSlider(sliderValue: Int) { |
|
|
|
func setTimezoneDatasourceSlider(sliderValue: Int) { |
|
|
|
|
|
|
|
futureSliderValue = sliderValue |
|
|
|
datasource?.setSlider(value: sliderValue) |
|
|
|
datasource?.setSlider(value: sliderValue) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -619,9 +575,6 @@ class ParentPanelController: NSWindowController { |
|
|
|
let cellView = mainTableView.view(atColumn: 0, row: $0, makeIfNecessary: false) as? TimezoneCellView, |
|
|
|
let cellView = mainTableView.view(atColumn: 0, row: $0, makeIfNecessary: false) as? TimezoneCellView, |
|
|
|
let model = TimezoneData.customObject(from: current) |
|
|
|
let model = TimezoneData.customObject(from: current) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if let futureSliderCell = futureSlider.cell as? CustomSliderCell, futureSliderCell.tracking == true { |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if modernContainerView != nil, modernSlider.isHidden == false, modernContainerView.currentlyInFocus { |
|
|
|
if modernContainerView != nil, modernSlider.isHidden == false, modernContainerView.currentlyInFocus { |
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
@ -646,19 +599,9 @@ class ParentPanelController: NSWindowController { |
|
|
|
cellView.noteLabel.stringValue = UserDefaultKeys.emptyString |
|
|
|
cellView.noteLabel.stringValue = UserDefaultKeys.emptyString |
|
|
|
} |
|
|
|
} |
|
|
|
cellView.layout(with: model) |
|
|
|
cellView.layout(with: model) |
|
|
|
updateDatePicker() |
|
|
|
// TODO: Update modern slider |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private func updateDatePicker() { |
|
|
|
|
|
|
|
sliderDatePicker.minDate = Date() |
|
|
|
|
|
|
|
guard let sliderRange = DataStore.shared().retrieve(key: UserDefaultKeys.futureSliderRange) as? NSNumber else { |
|
|
|
|
|
|
|
sliderDatePicker.maxDate = Date(timeInterval: 1 * 24 * 60 * 60, since: Date()) |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sliderDatePicker.maxDate = Date(timeInterval: (sliderRange.doubleValue + 1) * 24 * 60 * 60, since: Date()) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@discardableResult |
|
|
|
@discardableResult |
|
|
|
@ -955,22 +898,11 @@ class ParentPanelController: NSWindowController { |
|
|
|
|
|
|
|
|
|
|
|
// MARK: Date Picker + Slider |
|
|
|
// MARK: Date Picker + Slider |
|
|
|
|
|
|
|
|
|
|
|
@IBAction func sliderPickerChanged(_: Any) { |
|
|
|
|
|
|
|
let minutesDifference = minutes(from: Date(), other: sliderDatePicker.dateValue) |
|
|
|
|
|
|
|
futureSlider.integerValue = minutesDifference |
|
|
|
|
|
|
|
setTimezoneDatasourceSlider(sliderValue: minutesDifference) |
|
|
|
|
|
|
|
updateTableContent() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func minutes(from date: Date, other: Date) -> Int { |
|
|
|
func minutes(from date: Date, other: Date) -> Int { |
|
|
|
return Calendar.current.dateComponents([.minute], from: date, to: other).minute ?? 0 |
|
|
|
return Calendar.current.dateComponents([.minute], from: date, to: other).minute ?? 0 |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@IBAction func resetDatePicker(_: Any) { |
|
|
|
|
|
|
|
futureSlider.integerValue = 0 |
|
|
|
|
|
|
|
sliderDatePicker.dateValue = Date() |
|
|
|
|
|
|
|
setTimezoneDatasourceSlider(sliderValue: 0) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@objc func terminateClocker() { |
|
|
|
@objc func terminateClocker() { |
|
|
|
NSApplication.shared.terminate(nil) |
|
|
|
NSApplication.shared.terminate(nil) |
|
|
|
|
Abhishek Banthia
9 months ago