From 13c54a6debfa25070a68070f06c8bb28a2d953b0 Mon Sep 17 00:00:00 2001 From: Giorgio Calderolla Date: Mon, 26 Apr 2021 13:02:42 +0200 Subject: [PATCH] Add link to instructions for Open at Login replacement --- Catch.xcodeproj/project.pbxproj | 12 +++----- Resources/App/Base.lproj/UI.xib | 33 +++++++++++++++++---- Resources/App/en.lproj/Localizable.strings | Bin 2286 -> 2354 bytes Resources/App/it.lproj/Localizable.strings | Bin 2458 -> 2526 bytes Resources/App/it.lproj/UI.strings | Bin 4836 -> 4626 bytes Sources/App/AppDelegate.swift | 9 +++--- Sources/App/PreferencesView.swift | 4 +++ Sources/App/ServiceURLs.swift | 1 + 8 files changed, 40 insertions(+), 19 deletions(-) diff --git a/Catch.xcodeproj/project.pbxproj b/Catch.xcodeproj/project.pbxproj index 4520d04..83e9ce1 100644 --- a/Catch.xcodeproj/project.pbxproj +++ b/Catch.xcodeproj/project.pbxproj @@ -685,7 +685,6 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "-"; - CURRENT_PROJECT_VERSION = 719; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Vendor", @@ -695,7 +694,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.0.1; OTHER_LDFLAGS = "-Wl,-rpath,@loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.giorgiocalderolla.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = Catch; @@ -711,7 +709,6 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 719; DEVELOPMENT_TEAM = 4449XA862Y; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -723,7 +720,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.0.1; OTHER_LDFLAGS = "-Wl,-rpath,@loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.giorgiocalderolla.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = Catch; @@ -761,7 +757,7 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 717; + CURRENT_PROJECT_VERSION = 720; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -783,7 +779,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; LLVM_LTO = NO; MACOSX_DEPLOYMENT_TARGET = 10.11; - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.0.1; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-Wextra", @@ -826,7 +822,7 @@ CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 717; + CURRENT_PROJECT_VERSION = 720; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -845,7 +841,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.0.1; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; diff --git a/Resources/App/Base.lproj/UI.xib b/Resources/App/Base.lproj/UI.xib index 47a5fcd..78f49f0 100644 --- a/Resources/App/Base.lproj/UI.xib +++ b/Resources/App/Base.lproj/UI.xib @@ -526,10 +526,10 @@ - + + + + + + + + + + + + @@ -620,6 +640,7 @@ DQ + @@ -656,7 +677,7 @@ DQ - + @@ -779,7 +800,7 @@ DQ - + @@ -858,7 +879,7 @@ DQ - + diff --git a/Resources/App/en.lproj/Localizable.strings b/Resources/App/en.lproj/Localizable.strings index 6925945bb2dda2f466f0d1c7fcd89098ce6111b9..d16e885a9f083bcc3ef8c4b95358f557c2bfb950 100644 GIT binary patch delta 76 zcmaDSxJhWkI}R5v1|08~s3oB#j- delta 7 Ocmca7JWF`PEKUFoCIa#R diff --git a/Resources/App/it.lproj/UI.strings b/Resources/App/it.lproj/UI.strings index a0c0e884f50850243bbb383b713a4a61e6a64fb8..fb323374c6d1e4147bf6431fafe771954e382828 100644 GIT binary patch delta 11 ScmaE&I!R@Nm*8X>p%VZb_ykk{ delta 99 zcmbQF@pu}Je Yl+j|)XW#;|!D5p)vPz2M)G2ro05R7TM*si- diff --git a/Sources/App/AppDelegate.swift b/Sources/App/AppDelegate.swift index 1ef063e..a91b01c 100644 --- a/Sources/App/AppDelegate.swift +++ b/Sources/App/AppDelegate.swift @@ -27,27 +27,26 @@ extension AppDelegate: NSUserNotificationCenterDelegate { // MARK: Actions extension AppDelegate { @IBAction private func browseShowRSS(_: Any?) { - // Launch the system browser, open ShowRSS NSWorkspace.shared.open(.showRSSURL) } @IBAction private func browseWebsite(_: Any?) { - // Launch the system browser, open the applications's website NSWorkspace.shared.open(.appURL) } @IBAction private func browseHelp(_: Any?) { - // Launch the system browser, open the applications's on-line help NSWorkspace.shared.open(.helpURL) } + @IBAction private func browseOpenAtLoginHelp(_: Any?) { + NSWorkspace.shared.open(.openAtLoginHelpURL) + } + @IBAction private func browseFeatureRequest(_: Any?) { - // Launch the system browser, open the applications's feature request page NSWorkspace.shared.open(.featureRequestURL) } @IBAction private func browseBugReport(_: Any?) { - // Launch the system browser, open the applications's bug report page NSWorkspace.shared.open(.bugReportURL) } } diff --git a/Sources/App/PreferencesView.swift b/Sources/App/PreferencesView.swift index 2046e29..d34fec7 100644 --- a/Sources/App/PreferencesView.swift +++ b/Sources/App/PreferencesView.swift @@ -9,6 +9,8 @@ class PreferencesView: NSView { @IBOutlet weak var openAutomaticallyCheckbox: NSButton! @IBOutlet weak var downloadScriptCheckbox: NSButton! + @IBOutlet weak var openAtLoginButton: NSButton! + @IBOutlet weak var toolBar: NSToolbar! override func awakeFromNib() { @@ -21,6 +23,8 @@ class PreferencesView: NSView { openAutomaticallyCheckbox.title = NSLocalizedString("Open automatically", comment: "") downloadScriptCheckbox.title = NSLocalizedString("Download using script:", comment: "") + openAtLoginButton.title = NSLocalizedString("Open at Login", comment: "") + for item in toolBar.items { item.label = NSLocalizedString(item.itemIdentifier.rawValue, comment: "") } diff --git a/Sources/App/ServiceURLs.swift b/Sources/App/ServiceURLs.swift index 8b63309..4bc57f1 100644 --- a/Sources/App/ServiceURLs.swift +++ b/Sources/App/ServiceURLs.swift @@ -7,4 +7,5 @@ extension URL { static let bugReportURL = URL(string: "https://github.com/mipstian/catch/issues/new?labels=bug")! static let featureRequestURL = URL(string: "https://github.com/mipstian/catch/issues/new?labels=enhancement")! static let helpURL = URL(string: "https://github.com/mipstian/catch/wiki/Configuration")! + static let openAtLoginHelpURL = URL(string: "https://github.com/mipstian/catch/wiki/Have-Catch-Automatically-Open-at-Login")! }