From 1a8f6b2766cf96fd9ed3df90915b564e523090c9 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Wed, 11 Aug 2021 23:26:04 -0500 Subject: [PATCH 1/5] Update ParentPanelController.swift --- Clocker/Panel/ParentPanelController.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Clocker/Panel/ParentPanelController.swift b/Clocker/Panel/ParentPanelController.swift index b01cfc7..7349561 100644 --- a/Clocker/Panel/ParentPanelController.swift +++ b/Clocker/Panel/ParentPanelController.swift @@ -543,7 +543,7 @@ class ParentPanelController: NSWindowController { @IBAction func openPreferences(_: NSButton) { updatePopoverDisplayState() // Popover's class has access to all timezones. Need to close the popover, so that we don't have two copies of selections - openPreferences() + openPreferencesWindow() } func deleteTimezone(at row: Int) { @@ -682,7 +682,7 @@ class ParentPanelController: NSWindowController { mainTableView.reloadData() } - private func openPreferences() { + @objc private func openPreferencesWindow() { oneWindow?.showWindow(nil) NSApp.activate(ignoringOtherApps: true) } @@ -1000,6 +1000,8 @@ class ParentPanelController: NSWindowController { action: #selector(reportIssue), keyEquivalent: "") let localizeClocker = NSMenuItem(title: "Localize Clocker...", action: #selector(openCrowdin), keyEquivalent: "") + let openPreferences = NSMenuItem(title: "Preferences", + action: #selector(openPreferencesWindow), keyEquivalent: "") let appDisplayName = Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName") ?? "Clocker" let shortVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") ?? "N/A" @@ -1008,6 +1010,7 @@ class ParentPanelController: NSWindowController { let versionInfo = "\(appDisplayName) \(shortVersion) (\(longVersion))" let clockerVersionInfo = NSMenuItem(title: versionInfo, action: nil, keyEquivalent: "") clockerVersionInfo.isEnabled = false + menuItem.addItem(openPreferences) menuItem.addItem(rateClocker) menuItem.addItem(sendFeedback) menuItem.addItem(localizeClocker) From ddcc3f7174793daab07292ac91cf3b0d33126223 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Wed, 11 Aug 2021 23:27:51 -0500 Subject: [PATCH 2/5] Minor tweaks --- Clocker/Clocker/en.lproj/Panel.xib | 22 ++++++++++----------- Clocker/Panel/UI/FloatingWindow.xib | 30 ++++++++++++++--------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Clocker/Clocker/en.lproj/Panel.xib b/Clocker/Clocker/en.lproj/Panel.xib index 5212f98..211ad8b 100755 --- a/Clocker/Clocker/en.lproj/Panel.xib +++ b/Clocker/Clocker/en.lproj/Panel.xib @@ -261,7 +261,7 @@ - + @@ -526,7 +526,7 @@ + - + - - + - + diff --git a/Clocker/Panel/UI/FloatingWindow.xib b/Clocker/Panel/UI/FloatingWindow.xib index 14a5dc4..5f3885b 100644 --- a/Clocker/Panel/UI/FloatingWindow.xib +++ b/Clocker/Panel/UI/FloatingWindow.xib @@ -44,22 +44,22 @@ - + - + - + - + - + @@ -292,7 +292,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -404,7 +404,7 @@ - + + + - - + - From 5e8d53cee11d8cf882f3007019f7dd7b6685d3ad Mon Sep 17 00:00:00 2001 From: Abhishek Date: Wed, 11 Aug 2021 23:43:06 -0500 Subject: [PATCH 3/5] Few updates. --- Clocker/Clocker/en.lproj/Panel.xib | 151 ++++++++++++---------- Clocker/Panel/ParentPanelController.swift | 4 - 2 files changed, 81 insertions(+), 74 deletions(-) diff --git a/Clocker/Clocker/en.lproj/Panel.xib b/Clocker/Clocker/en.lproj/Panel.xib index 211ad8b..712d383 100755 --- a/Clocker/Clocker/en.lproj/Panel.xib +++ b/Clocker/Clocker/en.lproj/Panel.xib @@ -44,14 +44,14 @@ - + - + - + @@ -261,7 +261,7 @@ - + @@ -310,7 +310,7 @@ - + @@ -409,76 +409,87 @@ - + - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - + + + + + diff --git a/Clocker/Panel/ParentPanelController.swift b/Clocker/Panel/ParentPanelController.swift index 7349561..746c8de 100644 --- a/Clocker/Panel/ParentPanelController.swift +++ b/Clocker/Panel/ParentPanelController.swift @@ -870,10 +870,6 @@ class ParentPanelController: NSWindowController { } else { updateReviewView() ReviewController.prompt() - - if let countryCode = Locale.autoupdatingCurrent.regionCode { - Logger.log(object: ["CurrentCountry": countryCode], for: "Remind Later for Feedback") - } } } From 18955f3808d53a6d5fbcfae2dd7f6490842b101e Mon Sep 17 00:00:00 2001 From: Abhishek Date: Thu, 12 Aug 2021 21:35:20 -0500 Subject: [PATCH 4/5] Key equivalents. --- Clocker/Clocker/en.lproj/Panel.xib | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Clocker/Clocker/en.lproj/Panel.xib b/Clocker/Clocker/en.lproj/Panel.xib index 712d383..7f4e374 100755 --- a/Clocker/Clocker/en.lproj/Panel.xib +++ b/Clocker/Clocker/en.lproj/Panel.xib @@ -373,6 +373,7 @@ + @@ -387,6 +388,7 @@ + From 47a24d5ee55be33a78cf33de04d17f0261a4a82d Mon Sep 17 00:00:00 2001 From: Abhishek Date: Thu, 12 Aug 2021 22:24:42 -0500 Subject: [PATCH 5/5] New changes. --- Clocker/Clocker/en.lproj/Panel.xib | 20 ++++++++++- Clocker/Overall App/Themer.swift | 8 +++-- Clocker/Panel/PanelController.swift | 1 + .../ParentPanelController+ModernSlider.swift | 33 +++++++++++++++++++ Clocker/Panel/ParentPanelController.swift | 3 +- .../UpcomingEventViewItem.swift | 2 +- 6 files changed, 62 insertions(+), 5 deletions(-) diff --git a/Clocker/Clocker/en.lproj/Panel.xib b/Clocker/Clocker/en.lproj/Panel.xib index 7f4e374..cd8876b 100755 --- a/Clocker/Clocker/en.lproj/Panel.xib +++ b/Clocker/Clocker/en.lproj/Panel.xib @@ -22,6 +22,7 @@ + @@ -261,7 +262,7 @@ - + @@ -364,6 +365,20 @@ +