From 71d8cb6246535e7aaff6ef1c3c7ecce38801feec Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Wed, 22 Jun 2022 16:27:51 -0700 Subject: [PATCH] Comply with App Store policies Remove the stale Updates check preferences pane, and remove the donation option from the menu, as it is considered In App Purchases. Consider adding actual App Store In App Purchase options of "Buy me a coffee" or similar, with no guarantee of return for the purchase, other than furthering development. Make them repeatable purchases. Signed-off-by: Christopher Snowhill --- Application/AppController.h | 5 -- Application/AppController.m | 16 ---- Base.lproj/MainMenu.xib | 73 +++++-------------- .../Preferences/Base.lproj/Preferences.xib | 25 +------ .../Preferences/GeneralPreferencesPlugin.h | 2 - .../Preferences/GeneralPreferencesPlugin.m | 8 -- en.lproj/MainMenu.strings | 3 - es.lproj/MainMenu.strings | 3 - 8 files changed, 20 insertions(+), 115 deletions(-) diff --git a/Application/AppController.h b/Application/AppController.h index ae2928ab5..d035ba8ea 100644 --- a/Application/AppController.h +++ b/Application/AppController.h @@ -63,11 +63,6 @@ - (IBAction)delEntries:(id)sender; - (IBAction)savePlaylist:(id)sender; -- (IBAction)openLiberapayPage:(id)sender; -- (IBAction)openPaypalPage:(id)sender; -- (IBAction)openKofiPage:(id)sender; -- (IBAction)openPatreonPage:(id)sender; - - (IBAction)privacyPolicy:(id)sender; - (IBAction)feedback:(id)sender; diff --git a/Application/AppController.m b/Application/AppController.m index bd3223b20..e4843358d 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -482,22 +482,6 @@ BOOL kAppControllerShuttingDown = NO; [theApplication replyToOpenOrPrint:NSApplicationDelegateReplySuccess]; } -- (IBAction)openLiberapayPage:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://liberapay.com/kode54"]]; -} - -- (IBAction)openPaypalPage:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.paypal.com/paypalme/kode54"]]; -} - -- (IBAction)openKofiPage:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://ko-fi.com/kode54"]]; -} - -- (IBAction)openPatreonPage:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.patreon.com/kode54"]]; -} - - (IBAction)privacyPolicy:(id)sender { [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.iubenda.com/privacy-policy/59859310"]]; } diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib index bc19dfd46..eef85baee 100644 --- a/Base.lproj/MainMenu.xib +++ b/Base.lproj/MainMenu.xib @@ -25,14 +25,14 @@ - + - + @@ -141,7 +141,7 @@ - + @@ -184,11 +184,11 @@ - + - + @@ -229,7 +229,7 @@ - + @@ -273,7 +273,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -481,11 +481,11 @@ - + - + @@ -525,11 +525,11 @@ - + - + @@ -569,11 +569,11 @@ - + - + @@ -1252,45 +1252,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Preferences/Preferences/Base.lproj/Preferences.xib b/Preferences/Preferences/Base.lproj/Preferences.xib index 3c0b62c5c..7a8b62fb8 100644 --- a/Preferences/Preferences/Base.lproj/Preferences.xib +++ b/Preferences/Preferences/Base.lproj/Preferences.xib @@ -16,7 +16,6 @@ - @@ -200,24 +199,6 @@ - - - - - - - - @@ -441,7 +422,7 @@ - + @@ -463,7 +444,7 @@ - + @@ -498,7 +479,7 @@ - + diff --git a/Preferences/Preferences/GeneralPreferencesPlugin.h b/Preferences/Preferences/GeneralPreferencesPlugin.h index 41e47441a..91e49d217 100644 --- a/Preferences/Preferences/GeneralPreferencesPlugin.h +++ b/Preferences/Preferences/GeneralPreferencesPlugin.h @@ -22,7 +22,6 @@ IBOutlet GeneralPane *generalPane; IBOutlet NSView *playlistView; - IBOutlet NSView *updatesView; IBOutlet NSView *notificationsView; IBOutlet NSView *appearanceView; @@ -34,7 +33,6 @@ - (MIDIPane *)midiPane; - (GeneralPane *)generalPane; -- (GeneralPreferencePane *)updatesPane; - (GeneralPreferencePane *)playlistPane; - (GeneralPreferencePane *)notificationsPane; - (GeneralPreferencePane *)appearancePane; diff --git a/Preferences/Preferences/GeneralPreferencesPlugin.m b/Preferences/Preferences/GeneralPreferencesPlugin.m index f9a55f5b7..93ff07cd7 100644 --- a/Preferences/Preferences/GeneralPreferencesPlugin.m +++ b/Preferences/Preferences/GeneralPreferencesPlugin.m @@ -30,7 +30,6 @@ return @[[plugin playlistPane], [plugin hotKeyPane], - [plugin updatesPane], [plugin outputPane], [plugin generalPane], [plugin notificationsPane], @@ -54,13 +53,6 @@ return generalPane; } -- (GeneralPreferencePane *)updatesPane { - return [GeneralPreferencePane preferencePaneWithView:updatesView - title:NSLocalizedPrefString(@"Updates") - systemIconName:@"arrow.triangle.2.circlepath.circle.fill" - orOldIconNamed:@"updates"]; -} - - (GeneralPreferencePane *)playlistPane { return [GeneralPreferencePane preferencePaneWithView:playlistView title:NSLocalizedPrefString(@"Playlist") diff --git a/en.lproj/MainMenu.strings b/en.lproj/MainMenu.strings index 072db19bf..c664fcab7 100644 --- a/en.lproj/MainMenu.strings +++ b/en.lproj/MainMenu.strings @@ -149,9 +149,6 @@ /* Class = "NSMenuItem"; title = "Cog"; ObjectID = "702"; */ "702.title" = "Cog"; -/* Class = "NSMenuItem"; title = "Support Cog..."; ObjectID = "751"; */ -"751.title" = "Donate"; - /* Class = "NSMenuItem"; title = "Current Song"; ObjectID = "791"; */ "791.title" = "Current Song"; diff --git a/es.lproj/MainMenu.strings b/es.lproj/MainMenu.strings index 072db19bf..c664fcab7 100644 --- a/es.lproj/MainMenu.strings +++ b/es.lproj/MainMenu.strings @@ -149,9 +149,6 @@ /* Class = "NSMenuItem"; title = "Cog"; ObjectID = "702"; */ "702.title" = "Cog"; -/* Class = "NSMenuItem"; title = "Support Cog..."; ObjectID = "751"; */ -"751.title" = "Donate"; - /* Class = "NSMenuItem"; title = "Current Song"; ObjectID = "791"; */ "791.title" = "Current Song";