From 8d2e4e4383abfbafc92452dd751a05cf9e2815ee Mon Sep 17 00:00:00 2001 From: relikd Date: Thu, 24 Oct 2019 11:53:01 +0200 Subject: [PATCH] Fix preferences on macOS 10.15 --- CHANGELOG.md | 2 ++ baRSS.xcodeproj/project.pbxproj | 1 + baRSS/Feed Import/Download3rdParty.m | 5 +++++ baRSS/Info.plist | 2 +- .../Preferences/Feeds Tab/ModalFeedEditView.h | 20 +++++++++---------- .../Preferences/Feeds Tab/SettingsFeedsView.h | 6 +++--- .../General Tab/SettingsGeneralView.h | 4 ++-- 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9b6781..512f5cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project does adhere to [Semantic Versioning](https://semver.org/spec/v2 ## [Unreleased] +### Fixed +- Preferences could not be opened on Catalina ## [1.0.1] - 2019-10-04 ### Fixed diff --git a/baRSS.xcodeproj/project.pbxproj b/baRSS.xcodeproj/project.pbxproj index 093b9f9..be33bad 100644 --- a/baRSS.xcodeproj/project.pbxproj +++ b/baRSS.xcodeproj/project.pbxproj @@ -702,6 +702,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; diff --git a/baRSS/Feed Import/Download3rdParty.m b/baRSS/Feed Import/Download3rdParty.m index 0537d07..8614af5 100644 --- a/baRSS/Feed Import/Download3rdParty.m +++ b/baRSS/Feed Import/Download3rdParty.m @@ -80,5 +80,10 @@ return [NSString stringWithFormat:@"http://i.ytimg.com/vi/%@/hqdefault.jpg", videoid]; } +/// @return @c http://i.ytimg.com/vi//maxresdefault.jpg ++ (NSString*)videoImage4k:(NSString*)videoid { + return [NSString stringWithFormat:@"http://i.ytimg.com/vi/%@/maxresdefault.jpg", videoid]; +} + @end diff --git a/baRSS/Info.plist b/baRSS/Info.plist index 61a806e..86a1206 100644 --- a/baRSS/Info.plist +++ b/baRSS/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 14405 + 14438 LSApplicationCategoryType public.app-category.news LSMinimumSystemVersion diff --git a/baRSS/Preferences/Feeds Tab/ModalFeedEditView.h b/baRSS/Preferences/Feeds Tab/ModalFeedEditView.h index 6895c3c..76bf655 100644 --- a/baRSS/Preferences/Feeds Tab/ModalFeedEditView.h +++ b/baRSS/Preferences/Feeds Tab/ModalFeedEditView.h @@ -24,20 +24,20 @@ @class ModalFeedEdit; @interface ModalFeedEditView : NSView -@property (weak) IBOutlet NSTextField *url; -@property (weak) IBOutlet NSProgressIndicator *spinnerURL; -@property (weak) IBOutlet NSImageView *favicon; +@property (strong) IBOutlet NSTextField *url; +@property (strong) IBOutlet NSProgressIndicator *spinnerURL; +@property (strong) IBOutlet NSImageView *favicon; -@property (weak) IBOutlet NSTextField *name; -@property (weak) IBOutlet NSProgressIndicator *spinnerName; +@property (strong) IBOutlet NSTextField *name; +@property (strong) IBOutlet NSProgressIndicator *spinnerName; -@property (weak) IBOutlet NSTextField *refreshNum; -@property (weak) IBOutlet NSPopUpButton *refreshUnit; +@property (strong) IBOutlet NSTextField *refreshNum; +@property (strong) IBOutlet NSPopUpButton *refreshUnit; -@property (weak) IBOutlet NSButton *warningButton; +@property (strong) IBOutlet NSButton *warningButton; @property NSPopover *warningPopover; -@property (weak) IBOutlet NSTextField *warningText; -@property (weak) IBOutlet NSButton *warningReload; +@property (strong) IBOutlet NSTextField *warningText; +@property (strong) IBOutlet NSButton *warningReload; - (instancetype)initWithController:(ModalFeedEdit*)controller NS_DESIGNATED_INITIALIZER; - (instancetype)initWithFrame:(NSRect)frameRect NS_UNAVAILABLE; diff --git a/baRSS/Preferences/Feeds Tab/SettingsFeedsView.h b/baRSS/Preferences/Feeds Tab/SettingsFeedsView.h index 47b7762..734ffc8 100644 --- a/baRSS/Preferences/Feeds Tab/SettingsFeedsView.h +++ b/baRSS/Preferences/Feeds Tab/SettingsFeedsView.h @@ -24,9 +24,9 @@ @class SettingsFeeds; @interface SettingsFeedsView : NSView -@property (weak) IBOutlet NSOutlineView *outline; -@property (weak) IBOutlet NSTextField *status; -@property (weak) IBOutlet NSProgressIndicator *spinner; +@property (strong) IBOutlet NSOutlineView *outline; +@property (strong) IBOutlet NSTextField *status; +@property (strong) IBOutlet NSProgressIndicator *spinner; - (instancetype)initWithController:(SettingsFeeds*)delegate NS_DESIGNATED_INITIALIZER; - (instancetype)initWithFrame:(NSRect)frameRect NS_UNAVAILABLE; diff --git a/baRSS/Preferences/General Tab/SettingsGeneralView.h b/baRSS/Preferences/General Tab/SettingsGeneralView.h index 9c8258c..c2da80e 100644 --- a/baRSS/Preferences/General Tab/SettingsGeneralView.h +++ b/baRSS/Preferences/General Tab/SettingsGeneralView.h @@ -24,8 +24,8 @@ @class SettingsGeneral; @interface SettingsGeneralView : NSView -@property (weak) IBOutlet NSPopUpButton* popupHttpApplication; -@property (weak) IBOutlet NSTextField *defaultReader; +@property (strong) IBOutlet NSPopUpButton* popupHttpApplication; +@property (strong) IBOutlet NSTextField *defaultReader; - (instancetype)initWithController:(SettingsGeneral*)controller NS_DESIGNATED_INITIALIZER; - (instancetype)initWithFrame:(NSRect)frameRect NS_UNAVAILABLE;