kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add menu and toolbar changes from cyberfox

Browse Source
This commit is contained in:
André Berg
2009-10-26 16:26:52 +01:00
parent b580c03795
commit 2b0000ca23
8 changed files with 958 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Crystal_Clear_action_2downarrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

Crystal_Clear_action_2uparrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.9 KiB

Crystal_Clear_action_reload.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

English.lproj/RepositoryWindow.xib
+696 -9
View File
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9F33</string>
<string key="IBDocument.SystemVersion">9L31a</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.34</string>
<string key="IBDocument.HIToolboxVersion">352.00</string>
<string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="3"/>
@@ -42,7 +42,471 @@
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">GitX</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<object class="NSToolbar" key="NSViewClass" id="145008030">
<object class="NSMutableString" key="NSToolbarIdentifier">
<characters key="NS.bytes">27A2F5CF-4BCA-4353-B806-0E0F13EB2FFD</characters>
</object>
<nil key="NSToolbarDelegate"/>
<bool key="NSToolbarPrefersToBeShown">YES</bool>
<bool key="NSToolbarShowsBaselineSeparator">YES</bool>
<bool key="NSToolbarAllowsUserCustomization">YES</bool>
<bool key="NSToolbarAutosavesConfiguration">YES</bool>
<int key="NSToolbarDisplayMode">1</int>
<int key="NSToolbarSizeMode">1</int>
<object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>1E431E79-1591-49E7-9E17-49497CA4622A</string>
<string>2C3809A1-DBAB-456F-B222-A133DAC6C633</string>
<string>5D2A15BF-26CE-4E1A-972B-2428B7334A86</string>
<string>7FFB691C-2D2F-49A9-997F-AE1AE8BFF3F1</string>
<string>86360841-A2B1-4802-845A-AE424521FE99</string>
<string>99C2C9EB-AE16-42A9-BE52-46CE903E9AF9</string>
<string>E8AEE3B4-5661-4310-B27C-B158726D7F15</string>
<string>NSToolbarFlexibleSpaceItem</string>
<string>NSToolbarSeparatorItem</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSToolbarItem" id="865090311">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">1E431E79-1591-49E7-9E17-49497CA4622A</characters>
</object>
<string key="NSToolbarItemLabel">View</string>
<string key="NSToolbarItemPaletteLabel">View selector</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSSegmentedControl" key="NSToolbarItemView" id="680923877">
<nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {87, 25}}</string>
<int key="NSTag">3</int>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="485405534">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<object class="NSFont" key="NSSupport" id="1066349001">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.300000e+01</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="680923877"/>
<object class="NSMutableArray" key="NSSegmentImages">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSSegmentItem">
<double key="NSSegmentItemWidth">4.000000e+01</double>
<object class="NSCustomResource" key="NSSegmentItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">HistoryViewTemplate</string>
</object>
<string key="NSSegmentItemLabel"/>
<string key="NSSegmentItemTooltip">History View</string>
<int key="NSSegmentItemImageScaling">0</int>
</object>
<object class="NSSegmentItem">
<double key="NSSegmentItemWidth">4.000000e+01</double>
<object class="NSCustomResource" key="NSSegmentItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">CommitViewTemplate</string>
</object>
<string key="NSSegmentItemLabel"/>
<string key="NSSegmentItemTooltip">Commit View</string>
<bool key="NSSegmentItemSelected">YES</bool>
<int key="NSSegmentItemImageScaling">0</int>
</object>
</object>
<int key="NSSelectedSegment">1</int>
<int key="NSSegmentStyle">2</int>
</object>
</object>
<nil key="NSToolbarItemImage"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{87, 25}</string>
<string key="NSToolbarItemMaxSize">{87, 25}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">3</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="421760452">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">2C3809A1-DBAB-456F-B222-A133DAC6C633</characters>
</object>
<string key="NSToolbarItemLabel">Fetch</string>
<string key="NSToolbarItemPaletteLabel">Fetch</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">RmV0Y2ggdGhlIGxhdGVzdCBjaGFuZ2VzIGZyb20gdGhlIHJlbW90ZSByZXBvc2l0b3J5LCBidXQgZG9u
J3QgbWVyZ2UgdGhlbSBpbnRvIGxvY2FsIGNoYW5nZXMuA</string>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Crystal_Clear_action_reload</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
<string key="NSToolbarItemMaxSize">{0, 0}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">0</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="277347675">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">5D2A15BF-26CE-4E1A-972B-2428B7334A86</characters>
</object>
<string key="NSToolbarItemLabel">Push</string>
<string key="NSToolbarItemPaletteLabel">Push</string>
<string key="NSToolbarItemToolTip">Push local commits up to the remote repository.</string>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Crystal_Clear_action_2uparrow</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
<string key="NSToolbarItemMaxSize">{0, 0}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">0</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="962098313">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">7FFB691C-2D2F-49A9-997F-AE1AE8BFF3F1</characters>
</object>
<string key="NSToolbarItemLabel">Search</string>
<object class="NSMutableString" key="NSToolbarItemPaletteLabel">
<characters key="NS.bytes">Search Field</characters>
</object>
<nil key="NSToolbarItemToolTip"/>
<object class="NSSearchField" key="NSToolbarItemView" id="956449339">
<nil key="NSNextResponder"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{0, 14}, {183, 22}}</string>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="63687217">
<int key="NSCellFlags">343014976</int>
<int key="NSCellFlags2">268436480</int>
<reference key="NSSupport" ref="1066349001"/>
<string key="NSPlaceholderString">Subject</string>
<reference key="NSControlView" ref="956449339"/>
<bool key="NSDrawsBackground">YES</bool>
<int key="NSTextBezelStyle">1</int>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
<object class="NSButtonCell" key="NSSearchButtonCell">
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">search</string>
<string key="NSAction">_searchFieldSearch:</string>
<reference key="NSTarget" ref="63687217"/>
<reference key="NSControlView" ref="956449339"/>
<int key="NSButtonFlags">138690815</int>
<int key="NSButtonFlags2">0</int>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<object class="NSButtonCell" key="NSCancelButtonCell">
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">clear</string>
<object class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableDictionary">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>AXDescription</string>
<string>NSAccessibilityEncodedAttributesValueType</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>cancel</string>
<integer value="1" id="9"/>
</object>
</object>
</object>
<string key="NSAction">_searchFieldCancel:</string>
<reference key="NSTarget" ref="63687217"/>
<reference key="NSControlView" ref="956449339"/>
<int key="NSButtonFlags">138690815</int>
<int key="NSButtonFlags2">0</int>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<int key="NSMaximumRecents">255</int>
<bytes key="NSSearchFieldFlags">CAAAAA</bytes>
</object>
</object>
<nil key="NSToolbarItemImage"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{183, 22}</string>
<string key="NSToolbarItemMaxSize">{183, 22}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">0</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="260461289">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">86360841-A2B1-4802-845A-AE424521FE99</characters>
</object>
<string key="NSToolbarItemLabel">Create Branch</string>
<string key="NSToolbarItemPaletteLabel">Create Branch</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSButton" key="NSToolbarItemView" id="452659168">
<nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{21, 14}, {40, 25}}</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="913477460">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="1066349001"/>
<reference key="NSControlView" ref="452659168"/>
<int key="NSButtonFlags">-2033434369</int>
<int key="NSButtonFlags2">163</int>
<object class="NSCustomResource" key="NSNormalImage" id="596236785">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">AddBranchTemplate</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
</object>
<reference key="NSToolbarItemImage" ref="596236785"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{40, 25}</string>
<string key="NSToolbarItemMaxSize">{40, 25}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">0</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="811510833">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">99C2C9EB-AE16-42A9-BE52-46CE903E9AF9</characters>
</object>
<string key="NSToolbarItemLabel">Branch</string>
<string key="NSToolbarItemPaletteLabel">Branch</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSPopUpButton" key="NSToolbarItemView" id="940778637">
<nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {134, 26}}</string>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="973289212">
<int key="NSCellFlags">-2076049856</int>
<int key="NSCellFlags2">2048</int>
<reference key="NSSupport" ref="1066349001"/>
<reference key="NSControlView" ref="940778637"/>
<int key="NSButtonFlags">109199615</int>
<int key="NSButtonFlags2">1</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
<object class="NSMenuItem" key="NSMenuItem" id="764096872">
<reference key="NSMenu" ref="595829333"/>
<string key="NSTitle">master</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
<object class="NSCustomResource" key="NSOnImage" id="447787266">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSMenuCheckmark</string>
</object>
<object class="NSCustomResource" key="NSMixedImage" id="151948248">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSMenuMixedState</string>
</object>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="973289212"/>
</object>
<bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="595829333">
<string key="NSTitle">OtherViews</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="764096872"/>
<object class="NSMenuItem" id="912705626">
<reference key="NSMenu" ref="595829333"/>
<string key="NSTitle">Item 2</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447787266"/>
<reference key="NSMixedImage" ref="151948248"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="973289212"/>
</object>
<object class="NSMenuItem" id="995339045">
<reference key="NSMenu" ref="595829333"/>
<string key="NSTitle">Item 3</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447787266"/>
<reference key="NSMixedImage" ref="151948248"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="973289212"/>
</object>
</object>
</object>
<int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">2</int>
</object>
</object>
<nil key="NSToolbarItemImage"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{134, 26}</string>
<string key="NSToolbarItemMaxSize">{134, 26}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">0</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="1035589866">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">E8AEE3B4-5661-4310-B27C-B158726D7F15</characters>
</object>
<string key="NSToolbarItemLabel">Rebase</string>
<string key="NSToolbarItemPaletteLabel">Rebase</string>
<string key="NSToolbarItemToolTip">Pull the latest version from the remote repository, and replay local changes on top of it.</string>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Crystal_Clear_action_2downarrow</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
<string key="NSToolbarItemMaxSize">{0, 0}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">0</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarFlexibleSpaceItem" id="316966217">
<string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
<string key="NSToolbarItemLabel"/>
<string key="NSToolbarItemPaletteLabel">Flexible Space</string>
<nil key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<nil key="NSToolbarItemImage"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{1, 5}</string>
<string key="NSToolbarItemMaxSize">{20000, 32}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">-1</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447787266"/>
<reference key="NSMixedImage" ref="151948248"/>
</object>
</object>
<object class="NSToolbarSeparatorItem" id="455236631">
<string key="NSToolbarItemIdentifier">NSToolbarSeparatorItem</string>
<string key="NSToolbarItemLabel"/>
<string key="NSToolbarItemPaletteLabel">Separator</string>
<nil key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<nil key="NSToolbarItemImage"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{12, 5}</string>
<string key="NSToolbarItemMaxSize">{12, 1000}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">-1</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447787266"/>
<reference key="NSMixedImage" ref="151948248"/>
</object>
</object>
</object>
</object>
<object class="NSArray" key="NSToolbarIBAllowedItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="865090311"/>
<reference ref="455236631"/>
<reference ref="811510833"/>
<reference ref="316966217"/>
<reference ref="962098313"/>
<reference ref="260461289"/>
<reference ref="1035589866"/>
<reference ref="277347675"/>
<reference ref="421760452"/>
</object>
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="865090311"/>
<reference ref="455236631"/>
<reference ref="811510833"/>
<reference ref="260461289"/>
<reference ref="316966217"/>
<reference ref="962098313"/>
<reference ref="1035589866"/>
<reference ref="277347675"/>
<reference ref="421760452"/>
</object>
<object class="NSMutableArray" key="NSToolbarIBSelectableItems">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="751230759">
@@ -52,7 +516,7 @@
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</string>
<string key="NSMinSize">{213, 179}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSFrameAutosaveName">GitX</string>
</object>
@@ -112,6 +576,7 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="751230759"/>
<reference ref="145008030"/>
</object>
<reference key="parent" ref="1002"/>
<string key="objectName">Window</string>
@@ -124,6 +589,171 @@
</object>
<reference key="parent" ref="491121796"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">351</int>
<reference key="object" ref="145008030"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="455236631"/>
<reference ref="421760452"/>
<reference ref="277347675"/>
<reference ref="1035589866"/>
<reference ref="811510833"/>
<reference ref="260461289"/>
<reference ref="865090311"/>
<reference ref="962098313"/>
<reference ref="316966217"/>
</object>
<reference key="parent" ref="491121796"/>
<string key="objectName">History Toolbar</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">352</int>
<reference key="object" ref="455236631"/>
<reference key="parent" ref="145008030"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">353</int>
<reference key="object" ref="421760452"/>
<reference key="parent" ref="145008030"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">354</int>
<reference key="object" ref="277347675"/>
<reference key="parent" ref="145008030"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">355</int>
<reference key="object" ref="1035589866"/>
<reference key="parent" ref="145008030"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">356</int>
<reference key="object" ref="811510833"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="940778637"/>
</object>
<reference key="parent" ref="145008030"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">357</int>
<reference key="object" ref="260461289"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="452659168"/>
</object>
<reference key="parent" ref="145008030"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">358</int>
<reference key="object" ref="865090311"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="680923877"/>
</object>
<reference key="parent" ref="145008030"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">359</int>
<reference key="object" ref="962098313"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="956449339"/>
</object>
<reference key="parent" ref="145008030"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">360</int>
<reference key="object" ref="316966217"/>
<reference key="parent" ref="145008030"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">361</int>
<reference key="object" ref="956449339"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="63687217"/>
</object>
<reference key="parent" ref="962098313"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">362</int>
<reference key="object" ref="63687217"/>
<reference key="parent" ref="956449339"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">363</int>
<reference key="object" ref="680923877"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="485405534"/>
</object>
<reference key="parent" ref="865090311"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">364</int>
<reference key="object" ref="485405534"/>
<reference key="parent" ref="680923877"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">365</int>
<reference key="object" ref="452659168"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="913477460"/>
</object>
<reference key="parent" ref="260461289"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">366</int>
<reference key="object" ref="913477460"/>
<reference key="parent" ref="452659168"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">367</int>
<reference key="object" ref="940778637"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="973289212"/>
</object>
<reference key="parent" ref="811510833"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">368</int>
<reference key="object" ref="973289212"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="595829333"/>
</object>
<reference key="parent" ref="940778637"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">369</int>
<reference key="object" ref="595829333"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="764096872"/>
<reference ref="912705626"/>
<reference ref="995339045"/>
</object>
<reference key="parent" ref="973289212"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">370</int>
<reference key="object" ref="764096872"/>
<reference key="parent" ref="595829333"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">371</int>
<reference key="object" ref="912705626"/>
<reference key="parent" ref="595829333"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">372</int>
<reference key="object" ref="995339045"/>
<reference key="parent" ref="595829333"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -142,6 +772,31 @@
<string>3.windowTemplate.hasMinSize</string>
<string>3.windowTemplate.maxSize</string>
<string>3.windowTemplate.minSize</string>
<string>351.IBEditorWindowLastContentRect</string>
<string>351.IBPluginDependency</string>
<string>351.editorWindowContentRectSynchronizationRect</string>
<string>353.IBPluginDependency</string>
<string>354.IBPluginDependency</string>
<string>355.IBPluginDependency</string>
<string>356.IBPluginDependency</string>
<string>357.IBPluginDependency</string>
<string>358.IBPluginDependency</string>
<string>359.IBPluginDependency</string>
<string>361.IBPluginDependency</string>
<string>362.IBPluginDependency</string>
<string>363.IBPluginDependency</string>
<string>364.IBPluginDependency</string>
<string>365.IBAttributePlaceholdersKey</string>
<string>365.IBPluginDependency</string>
<string>366.IBPluginDependency</string>
<string>367.IBPluginDependency</string>
<string>368.IBPluginDependency</string>
<string>369.IBEditorWindowLastContentRect</string>
<string>369.IBPluginDependency</string>
<string>369.editorWindowContentRectSynchronizationRect</string>
<string>370.IBPluginDependency</string>
<string>371.IBPluginDependency</string>
<string>372.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string>
</object>
@@ -150,15 +805,47 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilderKit</string>
<string>com.apple.InterfaceBuilderKit</string>
<string>{{1047, 395}, {850, 418}}</string>
<string>{{1047, 395}, {850, 418}}</string>
<integer value="1" id="9"/>
<string>{{64, 65}, {850, 418}}</string>
<string>{{64, 65}, {850, 418}}</string>
<reference ref="9"/>
<reference ref="9"/>
<string>{{15, 196}, {850, 418}}</string>
<boolean value="NO"/>
<reference ref="9"/>
<string>{3.40282e+38, 3.40282e+38}</string>
<string>{213, 107}</string>
<string>{{204, 463}, {616, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{132, 614}, {616, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
<string key="name">ToolTip</string>
<reference key="object" ref="452659168"/>
<string key="toolTip">Create Branch</string>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{725, 616}, {134, 63}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{848, 458}, {116, 63}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
</object>
@@ -183,7 +870,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">350</int>
<int key="maxID">372</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
GitX.xcodeproj/project.pbxproj
+12
View File
@@ -31,6 +31,9 @@
47DBDBCA0E95016F00671A1E /* PBNSURLPathUserDefaultsTransfomer.m in Sources */ = {isa = PBXBuildFile; fileRef = 47DBDBC90E95016F00671A1E /* PBNSURLPathUserDefaultsTransfomer.m */; };
654D16E8108C6CA6008D960C /* PBQLOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = F513085A0E0740F2000C8BCD /* PBQLOutlineView.m */; };
65C77FA0108BF560003BD3B5 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65C77F9F108BF560003BD3B5 /* Quartz.framework */; };
66D5992E1094012B000D397A /* Crystal_Clear_action_2downarrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 66D5992B1094012B000D397A /* Crystal_Clear_action_2downarrow.png */; };
66D5992F1094012B000D397A /* Crystal_Clear_action_2uparrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 66D5992C1094012B000D397A /* Crystal_Clear_action_2uparrow.png */; };
66D599301094012B000D397A /* Crystal_Clear_action_reload.png in Resources */ = {isa = PBXBuildFile; fileRef = 66D5992D1094012B000D397A /* Crystal_Clear_action_reload.png */; };
770B37ED0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 770B37EC0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel */; };
77C8280E06725ACE000B614F /* ApplicationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77C8280C06725ACE000B614F /* ApplicationController.m */; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
@@ -191,6 +194,9 @@
654D18EF108C9597008D960C /* Install.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Install.xcconfig; sourceTree = "<group>"; };
654D18F6108C96CB008D960C /* install.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = install.sh; sourceTree = "<group>"; };
65C77F9F108BF560003BD3B5 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
66D5992B1094012B000D397A /* Crystal_Clear_action_2downarrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Crystal_Clear_action_2downarrow.png; sourceTree = "<group>"; };
66D5992C1094012B000D397A /* Crystal_Clear_action_2uparrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Crystal_Clear_action_2uparrow.png; sourceTree = "<group>"; };
66D5992D1094012B000D397A /* Crystal_Clear_action_reload.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Crystal_Clear_action_reload.png; sourceTree = "<group>"; };
770B37EC0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = GitTest_DataModel.xcdatamodel; sourceTree = "<group>"; };
77C82804067257F0000B614F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
77C8280B06725ACE000B614F /* ApplicationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationController.h; sourceTree = "<group>"; };
@@ -434,6 +440,9 @@
32CA4F630368D1EE00C91783 /* GitX_Prefix.pch */,
29B97316FDCFA39411CA2CEA /* main.m */,
F5E92A220E88569500056E75 /* new_file.png */,
66D5992B1094012B000D397A /* Crystal_Clear_action_2downarrow.png */,
66D5992C1094012B000D397A /* Crystal_Clear_action_2uparrow.png */,
66D5992D1094012B000D397A /* Crystal_Clear_action_reload.png */,
);
name = "Other Sources";
sourceTree = "<group>";
@@ -843,6 +852,9 @@
47DBDB6A0E94EF6500671A1E /* Preferences.xib in Resources */,
47DBDBB10E94F6CA00671A1E /* Updates.png in Resources */,
F569AE930F2CBD7C00C2FFA7 /* Credits.html in Resources */,
66D5992E1094012B000D397A /* Crystal_Clear_action_2downarrow.png in Resources */,
66D5992F1094012B000D397A /* Crystal_Clear_action_2uparrow.png in Resources */,
66D599301094012B000D397A /* Crystal_Clear_action_reload.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
PBGitHistoryView.xib
+160 -18
View File
@@ -8,8 +8,8 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="237"/>
<integer value="46"/>
<integer value="113"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -913,7 +913,7 @@
<string key="NSWindowContentMaxSize">{1000, 102}</string>
<string key="NSWindowContentMinSize">{346, 102}</string>
<object class="NSView" key="NSWindowView" id="562356688">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1022,7 +1022,6 @@
</object>
</object>
<string key="NSFrameSize">{346, 102}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{346, 124}</string>
@@ -1044,9 +1043,12 @@
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>1E431E79-1591-49E7-9E17-49497CA4622A</string>
<string>2C3809A1-DBAB-456F-B222-A133DAC6C633</string>
<string>5D2A15BF-26CE-4E1A-972B-2428B7334A86</string>
<string>7FFB691C-2D2F-49A9-997F-AE1AE8BFF3F1</string>
<string>86360841-A2B1-4802-845A-AE424521FE99</string>
<string>99C2C9EB-AE16-42A9-BE52-46CE903E9AF9</string>
<string>E8AEE3B4-5661-4310-B27C-B158726D7F15</string>
<string>NSToolbarFlexibleSpaceItem</string>
<string>NSToolbarSeparatorItem</string>
</object>
@@ -1060,9 +1062,10 @@
<string key="NSToolbarItemPaletteLabel">View selector</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSSegmentedControl" key="NSToolbarItemView" id="764711234">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {87, 25}}</string>
<reference key="NSSuperview"/>
<int key="NSTag">3</int>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="266464607">
@@ -1109,6 +1112,51 @@
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="93942157">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">2C3809A1-DBAB-456F-B222-A133DAC6C633</characters>
</object>
<string key="NSToolbarItemLabel">Fetch</string>
<string key="NSToolbarItemPaletteLabel">Fetch</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">RmV0Y2ggdGhlIGxhdGVzdCBjaGFuZ2VzIGZyb20gdGhlIHJlbW90ZSByZXBvc2l0b3J5LCBidXQgZG9u
J3QgbWVyZ2UgdGhlbSBpbnRvIGxvY2FsIGNoYW5nZXMuA</string>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Crystal_Clear_action_reload</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
<string key="NSToolbarItemMaxSize">{0, 0}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">0</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="428123990">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">5D2A15BF-26CE-4E1A-972B-2428B7334A86</characters>
</object>
<string key="NSToolbarItemLabel">Push</string>
<string key="NSToolbarItemPaletteLabel">Push</string>
<string key="NSToolbarItemToolTip">Push local commits up to the remote repository.</string>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Crystal_Clear_action_2uparrow</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
<string key="NSToolbarItemMaxSize">{0, 0}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">0</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="479447135">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">7FFB691C-2D2F-49A9-997F-AE1AE8BFF3F1</characters>
@@ -1119,9 +1167,10 @@
</object>
<nil key="NSToolbarItemToolTip"/>
<object class="NSSearchField" key="NSToolbarItemView" id="845792858">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{0, 14}, {183, 22}}</string>
<reference key="NSSuperview"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="449521666">
<int key="NSCellFlags">343014976</int>
@@ -1198,9 +1247,10 @@
<string key="NSToolbarItemPaletteLabel">Create Branch</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSButton" key="NSToolbarItemView" id="733802043">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{21, 14}, {40, 25}}</string>
<reference key="NSSuperview"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="596537926">
<int key="NSCellFlags">-2080244224</int>
@@ -1239,9 +1289,10 @@
<string key="NSToolbarItemPaletteLabel">Branch</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSPopUpButton" key="NSToolbarItemView" id="630469851">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {134, 26}}</string>
<reference key="NSSuperview"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="265884357">
<int key="NSCellFlags">-2076049856</int>
@@ -1311,8 +1362,30 @@
<nil key="NSToolbarItemImage"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{134, 25}</string>
<string key="NSToolbarItemMaxSize">{134, 25}</string>
<string key="NSToolbarItemMinSize">{134, 26}</string>
<string key="NSToolbarItemMaxSize">{134, 26}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">0</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="596321972">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">E8AEE3B4-5661-4310-B27C-B158726D7F15</characters>
</object>
<string key="NSToolbarItemLabel">Rebase</string>
<string key="NSToolbarItemPaletteLabel">Rebase</string>
<string key="NSToolbarItemToolTip">Pull the latest version from the remote repository, and replay local changes on top of it.</string>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Crystal_Clear_action_2downarrow</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
<string key="NSToolbarItemMaxSize">{0, 0}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">0</int>
@@ -1383,6 +1456,9 @@
<reference ref="633367776"/>
<reference ref="479447135"/>
<reference ref="608989609"/>
<reference ref="596321972"/>
<reference ref="428123990"/>
<reference ref="93942157"/>
</object>
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1390,6 +1466,10 @@
<reference ref="776753395"/>
<reference ref="455812118"/>
<reference ref="608989609"/>
<reference ref="776753395"/>
<reference ref="596321972"/>
<reference ref="428123990"/>
<reference ref="93942157"/>
<reference ref="633367776"/>
<reference ref="479447135"/>
</object>
@@ -1995,6 +2075,30 @@
</object>
<int key="connectionID">291</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">rebaseButton:</string>
<reference key="source" ref="892732705"/>
<reference key="destination" ref="596321972"/>
</object>
<int key="connectionID">296</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">pushButton:</string>
<reference key="source" ref="892732705"/>
<reference key="destination" ref="428123990"/>
</object>
<int key="connectionID">297</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">fetchButton:</string>
<reference key="source" ref="892732705"/>
<reference key="destination" ref="93942157"/>
</object>
<int key="connectionID">298</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -2411,10 +2515,13 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="633367776"/>
<reference ref="479447135"/>
<reference ref="776753395"/>
<reference ref="215578734"/>
<reference ref="608989609"/>
<reference ref="455812118"/>
<reference ref="596321972"/>
<reference ref="428123990"/>
<reference ref="93942157"/>
<reference ref="776753395"/>
</object>
<reference key="parent" ref="1002"/>
<string key="objectName">History Toolbar</string>
@@ -2433,11 +2540,6 @@
</object>
<reference key="parent" ref="65173285"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">222</int>
<reference key="object" ref="776753395"/>
<reference key="parent" ref="65173285"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">223</int>
<reference key="object" ref="215578734"/>
@@ -2579,6 +2681,26 @@
<reference key="object" ref="671609291"/>
<reference key="parent" ref="456964926"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">292</int>
<reference key="object" ref="596321972"/>
<reference key="parent" ref="65173285"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">293</int>
<reference key="object" ref="428123990"/>
<reference key="parent" ref="65173285"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">294</int>
<reference key="object" ref="93942157"/>
<reference key="parent" ref="65173285"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">222</int>
<reference key="object" ref="776753395"/>
<reference key="parent" ref="65173285"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2660,6 +2782,9 @@
<string>288.IBPluginDependency</string>
<string>29.IBPluginDependency</string>
<string>29.IBShouldRemoveOnLegacySave</string>
<string>292.IBPluginDependency</string>
<string>293.IBPluginDependency</string>
<string>294.IBPluginDependency</string>
<string>3.IBPluginDependency</string>
<string>3.ImportedFromIB2</string>
<string>30.CustomClassName</string>
@@ -2702,7 +2827,7 @@
<string>com.apple.InterfaceBuilderKit</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{312, 366}, {616, 227}}</string>
<string>{{707, 168}, {616, 227}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{132, 614}, {616, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2788,6 +2913,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>PBUnsortableTableHeader</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2817,7 +2945,7 @@
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{321, 67}, {852, 432}}</string>
<string>{{235, 559}, {852, 432}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2851,11 +2979,19 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">291</int>
<int key="maxID">304</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">NSToolbarItem</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">PBCollapsibleSplitView</string>
<string key="superclassName">PBNiceSplitView</string>
@@ -3004,6 +3140,9 @@
<string>addRef:</string>
<string>changeBranch:</string>
<string>closeSheet:</string>
<string>fetchButton:</string>
<string>pushButton:</string>
<string>rebaseButton:</string>
<string>saveSheet:</string>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -3012,6 +3151,9 @@
<string>NSMenuItem</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
PBRefController.h
+9
View File
@@ -29,10 +29,19 @@
- (IBAction)closeSheet:(id) sender;
- (IBAction)saveSheet:(id) sender;
- (IBAction)rebaseButton:(id)sender;
- (IBAction)pushButton:(id)sender;
- (IBAction)fetchButton:(id)sender;
- (NSArray *) menuItemsForRef:(PBGitRef *)ref commit:(PBGitCommit *)commit;
- (void) changeBranch:(NSMenuItem *)sender;
- (void) selectCurrentBranch;
- (void) updateBranchMenu;
- (void) pullImpl:(NSString *)refName;
- (void) pushImpl:(NSString *)refName;
- (void) rebaseImpl:(NSString *)refName;
@end
PBRefController.m
+81 -30
View File
@@ -70,44 +70,17 @@
- (void) pushRef:(PBRefMenuItem *)sender
{
int ret = 1;
NSString *remote = [[historyController.repository config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", [[sender ref] shortName]]];
NSString *rval = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"push", remote, [[sender ref] shortName], nil] retValue: &ret];
if (ret) {
NSString *info = [NSString stringWithFormat:@"There was an error pushing the branch to the remote repository.\n\n%d\n%@", ret, rval];
[[historyController.repository windowController] showMessageSheet:@"Pushing branch failed" infoText:info];
return;
}
[historyController.repository reloadRefs];
[commitController rearrangeObjects];
[self pushImpl:[[sender ref] shortName]];
}
- (void) pullRef:(PBRefMenuItem *)sender
{
int ret = 1;
NSString *remote = [[historyController.repository config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", [[sender ref] shortName]]];
NSString *rval = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"pull", remote, [[sender ref] shortName], nil] retValue: &ret];
if (ret) {
NSString *info = [NSString stringWithFormat:@"There was an error pulling from the remote repository.\n\n%d\n%@", ret, rval];
[[historyController.repository windowController] showMessageSheet:@"Pulling from remote failed" infoText:info];
return;
}
[historyController.repository reloadRefs];
[commitController rearrangeObjects];
[self pullImpl:[[sender ref] shortName]];
}
- (void) rebaseRef:(PBRefMenuItem *)sender
{
int ret = 1;
NSString *remote = [[historyController.repository config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", [[sender ref] shortName]]];
NSString *rval = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"pull", @"--rebase", remote, [[sender ref] shortName], nil] retValue: &ret];
if (ret) {
NSString *info = [NSString stringWithFormat:@"There was an error rebasing from the remote repository.\n\n%d\n%@", ret, rval];
[[historyController.repository windowController] showMessageSheet:@"Rebasing from remote failed" infoText:info];
return;
}
[historyController.repository reloadRefs];
[commitController rearrangeObjects];
[self rebaseImpl:[[sender ref] shortName]];
}
- (void) tagInfo:(PBRefMenuItem *)sender
@@ -128,6 +101,63 @@
return [PBRefMenuItem defaultMenuItemsForRef:ref commit:commit target:self];
}
- (void) pushImpl:(NSString *)refName
{
int ret = 1;
NSString *remote = [[historyController.repository config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", refName]];
NSString *rval = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"push", remote, refName, nil] retValue: &ret];
if (ret) {
NSString *info = [NSString stringWithFormat:@"There was an error pushing the branch to the remote repository.\n\n%d\n%@", ret, rval];
[[historyController.repository windowController] showMessageSheet:@"Pushing branch failed" infoText:info];
return;
}
[historyController.repository reloadRefs];
[commitController rearrangeObjects];
}
- (void) pullImpl:(NSString *)refName
{
int ret = 1;
NSString *remote = [[historyController.repository config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", refName]];
NSString *rval = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"pull", remote, refName, nil] retValue: &ret];
if (ret) {
NSString *info = [NSString stringWithFormat:@"There was an error pulling from the remote repository.\n\n%d\n%@", ret, rval];
[[historyController.repository windowController] showMessageSheet:@"Pulling from remote failed" infoText:info];
return;
}
[historyController.repository reloadRefs];
[commitController rearrangeObjects];
}
- (void) rebaseImpl:(NSString *)refName
{
int ret = 1;
NSString *remote = [[historyController.repository config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", refName]];
NSString *rval = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"pull", @"--rebase", remote, refName, nil] retValue: &ret];
if (ret) {
NSString *info = [NSString stringWithFormat:@"There was an error rebasing from the remote repository.\n\n%d\n%@", ret, rval];
[[historyController.repository windowController] showMessageSheet:@"Rebasing from remote failed" infoText:info];
return;
}
[historyController.repository reloadRefs];
[commitController rearrangeObjects];
}
- (void) fetchImpl:(NSString *)refName
{
int ret = 1;
NSString *remote = nil;
if(refName != nil) remote = [[historyController.repository config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", refName]];
NSString *rval = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"fetch", remote, refName, nil] retValue: &ret];
if (ret) {
NSString *info = [NSString stringWithFormat:@"There was an error fetching from the remote repository.\n\n%d\n%@", ret, rval];
[[historyController.repository windowController] showMessageSheet:@"Rebasing from remote failed" infoText:info];
return;
}
[historyController.repository reloadRefs];
[commitController rearrangeObjects];
}
# pragma mark Tableview delegate methods
- (BOOL)tableView:(NSTableView *)tv writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard*)pboard
@@ -220,6 +250,27 @@
contextInfo:NULL];
}
-(void)rebaseButton:(id)sender
{
NSString *refName =[historyController.repository.currentBranch simpleRef];
[self rebaseImpl:refName];
// NSLog([NSString stringWithFormat:@"Rebase hit for %@!", refName]);
}
-(void)pushButton:(id)sender
{
NSString *refName =[historyController.repository.currentBranch simpleRef];
[self pushImpl:refName];
// NSLog([NSString stringWithFormat:@"Push hit for %@!", refName]);
}
-(void)fetchButton:(id)sender
{
NSString *refName =[historyController.repository.currentBranch simpleRef];
[self fetchImpl:refName];
// NSLog([NSString stringWithFormat:@"Fetch hit for %@!", refName]);
}
-(void)saveSheet:(id) sender
{
NSString *branchName = [@"refs/heads/" stringByAppendingString:[newBranchName stringValue]];