Remove donation requests.

mjolnirapp · Sep 12, 2014 · fc60fe6 · fc60fe6
1 parent 4a01c0b
commit fc60fe6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 136 deletions.
diff --git 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
@@ -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
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="14A329r" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1080" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +11,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customObject id="Voe-Tx-rLC" customClass="MJAppDelegate">
             <connections>
                 <outlet property="menuBarMenu" destination="QDI-lT-VMy" id="4Dj-Eu-yzI"/>
@@ -30,13 +30,6 @@
                                     <action selector="showAboutPanel:" target="Voe-Tx-rLC" id="bG4-ba-EWj"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Donate ❤️" id="SWK-JB-caq">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="donate:" target="Voe-Tx-rLC" id="i6g-ti-2Yz"/>
-                                    <binding destination="b8h-DN-29z" name="hidden" keyPath="values.MJUserDonatedKey" id="DqM-60-IIC"/>
-                                </connections>
-                            </menuItem>
                             <menuItem title="Check for Updates..." id="BOF-NM-1cW">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
@@ -413,13 +406,6 @@
                         <action selector="showAboutPanel:" target="Voe-Tx-rLC" id="Vu4-C4-kcK"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Donate ❤️" id="VlO-eE-8tv">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <connections>
-                        <action selector="donate:" target="Voe-Tx-rLC" id="iR7-ak-iap"/>
-                        <binding destination="b8h-DN-29z" name="hidden" keyPath="values.MJUserDonatedKey" id="bMn-Da-RUh"/>
-                    </connections>
-                </menuItem>
                 <menuItem title="Check for Updates..." id="zC2-p9-aqe">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>

diff --git a/Mjolnir/PreferencesWindow.xib b/Mjolnir/PreferencesWindow.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="14A329r" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1080" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MJPreferencesWindowController">
@@ -16,18 +16,18 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Mjolnir Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="prefs" animationBehavior="default" id="1ae-mv-r5b" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="957" y="580" width="406" height="288"/>
+            <rect key="contentRect" x="957" y="580" width="406" height="242"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <view key="contentView" id="Akb-Ed-9u3">
-                <rect key="frame" x="0.0" y="0.0" width="406" height="288"/>
+                <rect key="frame" x="0.0" y="-1" width="406" height="242"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button id="LCE-lg-IdY">
-                        <rect key="frame" x="127" y="190" width="121" height="18"/>
+                        <rect key="frame" x="127" y="144" width="121" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Show dock icon" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="1Ay-Q1-93j">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -38,7 +38,7 @@
                         </connections>
                     </button>
                     <button id="onk-bV-cOj">
-                        <rect key="frame" x="127" y="170" width="126" height="18"/>
+                        <rect key="frame" x="127" y="124" width="126" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Show menu icon" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uNE-4I-dRd">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -49,7 +49,7 @@
                         </connections>
                     </button>
                     <button id="e5P-fQ-lSS">
-                        <rect key="frame" x="127" y="230" width="168" height="18"/>
+                        <rect key="frame" x="127" y="184" width="168" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Launch Mjolnir at login" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="WYx-7x-qXj">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -60,7 +60,7 @@
                         </connections>
                     </button>
                     <button id="8hE-jn-yvO">
-                        <rect key="frame" x="127" y="210" width="137" height="18"/>
+                        <rect key="frame" x="127" y="164" width="137" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Check for updates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="eue-1N-zi1">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -71,7 +71,7 @@
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="VQb-h7-4Va">
-                        <rect key="frame" x="61" y="231" width="62" height="17"/>
+                        <rect key="frame" x="61" y="185" width="62" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Behavior:" id="dha-iU-GWx">
                             <font key="font" metaFont="system"/>
@@ -80,7 +80,7 @@
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" id="4ho-hR-nJI">
-                        <rect key="frame" x="123" y="79" width="162" height="32"/>
+                        <rect key="frame" x="123" y="33" width="162" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Enable Accessibility" bezelStyle="rounded" imagePosition="left" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cuD-Tg-hc1">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -96,7 +96,7 @@
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="fRb-9A-PSe">
-                        <rect key="frame" x="127" y="115" width="241" height="17"/>
+                        <rect key="frame" x="127" y="69" width="241" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Accessibility is enabled. You're all set!" id="PqP-7R-CO6">
                             <font key="font" metaFont="system"/>
@@ -108,7 +108,7 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Ljs-s0-qtL">
-                        <rect key="frame" x="38" y="115" width="85" height="17"/>
+                        <rect key="frame" x="38" y="69" width="85" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Accessibility:" id="xX6-GD-rGt">
                             <font key="font" metaFont="system"/>
@@ -117,76 +117,15 @@
                         </textFieldCell>
                     </textField>
                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="fzK-vc-sjF">
-                        <rect key="frame" x="287" y="88" width="16" height="16"/>
+                        <rect key="frame" x="287" y="42" width="16" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSStatusAvailable" id="6r9-hh-evU"/>
                         <connections>
                             <binding destination="-2" name="value" keyPath="self.isAccessibilityEnabledImage" id="sOX-IP-ZMv"/>
                         </connections>
                     </imageView>
-                    <button id="SPJ-fd-frI">
-                        <rect key="frame" x="127" y="42" width="128" height="18"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="check" title="I have donated :)" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="dan-Qn-9Kr">
-                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="toggleOpensAtLogin:" target="-2" id="Yds-sK-mlV"/>
-                            <binding destination="dqg-7Y-qrg" name="value" keyPath="values.MJUserDonatedKey" id="LtU-tJ-odr"/>
-                        </connections>
-                    </button>
-                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" id="7s9-YR-dHP">
-                        <rect key="frame" x="335" y="37" width="25" height="25"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="uig-mx-gT0">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="showDonateHelp:" target="-2" id="9no-SC-8M9"/>
-                            <binding destination="dqg-7Y-qrg" name="hidden" keyPath="values.MJUserDonatedKey" id="35i-OI-LZe"/>
-                        </connections>
-                    </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="UMF-wL-NEX">
-                        <rect key="frame" x="47" y="43" width="76" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Support us:" id="Gsc-Iq-YiH">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="nyB-GT-m3R">
-                        <rect key="frame" x="259" y="40" width="21" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="❤️" id="ILn-UB-Eum">
-                            <font key="font" size="13" name="AppleColorEmoji"/>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                        <connections>
-                            <binding destination="dqg-7Y-qrg" name="hidden" keyPath="values.MJUserDonatedKey" id="TLX-rI-aDW">
-                                <dictionary key="options">
-                                    <string key="NSValueTransformerName">NSNegateBoolean</string>
-                                </dictionary>
-                            </binding>
-                        </connections>
-                    </textField>
-                    <button verticalHuggingPriority="750" id="MJn-ze-nxI">
-                        <rect key="frame" x="252" y="33" width="86" height="32"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="push" title="Donate" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="eAO-Ye-sOw">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="donate:" target="-2" id="8JQ-mV-7oI"/>
-                            <binding destination="dqg-7Y-qrg" name="hidden" keyPath="values.MJUserDonatedKey" id="x9N-qa-lyl"/>
-                        </connections>
-                    </button>
                     <button id="pYS-Wj-7iw">
-                        <rect key="frame" x="127" y="150" width="205" height="18"/>
+                        <rect key="frame" x="127" y="104" width="205" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Keep Console window on top" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="OSm-zw-Lk8">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -198,6 +137,7 @@
                     </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="333" y="345"/>
         </window>
         <userDefaultsController representsSharedInstance="YES" id="dqg-7Y-qrg"/>
     </objects>