From ca479c79e95cdbaaef00b08dd3ec5b205a3e0145 Mon Sep 17 00:00:00 2001 From: Pieter de Bie Date: Tue, 8 Sep 2009 14:50:20 +0200 Subject: [PATCH] Sidebar: display a custom icon These are based on a contribution by Vincent Esche, but we'll probably have to change them a bit. --- GitX.xcodeproj/project.pbxproj | 16 ++++++++++++++++ Images/branch.tiff | Bin 0 -> 4418 bytes Images/folder.tiff | Bin 0 -> 4418 bytes Images/remote.tiff | Bin 0 -> 4418 bytes Images/tag.tiff | Bin 0 -> 4418 bytes PBGitSidebarController.m | 5 +---- PBSourceViewItem.h | 5 ++++- PBSourceViewItem.m | 20 +++++++++++++++++++- 8 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 Images/branch.tiff create mode 100644 Images/folder.tiff create mode 100644 Images/remote.tiff create mode 100644 Images/tag.tiff diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index a07e078..11fb6a7 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -96,6 +96,10 @@ F58DB55910566D3500CFDF4A /* PBGitSidebarController.m in Sources */ = {isa = PBXBuildFile; fileRef = F58DB55810566D3500CFDF4A /* PBGitSidebarController.m */; }; F58DB56010566E3900CFDF4A /* PBGitSidebarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F58DB55F10566E3900CFDF4A /* PBGitSidebarView.xib */; }; F58DB5E8105671B600CFDF4A /* PBSourceViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = F58DB5E7105671B600CFDF4A /* PBSourceViewItem.m */; }; + F58DB7711056860900CFDF4A /* branch.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F58DB76D1056860900CFDF4A /* branch.tiff */; }; + F58DB7721056860900CFDF4A /* remote.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F58DB76E1056860900CFDF4A /* remote.tiff */; }; + F58DB7731056860900CFDF4A /* folder.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F58DB76F1056860900CFDF4A /* folder.tiff */; }; + F58DB7741056860900CFDF4A /* tag.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F58DB7701056860900CFDF4A /* tag.tiff */; }; F59116E60E843BB50072CCB1 /* PBGitCommitView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F59116E50E843BB50072CCB1 /* PBGitCommitView.xib */; }; F59116E90E843BCB0072CCB1 /* PBGitCommitController.m in Sources */ = {isa = PBXBuildFile; fileRef = F59116E80E843BCB0072CCB1 /* PBGitCommitController.m */; }; F593DF780E9E636C003A8559 /* PBFileChangesTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = F593DF770E9E636C003A8559 /* PBFileChangesTableView.m */; }; @@ -251,6 +255,10 @@ F58DB55F10566E3900CFDF4A /* PBGitSidebarView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PBGitSidebarView.xib; sourceTree = ""; }; F58DB5E6105671B600CFDF4A /* PBSourceViewItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBSourceViewItem.h; sourceTree = ""; }; F58DB5E7105671B600CFDF4A /* PBSourceViewItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBSourceViewItem.m; sourceTree = ""; }; + F58DB76D1056860900CFDF4A /* branch.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = branch.tiff; path = Images/branch.tiff; sourceTree = ""; }; + F58DB76E1056860900CFDF4A /* remote.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = remote.tiff; path = Images/remote.tiff; sourceTree = ""; }; + F58DB76F1056860900CFDF4A /* folder.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = folder.tiff; path = Images/folder.tiff; sourceTree = ""; }; + F58DB7701056860900CFDF4A /* tag.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = tag.tiff; path = Images/tag.tiff; sourceTree = ""; }; F59116E50E843BB50072CCB1 /* PBGitCommitView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PBGitCommitView.xib; sourceTree = ""; }; F59116E70E843BCB0072CCB1 /* PBGitCommitController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitCommitController.h; sourceTree = ""; }; F59116E80E843BCB0072CCB1 /* PBGitCommitController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitCommitController.m; sourceTree = ""; }; @@ -394,6 +402,10 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( + F58DB76D1056860900CFDF4A /* branch.tiff */, + F58DB76E1056860900CFDF4A /* remote.tiff */, + F58DB76F1056860900CFDF4A /* folder.tiff */, + F58DB7701056860900CFDF4A /* tag.tiff */, 3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */, 3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */, F56ADDD70ED19F9E002AC78F /* AddBranchTemplate.png */, @@ -765,6 +777,10 @@ 47DBDBB10E94F6CA00671A1E /* Updates.png in Resources */, F569AE930F2CBD7C00C2FFA7 /* Credits.html in Resources */, F58DB56010566E3900CFDF4A /* PBGitSidebarView.xib in Resources */, + F58DB7711056860900CFDF4A /* branch.tiff in Resources */, + F58DB7721056860900CFDF4A /* remote.tiff in Resources */, + F58DB7731056860900CFDF4A /* folder.tiff in Resources */, + F58DB7741056860900CFDF4A /* tag.tiff in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Images/branch.tiff b/Images/branch.tiff new file mode 100644 index 0000000000000000000000000000000000000000..dc35b5b8ded3e2bbfb65f98445b79ffe4a030184 GIT binary patch literal 4418 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 literal 0 HcmV?d00001 diff --git a/Images/folder.tiff b/Images/folder.tiff new file mode 100644 index 0000000000000000000000000000000000000000..c6a7b144c9425d22b7a15dea5c8687cc4bc3b859 GIT binary patch literal 4418 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 J0TzK_{{R7CC!zoV literal 0 HcmV?d00001 diff --git a/Images/remote.tiff b/Images/remote.tiff new file mode 100644 index 0000000000000000000000000000000000000000..24f81d4c16d34d8b421ced13ed1f38dcec172848 GIT binary patch literal 4418 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 literal 0 HcmV?d00001 diff --git a/Images/tag.tiff b/Images/tag.tiff new file mode 100644 index 0000000000000000000000000000000000000000..0532a45d36fff7722b88d229d025c93bdfcacb09 GIT binary patch literal 4418 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 literal 0 HcmV?d00001 diff --git a/PBGitSidebarController.m b/PBGitSidebarController.m index 5bb4854..097aade 100644 --- a/PBGitSidebarController.m +++ b/PBGitSidebarController.m @@ -42,10 +42,7 @@ - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item { - if ([item isGroupItem]) - [cell setImage:nil]; - else - [cell setImage:[NSImage imageNamed:@"new_file"]]; + [cell setImage:[item icon]]; } - (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item diff --git a/PBSourceViewItem.h b/PBSourceViewItem.h index c6d5f4e..8b1c160 100644 --- a/PBSourceViewItem.h +++ b/PBSourceViewItem.h @@ -15,6 +15,7 @@ NSString *title; PBGitRevSpecifier *revSpecifier; + PBSourceViewItem *parent; BOOL isGroupItem; } @@ -30,9 +31,11 @@ // to the 'local' branch thing - (void)addRev:(PBGitRevSpecifier *)revSpecifier toPath:(NSArray *)path; +- (NSImage *)icon; + @property(retain) NSString *title; @property(readonly) NSMutableArray *children; @property(assign) BOOL isGroupItem; @property(retain) PBGitRevSpecifier *revSpecifier; - +@property(retain) PBSourceViewItem *parent; @end diff --git a/PBSourceViewItem.m b/PBSourceViewItem.m index cd11084..2f3b416 100644 --- a/PBSourceViewItem.m +++ b/PBSourceViewItem.m @@ -10,7 +10,7 @@ #import "PBGitRevSpecifier.h" @implementation PBSourceViewItem -@synthesize title, isGroupItem, children, revSpecifier; +@synthesize parent, title, isGroupItem, children, revSpecifier; - (id)init { @@ -47,6 +47,7 @@ - (void)addChild:(PBSourceViewItem *)child { [self.children addObject:child]; + child.parent = self; } - (void)addRev:(PBGitRevSpecifier *)theRevSpecifier toPath:(NSArray *)path @@ -79,4 +80,21 @@ return [[revSpecifier description] lastPathComponent]; } +- (NSImage *)icon +{ + if ([self isGroupItem]) + return nil; + + if (self.parent && !self.parent.parent && [self.parent.title isEqualToString:@"Remotes"]) + return [NSImage imageNamed:@"remote"]; + + if (self.parent && !self.parent.parent && [self.parent.title isEqualToString:@"Tags"]) + return [NSImage imageNamed:@"tag"]; + + if ([[self children] count]) + return [NSImage imageNamed:@"folder"]; + + return [NSImage imageNamed:@"branch"]; +} + @end