|
|
@ -37,7 +37,7 @@ class ParentPanelController: NSWindowController { |
|
|
|
|
|
|
|
|
|
|
|
var datasource: TimezoneDataSource? |
|
|
|
var datasource: TimezoneDataSource? |
|
|
|
|
|
|
|
|
|
|
|
private lazy var feedbackWindow: AppFeedbackWindowController = AppFeedbackWindowController.shared() |
|
|
|
private lazy var feedbackWindow = AppFeedbackWindowController.shared() |
|
|
|
|
|
|
|
|
|
|
|
private var notePopover: NotesPopover? |
|
|
|
private var notePopover: NotesPopover? |
|
|
|
|
|
|
|
|
|
|
@ -395,7 +395,7 @@ class ParentPanelController: NSWindowController { |
|
|
|
|
|
|
|
|
|
|
|
var current = main.frame.height |
|
|
|
var current = main.frame.height |
|
|
|
|
|
|
|
|
|
|
|
let activeScreens = NSScreen.screens.filter { (current) -> Bool in |
|
|
|
let activeScreens = NSScreen.screens.filter { current -> Bool in |
|
|
|
NSMouseInRect(mouseLocation, current.frame, false) |
|
|
|
NSMouseInRect(mouseLocation, current.frame, false) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -426,7 +426,8 @@ class ParentPanelController: NSWindowController { |
|
|
|
newHeight += 20 |
|
|
|
newHeight += 20 |
|
|
|
} else if DataStore.shared().shouldDisplay(.dstTransitionInfo), |
|
|
|
} else if DataStore.shared().shouldDisplay(.dstTransitionInfo), |
|
|
|
let obj = object, |
|
|
|
let obj = object, |
|
|
|
TimezoneDataOperations(with: obj).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) != nil { |
|
|
|
TimezoneDataOperations(with: obj).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) != nil |
|
|
|
|
|
|
|
{ |
|
|
|
newHeight += 20 |
|
|
|
newHeight += 20 |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -496,7 +497,7 @@ class ParentPanelController: NSWindowController { |
|
|
|
updatePanelColor() |
|
|
|
updatePanelColor() |
|
|
|
|
|
|
|
|
|
|
|
let defaults = DataStore.shared().timezones() |
|
|
|
let defaults = DataStore.shared().timezones() |
|
|
|
let convertedTimezones = defaults.map { (data) -> TimezoneData in |
|
|
|
let convertedTimezones = defaults.map { data -> TimezoneData in |
|
|
|
TimezoneData.customObject(from: data)! |
|
|
|
TimezoneData.customObject(from: data)! |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -533,7 +534,8 @@ class ParentPanelController: NSWindowController { |
|
|
|
let currentCalendar = Calendar(identifier: .gregorian) |
|
|
|
let currentCalendar = Calendar(identifier: .gregorian) |
|
|
|
guard let newDate = currentCalendar.date(byAdding: .minute, |
|
|
|
guard let newDate = currentCalendar.date(byAdding: .minute, |
|
|
|
value: Int(futureSlider.doubleValue), |
|
|
|
value: Int(futureSlider.doubleValue), |
|
|
|
to: Date()) else { |
|
|
|
to: Date()) |
|
|
|
|
|
|
|
else { |
|
|
|
assertionFailure("Data was unexpectedly nil") |
|
|
|
assertionFailure("Data was unexpectedly nil") |
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
@ -600,7 +602,8 @@ class ParentPanelController: NSWindowController { |
|
|
|
|
|
|
|
|
|
|
|
if $0 < mainTableView.numberOfRows, |
|
|
|
if $0 < mainTableView.numberOfRows, |
|
|
|
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 { |
|
|
|
if let futureSliderCell = futureSlider.cell as? CustomSliderCell, futureSliderCell.tracking == true { |
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
@ -620,7 +623,8 @@ class ParentPanelController: NSWindowController { |
|
|
|
if let note = model.note, !note.isEmpty { |
|
|
|
if let note = model.note, !note.isEmpty { |
|
|
|
cellView.noteLabel.stringValue = note |
|
|
|
cellView.noteLabel.stringValue = note |
|
|
|
} else if DataStore.shared().shouldDisplay(.dstTransitionInfo), |
|
|
|
} else if DataStore.shared().shouldDisplay(.dstTransitionInfo), |
|
|
|
let value = TimezoneDataOperations(with: model).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) { |
|
|
|
let value = TimezoneDataOperations(with: model).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) |
|
|
|
|
|
|
|
{ |
|
|
|
cellView.noteLabel.stringValue = value |
|
|
|
cellView.noteLabel.stringValue = value |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
cellView.noteLabel.stringValue = CLEmptyString |
|
|
|
cellView.noteLabel.stringValue = CLEmptyString |
|
|
@ -719,7 +723,8 @@ class ParentPanelController: NSWindowController { |
|
|
|
|
|
|
|
|
|
|
|
@IBAction func calendarButtonAction(_: NSButton) { |
|
|
|
@IBAction func calendarButtonAction(_: NSButton) { |
|
|
|
if calendarButton.title == NSLocalizedString("Click here to start.", |
|
|
|
if calendarButton.title == NSLocalizedString("Click here to start.", |
|
|
|
comment: "Button Title for no Calendar access") { |
|
|
|
comment: "Button Title for no Calendar access") |
|
|
|
|
|
|
|
{ |
|
|
|
showPermissionsWindow() |
|
|
|
showPermissionsWindow() |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
retrieveCalendarEvents() |
|
|
|
retrieveCalendarEvents() |
|
|
|