diff --git a/CHANGELOG.md b/CHANGELOG.md index 07e0134..9bdc80c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ and this project does NOT adhere to [Semantic Versioning](https://semver.org/spe ### Fixed - Article order got mixed up for some feeds (issue: #4) +### Changed +- Removed 'Start on login'. Use Preferences > Users > Login Items instead. + ## [0.9.3] - 2019-03-14 ### Added diff --git a/baRSS-Helper/Info.plist b/baRSS-Helper/Info.plist deleted file mode 100644 index acac651..0000000 --- a/baRSS-Helper/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSMinimumSystemVersion - $(MACOSX_DEPLOYMENT_TARGET) - NSHumanReadableCopyright - Copyright © 2018 relikd. Public Domain. - LSBackgroundOnly - - - diff --git a/baRSS-Helper/main.m b/baRSS-Helper/main.m deleted file mode 100644 index 7e77d9f..0000000 --- a/baRSS-Helper/main.m +++ /dev/null @@ -1,49 +0,0 @@ -// -// The MIT License (MIT) -// Copyright (c) 2018 Oleg Geier -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal in -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -// of the Software, and to permit persons to whom the Software is furnished to do -// so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#import - -int main(int argc, const char * argv[]) { - @autoreleasepool { - // see: http://martiancraft.com/blog/2015/01/login-items/ - NSURL *mainURL = [NSURL fileURLWithPath:@"../../../../" isDirectory:YES relativeToURL:NSBundle.mainBundle.bundleURL]; - NSString *mainIdent = [[NSBundle bundleWithURL:mainURL] bundleIdentifier]; // de.relikd.baRSS - - NSArray *arr = [NSRunningApplication runningApplicationsWithBundleIdentifier:mainIdent]; - if (arr.count == 0) { // if not already running - NSArray *pathComponents = [[[NSBundle mainBundle] bundlePath] pathComponents]; - pathComponents = [pathComponents subarrayWithRange:NSMakeRange(0, [pathComponents count] - 4)]; - NSString *path = [NSString pathWithComponents:pathComponents]; - [[NSWorkspace sharedWorkspace] launchApplication:path]; - } - /* - Important: If your daemon shuts down too quickly after being launched, - launchd may think it has crashed. Daemons that continue this behavior may - be suspended and not launched again when future requests arrive. To avoid - this behavior, do not shut down for at least 10 seconds after launch. - */ - // https://developer.apple.com/library/archive/documentation/MacOSX/Conceptual/BPSystemStartup/Chapters/CreatingLaunchdJobs.html - sleep(10); // Not sure if this is necessary. However, it doesnt hurt. - [NSApp terminate:nil]; - } - return 0; -} diff --git a/baRSS.xcodeproj/project.pbxproj b/baRSS.xcodeproj/project.pbxproj index 3fddfd9..68e12e9 100644 --- a/baRSS.xcodeproj/project.pbxproj +++ b/baRSS.xcodeproj/project.pbxproj @@ -33,12 +33,9 @@ 54B749DA2204A85C0022CC6D /* BarStatusItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 54B749D92204A85C0022CC6D /* BarStatusItem.m */; }; 54B749E0220636200022CC6D /* FeedArticle+Ext.m in Sources */ = {isa = PBXBuildFile; fileRef = 54B749DF220635CD0022CC6D /* FeedArticle+Ext.m */; }; 54BB048921FD2AB500C303A5 /* NSDate+Ext.m in Sources */ = {isa = PBXBuildFile; fileRef = 54BB048821FD2AB500C303A5 /* NSDate+Ext.m */; }; - 54CC04382162532A00A48795 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 54CC04372162532A00A48795 /* main.m */; }; - 54CC043E2162566900A48795 /* baRSS-Helper.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 54CC042C2162532800A48795 /* baRSS-Helper.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 54E88320211B509D00064188 /* ModalFeedEdit.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E8831E211B509D00064188 /* ModalFeedEdit.m */; }; 54E88321211B509D00064188 /* ModalFeedEdit.xib in Resources */ = {isa = PBXBuildFile; fileRef = 54E8831F211B509D00064188 /* ModalFeedEdit.xib */; }; 54F39C2E210BE1F700AEE730 /* DBv1.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 54ACC28221061B3B0020715F /* DBv1.xcdatamodeld */; }; - 54F518782162CA4F00EE856C /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54F518772162CA4F00EE856C /* ServiceManagement.framework */; }; 54F6025D21C1D4170006D338 /* OpmlExport.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F6025C21C1D4170006D338 /* OpmlExport.m */; }; 54FE73D021220DEC003EAC65 /* StoreCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = 54FE73CF21220DEC003EAC65 /* StoreCoordinator.m */; }; 54FE73D3212316CD003EAC65 /* BarMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 54FE73D2212316CD003EAC65 /* BarMenu.m */; }; @@ -66,16 +63,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 54CC043D2162565F00A48795 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = Contents/Library/LoginItems; - dstSubfolderSpec = 1; - files = ( - 54CC043E2162566900A48795 /* baRSS-Helper.app in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -128,9 +115,6 @@ 54B749DF220635CD0022CC6D /* FeedArticle+Ext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "FeedArticle+Ext.m"; sourceTree = ""; }; 54BB048721FD2AB500C303A5 /* NSDate+Ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Ext.h"; sourceTree = ""; }; 54BB048821FD2AB500C303A5 /* NSDate+Ext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Ext.m"; sourceTree = ""; }; - 54CC042C2162532800A48795 /* baRSS-Helper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "baRSS-Helper.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 54CC04362162532A00A48795 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 54CC04372162532A00A48795 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 54E8831D211B509D00064188 /* ModalFeedEdit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModalFeedEdit.h; sourceTree = ""; }; 54E8831E211B509D00064188 /* ModalFeedEdit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModalFeedEdit.m; sourceTree = ""; }; 54E8831F211B509D00064188 /* ModalFeedEdit.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ModalFeedEdit.xib; sourceTree = ""; }; @@ -148,18 +132,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 54F518782162CA4F00EE856C /* ServiceManagement.framework in Frameworks */, 544DCCB9212A2B4D002DBC46 /* RSXML.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 54CC04292162532800A48795 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -254,7 +230,6 @@ 540CD14821C094A2004AB594 /* README.md */, 54892F1D2235285700271CBA /* CHANGELOG.md */, 54ACC27E21061B3B0020715F /* baRSS */, - 54CC042D2162532800A48795 /* baRSS-Helper */, 54ACC27D21061B3B0020715F /* Products */, 544FBD4321064AEB008A260C /* Frameworks */, ); @@ -264,7 +239,6 @@ isa = PBXGroup; children = ( 54ACC27C21061B3B0020715F /* baRSS Beta.app */, - 54CC042C2162532800A48795 /* baRSS-Helper.app */, ); name = Products; sourceTree = ""; @@ -287,15 +261,6 @@ path = baRSS; sourceTree = ""; }; - 54CC042D2162532800A48795 /* baRSS-Helper */ = { - isa = PBXGroup; - children = ( - 54CC04362162532A00A48795 /* Info.plist */, - 54CC04372162532A00A48795 /* main.m */, - ); - path = "baRSS-Helper"; - sourceTree = ""; - }; 54E88323211B542E00064188 /* Feeds Tab */ = { isa = PBXGroup; children = ( @@ -323,7 +288,6 @@ 54ACC27A21061B3B0020715F /* Resources */, 544DCCBB212A2B4D002DBC46 /* Embed Frameworks */, 544DCCBC212A2B5A002DBC46 /* CopyFiles */, - 54CC043D2162565F00A48795 /* CopyFiles */, 543964EE2215C27B0016AAA3 /* ShellScript */, ); buildRules = ( @@ -335,23 +299,6 @@ productReference = 54ACC27C21061B3B0020715F /* baRSS Beta.app */; productType = "com.apple.product-type.application"; }; - 54CC042B2162532800A48795 /* baRSS-Helper */ = { - isa = PBXNativeTarget; - buildConfigurationList = 54CC043C2162532A00A48795 /* Build configuration list for PBXNativeTarget "baRSS-Helper" */; - buildPhases = ( - 54CC04282162532800A48795 /* Sources */, - 54CC04292162532800A48795 /* Frameworks */, - 54CC042A2162532800A48795 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "baRSS-Helper"; - productName = "baRSS-Helper"; - productReference = 54CC042C2162532800A48795 /* baRSS-Helper.app */; - productType = "com.apple.product-type.application"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -373,14 +320,6 @@ }; }; }; - 54CC042B2162532800A48795 = { - CreatedOnToolsVersion = 9.4.1; - SystemCapabilities = { - com.apple.Sandbox = { - enabled = 0; - }; - }; - }; }; }; buildConfigurationList = 54ACC27721061B3B0020715F /* Build configuration list for PBXProject "baRSS" */; @@ -397,7 +336,6 @@ projectRoot = ""; targets = ( 54ACC27B21061B3B0020715F /* baRSS */, - 54CC042B2162532800A48795 /* baRSS-Helper */, ); }; /* End PBXProject section */ @@ -415,13 +353,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 54CC042A2162532800A48795 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -476,14 +407,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 54CC04282162532800A48795 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 54CC04382162532A00A48795 /* main.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -695,44 +618,6 @@ }; name = Release; }; - 54CC043A2162532A00A48795 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = "baRSS-Helper/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 10.12; - PRODUCT_BUNDLE_IDENTIFIER = "de.relikd.baRSS-Helper"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SKIP_INSTALL = YES; - }; - name = Debug; - }; - 54CC043B2162532A00A48795 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = "baRSS-Helper/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 10.12; - PRODUCT_BUNDLE_IDENTIFIER = "de.relikd.baRSS-Helper"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SKIP_INSTALL = YES; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -754,15 +639,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 54CC043C2162532A00A48795 /* Build configuration list for PBXNativeTarget "baRSS-Helper" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 54CC043A2162532A00A48795 /* Debug */, - 54CC043B2162532A00A48795 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ /* Begin XCVersionGroup section */ diff --git a/baRSS/Info.plist b/baRSS/Info.plist index f120283..73c55c2 100644 --- a/baRSS/Info.plist +++ b/baRSS/Info.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1172 + 1184 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) LSUIElement diff --git a/baRSS/Preferences/General Tab/SettingsGeneral.m b/baRSS/Preferences/General Tab/SettingsGeneral.m index 49d8156..b8b1706 100644 --- a/baRSS/Preferences/General Tab/SettingsGeneral.m +++ b/baRSS/Preferences/General Tab/SettingsGeneral.m @@ -27,8 +27,6 @@ #import "StoreCoordinator.h" #import "Constants.h" -#import - @interface SettingsGeneral() @property (weak) IBOutlet NSPopUpButton *popupHttpApplication; @property (weak) IBOutlet NSPopUpButton *popupDefaultRSSReader; @@ -49,17 +47,6 @@ #pragma mark - UI interaction with IBAction -/// Run helper application to add thyself to startup items. -- (IBAction)changeStartOnLogin:(NSButton *)sender { - // launchctl list | grep de.relikd - CFStringRef helperIdentifier = CFBridgingRetain(@"de.relikd.baRSS-Helper"); - Boolean setOnLogin = (sender.state == NSControlStateValueOn); - if (!helperIdentifier || !SMLoginItemSetEnabled(helperIdentifier, setOnLogin)) - sender.state = (setOnLogin ? NSControlStateValueOff : NSControlStateValueOn); // restore prev state - if (helperIdentifier) - CFRelease(helperIdentifier); -} - - (IBAction)fixCache:(NSButton *)sender { NSUInteger deleted = [StoreCoordinator deleteUnreferenced]; [StoreCoordinator restoreFeedIndexPaths]; diff --git a/baRSS/Preferences/General Tab/SettingsGeneral.xib b/baRSS/Preferences/General Tab/SettingsGeneral.xib index 37e3568..e441834 100644 --- a/baRSS/Preferences/General Tab/SettingsGeneral.xib +++ b/baRSS/Preferences/General Tab/SettingsGeneral.xib @@ -21,25 +21,19 @@ - - + @@ -48,7 +42,7 @@ - + @@ -64,7 +58,7 @@ - + @@ -73,7 +67,7 @@ - + @@ -88,17 +82,6 @@ -