Skip to content

Commit

Permalink
new Hotkeys icon
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattrajca
mattrajca committed Jul 27, 2012
1 parent de71978 commit 14f7375
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 23 deletions.
48 changes: 37 additions & 11 deletions English.lproj/PXPreferences.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">11C74</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1138.23</string>
<string key="IBDocument.HIToolboxVersion">567.00</string>
<string key="IBDocument.SystemVersion">12A269</string>
<string key="IBDocument.InterfaceBuilderVersion">2549</string>
<string key="IBDocument.AppKitVersion">1187</string>
<string key="IBDocument.HIToolboxVersion">624.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">1938</string>
<string key="NS.object.0">2549</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSCustomObject</string>
<string>NSToolbar</string>
<string>NSToolbarItem</string>
<string>NSWindowTemplate</string>
<string>NSView</string>
<string>NSToolbar</string>
<string>NSCustomObject</string>
<string>NSWindowTemplate</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand Down Expand Up @@ -63,7 +63,7 @@
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">HotkeysPreferences</string>
<string key="NSResourceName">Hotkeys</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
Expand Down Expand Up @@ -114,6 +114,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{420, 270}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
Expand Down Expand Up @@ -233,7 +234,32 @@
<nil key="sourceID"/>
<int key="maxID">13</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">PXPreferencesController</string>
<string key="superclassName">NSWindowController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="selectGeneralTab:">id</string>
<string key="selectHotkeysTab:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="selectGeneralTab:">
<string key="name">selectGeneralTab:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="selectHotkeysTab:">
<string key="name">selectHotkeysTab:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/PXPreferencesController.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
Expand All @@ -247,7 +273,7 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="HotkeysPreferences">{32, 32}</string>
<string key="Hotkeys">{36, 36}</string>
<string key="NSPreferencesGeneral">{32, 32}</string>
</dictionary>
</data>
Expand Down
Binary file added Graphics/Hotkeys.sketch/Data
View file
Binary file not shown.
Binary file added Graphics/Hotkeys.sketch/QuickLook/Preview.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Graphics/Hotkeys.sketch/QuickLook/Thumbnail.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 8 additions & 12 deletions Pixen.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
C94FA7BF15A5DE18000FA307 /* TitlebarGradient@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C94FA7BD15A5DE18000FA307 /* TitlebarGradient@2x.png */; };
C953831813FC477100440AB5 /* PXSequenceExportViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C953831613FC477100440AB5 /* PXSequenceExportViewController.h */; };
C953831913FC477100440AB5 /* PXSequenceExportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C953831713FC477100440AB5 /* PXSequenceExportViewController.m */; };
C95B209415C353F7003D6C2A /* Hotkeys.png in Resources */ = {isa = PBXBuildFile; fileRef = C95B209315C353F7003D6C2A /* Hotkeys.png */; };
C95B209615C357F9003D6C2A /* Hotkeys@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C95B209515C357F9003D6C2A /* Hotkeys@2x.png */; };
C96541EB13FF44A600F1F83C /* PXDeleteCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = C96541E913FF44A600F1F83C /* PXDeleteCollectionView.h */; };
C96541EC13FF44A600F1F83C /* PXDeleteCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = C96541EA13FF44A600F1F83C /* PXDeleteCollectionView.m */; };
C968A8E114A5292700905E3D /* Pixen128.png in Resources */ = {isa = PBXBuildFile; fileRef = C968A8E014A5292700905E3D /* Pixen128.png */; };
Expand Down Expand Up @@ -400,7 +402,6 @@
EABD60BA0CE986E3008A1B1E /* PXCanvasPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = EABD60B80CE986E3008A1B1E /* PXCanvasPreviewView.m */; };
EAC9174C0CE7DC7300E519E1 /* Pixen.icns in Resources */ = {isa = PBXBuildFile; fileRef = EAC916E50CE7DC7300E519E1 /* Pixen.icns */; };
EAC9174F0CE7DC7300E519E1 /* PixenDoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = EAC916E80CE7DC7300E519E1 /* PixenDoc.icns */; };
EAC917510CE7DC7300E519E1 /* HotkeysPreferences.tiff in Resources */ = {isa = PBXBuildFile; fileRef = EAC916EB0CE7DC7300E519E1 /* HotkeysPreferences.tiff */; };
EAC917530CE7DC7300E519E1 /* apencil.png in Resources */ = {isa = PBXBuildFile; fileRef = EAC916EE0CE7DC7300E519E1 /* apencil.png */; };
EAC917540CE7DC7300E519E1 /* ellipse.png in Resources */ = {isa = PBXBuildFile; fileRef = EAC916EF0CE7DC7300E519E1 /* ellipse.png */; };
EAC917550CE7DC7300E519E1 /* eraser.png in Resources */ = {isa = PBXBuildFile; fileRef = EAC916F00CE7DC7300E519E1 /* eraser.png */; };
Expand Down Expand Up @@ -570,6 +571,8 @@
C94FA7BD15A5DE18000FA307 /* TitlebarGradient@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "TitlebarGradient@2x.png"; sourceTree = "<group>"; };
C953831613FC477100440AB5 /* PXSequenceExportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PXSequenceExportViewController.h; sourceTree = "<group>"; };
C953831713FC477100440AB5 /* PXSequenceExportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PXSequenceExportViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
C95B209315C353F7003D6C2A /* Hotkeys.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Hotkeys.png; sourceTree = "<group>"; };
C95B209515C357F9003D6C2A /* Hotkeys@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Hotkeys@2x.png"; sourceTree = "<group>"; };
C96541E913FF44A600F1F83C /* PXDeleteCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PXDeleteCollectionView.h; sourceTree = "<group>"; };
C96541EA13FF44A600F1F83C /* PXDeleteCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PXDeleteCollectionView.m; sourceTree = "<group>"; };
C968A8E014A5292700905E3D /* Pixen128.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Pixen128.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -935,7 +938,6 @@
EABD60B80CE986E3008A1B1E /* PXCanvasPreviewView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PXCanvasPreviewView.m; sourceTree = "<group>"; };
EAC916E50CE7DC7300E519E1 /* Pixen.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Pixen.icns; sourceTree = "<group>"; };
EAC916E80CE7DC7300E519E1 /* PixenDoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = PixenDoc.icns; sourceTree = "<group>"; };
EAC916EB0CE7DC7300E519E1 /* HotkeysPreferences.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = HotkeysPreferences.tiff; sourceTree = "<group>"; };
EAC916EE0CE7DC7300E519E1 /* apencil.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = apencil.png; sourceTree = "<group>"; };
EAC916EF0CE7DC7300E519E1 /* ellipse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ellipse.png; sourceTree = "<group>"; };
EAC916F00CE7DC7300E519E1 /* eraser.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = eraser.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1882,6 +1884,8 @@
EAC916E00CE7DC7300E519E1 /* Icons */ = {
isa = PBXGroup;
children = (
C95B209315C353F7003D6C2A /* Hotkeys.png */,
C95B209515C357F9003D6C2A /* Hotkeys@2x.png */,
C9BA173E15A5CFDC008BC323 /* ImageSizeInfo.png */,
C9BA173F15A5CFDC008BC323 /* ImageSizeInfo@2x.png */,
C99236FB152CD37400EC3AE5 /* Next.png */,
Expand All @@ -1894,21 +1898,12 @@
C97C7F0D14EF17DA0089A637 /* PixenPalette.icns */,
C99236FD152CD6AB00EC3AE5 /* Play.png */,
C99236F9152CD1F000EC3AE5 /* Previous.png */,
EAC916E90CE7DC7300E519E1 /* Preferences Icons */,
EAC916EC0CE7DC7300E519E1 /* Tool Icons */,
EAC917070CE7DC7300E519E1 /* Toolbar Icons */,
);
path = Icons;
sourceTree = "<group>";
};
EAC916E90CE7DC7300E519E1 /* Preferences Icons */ = {
isa = PBXGroup;
children = (
EAC916EB0CE7DC7300E519E1 /* HotkeysPreferences.tiff */,
);
path = "Preferences Icons";
sourceTree = "<group>";
};
EAC916EC0CE7DC7300E519E1 /* Tool Icons */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2277,7 +2272,6 @@
61FED6C408BCC646005E51EA /* PXSequenceExportView.xib in Resources */,
EAC9174C0CE7DC7300E519E1 /* Pixen.icns in Resources */,
EAC9174F0CE7DC7300E519E1 /* PixenDoc.icns in Resources */,
EAC917510CE7DC7300E519E1 /* HotkeysPreferences.tiff in Resources */,
EAC917530CE7DC7300E519E1 /* apencil.png in Resources */,
EAC917540CE7DC7300E519E1 /* ellipse.png in Resources */,
EAC917550CE7DC7300E519E1 /* eraser.png in Resources */,
Expand Down Expand Up @@ -2366,6 +2360,8 @@
C9BFCC7F15C3011400016E09 /* Popout.png in Resources */,
C9BFCC8015C3011400016E09 /* Popout@2x.png in Resources */,
C9BFCC8C15C3051000016E09 /* PXPalette.xib in Resources */,
C95B209415C353F7003D6C2A /* Hotkeys.png in Resources */,
C95B209615C357F9003D6C2A /* Hotkeys@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file added Resources/Icons/Hotkeys.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Icons/Hotkeys@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Resources/Icons/Preferences Icons/HotkeysPreferences.tiff
View file
Binary file not shown.

0 comments on commit 14f7375

Please sign in to comment.