Skip to content

Commit f1b6c2f

Browse files
rowanjrowanj
committed
Merge branch 'issues/182'
2 parents 70b0fd3 + 27a5eba commit f1b6c2f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+116
-32
lines changed

‎Classes/PBChangedFile.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ - (NSImage *) icon
4646
filename = @"empty_file";
4747
break;
4848
}
49-
NSString *p = [[NSBundle mainBundle] pathForResource:filename ofType:@"png"];
50-
return [[NSImage alloc] initByReferencingFile: p];
49+
return [NSImage imageNamed:filename];
5150
}
5251

5352
+ (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector

‎Classes/git/PBGitSVBranchItem.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ - (NSImage *) icon
2525
{
2626
static NSImage *branchImage = nil;
2727
if (!branchImage)
28-
branchImage = [NSImage imageNamed:@"Branch.png"];
28+
branchImage = [NSImage imageNamed:@"Branch"];
2929

3030
return branchImage;
3131
}

‎Classes/git/PBGitSVFolderItem.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ - (NSImage *) icon
2424
{
2525
static NSImage *folderImage = nil;
2626
if (!folderImage) {
27-
folderImage = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kGenericFolderIcon)];
27+
//folderImage = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kGenericFolderIcon)];
28+
folderImage = [NSImage imageNamed:@"Folder"];
2829
[folderImage setSize:NSMakeSize(16,16)];
2930
}
3031

‎Classes/git/PBGitSVOtherRevItem.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ - (NSImage *) icon
2626
{
2727
static NSImage *otherRevImage = nil;
2828
if (!otherRevImage)
29-
otherRevImage = [NSImage imageNamed:@"Branch.png"];
29+
otherRevImage = [NSImage imageNamed:@"Branch"];
3030

3131
return otherRevImage;
3232
}

‎Classes/git/PBGitSVRemoteBranchItem.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ - (NSImage *) icon
2525
{
2626
static NSImage *remoteBranchImage = nil;
2727
if (!remoteBranchImage)
28-
remoteBranchImage = [NSImage imageNamed:@"RemoteBranch.png"];
28+
remoteBranchImage = [NSImage imageNamed:@"RemoteBranch"];
2929

3030
return remoteBranchImage;
3131
}

‎Classes/git/PBGitSVRemoteItem.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ - (NSImage *) icon
2525
{
2626
static NSImage *networkImage = nil;
2727
if (!networkImage) {
28-
networkImage = [NSImage imageNamed:NSImageNameNetwork];
28+
networkImage = [NSImage imageNamed:@"Remote"];
2929
[networkImage setSize:NSMakeSize(16,16)];
3030
}
3131

‎GitX.xcodeproj/project.pbxproj

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,22 @@
183183
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
184184
911112370E5A097800BF76B4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 911112360E5A097800BF76B4 /* Security.framework */; };
185185
913D5E500E55645900CECEA2 /* gitx in Resources */ = {isa = PBXBuildFile; fileRef = 913D5E490E55644600CECEA2 /* gitx */; };
186+
BC067C64175A0EC400D86938 /* AddBranchTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C63175A0EC400D86938 /* AddBranchTemplate@2x.png */; };
187+
BC067C6F175A0ECD00D86938 /* AddLabelTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C6E175A0ECD00D86938 /* AddLabelTemplate@2x.png */; };
188+
BC067C71175A100600D86938 /* AddRemote@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C70175A100600D86938 /* AddRemote@2x.png */; };
189+
BC067C73175A12A400D86938 /* CherryPickTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C72175A12A400D86938 /* CherryPickTemplate@2x.png */; };
190+
BC067C75175A149000D86938 /* MergeTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C74175A149000D86938 /* MergeTemplate@2x.png */; };
191+
BC067C77175A16A500D86938 /* RebaseTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C76175A16A500D86938 /* RebaseTemplate@2x.png */; };
192+
BC0AAF6117590F5100F4EE9A /* StageView@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF6017590F5100F4EE9A /* StageView@2x.png */; };
193+
BC0AAF6C17590F5B00F4EE9A /* Branch@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF6B17590F5B00F4EE9A /* Branch@2x.png */; };
194+
BC0AAF6E17590F6400F4EE9A /* RemoteBranch@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF6D17590F6400F4EE9A /* RemoteBranch@2x.png */; };
195+
BC0AAF701759140C00F4EE9A /* deleted_file@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF6F1759140C00F4EE9A /* deleted_file@2x.png */; };
196+
BC0AAF721759141400F4EE9A /* empty_file@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF711759141400F4EE9A /* empty_file@2x.png */; };
197+
BC0AAF741759142500F4EE9A /* new_file@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF731759142500F4EE9A /* new_file@2x.png */; };
198+
BC0AAF77175915F400F4EE9A /* Remote.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF75175915F400F4EE9A /* Remote.png */; };
199+
BC0AAF78175915F400F4EE9A /* Remote@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF76175915F400F4EE9A /* Remote@2x.png */; };
200+
BC0AAF7B175916D700F4EE9A /* Folder.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF79175916D700F4EE9A /* Folder.png */; };
201+
BC0AAF7C175916D700F4EE9A /* Folder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF7A175916D700F4EE9A /* Folder@2x.png */; };
186202
D87127011229A21C00012334 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D87127001229A21C00012334 /* QuartzCore.framework */; };
187203
D89E9B141218BA260097A90B /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D89E9AB21218A9DA0097A90B /* ScriptingBridge.framework */; };
188204
D8E3B2B810DC9FB2001096A3 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */; };
@@ -606,6 +622,22 @@
606622
8D1107320486CEB800E47090 /* GitX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GitX.app; sourceTree = BUILT_PRODUCTS_DIR; };
607623
911112360E5A097800BF76B4 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
608624
913D5E490E55644600CECEA2 /* gitx */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gitx; sourceTree = BUILT_PRODUCTS_DIR; };
625+
BC067C63175A0EC400D86938 /* AddBranchTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AddBranchTemplate@2x.png"; sourceTree = "<group>"; };
626+
BC067C6E175A0ECD00D86938 /* AddLabelTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AddLabelTemplate@2x.png"; sourceTree = "<group>"; };
627+
BC067C70175A100600D86938 /* AddRemote@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AddRemote@2x.png"; sourceTree = "<group>"; };
628+
BC067C72175A12A400D86938 /* CherryPickTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "CherryPickTemplate@2x.png"; sourceTree = "<group>"; };
629+
BC067C74175A149000D86938 /* MergeTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "MergeTemplate@2x.png"; sourceTree = "<group>"; };
630+
BC067C76175A16A500D86938 /* RebaseTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RebaseTemplate@2x.png"; sourceTree = "<group>"; };
631+
BC0AAF6017590F5100F4EE9A /* StageView@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "StageView@2x.png"; sourceTree = "<group>"; };
632+
BC0AAF6B17590F5B00F4EE9A /* Branch@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Branch@2x.png"; sourceTree = "<group>"; };
633+
BC0AAF6D17590F6400F4EE9A /* RemoteBranch@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RemoteBranch@2x.png"; sourceTree = "<group>"; };
634+
BC0AAF6F1759140C00F4EE9A /* deleted_file@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "deleted_file@2x.png"; sourceTree = "<group>"; };
635+
BC0AAF711759141400F4EE9A /* empty_file@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "empty_file@2x.png"; sourceTree = "<group>"; };
636+
BC0AAF731759142500F4EE9A /* new_file@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "new_file@2x.png"; sourceTree = "<group>"; };
637+
BC0AAF75175915F400F4EE9A /* Remote.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Remote.png; sourceTree = "<group>"; };
638+
BC0AAF76175915F400F4EE9A /* Remote@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Remote@2x.png"; sourceTree = "<group>"; };
639+
BC0AAF79175916D700F4EE9A /* Folder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Folder.png; sourceTree = "<group>"; };
640+
BC0AAF7A175916D700F4EE9A /* Folder@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Folder@2x.png"; sourceTree = "<group>"; };
609641
D87127001229A21C00012334 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
610642
D89E9AB21218A9DA0097A90B /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = System/Library/Frameworks/ScriptingBridge.framework; sourceTree = SDKROOT; };
611643
D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = /System/Library/Frameworks/ScriptingBridge.framework; sourceTree = "<absolute>"; };
@@ -745,34 +777,45 @@
745777
isa = PBXGroup;
746778
children = (
747779
4A5D758214A9A90500DF6C68 /* add_branch.psd */,
780+
BC067C63175A0EC400D86938 /* AddBranchTemplate@2x.png */,
748781
4A5D758314A9A90500DF6C68 /* AddBranchTemplate.png */,
749782
4A5D758414A9A90500DF6C68 /* AddBranchTemplate.psd */,
783+
BC067C6E175A0ECD00D86938 /* AddLabelTemplate@2x.png */,
750784
4A5D758514A9A90500DF6C68 /* AddLabelTemplate.png */,
751785
4A5D758614A9A90500DF6C68 /* AddLabelTemplate.psd */,
752786
4A5D758714A9A90500DF6C68 /* AddRemote.acorn */,
787+
BC067C70175A100600D86938 /* AddRemote@2x.png */,
753788
4A5D758814A9A90500DF6C68 /* AddRemote.png */,
754789
4A5D758914A9A90500DF6C68 /* AddRemoteBranchFireworksTemplate.png */,
755790
4A5D758A14A9A90500DF6C68 /* AddRemoteBranchTemplate.png */,
791+
BC0AAF6B17590F5B00F4EE9A /* Branch@2x.png */,
756792
4A5D758B14A9A90500DF6C68 /* Branch.png */,
757793
4A5D758C14A9A90500DF6C68 /* branch.tiff */,
758794
4A5D758D14A9A90500DF6C68 /* CherryPickTemplate.png */,
795+
BC067C72175A12A400D86938 /* CherryPickTemplate@2x.png */,
759796
4A5D758E14A9A90500DF6C68 /* CloneRepositoryFireworksTemplate.png */,
760797
4A5D758F14A9A90500DF6C68 /* CloneRepositoryTemplate.png */,
761798
4A5D759014A9A90500DF6C68 /* CommitViewTemplate.png */,
762799
4A5D759114A9A90500DF6C68 /* CommitViewTemplate.psd */,
763800
4A5D759214A9A90500DF6C68 /* deleted_file.png */,
801+
BC0AAF6F1759140C00F4EE9A /* deleted_file@2x.png */,
764802
4A5D759314A9A90500DF6C68 /* DetailViewTemplate.png */,
765803
4A5D759414A9A90500DF6C68 /* empty_file.png */,
804+
BC0AAF711759141400F4EE9A /* empty_file@2x.png */,
766805
4A5D759514A9A90500DF6C68 /* FetchTemplate.png */,
767806
4A5D759614A9A90500DF6C68 /* file_template.psd */,
768807
4A5D759714A9A90500DF6C68 /* folder.tiff */,
808+
BC0AAF79175916D700F4EE9A /* Folder.png */,
809+
BC0AAF7A175916D700F4EE9A /* Folder@2x.png */,
769810
4A5D759814A9A90500DF6C68 /* gitx_icon.psd */,
770811
4A5D759914A9A90500DF6C68 /* HistoryViewTemplate.png */,
771812
4A5D759A14A9A90500DF6C68 /* HistoryViewTemplate.psd */,
772813
4A5D759B14A9A90500DF6C68 /* mainSplitterBar.tiff */,
773814
4A5D759C14A9A90500DF6C68 /* mainSplitterDimple.tiff */,
774815
4A5D759D14A9A90500DF6C68 /* MergeTemplate.png */,
816+
BC067C74175A149000D86938 /* MergeTemplate@2x.png */,
775817
4A5D759E14A9A90500DF6C68 /* new_file.png */,
818+
BC0AAF731759142500F4EE9A /* new_file@2x.png */,
776819
4A5D759F14A9A90500DF6C68 /* Preferences */,
777820
4A5D75A114A9A90500DF6C68 /* PullFireworksTemplate.png */,
778821
4A5D75A214A9A90500DF6C68 /* PullPopUpFireworksTemplate.png */,
@@ -785,11 +828,16 @@
785828
4A5D75A914A9A90500DF6C68 /* RebaseFireworksTemplate.png */,
786829
4A5D75AA14A9A90500DF6C68 /* RebasePopUpFireworksTemplate.png */,
787830
4A5D75AB14A9A90500DF6C68 /* RebasePopUpTemplate.png */,
831+
BC067C76175A16A500D86938 /* RebaseTemplate@2x.png */,
788832
4A5D75AC14A9A90500DF6C68 /* RebaseTemplate.png */,
789833
4A5D75AD14A9A90500DF6C68 /* remote.tiff */,
834+
BC0AAF75175915F400F4EE9A /* Remote.png */,
835+
BC0AAF76175915F400F4EE9A /* Remote@2x.png */,
836+
BC0AAF6D17590F6400F4EE9A /* RemoteBranch@2x.png */,
790837
4A5D75AE14A9A90500DF6C68 /* RemoteBranch.png */,
791838
4A5D75AF14A9A90500DF6C68 /* rewindImage.pdf */,
792839
4A5D75B014A9A90500DF6C68 /* site_download_background.png */,
840+
BC0AAF6017590F5100F4EE9A /* StageView@2x.png */,
793841
4A5D75B114A9A90500DF6C68 /* StageView.png */,
794842
4A5D75B214A9A90500DF6C68 /* Tag.png */,
795843
4A5D75B314A9A90500DF6C68 /* tag.tiff */,
@@ -1339,6 +1387,22 @@
13391387
4A5D761F14A9A99E00DF6C68 /* Preferences.xib in Resources */,
13401388
4A5D762014A9A99E00DF6C68 /* RepositoryWindow.xib in Resources */,
13411389
4A90A73514A9D24300D0DA02 /* GitX.sdef in Resources */,
1390+
BC0AAF6117590F5100F4EE9A /* StageView@2x.png in Resources */,
1391+
BC0AAF6C17590F5B00F4EE9A /* Branch@2x.png in Resources */,
1392+
BC0AAF6E17590F6400F4EE9A /* RemoteBranch@2x.png in Resources */,
1393+
BC0AAF701759140C00F4EE9A /* deleted_file@2x.png in Resources */,
1394+
BC0AAF721759141400F4EE9A /* empty_file@2x.png in Resources */,
1395+
BC0AAF741759142500F4EE9A /* new_file@2x.png in Resources */,
1396+
BC0AAF77175915F400F4EE9A /* Remote.png in Resources */,
1397+
BC0AAF78175915F400F4EE9A /* Remote@2x.png in Resources */,
1398+
BC0AAF7B175916D700F4EE9A /* Folder.png in Resources */,
1399+
BC0AAF7C175916D700F4EE9A /* Folder@2x.png in Resources */,
1400+
BC067C64175A0EC400D86938 /* AddBranchTemplate@2x.png in Resources */,
1401+
BC067C6F175A0ECD00D86938 /* AddLabelTemplate@2x.png in Resources */,
1402+
BC067C71175A100600D86938 /* AddRemote@2x.png in Resources */,
1403+
BC067C73175A12A400D86938 /* CherryPickTemplate@2x.png in Resources */,
1404+
BC067C75175A149000D86938 /* MergeTemplate@2x.png in Resources */,
1405+
BC067C77175A16A500D86938 /* RebaseTemplate@2x.png in Resources */,
13421406
);
13431407
runOnlyForDeploymentPostprocessing = 0;
13441408
};

‎Resources/Images/AddBranchTemplate.png

386 Bytes
Loading

‎Resources/Images/AddBranchTemplate@2x.png

719 Bytes
Loading

‎Resources/Images/AddLabelTemplate.png

258 Bytes
Loading

0 commit comments

Comments
 (0)