Browse Source

Minor changes.

pull/113/head
Abhishek 3 years ago
parent
commit
59a9cc2d64
  1. 5
      Clocker/Panel/ParentPanelController.swift
  2. 9
      Clocker/Panel/Rate Controller/ReviewController.swift
  3. 45
      Clocker/Preferences/OneWindowController.swift

5
Clocker/Panel/ParentPanelController.swift

@ -686,8 +686,7 @@ class ParentPanelController: NSWindowController {
} }
@objc private func openPreferencesWindow() { @objc private func openPreferencesWindow() {
oneWindow?.showWindow(nil) oneWindow?.openGeneralPane()
NSApp.activate(ignoringOtherApps: true)
} }
@IBAction func dismissNextEventLabel(_: NSButton) { @IBAction func dismissNextEventLabel(_: NSButton) {
@ -724,7 +723,7 @@ class ParentPanelController: NSWindowController {
} }
private func showPermissionsWindow() { private func showPermissionsWindow() {
oneWindow?.openPermissions() oneWindow?.openPermissionsPane()
NSApp.activate(ignoringOtherApps: true) NSApp.activate(ignoringOtherApps: true)
} }

9
Clocker/Panel/Rate Controller/ReviewController.swift

@ -50,7 +50,7 @@ final class ReviewController {
let lastVersion = storage.object(forKey: Keys.lastVersion) as? String let lastVersion = storage.object(forKey: Keys.lastVersion) as? String
else { return true } else { return true }
// Minimum interval between two versions should be 45 // Minimum interval between two versions should be 3 months
let minInterval: TimeInterval = day * 90 let minInterval: TimeInterval = day * 90
// never prompt w/in the same version // never prompt w/in the same version
@ -60,13 +60,12 @@ final class ReviewController {
} }
class func prompt() { class func prompt() {
guard let ratingsURL = URL(string: AboutUsConstants.AppStoreLink) else {
return
}
if #available(OSX 10.14, *) { if #available(OSX 10.14, *) {
SKStoreReviewController.requestReview() SKStoreReviewController.requestReview()
} else { } else {
guard let ratingsURL = URL(string: AboutUsConstants.AppStoreLink) else {
return
}
NSWorkspace.shared.open(ratingsURL) NSWorkspace.shared.open(ratingsURL)
} }

45
Clocker/Preferences/OneWindowController.swift

@ -51,22 +51,6 @@ class OneWindowController: NSWindowController {
window?.identifier = NSUserInterfaceItemIdentifier("Preferences") window?.identifier = NSUserInterfaceItemIdentifier("Preferences")
} }
func openPermissions() {
guard let window = window else {
return
}
if !window.isMainWindow || !window.isVisible {
showWindow(nil)
}
guard let tabViewController = contentViewController as? CenteredTabViewController else {
return
}
tabViewController.selectedTabViewItemIndex = 3
}
private func setupToolbarImages() { private func setupToolbarImages() {
guard let tabViewController = contentViewController as? CenteredTabViewController else { guard let tabViewController = contentViewController as? CenteredTabViewController else {
return return
@ -92,4 +76,33 @@ class OneWindowController: NSWindowController {
} }
} }
} }
// MARK: Public
func openPermissionsPane() {
openPreferenceTab(at: 3)
NSApp.activate(ignoringOtherApps: true)
}
// Action mapped to the + button in the PanelController. We should always open the General Pane when the + button is clicked.
func openGeneralPane() {
openPreferenceTab(at: 0)
NSApp.activate(ignoringOtherApps: true)
}
private func openPreferenceTab(at index: Int) {
guard let window = window else {
return
}
if !window.isMainWindow || !window.isVisible {
showWindow(nil)
}
guard let tabViewController = contentViewController as? CenteredTabViewController else {
return
}
tabViewController.selectedTabViewItemIndex = index
}
} }

Loading…
Cancel
Save