diff --git a/Mjolnir/MJAppDelegate.m b/Mjolnir/MJAppDelegate.m index c018befa..b35e5533 100644 --- a/Mjolnir/MJAppDelegate.m +++ b/Mjolnir/MJAppDelegate.m @@ -79,10 +79,6 @@ - (IBAction) checkForUpdates:(id)sender { MJUpdateCheckerCheckVerbosely(); } -- (IBAction) donate:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:MJDonationURL]]; -} - - (IBAction) openConfig:(id)sender { NSString* path = MJConfigFileFullPath(); diff --git a/Mjolnir/MJPreferencesWindowController.m b/Mjolnir/MJPreferencesWindowController.m index 763143ac..4eac1027 100644 --- a/Mjolnir/MJPreferencesWindowController.m +++ b/Mjolnir/MJPreferencesWindowController.m @@ -125,21 +125,6 @@ - (IBAction) toggleKeepConsoleOnTop:(id)sender { MJConsoleWindowSetAlwaysOnTop([sender state] == NSOnState); } -- (IBAction) donate:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:MJDonationURL]]; -} - -- (IBAction) showDonateHelp:(id)sender { - NSAlert* alert = [[NSAlert alloc] init]; - [alert setAlertStyle:NSInformationalAlertStyle]; - [alert setMessageText:@"What's this 'donate' stuff all about?"]; - [alert setInformativeText:MJDonateMessage]; - [alert beginSheetModalForWindow:[self window] - modalDelegate:nil - didEndSelector:NULL - contextInfo:NULL]; -} - - (void) dockMenuProblemAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { BOOL skipNextTime = ([[alert suppressionButton] state] == NSOnState); [[NSUserDefaults standardUserDefaults] setBool:skipNextTime forKey:MJSkipDockMenuIconProblemAlertKey]; diff --git a/Mjolnir/MainMenu.xib b/Mjolnir/MainMenu.xib index 29092aee..2916c54c 100644 --- a/Mjolnir/MainMenu.xib +++ b/Mjolnir/MainMenu.xib @@ -1,8 +1,8 @@ - + - - + + @@ -11,7 +11,7 @@ - + @@ -30,13 +30,6 @@ - - - - - - - @@ -413,13 +406,6 @@ - - - - - - - diff --git a/Mjolnir/PreferencesWindow.xib b/Mjolnir/PreferencesWindow.xib index 496f265b..4ac99a4a 100644 --- a/Mjolnir/PreferencesWindow.xib +++ b/Mjolnir/PreferencesWindow.xib @@ -1,8 +1,8 @@ - + - - + + @@ -16,18 +16,18 @@ - + - + - + - + @@ -80,7 +80,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -117,76 +117,15 @@ - + - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - + diff --git a/Mjolnir/variables.h b/Mjolnir/variables.h index 0404300d..c9ffb5c6 100644 --- a/Mjolnir/variables.h +++ b/Mjolnir/variables.h @@ -5,7 +5,6 @@ static NSString* MJReleaseNotesURL = @"https://github.com/mjolnir-io/mjolnir#changes"; static NSString* MJDownloadPage = @"https://github.com/mjolnir-io/mjolnir/releases/latest"; static NSString* MJUpdatesURL = @"https://raw.githubusercontent.com/mjolnir-io/mjolnir/master/LATESTVERSION"; -static NSString* MJDonationURL = @"https://www.paypal.com/cgi-bin/webscr?business=sbdegutis@gmail.com&cmd=_donations&item_name=Mjolnir.app%20donation&no_shipping=1"; static NSString* MJPublicKey = @"" "-----BEGIN PUBLIC KEY-----\n" @@ -30,9 +29,4 @@ static NSString* MJPublicKey = @"" static NSString* MJConfigFile = @"~/.mjolnir/init.lua"; -static NSString* MJDonateMessage = @"" -"I've worked hard to make this app useful and easy to use. I've also released it with a liberal open source license, so that you can do with it as you please.\n\n" -"So, instead of charging for licenses, I'm asking for donations. If you find Mjolnir genuinely beneficial to your productivity, I encourage you to donate in proportion to the value you're getting out of it.\n\n" -"Your donations will fund the time I'll be spending making Mjolnir even better, and will be used to compensate volunteers for the time and skills which they have generously contributed to the project."; - #endif diff --git a/README.md b/README.md index a9e56c3e..49172963 100644 --- a/README.md +++ b/README.md @@ -253,22 +253,6 @@ software Mjolnir uses internally (basically just Lua's license). - First public release -## Donate - -I've worked hard to make this app useful and easy to use. I've also -released it with a liberal open source license, so that you can do -with it as you please. - -So, instead of charging for licenses, I'm asking for donations. If you -find Mjolnir genuinely beneficial to your productivity, I encourage -you to donate in proportion to the value you're getting out of it. - -Your donations will fund the time I'll be spending making Mjolnir even -better, and will be used to compensate volunteers for the time and -skills which they have generously contributed to the project. - -Currently, donations can be made [by PayPal](https://www.paypal.com/cgi-bin/webscr?business=sbdegutis@gmail.com&cmd=_donations&item_name=Mjolnir.app%20donation&no_shipping=1). If you don't have a PayPal account, they let you pay with a credit card too without having to sign up with them. - ## License > Released under MIT license.