Skip to content

Commit

Permalink
Merge pull request #20 from alexzielenski/dev
Browse files Browse the repository at this point in the history 
v0.0.2
  • Loading branch information
@alexzielenski
alexzielenski committed Feb 15, 2014
2 parents 850926d + 0e6ff0a commit ccb0d1a
Show file tree
Hide file tree
Showing 35 changed files with 1,315 additions and 114 deletions.
38 changes: 38 additions & 0 deletions Mousecape/Mousecape.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
FA35984D189DC55A00288163 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA35984C189DC55A00288163 /* ServiceManagement.framework */; };
FA359852189E035900288163 /* listen.m in Sources */ = {isa = PBXBuildFile; fileRef = FA359851189E035900288163 /* listen.m */; };
FA359853189E040D00288163 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA359844189DBA3800288163 /* SystemConfiguration.framework */; };
FA5107E718A823BD00917185 /* MASPreferencesWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA5107E118A823BD00917185 /* MASPreferencesWindow.xib */; };
FA5107E818A823BD00917185 /* MASPreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA5107E318A823BD00917185 /* MASPreferencesWindowController.m */; };
FA5107ED18A8253600917185 /* MCGeneralPreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA5107EB18A8253600917185 /* MCGeneralPreferencesController.m */; };
FA5107EE18A8253600917185 /* GeneralPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA5107EC18A8253600917185 /* GeneralPreferences.xib */; };
FA8FF76B189D664400750E51 /* restore.m in Sources */ = {isa = PBXBuildFile; fileRef = FA8FF76A189D664400750E51 /* restore.m */; };
FA8FF76E189D66CB00750E51 /* backup.m in Sources */ = {isa = PBXBuildFile; fileRef = FA8FF76D189D66CB00750E51 /* backup.m */; };
FA8FF771189D66D800750E51 /* apply.m in Sources */ = {isa = PBXBuildFile; fileRef = FA8FF770189D66D800750E51 /* apply.m */; };
Expand Down Expand Up @@ -117,6 +121,13 @@
FA35984C189DC55A00288163 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
FA359850189E035200288163 /* listen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = listen.h; sourceTree = "<group>"; };
FA359851189E035900288163 /* listen.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = listen.m; sourceTree = "<group>"; };
FA5107E018A823BD00917185 /* MASPreferencesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASPreferencesViewController.h; sourceTree = "<group>"; };
FA5107E118A823BD00917185 /* MASPreferencesWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MASPreferencesWindow.xib; sourceTree = "<group>"; };
FA5107E218A823BD00917185 /* MASPreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASPreferencesWindowController.h; sourceTree = "<group>"; };
FA5107E318A823BD00917185 /* MASPreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASPreferencesWindowController.m; sourceTree = "<group>"; };
FA5107EA18A8253600917185 /* MCGeneralPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MCGeneralPreferencesController.h; path = Preferences/MCGeneralPreferencesController.h; sourceTree = "<group>"; };
FA5107EB18A8253600917185 /* MCGeneralPreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MCGeneralPreferencesController.m; path = Preferences/MCGeneralPreferencesController.m; sourceTree = "<group>"; };
FA5107EC18A8253600917185 /* GeneralPreferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = GeneralPreferences.xib; path = Preferences/GeneralPreferences.xib; sourceTree = "<group>"; };
FA8FF769189D663B00750E51 /* restore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = restore.h; sourceTree = "<group>"; };
FA8FF76A189D664400750E51 /* restore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = restore.m; sourceTree = "<group>"; };
FA8FF76C189D66C400750E51 /* backup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = backup.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -247,9 +258,31 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
FA5107DD18A823BD00917185 /* MASPreferences */ = {
isa = PBXGroup;
children = (
FA5107E018A823BD00917185 /* MASPreferencesViewController.h */,
FA5107E118A823BD00917185 /* MASPreferencesWindow.xib */,
FA5107E218A823BD00917185 /* MASPreferencesWindowController.h */,
FA5107E318A823BD00917185 /* MASPreferencesWindowController.m */,
);
path = MASPreferences;
sourceTree = "<group>";
};
FA5107EF18A8253A00917185 /* Preferences */ = {
isa = PBXGroup;
children = (
FA5107EA18A8253600917185 /* MCGeneralPreferencesController.h */,
FA5107EB18A8253600917185 /* MCGeneralPreferencesController.m */,
FA5107EC18A8253600917185 /* GeneralPreferences.xib */,
);
name = Preferences;
sourceTree = "<group>";
};
FAAEF8EE189EB32700145DF8 /* external */ = {
isa = PBXGroup;
children = (
FA5107DD18A823BD00917185 /* MASPreferences */,
FAAEF8EF189EB32700145DF8 /* BTRKit */,
);
path = external;
Expand Down Expand Up @@ -474,6 +507,7 @@
FAEE651918A047E8003AA182 /* MCLibraryViewController.m */,
FAEE651A18A047E8003AA182 /* MCLibraryWindowController.h */,
FAEE651B18A047E8003AA182 /* MCLibraryWindowController.m */,
FA5107EF18A8253A00917185 /* Preferences */,
);
name = controllers;
path = src/controllers;
Expand Down Expand Up @@ -619,8 +653,10 @@
FAC69F6F189D603C00BC829D /* InfoPlist.strings in Resources */,
FA04886D189F58B1001F3AB5 /* Library.xib in Resources */,
FA04886C189F58B1001F3AB5 /* Edit.xib in Resources */,
FA5107EE18A8253600917185 /* GeneralPreferences.xib in Resources */,
FAC69F7D189D603C00BC829D /* Images.xcassets in Resources */,
FAC69F75189D603C00BC829D /* Credits.rtf in Resources */,
FA5107E718A823BD00917185 /* MASPreferencesWindow.xib in Resources */,
FAC69F7B189D603C00BC829D /* MainMenu.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -667,9 +703,11 @@
FAAEF94E189EFC9300145DF8 /* create.m in Sources */,
FAEE652C18A047E8003AA182 /* MCEditDetailController.m in Sources */,
FAAEF94F189EFC9600145DF8 /* backup.m in Sources */,
FA5107ED18A8253600917185 /* MCGeneralPreferencesController.m in Sources */,
FAAEF951189F0CC300145DF8 /* restore.m in Sources */,
FAAEF950189EFC9800145DF8 /* apply.m in Sources */,
FAEE652918A047E8003AA182 /* NSFileManager+DirectoryLocations.m in Sources */,
FA5107E818A823BD00917185 /* MASPreferencesWindowController.m in Sources */,
FAEE652D18A047E8003AA182 /* MCEditListController.m in Sources */,
FAC69F71189D603C00BC829D /* main.m in Sources */,
FAEE653218A047E8003AA182 /* MCCursor.m in Sources */,
Expand Down
40 changes: 36 additions & 4 deletions Mousecape/Mousecape/Base.lproj/Edit.xib
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13C48" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment defaultVersion="1080" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
Expand All @@ -18,7 +18,6 @@
<customObject id="-3" userLabel="Application"/>
<window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" wantsToBeColor="NO" animationBehavior="default" id="1">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="525" height="297"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
<value key="minSize" type="size" width="500" height="310"/>
Expand Down Expand Up @@ -124,6 +123,7 @@
<connections>
<outlet property="dataSource" destination="oUs-Nv-PHw" id="ur0-Pm-oqJ"/>
<outlet property="delegate" destination="oUs-Nv-PHw" id="GMA-yd-uCn"/>
<outlet property="menu" destination="vy8-Pj-2Jg" id="4S4-YC-adi"/>
<outlet property="nextKeyView" destination="fzz-Li-KC6" id="Mg7-QD-IZj"/>
</connections>
</tableView>
Expand Down Expand Up @@ -517,7 +517,7 @@
</textFieldCell>
<connections>
<binding destination="tMj-cQ-hK0" name="value" keyPath="cursor.hotSpot" id="aFb-fI-aHw"/>
<outlet property="nextKeyView" destination="yz7-y5-TxE" id="Gtw-PH-Eo8"/>
<outlet property="nextKeyView" destination="wdB-yr-r6Y" id="Smn-hK-iP2"/>
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="75v-aw-FbU">
Expand Down Expand Up @@ -608,7 +608,7 @@
</textFieldCell>
<connections>
<binding destination="tMj-cQ-hK0" name="value" keyPath="cursor.size" id="dXp-5z-YR6"/>
<outlet property="nextKeyView" destination="yz7-y5-TxE" id="IBE-mt-pxg"/>
<outlet property="nextKeyView" destination="yz7-y5-TxE" id="9Cb-FK-ium"/>
</connections>
</textField>
</subviews>
Expand Down Expand Up @@ -671,6 +671,38 @@
<outlet property="nextKeyView" destination="yz7-y5-TxE" id="WHy-Vl-LGY"/>
</connections>
</customView>
<menu id="vy8-Pj-2Jg">
<items>
<menuItem title="New Cursor" tag="-1" id="KQs-oD-CRg">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="addAction:" target="oUs-Nv-PHw" id="Vbo-8k-sGO"/>
</connections>
</menuItem>
<menuItem title="Remove Cursor" tag="-1" id="gnE-s8-eO8">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="removeAction:" target="oUs-Nv-PHw" id="QmX-eg-rb3"/>
<binding destination="oUs-Nv-PHw" name="enabled" keyPath="selectedObject" id="v5P-WH-Wea">
<dictionary key="options">
<string key="NSValueTransformerName">NSIsNotNil</string>
</dictionary>
</binding>
</connections>
</menuItem>
<menuItem title="Duplicate" tag="-1" id="swO-bv-qRE">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="duplicateAction:" target="oUs-Nv-PHw" id="z4d-84-N6g"/>
<binding destination="oUs-Nv-PHw" name="enabled" keyPath="selectedObject" id="Q5o-HW-cMv">
<dictionary key="options">
<string key="NSValueTransformerName">NSIsNotNil</string>
</dictionary>
</binding>
</connections>
</menuItem>
</items>
</menu>
</objects>
<resources>
<image name="NSAddTemplate" width="8" height="8"/>
Expand Down
25 changes: 16 additions & 9 deletions Mousecape/Mousecape/Base.lproj/Library.xib
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13C48" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment defaultVersion="1080" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
Expand Down Expand Up @@ -155,30 +155,37 @@
</viewController>
<menu id="zpf-M9-Nd1">
<items>
<menuItem title="Apply" id="aI1-E0-bnW">
<menuItem title="Apply" tag="-1" id="aI1-E0-bnW">
<string key="keyEquivalent" base64-UTF8="YES">
DQ
</string>
<connections>
<action selector="applyAction:" target="zL4-Ay-t4Q" id="4KV-AP-8YO"/>
<action selector="applyCape:" target="-1" id="KG6-81-DdR"/>
</connections>
</menuItem>
<menuItem title="Edit" tag="1" keyEquivalent="e" id="HJc-SX-JjZ">
<menuItem title="Edit" tag="-1" keyEquivalent="e" id="HJc-SX-JjZ">
<connections>
<action selector="editAction:" target="zL4-Ay-t4Q" id="R94-y0-i5l"/>
<action selector="editCape:" target="-1" id="6nG-0d-9YV"/>
</connections>
</menuItem>
<menuItem title="Duplicate" tag="2" keyEquivalent="S" id="PhG-Ll-nqz">
<menuItem title="Duplicate" tag="-1" keyEquivalent="S" id="PhG-Ll-nqz">
<connections>
<action selector="duplicateAction:" target="zL4-Ay-t4Q" id="dYH-lp-gER"/>
<action selector="duplicateCape:" target="-1" id="N0m-Bu-OYJ"/>
</connections>
</menuItem>
<menuItem title="Remove" tag="3" id="Aig-wl-ivn">
<menuItem title="Remove" tag="-1" id="Aig-wl-ivn">
<string key="keyEquivalent" base64-UTF8="YES">
CA
</string>
<connections>
<action selector="removeAction:" target="zL4-Ay-t4Q" id="WYv-bz-sLl"/>
<action selector="removeCape:" target="-1" id="rSg-Ns-VmO"/>
</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"/>
</connections>
</menuItem>
</items>
Expand Down
24 changes: 17 additions & 7 deletions Mousecape/Mousecape/Base.lproj/MainMenu.xib
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13C48" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment defaultVersion="1080" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
Expand All @@ -26,14 +26,18 @@
<menuItem isSeparatorItem="YES" id="236">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Preferences…" keyEquivalent="," id="129"/>
<menuItem title="Preferences…" keyEquivalent="," id="129">
<connections>
<action selector="showPreferences:" target="-1" id="lNW-tH-IKS"/>
</connections>
</menuItem>
<menuItem title="Check for Updates..." id="igk-i0-oH0">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="Install Helper Tool" id="Ui2-VN-tbP">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="toggleInstall:" target="494" id="Rfq-DA-Ni8"/>
<action selector="toggleInstall:" target="-1" id="Ppc-Jw-bxU"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="143">
Expand Down Expand Up @@ -85,6 +89,11 @@
<action selector="openDocument:" target="-1" id="2Qd-t2-zEv"/>
</connections>
</menuItem>
<menuItem title="Import MightyMouse" keyEquivalent="i" id="l3B-n8-21Z">
<connections>
<action selector="convertCape:" target="494" id="vs2-8F-92y"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="79">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
Expand Down Expand Up @@ -351,14 +360,15 @@ CA
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="EOT-Rk-oU3"/>
<menuItem title="Restore Defaults" keyEquivalent="r" id="uCE-YB-8VL">
<menuItem title="Show in Finder" id="PAd-kz-Eoi">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="restoreCape:" target="494" id="2ve-Ez-ktd"/>
<action selector="showCape:" target="-1" id="lep-7W-NSD"/>
</connections>
</menuItem>
<menuItem title="Import MightyMouse" keyEquivalent="i" id="l3B-n8-21Z">
<menuItem title="Restore Defaults" keyEquivalent="r" id="uCE-YB-8VL">
<connections>
<action selector="convertCape:" target="494" id="vs2-8F-92y"/>
<action selector="restoreCape:" target="494" id="2ve-Ez-ktd"/>
</connections>
</menuItem>
</items>
Expand Down
1 change: 0 additions & 1 deletion Mousecape/Mousecape/MCAppDelegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@
@interface MCAppDelegate : NSObject <NSApplicationDelegate>
@property (assign) IBOutlet NSMenuItem *toggleHelperItem;
@property (strong) MCLibraryWindowController *libraryWindowController;
- (IBAction)toggleInstall:(NSMenuItem *)sender;
@end
Loading

0 comments on commit ccb0d1a

Please sign in to comment.