Skip to content

Commit

Permalink
Add link to instructions for Open at Login replacement
Browse files Browse the repository at this point in the history
  • Loading branch information
Giorgio Calderolla committed Apr 26, 2021
1 parent 410bab6 commit 13c54a6
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 19 deletions.
12 changes: 4 additions & 8 deletions Catch.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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;
Expand All @@ -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 = (
Expand All @@ -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;
Expand Down Expand Up @@ -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 = (
Expand All @@ -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",
Expand Down Expand Up @@ -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;
Expand All @@ -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";
Expand Down
33 changes: 27 additions & 6 deletions Resources/App/Base.lproj/UI.xib
Original file line number Diff line number Diff line change
Expand Up @@ -526,10 +526,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3el-4q-ruU">
<rect key="frame" x="0.0" y="197" width="660" height="40"/>
<rect key="frame" x="0.0" y="161" width="660" height="76"/>
<subviews>
<button translatesAutoresizingMaskIntoConstraints="NO" id="AN1-pr-EUN">
<rect key="frame" x="-2" y="23" width="231" height="18"/>
<rect key="frame" x="-2" y="59" width="231" height="18"/>
<buttonCell key="cell" type="check" title="Prevent system sleep when active" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="kuL-eb-cd0">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
Expand All @@ -539,20 +539,40 @@
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="806">
<rect key="frame" x="-2" y="-1" width="221" height="18"/>
<rect key="frame" x="-2" y="35" width="221" height="18"/>
<buttonCell key="cell" type="check" title="Automatically check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="807">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="4Ft-Fu-CAY">
<rect key="frame" x="0.0" y="28" width="163" height="0.0"/>
<constraints>
<constraint firstAttribute="height" id="Jmo-F3-BvH"/>
</constraints>
</customView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zcn-Kt-bTj">
<rect key="frame" x="-7" y="-7" width="120" height="32"/>
<buttonCell key="cell" type="push" title="Open at Login" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="r4V-EW-8yf">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="browseOpenAtLoginHelp:" target="205" id="vPa-hj-X2R"/>
</connections>
</button>
</subviews>
<visibilityPriorities>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
</subviews>
Expand Down Expand Up @@ -620,6 +640,7 @@ DQ
<connections>
<outlet property="downloadScriptCheckbox" destination="GJR-jo-BJL" id="z5g-lf-uhF"/>
<outlet property="importFromOPMLButton" destination="SIo-Vm-tN9" id="lme-NT-tYN"/>
<outlet property="openAtLoginButton" destination="zcn-Kt-bTj" id="UII-u5-8iI"/>
<outlet property="openAutomaticallyCheckbox" destination="shg-7R-wuU" id="wCo-7O-0Ts"/>
<outlet property="organizeCheckbox" destination="bJl-7q-4yr" id="jET-Ex-bVY"/>
<outlet property="saveToLabel" destination="5qh-sS-yih" id="Y9T-XU-dwg"/>
Expand Down Expand Up @@ -656,7 +677,7 @@ DQ
<window title="Recent Episodes" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="aQN-n7-TBr" userLabel="Recent Episodes" customClass="NSPanel">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<rect key="contentRect" x="120" y="64" width="431" height="435"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1080"/>
<value key="minSize" type="size" width="200" height="300"/>
<view key="contentView" id="gSi-VU-gYd">
<rect key="frame" x="0.0" y="0.0" width="451" height="435"/>
Expand Down Expand Up @@ -779,7 +800,7 @@ DQ
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="213" width="572" height="151"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1080"/>
<view key="contentView" id="JVG-A7-ap0" customClass="AddFeedView" customModule="Catch" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="572" height="132"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down Expand Up @@ -858,7 +879,7 @@ DQ
<window title="Feed Contents" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="6AF-Wa-kWE">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<rect key="contentRect" x="689" y="399" width="600" height="600"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1080"/>
<view key="contentView" id="apF-ZH-7em">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down
Binary file modified Resources/App/en.lproj/Localizable.strings
Binary file not shown.
Binary file modified Resources/App/it.lproj/Localizable.strings
Binary file not shown.
Binary file modified Resources/App/it.lproj/UI.strings
Binary file not shown.
9 changes: 4 additions & 5 deletions Sources/App/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
4 changes: 4 additions & 0 deletions Sources/App/PreferencesView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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: "")
}
Expand Down
1 change: 1 addition & 0 deletions Sources/App/ServiceURLs.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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")!
}

0 comments on commit 13c54a6

Please sign in to comment.