diff --git a/Classes/Controllers/PBGitSidebarController.m b/Classes/Controllers/PBGitSidebarController.m index 70c3afc33..f356808ee 100644 --- a/Classes/Controllers/PBGitSidebarController.m +++ b/Classes/Controllers/PBGitSidebarController.m @@ -64,6 +64,16 @@ - (void)awakeFromNib [self selectStage]; else [self selectCurrentBranch]; + + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(expandCollapseItem:) name:NSOutlineViewItemWillExpandNotification object:sourceView]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(expandCollapseItem:) name:NSOutlineViewItemWillCollapseNotification object:sourceView]; + +} + +- (void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver:self name:NSOutlineViewItemWillExpandNotification object:sourceView]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:NSOutlineViewItemWillCollapseNotification object:sourceView]; } - (void)closeView @@ -250,7 +260,8 @@ - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(PBSourceViewCe { cell.isCheckedOut = [item.revSpecifier isEqual:[repository headRef]]; - [cell setImage:[item icon]]; + NSImage* iconImage = ([cell isHighlighted]) ? [item highlightedIcon] : [item icon]; + [cell setImage:iconImage]; } - (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item @@ -303,6 +314,14 @@ - (void)populateList [sourceView reloadItem:nil reloadChildren:YES]; } +- (void)expandCollapseItem:(NSNotification*)aNotification +{ + NSObject* child = [[aNotification userInfo] valueForKey:@"NSObject"]; + if ([child isKindOfClass:[PBSourceViewItem class]]) { + ((PBSourceViewItem*)child).isExpanded = [aNotification.name isEqualToString:NSOutlineViewItemWillExpandNotification]; + } +} + #pragma mark NSOutlineView Datasource methods - (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item diff --git a/Classes/Views/PBSourceViewItem.h b/Classes/Views/PBSourceViewItem.h index 4d9e6ee06..48c558a73 100644 --- a/Classes/Views/PBSourceViewItem.h +++ b/Classes/Views/PBSourceViewItem.h @@ -27,6 +27,7 @@ - (void)addChild:(PBSourceViewItem *)child; - (void)removeChild:(PBSourceViewItem *)child; +- (NSImage*)iconNamed:(NSString*)name; // This adds the ref to the path, which should match the item's title, // so "refs/heads/pu/pb/sidebar" would have the path [@"pu", @"pb", @"sidebare"] @@ -38,9 +39,11 @@ @property NSString *title; @property(nonatomic, readonly) NSArray *sortedChildren; -@property(assign) BOOL isGroupItem, isUncollapsible; +@property(assign) BOOL isGroupItem, isUncollapsible, isExpanded; @property PBGitRevSpecifier *revSpecifier; @property (assign)PBSourceViewItem *parent; +@property(readonly) NSString *iconName; @property(readonly) NSImage *icon; +@property(readonly) NSImage *highlightedIcon; @end diff --git a/Classes/Views/PBSourceViewItem.m b/Classes/Views/PBSourceViewItem.m index 722a8a49c..919e89769 100644 --- a/Classes/Views/PBSourceViewItem.m +++ b/Classes/Views/PBSourceViewItem.m @@ -18,8 +18,8 @@ @interface PBSourceViewItem () @implementation PBSourceViewItem -@synthesize parent, isGroupItem, revSpecifier, isUncollapsible; -@dynamic icon; +@synthesize parent, isGroupItem, revSpecifier, isUncollapsible, isExpanded; +@dynamic icon, highlightedIcon; - (id)init { @@ -107,8 +107,10 @@ - (void)addRev:(PBGitRevSpecifier *)theRevSpecifier toPath:(NSArray *)path if (!node) { if ([firstTitle isEqualToString:[[theRevSpecifier ref] remoteName]]) node = [PBGitSVRemoteItem remoteItemWithTitle:firstTitle]; - else + else { node = [PBGitSVFolderItem folderItemWithTitle:firstTitle]; + node.isExpanded = [[self title] isEqualToString:@"BRANCHES"]; + } [self addChild:node]; } @@ -130,7 +132,20 @@ - (PBSourceViewItem *)findRev:(PBGitRevSpecifier *)rev - (NSImage *) icon { - return nil; + return [self iconNamed:[self iconName]]; +} + +- (NSImage *) highlightedIcon +{ + return [self iconNamed:[[self iconName] stringByAppendingString:@"Highlighted"]]; +} + +- (NSImage *)iconNamed:(NSString*)name +{ + NSImage* iconImage = [NSImage imageNamed:name]; + [iconImage setSize:NSMakeSize(16,16)]; + [iconImage setCacheMode:NSImageCacheAlways]; + return iconImage; } - (NSString *)title diff --git a/Classes/git/PBGitSVBranchItem.m b/Classes/git/PBGitSVBranchItem.m index 6d5fa14f1..a02bd1ecb 100644 --- a/Classes/git/PBGitSVBranchItem.m +++ b/Classes/git/PBGitSVBranchItem.m @@ -21,13 +21,9 @@ + (id)branchItemWithRevSpec:(PBGitRevSpecifier *)revSpecifier } -- (NSImage *) icon +- (NSString*) iconName { - static NSImage *branchImage = nil; - if (!branchImage) - branchImage = [NSImage imageNamed:@"Branch"]; - - return branchImage; + return @"Branch"; } @end diff --git a/Classes/git/PBGitSVFolderItem.m b/Classes/git/PBGitSVFolderItem.m index 32e0887d6..07199393b 100644 --- a/Classes/git/PBGitSVFolderItem.m +++ b/Classes/git/PBGitSVFolderItem.m @@ -11,7 +11,6 @@ @implementation PBGitSVFolderItem - + (id)folderItemWithTitle:(NSString *)title { PBGitSVFolderItem *item = [self itemWithTitle:title]; @@ -19,17 +18,9 @@ + (id)folderItemWithTitle:(NSString *)title return item; } - -- (NSImage *) icon +- (NSString*) iconName { - static NSImage *folderImage = nil; - if (!folderImage) { - //folderImage = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kGenericFolderIcon)]; - folderImage = [NSImage imageNamed:@"Folder"]; - [folderImage setSize:NSMakeSize(16,16)]; - } - - return folderImage; + return (self.isExpanded) ? @"Folder" : @"FolderClosed"; } @end diff --git a/Classes/git/PBGitSVOtherRevItem.m b/Classes/git/PBGitSVOtherRevItem.m index a41cbca88..8c68b0dcb 100644 --- a/Classes/git/PBGitSVOtherRevItem.m +++ b/Classes/git/PBGitSVOtherRevItem.m @@ -21,14 +21,9 @@ + (id)otherItemWithRevSpec:(PBGitRevSpecifier *)revSpecifier return item; } - -- (NSImage *) icon +- (NSString*) iconName { - static NSImage *otherRevImage = nil; - if (!otherRevImage) - otherRevImage = [NSImage imageNamed:@"Branch"]; - - return otherRevImage; + return @"Branch"; } @end diff --git a/Classes/git/PBGitSVRemoteBranchItem.m b/Classes/git/PBGitSVRemoteBranchItem.m index 7bc7068b2..2091bd65c 100644 --- a/Classes/git/PBGitSVRemoteBranchItem.m +++ b/Classes/git/PBGitSVRemoteBranchItem.m @@ -20,14 +20,9 @@ + (id)remoteBranchItemWithRevSpec:(PBGitRevSpecifier *)revSpecifier return item; } - -- (NSImage *) icon +- (NSString*) iconName { - static NSImage *remoteBranchImage = nil; - if (!remoteBranchImage) - remoteBranchImage = [NSImage imageNamed:@"RemoteBranch"]; - - return remoteBranchImage; + return @"RemoteBranch"; } @end diff --git a/Classes/git/PBGitSVRemoteItem.m b/Classes/git/PBGitSVRemoteItem.m index 8cdef9c77..f3189059c 100644 --- a/Classes/git/PBGitSVRemoteItem.m +++ b/Classes/git/PBGitSVRemoteItem.m @@ -20,19 +20,11 @@ + (id)remoteItemWithTitle:(NSString *)title return item; } - -- (NSImage *) icon +- (NSString*) iconName { - static NSImage *networkImage = nil; - if (!networkImage) { - networkImage = [NSImage imageNamed:@"Remote"]; - [networkImage setSize:NSMakeSize(16,16)]; - } - - return networkImage; + return @"Remote"; } - - (PBGitRef *) ref { return [PBGitRef refFromString:[kGitXRemoteRefPrefix stringByAppendingString:self.title]]; diff --git a/Classes/git/PBGitSVStageItem.m b/Classes/git/PBGitSVStageItem.m index 3ae17259d..fce9006e0 100644 --- a/Classes/git/PBGitSVStageItem.m +++ b/Classes/git/PBGitSVStageItem.m @@ -20,13 +20,9 @@ + (id) stageItem } -- (NSImage *) icon +- (NSString*) iconName { - static NSImage *stageImage = nil; - if (!stageImage) - stageImage = [NSImage imageNamed:@"StageView"]; - - return stageImage; + return @"StageView"; } @end diff --git a/Classes/git/PBGitSVTagItem.m b/Classes/git/PBGitSVTagItem.m index ddffb536f..6b2da1b9a 100644 --- a/Classes/git/PBGitSVTagItem.m +++ b/Classes/git/PBGitSVTagItem.m @@ -20,14 +20,9 @@ + (id)tagItemWithRevSpec:(PBGitRevSpecifier *)revSpecifier return item; } - -- (NSImage *) icon +- (NSString*) iconName { - static NSImage *tagImage = nil; - if (!tagImage) - tagImage = [NSImage imageNamed:@"Tag.png"]; - - return tagImage; + return @"Tag"; } @end diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index 324dcae55..9edd6f989 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -19,8 +19,6 @@ 4A5D75C214A9A90500DF6C68 /* gitx.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D757E14A9A90500DF6C68 /* gitx.icns */; }; 4A5D75C614A9A90500DF6C68 /* AddBranchTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D758314A9A90500DF6C68 /* AddBranchTemplate.png */; }; 4A5D75C814A9A90500DF6C68 /* AddLabelTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D758514A9A90500DF6C68 /* AddLabelTemplate.png */; }; - 4A5D75CA14A9A90500DF6C68 /* AddRemote.acorn in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D758714A9A90500DF6C68 /* AddRemote.acorn */; }; - 4A5D75CB14A9A90500DF6C68 /* AddRemote.png in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D758814A9A90500DF6C68 /* AddRemote.png */; }; 4A5D75CC14A9A90500DF6C68 /* AddRemoteBranchFireworksTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D758914A9A90500DF6C68 /* AddRemoteBranchFireworksTemplate.png */; }; 4A5D75CD14A9A90500DF6C68 /* AddRemoteBranchTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D758A14A9A90500DF6C68 /* AddRemoteBranchTemplate.png */; }; 4A5D75CE14A9A90500DF6C68 /* Branch.png in Resources */ = {isa = PBXBuildFile; fileRef = 4A5D758B14A9A90500DF6C68 /* Branch.png */; }; @@ -183,9 +181,17 @@ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 911112370E5A097800BF76B4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 911112360E5A097800BF76B4 /* Security.framework */; }; 913D5E500E55645900CECEA2 /* gitx in Resources */ = {isa = PBXBuildFile; fileRef = 913D5E490E55644600CECEA2 /* gitx */; }; + BC0444AD17648CC900353E6D /* AddRemoteTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0444AC17648CC900353E6D /* AddRemoteTemplate.png */; }; + BC0444B817648D0200353E6D /* BranchHighlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0444B717648D0200353E6D /* BranchHighlighted.png */; }; + BC0444BA17648DA800353E6D /* FolderHighlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0444B917648DA700353E6D /* FolderHighlighted.png */; }; + BC0444BC17648DB400353E6D /* FolderClosed.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0444BB17648DB400353E6D /* FolderClosed.png */; }; + BC0444BE17648DC100353E6D /* FolderClosedHighlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0444BD17648DC100353E6D /* FolderClosedHighlighted@2x.png */; }; + BC0444C017648E6700353E6D /* RemoteHighlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0444BF17648E6700353E6D /* RemoteHighlighted.png */; }; + BC0444C217648E7D00353E6D /* RemoteBranchHighlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0444C117648E7D00353E6D /* RemoteBranchHighlighted.png */; }; + BC0444C417648EA400353E6D /* StageViewHighlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0444C317648EA400353E6D /* StageViewHighlighted.png */; }; + BC0444C617648EBE00353E6D /* TagHighlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0444C517648EBE00353E6D /* TagHighlighted.png */; }; BC067C64175A0EC400D86938 /* AddBranchTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C63175A0EC400D86938 /* AddBranchTemplate@2x.png */; }; BC067C6F175A0ECD00D86938 /* AddLabelTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C6E175A0ECD00D86938 /* AddLabelTemplate@2x.png */; }; - BC067C71175A100600D86938 /* AddRemote@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C70175A100600D86938 /* AddRemote@2x.png */; }; BC067C73175A12A400D86938 /* CherryPickTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C72175A12A400D86938 /* CherryPickTemplate@2x.png */; }; BC067C75175A149000D86938 /* MergeTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C74175A149000D86938 /* MergeTemplate@2x.png */; }; BC067C77175A16A500D86938 /* RebaseTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC067C76175A16A500D86938 /* RebaseTemplate@2x.png */; }; @@ -199,6 +205,24 @@ BC0AAF78175915F400F4EE9A /* Remote@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF76175915F400F4EE9A /* Remote@2x.png */; }; BC0AAF7B175916D700F4EE9A /* Folder.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF79175916D700F4EE9A /* Folder.png */; }; BC0AAF7C175916D700F4EE9A /* Folder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC0AAF7A175916D700F4EE9A /* Folder@2x.png */; }; + BC77578C176766B60048BB48 /* BranchTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC77578B176766B60048BB48 /* BranchTemplate@2x.png */; }; + BC775797176766C60048BB48 /* RemoteBranchTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BC775796176766C60048BB48 /* RemoteBranchTemplate@2x.png */; }; + BCFBAF6917636C4E004D727A /* RemoteHighlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF6817636C4E004D727A /* RemoteHighlighted@2x.png */; }; + BCFBAF7617637118004D727A /* FolderClosed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF7317637118004D727A /* FolderClosed@2x.png */; }; + BCFBAF7717637118004D727A /* FolderClosedHighlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF7417637118004D727A /* FolderClosedHighlighted.png */; }; + BCFBAF7817637118004D727A /* FolderHighlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF7517637118004D727A /* FolderHighlighted@2x.png */; }; + BCFBAF7A17637406004D727A /* BranchHighlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF7917637406004D727A /* BranchHighlighted@2x.png */; }; + BCFBAF7C17637511004D727A /* RemoteBranchHighlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF7B17637511004D727A /* RemoteBranchHighlighted@2x.png */; }; + BCFBAF7E17637611004D727A /* DetailViewTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF7D17637611004D727A /* DetailViewTemplate@2x.png */; }; + BCFBAF8017637E22004D727A /* TreeViewTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF7F17637E1E004D727A /* TreeViewTemplate@2x.png */; }; + BCFBAF8217637F0B004D727A /* TreeViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF8117637F07004D727A /* TreeViewTemplate.png */; }; + BCFBAF8417646DCF004D727A /* StageViewHighlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF8317646DCB004D727A /* StageViewHighlighted@2x.png */; }; + BCFBAF8717647695004D727A /* Tag@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF851764768E004D727A /* Tag@2x.png */; }; + BCFBAF8817647695004D727A /* TagHighlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF8617647692004D727A /* TagHighlighted@2x.png */; }; + BCFBAF8B17647881004D727A /* PullTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF891764787B004D727A /* PullTemplate@2x.png */; }; + BCFBAF8C17647881004D727A /* PushTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF8A1764787E004D727A /* PushTemplate@2x.png */; }; + BCFBAF8E17647A80004D727A /* FetchTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF8D17647A7C004D727A /* FetchTemplate@2x.png */; }; + BCFBAF9417648640004D727A /* AddRemoteTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFBAF931764863C004D727A /* AddRemoteTemplate@2x.png */; }; D87127011229A21C00012334 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D87127001229A21C00012334 /* QuartzCore.framework */; }; D89E9B141218BA260097A90B /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D89E9AB21218A9DA0097A90B /* ScriptingBridge.framework */; }; D8E3B2B810DC9FB2001096A3 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */; }; @@ -357,7 +381,6 @@ 4A5D758514A9A90500DF6C68 /* AddLabelTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AddLabelTemplate.png; sourceTree = ""; }; 4A5D758614A9A90500DF6C68 /* AddLabelTemplate.psd */ = {isa = PBXFileReference; lastKnownFileType = file; path = AddLabelTemplate.psd; sourceTree = ""; }; 4A5D758714A9A90500DF6C68 /* AddRemote.acorn */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = AddRemote.acorn; sourceTree = ""; }; - 4A5D758814A9A90500DF6C68 /* AddRemote.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AddRemote.png; sourceTree = ""; }; 4A5D758914A9A90500DF6C68 /* AddRemoteBranchFireworksTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AddRemoteBranchFireworksTemplate.png; sourceTree = ""; }; 4A5D758A14A9A90500DF6C68 /* AddRemoteBranchTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AddRemoteBranchTemplate.png; sourceTree = ""; }; 4A5D758B14A9A90500DF6C68 /* Branch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Branch.png; sourceTree = ""; }; @@ -621,9 +644,17 @@ 8D1107320486CEB800E47090 /* GitX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GitX.app; sourceTree = BUILT_PRODUCTS_DIR; }; 911112360E5A097800BF76B4 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = ""; }; 913D5E490E55644600CECEA2 /* gitx */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gitx; sourceTree = BUILT_PRODUCTS_DIR; }; + BC0444AC17648CC900353E6D /* AddRemoteTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AddRemoteTemplate.png; sourceTree = ""; }; + BC0444B717648D0200353E6D /* BranchHighlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = BranchHighlighted.png; sourceTree = ""; }; + BC0444B917648DA700353E6D /* FolderHighlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = FolderHighlighted.png; sourceTree = ""; }; + BC0444BB17648DB400353E6D /* FolderClosed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = FolderClosed.png; sourceTree = ""; }; + BC0444BD17648DC100353E6D /* FolderClosedHighlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "FolderClosedHighlighted@2x.png"; sourceTree = ""; }; + BC0444BF17648E6700353E6D /* RemoteHighlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RemoteHighlighted.png; sourceTree = ""; }; + BC0444C117648E7D00353E6D /* RemoteBranchHighlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RemoteBranchHighlighted.png; sourceTree = ""; }; + BC0444C317648EA400353E6D /* StageViewHighlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = StageViewHighlighted.png; sourceTree = ""; }; + BC0444C517648EBE00353E6D /* TagHighlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = TagHighlighted.png; sourceTree = ""; }; BC067C63175A0EC400D86938 /* AddBranchTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AddBranchTemplate@2x.png"; sourceTree = ""; }; BC067C6E175A0ECD00D86938 /* AddLabelTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AddLabelTemplate@2x.png"; sourceTree = ""; }; - BC067C70175A100600D86938 /* AddRemote@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AddRemote@2x.png"; sourceTree = ""; }; BC067C72175A12A400D86938 /* CherryPickTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "CherryPickTemplate@2x.png"; sourceTree = ""; }; BC067C74175A149000D86938 /* MergeTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "MergeTemplate@2x.png"; sourceTree = ""; }; BC067C76175A16A500D86938 /* RebaseTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RebaseTemplate@2x.png"; sourceTree = ""; }; @@ -637,6 +668,24 @@ BC0AAF76175915F400F4EE9A /* Remote@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Remote@2x.png"; sourceTree = ""; }; BC0AAF79175916D700F4EE9A /* Folder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Folder.png; sourceTree = ""; }; BC0AAF7A175916D700F4EE9A /* Folder@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Folder@2x.png"; sourceTree = ""; }; + BC77578B176766B60048BB48 /* BranchTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BranchTemplate@2x.png"; sourceTree = ""; }; + BC775796176766C60048BB48 /* RemoteBranchTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RemoteBranchTemplate@2x.png"; sourceTree = ""; }; + BCFBAF6817636C4E004D727A /* RemoteHighlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RemoteHighlighted@2x.png"; sourceTree = ""; }; + BCFBAF7317637118004D727A /* FolderClosed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "FolderClosed@2x.png"; sourceTree = ""; }; + BCFBAF7417637118004D727A /* FolderClosedHighlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = FolderClosedHighlighted.png; sourceTree = ""; }; + BCFBAF7517637118004D727A /* FolderHighlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "FolderHighlighted@2x.png"; sourceTree = ""; }; + BCFBAF7917637406004D727A /* BranchHighlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BranchHighlighted@2x.png"; sourceTree = ""; }; + BCFBAF7B17637511004D727A /* RemoteBranchHighlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RemoteBranchHighlighted@2x.png"; sourceTree = ""; }; + BCFBAF7D17637611004D727A /* DetailViewTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DetailViewTemplate@2x.png"; sourceTree = ""; }; + BCFBAF7F17637E1E004D727A /* TreeViewTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "TreeViewTemplate@2x.png"; sourceTree = ""; }; + BCFBAF8117637F07004D727A /* TreeViewTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = TreeViewTemplate.png; sourceTree = ""; }; + BCFBAF8317646DCB004D727A /* StageViewHighlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "StageViewHighlighted@2x.png"; sourceTree = ""; }; + BCFBAF851764768E004D727A /* Tag@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Tag@2x.png"; sourceTree = ""; }; + BCFBAF8617647692004D727A /* TagHighlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "TagHighlighted@2x.png"; sourceTree = ""; }; + BCFBAF891764787B004D727A /* PullTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "PullTemplate@2x.png"; sourceTree = ""; }; + BCFBAF8A1764787E004D727A /* PushTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "PushTemplate@2x.png"; sourceTree = ""; }; + BCFBAF8D17647A7C004D727A /* FetchTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "FetchTemplate@2x.png"; sourceTree = ""; }; + BCFBAF931764863C004D727A /* AddRemoteTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AddRemoteTemplate@2x.png"; sourceTree = ""; }; D87127001229A21C00012334 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; D89E9AB21218A9DA0097A90B /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = System/Library/Frameworks/ScriptingBridge.framework; sourceTree = SDKROOT; }; D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = /System/Library/Frameworks/ScriptingBridge.framework; sourceTree = ""; }; @@ -774,20 +823,24 @@ 4A5D758114A9A90500DF6C68 /* Images */ = { isa = PBXGroup; children = ( + BC77578B176766B60048BB48 /* BranchTemplate@2x.png */, + BC775796176766C60048BB48 /* RemoteBranchTemplate@2x.png */, 4A5D758214A9A90500DF6C68 /* add_branch.psd */, - BC067C63175A0EC400D86938 /* AddBranchTemplate@2x.png */, 4A5D758314A9A90500DF6C68 /* AddBranchTemplate.png */, + BC067C63175A0EC400D86938 /* AddBranchTemplate@2x.png */, 4A5D758414A9A90500DF6C68 /* AddBranchTemplate.psd */, - BC067C6E175A0ECD00D86938 /* AddLabelTemplate@2x.png */, 4A5D758514A9A90500DF6C68 /* AddLabelTemplate.png */, + BC067C6E175A0ECD00D86938 /* AddLabelTemplate@2x.png */, 4A5D758614A9A90500DF6C68 /* AddLabelTemplate.psd */, 4A5D758714A9A90500DF6C68 /* AddRemote.acorn */, - BC067C70175A100600D86938 /* AddRemote@2x.png */, - 4A5D758814A9A90500DF6C68 /* AddRemote.png */, 4A5D758914A9A90500DF6C68 /* AddRemoteBranchFireworksTemplate.png */, 4A5D758A14A9A90500DF6C68 /* AddRemoteBranchTemplate.png */, - BC0AAF6B17590F5B00F4EE9A /* Branch@2x.png */, + BC0444AC17648CC900353E6D /* AddRemoteTemplate.png */, + BCFBAF931764863C004D727A /* AddRemoteTemplate@2x.png */, 4A5D758B14A9A90500DF6C68 /* Branch.png */, + BC0AAF6B17590F5B00F4EE9A /* Branch@2x.png */, + BC0444B717648D0200353E6D /* BranchHighlighted.png */, + BCFBAF7917637406004D727A /* BranchHighlighted@2x.png */, 4A5D758C14A9A90500DF6C68 /* branch.tiff */, 4A5D758D14A9A90500DF6C68 /* CherryPickTemplate.png */, BC067C72175A12A400D86938 /* CherryPickTemplate@2x.png */, @@ -798,13 +851,23 @@ 4A5D759214A9A90500DF6C68 /* deleted_file.png */, BC0AAF6F1759140C00F4EE9A /* deleted_file@2x.png */, 4A5D759314A9A90500DF6C68 /* DetailViewTemplate.png */, + BCFBAF7D17637611004D727A /* DetailViewTemplate@2x.png */, + BCFBAF8117637F07004D727A /* TreeViewTemplate.png */, + BCFBAF7F17637E1E004D727A /* TreeViewTemplate@2x.png */, 4A5D759414A9A90500DF6C68 /* empty_file.png */, BC0AAF711759141400F4EE9A /* empty_file@2x.png */, 4A5D759514A9A90500DF6C68 /* FetchTemplate.png */, + BCFBAF8D17647A7C004D727A /* FetchTemplate@2x.png */, 4A5D759614A9A90500DF6C68 /* file_template.psd */, 4A5D759714A9A90500DF6C68 /* folder.tiff */, BC0AAF79175916D700F4EE9A /* Folder.png */, BC0AAF7A175916D700F4EE9A /* Folder@2x.png */, + BC0444B917648DA700353E6D /* FolderHighlighted.png */, + BCFBAF7517637118004D727A /* FolderHighlighted@2x.png */, + BC0444BB17648DB400353E6D /* FolderClosed.png */, + BCFBAF7317637118004D727A /* FolderClosed@2x.png */, + BCFBAF7417637118004D727A /* FolderClosedHighlighted.png */, + BC0444BD17648DC100353E6D /* FolderClosedHighlighted@2x.png */, 4A5D759814A9A90500DF6C68 /* gitx_icon.psd */, 4A5D759914A9A90500DF6C68 /* HistoryViewTemplate.png */, 4A5D759A14A9A90500DF6C68 /* HistoryViewTemplate.psd */, @@ -819,10 +882,12 @@ 4A5D75A214A9A90500DF6C68 /* PullPopUpFireworksTemplate.png */, 4A5D75A314A9A90500DF6C68 /* PullPopUpTemplate.png */, 4A5D75A414A9A90500DF6C68 /* PullTemplate.png */, + BCFBAF891764787B004D727A /* PullTemplate@2x.png */, 4A5D75A514A9A90500DF6C68 /* PushFireworksTemplate.png */, 4A5D75A614A9A90500DF6C68 /* PushPopUpFireworksTemplate.png */, 4A5D75A714A9A90500DF6C68 /* PushPopUpTemplate.png */, 4A5D75A814A9A90500DF6C68 /* PushTemplate.png */, + BCFBAF8A1764787E004D727A /* PushTemplate@2x.png */, 4A5D75A914A9A90500DF6C68 /* RebaseFireworksTemplate.png */, 4A5D75AA14A9A90500DF6C68 /* RebasePopUpFireworksTemplate.png */, 4A5D75AB14A9A90500DF6C68 /* RebasePopUpTemplate.png */, @@ -831,13 +896,22 @@ 4A5D75AD14A9A90500DF6C68 /* remote.tiff */, BC0AAF75175915F400F4EE9A /* Remote.png */, BC0AAF76175915F400F4EE9A /* Remote@2x.png */, - BC0AAF6D17590F6400F4EE9A /* RemoteBranch@2x.png */, + BC0444BF17648E6700353E6D /* RemoteHighlighted.png */, + BCFBAF6817636C4E004D727A /* RemoteHighlighted@2x.png */, 4A5D75AE14A9A90500DF6C68 /* RemoteBranch.png */, + BC0AAF6D17590F6400F4EE9A /* RemoteBranch@2x.png */, + BC0444C117648E7D00353E6D /* RemoteBranchHighlighted.png */, + BCFBAF7B17637511004D727A /* RemoteBranchHighlighted@2x.png */, 4A5D75AF14A9A90500DF6C68 /* rewindImage.pdf */, 4A5D75B014A9A90500DF6C68 /* site_download_background.png */, - BC0AAF6017590F5100F4EE9A /* StageView@2x.png */, 4A5D75B114A9A90500DF6C68 /* StageView.png */, + BC0AAF6017590F5100F4EE9A /* StageView@2x.png */, + BC0444C317648EA400353E6D /* StageViewHighlighted.png */, + BCFBAF8317646DCB004D727A /* StageViewHighlighted@2x.png */, 4A5D75B214A9A90500DF6C68 /* Tag.png */, + BCFBAF851764768E004D727A /* Tag@2x.png */, + BC0444C517648EBE00353E6D /* TagHighlighted.png */, + BCFBAF8617647692004D727A /* TagHighlighted@2x.png */, 4A5D75B314A9A90500DF6C68 /* tag.tiff */, ); path = Images; @@ -1326,8 +1400,6 @@ 4A5D75C214A9A90500DF6C68 /* gitx.icns in Resources */, 4A5D75C614A9A90500DF6C68 /* AddBranchTemplate.png in Resources */, 4A5D75C814A9A90500DF6C68 /* AddLabelTemplate.png in Resources */, - 4A5D75CA14A9A90500DF6C68 /* AddRemote.acorn in Resources */, - 4A5D75CB14A9A90500DF6C68 /* AddRemote.png in Resources */, 4A5D75CC14A9A90500DF6C68 /* AddRemoteBranchFireworksTemplate.png in Resources */, 4A5D75CD14A9A90500DF6C68 /* AddRemoteBranchTemplate.png in Resources */, 4A5D75CE14A9A90500DF6C68 /* Branch.png in Resources */, @@ -1397,10 +1469,36 @@ BC0AAF7C175916D700F4EE9A /* Folder@2x.png in Resources */, BC067C64175A0EC400D86938 /* AddBranchTemplate@2x.png in Resources */, BC067C6F175A0ECD00D86938 /* AddLabelTemplate@2x.png in Resources */, - BC067C71175A100600D86938 /* AddRemote@2x.png in Resources */, BC067C73175A12A400D86938 /* CherryPickTemplate@2x.png in Resources */, BC067C75175A149000D86938 /* MergeTemplate@2x.png in Resources */, BC067C77175A16A500D86938 /* RebaseTemplate@2x.png in Resources */, + BCFBAF6917636C4E004D727A /* RemoteHighlighted@2x.png in Resources */, + BCFBAF7617637118004D727A /* FolderClosed@2x.png in Resources */, + BCFBAF7717637118004D727A /* FolderClosedHighlighted.png in Resources */, + BCFBAF7817637118004D727A /* FolderHighlighted@2x.png in Resources */, + BCFBAF7A17637406004D727A /* BranchHighlighted@2x.png in Resources */, + BCFBAF7C17637511004D727A /* RemoteBranchHighlighted@2x.png in Resources */, + BCFBAF7E17637611004D727A /* DetailViewTemplate@2x.png in Resources */, + BCFBAF8017637E22004D727A /* TreeViewTemplate@2x.png in Resources */, + BCFBAF8217637F0B004D727A /* TreeViewTemplate.png in Resources */, + BCFBAF8417646DCF004D727A /* StageViewHighlighted@2x.png in Resources */, + BCFBAF8717647695004D727A /* Tag@2x.png in Resources */, + BCFBAF8817647695004D727A /* TagHighlighted@2x.png in Resources */, + BCFBAF8B17647881004D727A /* PullTemplate@2x.png in Resources */, + BCFBAF8C17647881004D727A /* PushTemplate@2x.png in Resources */, + BCFBAF8E17647A80004D727A /* FetchTemplate@2x.png in Resources */, + BCFBAF9417648640004D727A /* AddRemoteTemplate@2x.png in Resources */, + BC0444AD17648CC900353E6D /* AddRemoteTemplate.png in Resources */, + BC0444B817648D0200353E6D /* BranchHighlighted.png in Resources */, + BC0444BA17648DA800353E6D /* FolderHighlighted.png in Resources */, + BC0444BC17648DB400353E6D /* FolderClosed.png in Resources */, + BC0444BE17648DC100353E6D /* FolderClosedHighlighted@2x.png in Resources */, + BC0444C017648E6700353E6D /* RemoteHighlighted.png in Resources */, + BC0444C217648E7D00353E6D /* RemoteBranchHighlighted.png in Resources */, + BC0444C417648EA400353E6D /* StageViewHighlighted.png in Resources */, + BC0444C617648EBE00353E6D /* TagHighlighted.png in Resources */, + BC77578C176766B60048BB48 /* BranchTemplate@2x.png in Resources */, + BC775797176766C60048BB48 /* RemoteBranchTemplate@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Resources/Images/AddBranchTemplate.png b/Resources/Images/AddBranchTemplate.png index dbb750d1c..05116d43d 100644 Binary files a/Resources/Images/AddBranchTemplate.png and b/Resources/Images/AddBranchTemplate.png differ diff --git a/Resources/Images/AddBranchTemplate@2x.png b/Resources/Images/AddBranchTemplate@2x.png index bd2ed4298..709257a81 100644 Binary files a/Resources/Images/AddBranchTemplate@2x.png and b/Resources/Images/AddBranchTemplate@2x.png differ diff --git a/Resources/Images/AddLabelTemplate.png b/Resources/Images/AddLabelTemplate.png index 3c45fe923..ad053d4fd 100644 Binary files a/Resources/Images/AddLabelTemplate.png and b/Resources/Images/AddLabelTemplate.png differ diff --git a/Resources/Images/AddLabelTemplate@2x.png b/Resources/Images/AddLabelTemplate@2x.png index b1be99460..dab73582d 100644 Binary files a/Resources/Images/AddLabelTemplate@2x.png and b/Resources/Images/AddLabelTemplate@2x.png differ diff --git a/Resources/Images/AddRemote.png b/Resources/Images/AddRemote.png deleted file mode 100644 index 8576b2ab0..000000000 Binary files a/Resources/Images/AddRemote.png and /dev/null differ diff --git a/Resources/Images/AddRemote@2x.png b/Resources/Images/AddRemote@2x.png deleted file mode 100644 index 6520998c3..000000000 Binary files a/Resources/Images/AddRemote@2x.png and /dev/null differ diff --git a/Resources/Images/AddRemoteTemplate.png b/Resources/Images/AddRemoteTemplate.png new file mode 100644 index 000000000..fcb5925e8 Binary files /dev/null and b/Resources/Images/AddRemoteTemplate.png differ diff --git a/Resources/Images/AddRemoteTemplate@2x.png b/Resources/Images/AddRemoteTemplate@2x.png new file mode 100644 index 000000000..f7671df33 Binary files /dev/null and b/Resources/Images/AddRemoteTemplate@2x.png differ diff --git a/Resources/Images/Branch.png b/Resources/Images/Branch.png index c8982f4a3..eac24494f 100644 Binary files a/Resources/Images/Branch.png and b/Resources/Images/Branch.png differ diff --git a/Resources/Images/Branch@2x.png b/Resources/Images/Branch@2x.png index 74d4ad774..44378ddb1 100644 Binary files a/Resources/Images/Branch@2x.png and b/Resources/Images/Branch@2x.png differ diff --git a/Resources/Images/BranchHighlighted.png b/Resources/Images/BranchHighlighted.png new file mode 100644 index 000000000..fbda23134 Binary files /dev/null and b/Resources/Images/BranchHighlighted.png differ diff --git a/Resources/Images/BranchHighlighted@2x.png b/Resources/Images/BranchHighlighted@2x.png new file mode 100644 index 000000000..87436c7cd Binary files /dev/null and b/Resources/Images/BranchHighlighted@2x.png differ diff --git a/Resources/Images/BranchHighlightedTemplate@2x.png b/Resources/Images/BranchHighlightedTemplate@2x.png new file mode 100644 index 000000000..8eb435b30 Binary files /dev/null and b/Resources/Images/BranchHighlightedTemplate@2x.png differ diff --git a/Resources/Images/BranchTemplate.png b/Resources/Images/BranchTemplate.png new file mode 100644 index 000000000..83fdf3236 Binary files /dev/null and b/Resources/Images/BranchTemplate.png differ diff --git a/Resources/Images/BranchTemplate@2x.png b/Resources/Images/BranchTemplate@2x.png new file mode 100644 index 000000000..f531cb536 Binary files /dev/null and b/Resources/Images/BranchTemplate@2x.png differ diff --git a/Resources/Images/Buttons.pxm b/Resources/Images/Buttons.pxm deleted file mode 100644 index d51584c1c..000000000 Binary files a/Resources/Images/Buttons.pxm and /dev/null differ diff --git a/Resources/Images/Buttons@2x.pxm b/Resources/Images/Buttons@2x.pxm new file mode 100644 index 000000000..0a478cae7 Binary files /dev/null and b/Resources/Images/Buttons@2x.pxm differ diff --git a/Resources/Images/CherryPickTemplate.png b/Resources/Images/CherryPickTemplate.png index a0f895423..4cf241f66 100644 Binary files a/Resources/Images/CherryPickTemplate.png and b/Resources/Images/CherryPickTemplate.png differ diff --git a/Resources/Images/CherryPickTemplate@2x.png b/Resources/Images/CherryPickTemplate@2x.png index acebe1d1c..7941e89bb 100644 Binary files a/Resources/Images/CherryPickTemplate@2x.png and b/Resources/Images/CherryPickTemplate@2x.png differ diff --git a/Resources/Images/DetailViewTemplate.png b/Resources/Images/DetailViewTemplate.png index 8beeda036..b703f2e8d 100644 Binary files a/Resources/Images/DetailViewTemplate.png and b/Resources/Images/DetailViewTemplate.png differ diff --git a/Resources/Images/DetailViewTemplate@2x.png b/Resources/Images/DetailViewTemplate@2x.png new file mode 100644 index 000000000..fbb0b060e Binary files /dev/null and b/Resources/Images/DetailViewTemplate@2x.png differ diff --git a/Resources/Images/FetchTemplate.png b/Resources/Images/FetchTemplate.png index fc5d3261d..4342d4b1c 100644 Binary files a/Resources/Images/FetchTemplate.png and b/Resources/Images/FetchTemplate.png differ diff --git a/Resources/Images/FetchTemplate@2x.png b/Resources/Images/FetchTemplate@2x.png new file mode 100644 index 000000000..372f12a37 Binary files /dev/null and b/Resources/Images/FetchTemplate@2x.png differ diff --git a/Resources/Images/Folder.png b/Resources/Images/Folder.png index 4db6c1278..5f4039666 100644 Binary files a/Resources/Images/Folder.png and b/Resources/Images/Folder.png differ diff --git a/Resources/Images/Folder@2x.png b/Resources/Images/Folder@2x.png index 4382a50b6..b250daf66 100644 Binary files a/Resources/Images/Folder@2x.png and b/Resources/Images/Folder@2x.png differ diff --git a/Resources/Images/FolderClosed.png b/Resources/Images/FolderClosed.png new file mode 100644 index 000000000..2621f8573 Binary files /dev/null and b/Resources/Images/FolderClosed.png differ diff --git a/Resources/Images/FolderClosed@2x.png b/Resources/Images/FolderClosed@2x.png new file mode 100644 index 000000000..d63a90be9 Binary files /dev/null and b/Resources/Images/FolderClosed@2x.png differ diff --git a/Resources/Images/FolderClosedHighlighted.png b/Resources/Images/FolderClosedHighlighted.png new file mode 100644 index 000000000..a1aa2054e Binary files /dev/null and b/Resources/Images/FolderClosedHighlighted.png differ diff --git a/Resources/Images/FolderClosedHighlighted@2x.png b/Resources/Images/FolderClosedHighlighted@2x.png new file mode 100644 index 000000000..7f60b81f9 Binary files /dev/null and b/Resources/Images/FolderClosedHighlighted@2x.png differ diff --git a/Resources/Images/FolderHighlighted.png b/Resources/Images/FolderHighlighted.png new file mode 100644 index 000000000..a9cb52d68 Binary files /dev/null and b/Resources/Images/FolderHighlighted.png differ diff --git a/Resources/Images/FolderHighlighted@2x.png b/Resources/Images/FolderHighlighted@2x.png new file mode 100644 index 000000000..f3caae46a Binary files /dev/null and b/Resources/Images/FolderHighlighted@2x.png differ diff --git a/Resources/Images/Icons@2x.pxm b/Resources/Images/Icons@2x.pxm new file mode 100644 index 000000000..0c9820a68 Binary files /dev/null and b/Resources/Images/Icons@2x.pxm differ diff --git a/Resources/Images/Images.pxm b/Resources/Images/Images.pxm deleted file mode 100644 index 2ac75e1b4..000000000 Binary files a/Resources/Images/Images.pxm and /dev/null differ diff --git a/Resources/Images/MergeTemplate.png b/Resources/Images/MergeTemplate.png index d12f1d833..9bcf1b037 100644 Binary files a/Resources/Images/MergeTemplate.png and b/Resources/Images/MergeTemplate.png differ diff --git a/Resources/Images/MergeTemplate@2x.png b/Resources/Images/MergeTemplate@2x.png index 7ae5de011..6433f7496 100644 Binary files a/Resources/Images/MergeTemplate@2x.png and b/Resources/Images/MergeTemplate@2x.png differ diff --git a/Resources/Images/PullTemplate.png b/Resources/Images/PullTemplate.png index 00c20fc21..a72ce2247 100644 Binary files a/Resources/Images/PullTemplate.png and b/Resources/Images/PullTemplate.png differ diff --git a/Resources/Images/PullTemplate@2x.png b/Resources/Images/PullTemplate@2x.png new file mode 100644 index 000000000..6aa02fc91 Binary files /dev/null and b/Resources/Images/PullTemplate@2x.png differ diff --git a/Resources/Images/PushTemplate.png b/Resources/Images/PushTemplate.png index 5170db0fd..353cea7e7 100644 Binary files a/Resources/Images/PushTemplate.png and b/Resources/Images/PushTemplate.png differ diff --git a/Resources/Images/PushTemplate@2x.png b/Resources/Images/PushTemplate@2x.png new file mode 100644 index 000000000..76b8fa087 Binary files /dev/null and b/Resources/Images/PushTemplate@2x.png differ diff --git a/Resources/Images/RebaseTemplate.png b/Resources/Images/RebaseTemplate.png index c0ebc22fa..746f8985a 100644 Binary files a/Resources/Images/RebaseTemplate.png and b/Resources/Images/RebaseTemplate.png differ diff --git a/Resources/Images/RebaseTemplate@2x.png b/Resources/Images/RebaseTemplate@2x.png index 2a939f953..6a78e32eb 100644 Binary files a/Resources/Images/RebaseTemplate@2x.png and b/Resources/Images/RebaseTemplate@2x.png differ diff --git a/Resources/Images/Remote.png b/Resources/Images/Remote.png index d965b73e9..6f8e58efc 100644 Binary files a/Resources/Images/Remote.png and b/Resources/Images/Remote.png differ diff --git a/Resources/Images/Remote@2x.png b/Resources/Images/Remote@2x.png index dfb8c59c1..b928e9b38 100644 Binary files a/Resources/Images/Remote@2x.png and b/Resources/Images/Remote@2x.png differ diff --git a/Resources/Images/RemoteBranch.png b/Resources/Images/RemoteBranch.png index 3f15d3661..ada3c242e 100644 Binary files a/Resources/Images/RemoteBranch.png and b/Resources/Images/RemoteBranch.png differ diff --git a/Resources/Images/RemoteBranch@2x.png b/Resources/Images/RemoteBranch@2x.png index a0a9dcee3..d35d33306 100644 Binary files a/Resources/Images/RemoteBranch@2x.png and b/Resources/Images/RemoteBranch@2x.png differ diff --git a/Resources/Images/RemoteBranchHighlighted.png b/Resources/Images/RemoteBranchHighlighted.png new file mode 100644 index 000000000..9b699a727 Binary files /dev/null and b/Resources/Images/RemoteBranchHighlighted.png differ diff --git a/Resources/Images/RemoteBranchHighlighted@2x.png b/Resources/Images/RemoteBranchHighlighted@2x.png new file mode 100644 index 000000000..0a89beaf3 Binary files /dev/null and b/Resources/Images/RemoteBranchHighlighted@2x.png differ diff --git a/Resources/Images/RemoteBranchTemplate@2x.png b/Resources/Images/RemoteBranchTemplate@2x.png new file mode 100644 index 000000000..a83cd8fcd Binary files /dev/null and b/Resources/Images/RemoteBranchTemplate@2x.png differ diff --git a/Resources/Images/RemoteHighlighted.png b/Resources/Images/RemoteHighlighted.png new file mode 100644 index 000000000..f6c26898f Binary files /dev/null and b/Resources/Images/RemoteHighlighted.png differ diff --git a/Resources/Images/RemoteHighlighted@2x.png b/Resources/Images/RemoteHighlighted@2x.png new file mode 100644 index 000000000..a515a14da Binary files /dev/null and b/Resources/Images/RemoteHighlighted@2x.png differ diff --git a/Resources/Images/StageView.png b/Resources/Images/StageView.png index d1ff44b3b..97a071a5a 100644 Binary files a/Resources/Images/StageView.png and b/Resources/Images/StageView.png differ diff --git a/Resources/Images/StageView@2x.png b/Resources/Images/StageView@2x.png index 0369e5d68..e8955be95 100644 Binary files a/Resources/Images/StageView@2x.png and b/Resources/Images/StageView@2x.png differ diff --git a/Resources/Images/StageViewHighlighted.png b/Resources/Images/StageViewHighlighted.png new file mode 100644 index 000000000..9a9149dcc Binary files /dev/null and b/Resources/Images/StageViewHighlighted.png differ diff --git a/Resources/Images/StageViewHighlighted@2x.png b/Resources/Images/StageViewHighlighted@2x.png new file mode 100644 index 000000000..63db10925 Binary files /dev/null and b/Resources/Images/StageViewHighlighted@2x.png differ diff --git a/Resources/Images/StageViewTemplate.png b/Resources/Images/StageViewTemplate.png new file mode 100644 index 000000000..97a071a5a Binary files /dev/null and b/Resources/Images/StageViewTemplate.png differ diff --git a/Resources/Images/StageViewTemplate@2x.png b/Resources/Images/StageViewTemplate@2x.png new file mode 100644 index 000000000..e8955be95 Binary files /dev/null and b/Resources/Images/StageViewTemplate@2x.png differ diff --git a/Resources/Images/Tag.png b/Resources/Images/Tag.png index 2f3e96acf..c1a1c35d3 100644 Binary files a/Resources/Images/Tag.png and b/Resources/Images/Tag.png differ diff --git a/Resources/Images/Tag@2x.png b/Resources/Images/Tag@2x.png new file mode 100644 index 000000000..d50d672ab Binary files /dev/null and b/Resources/Images/Tag@2x.png differ diff --git a/Resources/Images/TagHighlighted.png b/Resources/Images/TagHighlighted.png new file mode 100644 index 000000000..072be6015 Binary files /dev/null and b/Resources/Images/TagHighlighted.png differ diff --git a/Resources/Images/TagHighlighted@2x.png b/Resources/Images/TagHighlighted@2x.png new file mode 100644 index 000000000..55066ee1b Binary files /dev/null and b/Resources/Images/TagHighlighted@2x.png differ diff --git a/Resources/Images/TreeTemplate@2x.png b/Resources/Images/TreeTemplate@2x.png new file mode 100644 index 000000000..13b808d70 Binary files /dev/null and b/Resources/Images/TreeTemplate@2x.png differ diff --git a/Resources/Images/TreeViewTemplate.png b/Resources/Images/TreeViewTemplate.png new file mode 100644 index 000000000..a8792f332 Binary files /dev/null and b/Resources/Images/TreeViewTemplate.png differ diff --git a/Resources/Images/TreeViewTemplate@2x.png b/Resources/Images/TreeViewTemplate@2x.png new file mode 100644 index 000000000..0a4ec959a Binary files /dev/null and b/Resources/Images/TreeViewTemplate@2x.png differ diff --git a/Resources/Images/deleted_file.png b/Resources/Images/deleted_file.png index 2b888b6f5..88d771bd4 100644 Binary files a/Resources/Images/deleted_file.png and b/Resources/Images/deleted_file.png differ diff --git a/Resources/Images/deleted_file@2x.png b/Resources/Images/deleted_file@2x.png index 2c4d15dde..bbe57f0cf 100644 Binary files a/Resources/Images/deleted_file@2x.png and b/Resources/Images/deleted_file@2x.png differ diff --git a/Resources/Images/empty_file.png b/Resources/Images/empty_file.png index edcc9a528..d565c12ac 100644 Binary files a/Resources/Images/empty_file.png and b/Resources/Images/empty_file.png differ diff --git a/Resources/Images/empty_file@2x.png b/Resources/Images/empty_file@2x.png index d79f00312..27dd42beb 100644 Binary files a/Resources/Images/empty_file@2x.png and b/Resources/Images/empty_file@2x.png differ diff --git a/Resources/Images/new_file.png b/Resources/Images/new_file.png index 805c767d6..66d948d12 100644 Binary files a/Resources/Images/new_file.png and b/Resources/Images/new_file.png differ diff --git a/Resources/Images/new_file@2x.png b/Resources/Images/new_file@2x.png index ed51bd486..591c69cab 100644 Binary files a/Resources/Images/new_file@2x.png and b/Resources/Images/new_file@2x.png differ diff --git a/Resources/XIBs/PBGitHistoryView.xib b/Resources/XIBs/PBGitHistoryView.xib index 1e242364d..e4905a095 100644 --- a/Resources/XIBs/PBGitHistoryView.xib +++ b/Resources/XIBs/PBGitHistoryView.xib @@ -2,9 +2,9 @@ 1060 - 12D78 + 12E55 3084 - 1187.37 + 1187.39 626.00 3084 @@ -120,7 +120,7 @@ 292 - {{267, 3}, {71, 25}} + {{266, 3}, {71, 25}} @@ -147,9 +147,10 @@ 2 + 32 NSImage - NSPathTemplate + TreeViewTemplate Tree View @@ -381,7 +382,7 @@ {991, 130} - + YES NO YES @@ -394,11 +395,10 @@ - + -2147483392 {{-26, 0}, {16, 17}} - @@ -544,7 +544,7 @@ - d MMMM y HH:mm + d MMM y HH:mm NO @@ -724,7 +724,7 @@ {955, 147} - + 133808 @@ -964,6 +964,7 @@ {955, 233} + 1 @@ -1038,7 +1039,7 @@ {231, 233} - + YES NO YES @@ -1131,7 +1132,7 @@ {233, 235} - + 133138 @@ -2870,6 +2871,7 @@ GitXTextFieldCell com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3432,9 +3434,9 @@ {128, 128} {128, 128} {128, 128} - {13, 10} {21, 16} {128, 128} + {128, 128} diff --git a/Resources/XIBs/PBGitSidebarView.xib b/Resources/XIBs/PBGitSidebarView.xib index e9e993f06..09fa3d5c1 100644 --- a/Resources/XIBs/PBGitSidebarView.xib +++ b/Resources/XIBs/PBGitSidebarView.xib @@ -2,9 +2,9 @@ 1060 - 12D78 + 12E55 3084 - 1187.37 + 1187.39 626.00 com.apple.InterfaceBuilder.CocoaPlugin @@ -59,6 +59,7 @@ 4352 {153, 354} + YES NO @@ -169,6 +170,7 @@ {153, 354} + @@ -179,6 +181,7 @@ -2147483392 {{137, 1}, {15, 338}} + NO @@ -190,6 +193,7 @@ -2147483392 {{-100, -100}, {196, 15}} + NO 1 @@ -200,6 +204,7 @@ {153, 354} + 133648 @@ -213,6 +218,7 @@ {153, 354} + NSView @@ -223,8 +229,9 @@ 268 - {{89, 1}, {161, 25}} + {{94, 1}, {161, 25}} + YES @@ -238,14 +245,16 @@ + 38 NSImage - AddRemote + AddRemoteTemplate Add remote 0 + 38 NSImage FetchTemplate @@ -255,21 +264,21 @@ 0 + 38 NSImage PullTemplate - Pull from default remote 2 0 + 38 NSImage PushTemplate - Push to remote 3 0 @@ -286,6 +295,7 @@ 268 {{9, 1}, {35, 25}} + YES @@ -364,6 +374,7 @@ {367, 28} + NSView @@ -603,6 +614,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -612,9 +624,95 @@ - 51 + 55 + + + + + PBGitSidebarController + PBViewController + + fetchPullPushAction: + id + + + fetchPullPushAction: + + fetchPullPushAction: + id + + + + NSPopUpButton + NSSegmentedControl + NSView + NSOutlineView + NSWindow + + + + actionButton + NSPopUpButton + + + remoteControls + NSSegmentedControl + + + sourceListControlsView + NSView + + + sourceView + NSOutlineView + + + window + NSWindow + + + + IBProjectSource + ./Classes/PBGitSidebarController.h + + + + PBIconAndTextCell + NSTextFieldCell + + IBProjectSource + ./Classes/PBIconAndTextCell.h + + + + PBSourceViewCell + PBIconAndTextCell + + IBProjectSource + ./Classes/PBSourceViewCell.h + + + + PBViewController + NSViewController + + refresh: + id + + + refresh: + + refresh: + id + + + + IBProjectSource + ./Classes/PBViewController.h + + + - 0 IBCocoaFramework @@ -624,7 +722,7 @@ YES 3 - {32, 32} + {128, 128} {128, 128} {15, 15} {11, 11} diff --git a/actions.pxm b/actions.pxm new file mode 100644 index 000000000..eb3bd822e Binary files /dev/null and b/actions.pxm differ diff --git a/html/images/added.png b/html/images/added.png index 32e6852b6..d17ad335f 100644 Binary files a/html/images/added.png and b/html/images/added.png differ diff --git a/html/images/icons.pxm b/html/images/icons.pxm deleted file mode 100644 index e0ce880eb..000000000 Binary files a/html/images/icons.pxm and /dev/null differ diff --git a/html/images/modified.png b/html/images/modified.png index 4ea1e7174..ebb8806a1 100644 Binary files a/html/images/modified.png and b/html/images/modified.png differ diff --git a/html/images/removed.png b/html/images/removed.png index e35000942..221b911b6 100644 Binary files a/html/images/removed.png and b/html/images/removed.png differ diff --git a/html/images/renamed.png b/html/images/renamed.png index cad41481a..e1a0afa6b 100644 Binary files a/html/images/renamed.png and b/html/images/renamed.png differ