diff --git a/English.lproj/RepositoryWindow.xib b/English.lproj/RepositoryWindow.xib index 2d9e00a..6145f41 100644 --- a/English.lproj/RepositoryWindow.xib +++ b/English.lproj/RepositoryWindow.xib @@ -50,7 +50,7 @@ A66F2540-5B64-4016-89F7-892563371FAF - NO + YES YES YES YES @@ -60,12 +60,99 @@ YES YES + 41FA1145-D953-446F-B6DF-0230885AB433 + 7A8FEE7B-B273-4AF3-8A22-53A9DAF786FA + FF15EAEC-D5AB-4C6F-9E13-4B62C6692BFC NSToolbarFlexibleSpaceItem NSToolbarSeparatorItem NSToolbarSpaceItem YES + + + 41FA1145-D953-446F-B6DF-0230885AB433 + + Terminal + Open in Terminal + + + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 7A8FEE7B-B273-4AF3-8A22-53A9DAF786FA + + Clone To + Clone Repository To + + + + 268 + {{38, 14}, {40, 25}} + + YES + + -2080244224 + 134217728 + Round Textured + + LucidaGrande + 13 + 1044 + + + -2033958657 + 163 + + NSImage + CloneRepositoryTemplate + + + + 400 + 75 + + + + + + {40, 25} + {40, 25} + YES + YES + 0 + YES + 0 + + + + FF15EAEC-D5AB-4C6F-9E13-4B62C6692BFC + + Reveal + Reveal in Finder + + + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + NSToolbarFlexibleSpaceItem @@ -157,12 +244,18 @@ YES + + + YES + + + YES @@ -268,7 +361,7 @@ {{0, 0}, {1440, 878}} - {213, 129} + {213, 185} {1.79769e+308, 1.79769e+308} GitX 31 @@ -341,6 +434,46 @@ 401 + + + terminalItem + + + + 404 + + + + finderItem + + + + 405 + + + + openInTerminal: + + + + 406 + + + + revealInFinder: + + + + 407 + + + + cloneTo: + + + + 414 + @@ -424,6 +557,9 @@ + + + @@ -478,6 +614,39 @@ + + 402 + + + + + 403 + + + + + 412 + + + YES + + + + + + 410 + + + YES + + + + + + 411 + + + @@ -505,15 +674,19 @@ 397.IBPluginDependency 398.IBPluginDependency 399.IBPluginDependency + 402.IBPluginDependency + 403.IBPluginDependency + 410.IBPluginDependency + 411.IBPluginDependency 5.IBPluginDependency 5.ImportedFromIB2 YES com.apple.InterfaceBuilder.CocoaPlugin - {{484, 718}, {890, 514}} + {{484, 662}, {890, 514}} com.apple.InterfaceBuilder.CocoaPlugin - {{484, 718}, {890, 514}} + {{484, 662}, {890, 514}} {{15, 196}, {850, 418}} @@ -524,7 +697,11 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{621, 1214}, {616, 0}} + {{621, 1007}, {616, 169}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -551,7 +728,7 @@ - 401 + 414 @@ -583,20 +760,24 @@ YES contentSplitView + finderItem progressIndicator sourceListControlsView sourceSplitView splitView statusField + terminalItem YES NSView + NSToolbarItem NSProgressIndicator NSView NSView NSSplitView NSTextField + NSToolbarItem @@ -666,6 +847,22 @@ AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + NSCell NSObject @@ -1165,5 +1362,9 @@ YES ../GitX.xcodeproj 3 + + CloneRepositoryTemplate + {26, 15} + diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index e117e66..6965f59 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -55,6 +55,7 @@ D828A5F21128AE7200F09D11 /* FetchTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D828A5EF1128AE7200F09D11 /* FetchTemplate.png */; }; D828A5F31128AE7200F09D11 /* PullTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D828A5F01128AE7200F09D11 /* PullTemplate.png */; }; D828A5F41128AE7200F09D11 /* PushTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D828A5F11128AE7200F09D11 /* PushTemplate.png */; }; + D828AEEC112F411100F09D11 /* CloneRepositoryTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D828AEEB112F411100F09D11 /* CloneRepositoryTemplate.png */; }; D8357535112640F100DE249D /* PBRemoteProgressSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8C1B77110E875CF009B7F8B /* PBRemoteProgressSheet.xib */; }; D854948610D5C01B0083B917 /* PBCreateBranchSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D854948510D5C01B0083B917 /* PBCreateBranchSheet.m */; }; D85810551127476E007F254B /* StageView.png in Resources */ = {isa = PBXBuildFile; fileRef = D85810541127476E007F254B /* StageView.png */; }; @@ -264,6 +265,7 @@ D828A5EF1128AE7200F09D11 /* FetchTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FetchTemplate.png; path = Images/FetchTemplate.png; sourceTree = ""; }; D828A5F01128AE7200F09D11 /* PullTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PullTemplate.png; path = Images/PullTemplate.png; sourceTree = ""; }; D828A5F11128AE7200F09D11 /* PushTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PushTemplate.png; path = Images/PushTemplate.png; sourceTree = ""; }; + D828AEEB112F411100F09D11 /* CloneRepositoryTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloneRepositoryTemplate.png; path = Images/CloneRepositoryTemplate.png; sourceTree = ""; }; D854948410D5C01B0083B917 /* PBCreateBranchSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBCreateBranchSheet.h; sourceTree = ""; }; D854948510D5C01B0083B917 /* PBCreateBranchSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBCreateBranchSheet.m; sourceTree = ""; }; D854949310D5C3E20083B917 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PBCreateBranchSheet.xib; sourceTree = ""; }; @@ -525,6 +527,7 @@ D828A5EF1128AE7200F09D11 /* FetchTemplate.png */, D828A5F01128AE7200F09D11 /* PullTemplate.png */, D828A5F11128AE7200F09D11 /* PushTemplate.png */, + D828AEEB112F411100F09D11 /* CloneRepositoryTemplate.png */, 3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */, D8A4BD041134AD2900E92D51 /* CherryPickTemplate.png */, D8A4BD051134AD2900E92D51 /* MergeTemplate.png */, @@ -1021,6 +1024,7 @@ D8A4BD071134AD2900E92D51 /* CherryPickTemplate.png in Resources */, D8A4BD081134AD2900E92D51 /* MergeTemplate.png in Resources */, D8A4BD091134AD2900E92D51 /* RebaseTemplate.png in Resources */, + D828AEEC112F411100F09D11 /* CloneRepositoryTemplate.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Images/CloneRepositoryFireworksTemplate.png b/Images/CloneRepositoryFireworksTemplate.png new file mode 100644 index 0000000..e6b5085 Binary files /dev/null and b/Images/CloneRepositoryFireworksTemplate.png differ diff --git a/Images/CloneRepositoryTemplate.png b/Images/CloneRepositoryTemplate.png new file mode 100644 index 0000000..fe61ae1 Binary files /dev/null and b/Images/CloneRepositoryTemplate.png differ diff --git a/PBGitWindowController.h b/PBGitWindowController.h index 223dc6d..ef1ab0d 100644 --- a/PBGitWindowController.h +++ b/PBGitWindowController.h @@ -26,6 +26,9 @@ IBOutlet NSProgressIndicator *progressIndicator; PBViewController* viewController; + + IBOutlet NSToolbarItem *terminalItem; + IBOutlet NSToolbarItem *finderItem; } @property (assign) __weak PBGitRepository *repository; diff --git a/PBGitWindowController.m b/PBGitWindowController.m index 71e279e..207844d 100644 --- a/PBGitWindowController.m +++ b/PBGitWindowController.m @@ -58,6 +58,12 @@ [[statusField cell] setBackgroundStyle:NSBackgroundStyleRaised]; [progressIndicator setUsesThreadedAnimation:YES]; + NSImage *finderImage = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kFinderIcon)]; + [finderItem setImage:finderImage]; + + NSImage *terminalImage = [[NSWorkspace sharedWorkspace] iconForFile:@"/Applications/Utilities/Terminal.app/"]; + [terminalItem setImage:terminalImage]; + [self showWindow:nil]; }