Merge pull request #27 from alexzielenski/dev

0.0.4
alexzielenski · Jul 2, 2014 · 88bf570 · 88bf570
2 parents 900313e + 5e432ef
commit 88bf570
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 72 deletions.
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Mousecape/Mousecape/Base.lproj/Edit.xib b/Mousecape/Mousecape/Base.lproj/Edit.xib
diff --git a/Mousecape/Mousecape/Base.lproj/Library.xib b/Mousecape/Mousecape/Base.lproj/Library.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6154.17" systemVersion="14A261i" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6154.21" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6154.17"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6154.21"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MCLibraryWindowController">
@@ -16,7 +16,7 @@
         <window title="Mousecape" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" frameAutosaveName="LibraryWindow" animationBehavior="default" id="1">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="711" height="311"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <value key="minSize" type="size" width="502" height="310"/>
             <view key="contentView" id="2">
                 <rect key="frame" x="0.0" y="0.0" width="711" height="311"/>
@@ -51,7 +51,7 @@
                                                     <rect key="frame" x="1" y="6" width="708" height="72"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Hfe-RO-hVE">
+                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hfe-RO-hVE">
                                                             <rect key="frame" x="18" y="55" width="97" height="17"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="0kt-g0-cQb">
                                                                 <font key="font" metaFont="system"/>
@@ -62,7 +62,7 @@
                                                                 <binding destination="syZ-Eq-Lt2" name="value" keyPath="objectValue.name" id="YHc-x9-wXk"/>
                                                             </connections>
                                                         </textField>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bEa-BS-ghQ">
+                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bEa-BS-ghQ">
                                                             <rect key="frame" x="115" y="55" width="48" height="14"/>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Subtitle" id="NXa-Ze-OX2">
                                                                 <font key="font" metaFont="smallSystemBold"/>
@@ -182,32 +182,32 @@
 DQ
 </string>
                     <connections>
-                        <action selector="applyCape:" target="-1" id="KG6-81-DdR"/>
+                        <action selector="applyCapeAction:" target="-1" id="KHK-0n-gS3"/>
                     </connections>
                 </menuItem>
                 <menuItem title="Edit" tag="-1" keyEquivalent="e" id="HJc-SX-JjZ">
                     <connections>
-                        <action selector="editCape:" target="-1" id="6nG-0d-9YV"/>
+                        <action selector="editCapeAction:" target="-1" id="xUA-Zj-ToX"/>
                     </connections>
                 </menuItem>
                 <menuItem title="Duplicate" tag="-1" keyEquivalent="S" id="PhG-Ll-nqz">
                     <connections>
-                        <action selector="duplicateCape:" target="-1" id="N0m-Bu-OYJ"/>
+                        <action selector="duplicateCapeAction:" target="-1" id="3xf-LP-P1p"/>
                     </connections>
                 </menuItem>
                 <menuItem title="Remove" tag="-1" id="Aig-wl-ivn">
                     <string key="keyEquivalent" base64-UTF8="YES">
 CA
 </string>
                     <connections>
-                        <action selector="removeCape:" target="-1" id="rSg-Ns-VmO"/>
+                        <action selector="removeCapeAction:" target="-1" id="Psf-74-zsG"/>
                     </connections>
                 </menuItem>
                 <menuItem isSeparatorItem="YES" id="A7P-y0-FBc"/>
                 <menuItem title="Show in Finder" tag="-1" id="2WM-EN-kiI">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
-                        <action selector="showCape:" target="-1" id="Wu1-o2-zZP"/>
+                        <action selector="showCapeAction:" target="-1" id="iF0-eu-Du4"/>
                     </connections>
                 </menuItem>
             </items>

diff --git a/Mousecape/Mousecape/Base.lproj/MainMenu.xib b/Mousecape/Mousecape/Base.lproj/MainMenu.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6154.17" systemVersion="14A261i" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6154.21" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6154.17"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6154.21"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">

diff --git a/Mousecape/Mousecape/Mousecape-Info.plist b/Mousecape/Mousecape/Mousecape-Info.plist
@@ -36,11 +36,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.2</string>
+	<string>0.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1310</string>
+	<string>1329</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Mousecape/Mousecape/en.lproj/Credits.rtf b/Mousecape/Mousecape/en.lproj/Credits.rtf
@@ -1,29 +1,22 @@
-{\rtf0\ansi{\fonttbl\f0\fswiss Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\paperw9840\paperh8400
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\vieww9600\viewh8400\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
 \f0\b\fs24 \cf0 Engineering:
 \b0 \
-	Some people\
-\
-
-\b Human Interface Design:
-\b0 \
-	Some other people\
+Alex Zielenski\
+{\field{\*\fldinst{HYPERLINK "http://alexzielenski.com"}}{\fldrslt http://alexzielenski.com}}\
 \
 
 \b Testing:
 \b0 \
-	Hopefully not nobody\
-\
-
-\b Documentation:
-\b0 \
-	Whoever\
+Justin Ayles\
 \
 
 \b With special thanks to:
 \b0 \
-	Mom\
-}
+{\field{\*\fldinst{HYPERLINK "http://maxrudberg.com"}}{\fldrslt Max Rudberg}}\
+Mom & Dad\
+}
diff --git a/Mousecape/Mousecape/src/controllers/MCEditDetailController.m b/Mousecape/Mousecape/src/controllers/MCEditDetailController.m
@@ -28,11 +28,6 @@ - (void)awakeFromNib {
     self.rep500View.scale  = 5.0;
     self.rep1000View.scale = 10.0;
 
-    self.rep100View.shouldShowHotSpot = YES;
-    self.rep200View.shouldShowHotSpot = YES;
-    self.rep500View.shouldShowHotSpot = YES;
-    self.rep1000View.shouldShowHotSpot = YES;
-
     [self.rep100View bind:@"image" toObject:self withKeyPath:@"cursor.cursorImage100" options:nil];
     [self.rep100View bind:@"frameCount" toObject:self withKeyPath:@"cursor.frameCount" options:nil];
     [self.rep100View bind:@"frameDuration" toObject:self withKeyPath:@"cursor.frameDuration" options:nil];

diff --git a/Mousecape/Mousecape/src/controllers/MCLibraryController.m b/Mousecape/Mousecape/src/controllers/MCLibraryController.m
@@ -46,6 +46,10 @@ - (void)loadLibrary {
     NSString *applied   = [NSUserDefaults.standardUserDefaults stringForKey:MCPreferencesAppliedCursorKey];
 
     for (NSString *filename in contents) {
+        // Ignore hidden files like .DS_Store
+        if ([filename hasPrefix:@"."])
+            continue;
+
         NSURL *fileURL = [NSURL fileURLWithPathComponents:@[ capesPath, filename ]];
         MCCursorLibrary *library = [MCCursorLibrary cursorLibraryWithContentsOfURL:fileURL];
 

diff --git a/Mousecape/Mousecape/src/views/MMAnimatingImageView.m b/Mousecape/Mousecape/src/views/MMAnimatingImageView.m
@@ -18,6 +18,7 @@ - (void)_initialize;
 - (void)_invalidateFrame;
 - (void)_invalidateAnimation;
 - (void)registerTypes;
+- (void)_dragAnimationEnded:(id)sender;
 @end
 
 @implementation MMAnimatingImageView
@@ -195,11 +196,15 @@ - (NSDragOperation)draggingSession:(NSDraggingSession *)session sourceOperationM
 - (void)draggingSession:(NSDraggingSession *)session endedAtPoint:(NSPoint)screenPoint operation:(NSDragOperation)operation {
     if (self.delegate && [self.delegate respondsToSelector:@selector(imageView:didDragOutImage:)] && operation == NSDragOperationNone && !NSPointInRect(screenPoint, self.window.frame)) {
         [[NSCursor currentCursor] pop];
-        NSShowAnimationEffect(NSAnimationEffectPoof, screenPoint, NSZeroSize, nil, NULL, nil);
+        NSShowAnimationEffect(NSAnimationEffectPoof, screenPoint, NSZeroSize, self, @selector(_dragAnimationEnded:), nil);
         [self.delegate imageView:self didDragOutImage:self.image];
     }
 }
 
+- (void)_dragAnimationEnded:(id)sender {
+    [[NSCursor arrowCursor] push];
+}
+
 - (void)draggingSession:(NSDraggingSession *)session movedToPoint:(NSPoint)screenPoint {
     if (!NSPointInRect(screenPoint, self.window.frame)) {
         [[NSCursor disappearingItemCursor] push];