diff --git a/English.lproj/RepositoryWindow.xib b/English.lproj/RepositoryWindow.xib index 6cd49fa..7474752 100644 --- a/English.lproj/RepositoryWindow.xib +++ b/English.lproj/RepositoryWindow.xib @@ -538,55 +538,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName">GitX</string> </object> - <object class="NSToolbarItem" id="562497830"> - <object class="NSMutableString" key="NSToolbarItemIdentifier"> - <characters key="NS.bytes">B6D80172-2D01-49BD-8E3A-2F1D9F672390</characters> - </object> - <string key="NSToolbarItemLabel">View</string> - <string key="NSToolbarItemPaletteLabel">View selector</string> - <nil key="NSToolbarItemToolTip"/> - <object class="NSSegmentedControl" key="NSToolbarItemView" id="469221894"> - <nil key="NSNextResponder"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{0, 14}, {142, 25}}</string> - <int key="NSTag">3</int> - <bool key="NSEnabled">YES</bool> - <object class="NSSegmentedCell" key="NSCell" id="1071657361"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">1044</int> - </object> - <reference key="NSControlView" ref="469221894"/> - <object class="NSMutableArray" key="NSSegmentImages"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSSegmentItem"> - <string key="NSSegmentItemLabel">History</string> - <int key="NSSegmentItemImageScaling">0</int> - </object> - <object class="NSSegmentItem"> - <string key="NSSegmentItemLabel">Commit</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">{142, 25}</string> - <string key="NSToolbarItemMaxSize">{142, 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> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -607,30 +558,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes> </object> <int key="connectionID">292</int> </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">selectedIndex: selectedViewIndex</string> - <reference key="source" ref="469221894"/> - <reference key="destination" ref="1001"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="469221894"/> - <reference key="NSDestination" ref="1001"/> - <string key="NSLabel">selectedIndex: selectedViewIndex</string> - <string key="NSBinding">selectedIndex</string> - <string key="NSKeyPath">selectedViewIndex</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">329</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">viewSelector</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="562497830"/> - </object> - <int key="connectionID">350</int> - </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -681,29 +608,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes> <reference key="parent" ref="491121796"/> </object> <object class="IBObjectRecord"> - <int key="objectID">324</int> - <reference key="object" ref="562497830"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="469221894"/> - </object> - <reference key="parent" ref="1002"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">325</int> - <reference key="object" ref="469221894"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1071657361"/> - </object> - <reference key="parent" ref="562497830"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">326</int> - <reference key="object" ref="1071657361"/> - <reference key="parent" ref="469221894"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">342</int> <reference key="object" ref="283658631"/> <object class="NSMutableArray" key="children"> @@ -772,8 +676,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes> <string>3.windowTemplate.hasMinSize</string> <string>3.windowTemplate.maxSize</string> <string>3.windowTemplate.minSize</string> - <string>325.IBPluginDependency</string> - <string>326.IBPluginDependency</string> <string>342.IBPluginDependency</string> <string>343.IBPluginDependency</string> <string>344.IBPluginDependency</string> @@ -790,9 +692,9 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilderKit</string> <string>com.apple.InterfaceBuilderKit</string> - <string>{{312, 315}, {850, 418}}</string> + <string>{{1047, -144}, {850, 418}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{312, 315}, {850, 418}}</string> + <string>{{1047, -144}, {850, 418}}</string> <integer value="1" id="9"/> <reference ref="9"/> <string>{{15, 196}, {850, 418}}</string> @@ -809,8 +711,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes> <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> <reference ref="9"/> </object> </object> diff --git a/PBGitCommitView.xib b/PBGitCommitView.xib index 0260e41..007010b 100644 --- a/PBGitCommitView.xib +++ b/PBGitCommitView.xib @@ -898,6 +898,120 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSCustomObject" id="1007648253"> <string key="NSClassName">PBWebChangesController</string> </object> + <object class="NSToolbar" id="570289088"> + <object class="NSMutableString" key="NSToolbarIdentifier"> + <characters key="NS.bytes">F94591D2-A188-4B08-A8B2-8C8CEC03CB14</characters> + </object> + <nil key="NSToolbarDelegate"/> + <bool key="NSToolbarPrefersToBeShown">YES</bool> + <bool key="NSToolbarShowsBaselineSeparator">YES</bool> + <bool key="NSToolbarAllowsUserCustomization">NO</bool> + <bool key="NSToolbarAutosavesConfiguration">NO</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>NSToolbarSeparatorItem</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSToolbarItem" id="271300712"> + <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="20026036"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{0, 14}, {142, 25}}</string> + <int key="NSTag">3</int> + <bool key="NSEnabled">YES</bool> + <object class="NSSegmentedCell" key="NSCell" id="796615469"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <reference key="NSSupport" ref="554612341"/> + <reference key="NSControlView" ref="20026036"/> + <object class="NSMutableArray" key="NSSegmentImages"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSSegmentItem"> + <string key="NSSegmentItemLabel">History</string> + <int key="NSSegmentItemImageScaling">0</int> + </object> + <object class="NSSegmentItem"> + <string key="NSSegmentItemLabel">Commit</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">{142, 25}</string> + <string key="NSToolbarItemMaxSize">{142, 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="NSToolbarSeparatorItem" id="354340151"> + <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> + <object class="NSCustomResource" key="NSOnImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuCheckmark</string> + </object> + <object class="NSCustomResource" key="NSMixedImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuMixedState</string> + </object> + </object> + </object> + </object> + </object> + <object class="NSArray" key="NSToolbarIBAllowedItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="271300712"/> + <reference ref="354340151"/> + </object> + <object class="NSMutableArray" key="NSToolbarIBDefaultItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="271300712"/> + <reference ref="354340151"/> + </object> + <object class="NSMutableArray" key="NSToolbarIBSelectableItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -1126,6 +1240,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">224</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">viewToolbar</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="570289088"/> + </object> + <int key="connectionID">241</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1419,6 +1541,45 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="object" ref="221814497"/> <reference key="parent" ref="750704519"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">225</int> + <reference key="object" ref="570289088"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="271300712"/> + <reference ref="354340151"/> + </object> + <reference key="parent" ref="1002"/> + <string key="objectName">Commit Toolbar</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">226</int> + <reference key="object" ref="271300712"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="20026036"/> + </object> + <reference key="parent" ref="570289088"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">227</int> + <reference key="object" ref="354340151"/> + <reference key="parent" ref="570289088"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">239</int> + <reference key="object" ref="20026036"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="796615469"/> + </object> + <reference key="parent" ref="271300712"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">240</int> + <reference key="object" ref="796615469"/> + <reference key="parent" ref="20026036"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -1446,6 +1607,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>164.IBPluginDependency</string> <string>2.IBPluginDependency</string> <string>217.IBPluginDependency</string> + <string>225.IBEditorWindowLastContentRect</string> + <string>225.IBPluginDependency</string> + <string>225.editorWindowContentRectSynchronizationRect</string> + <string>227.IBPluginDependency</string> + <string>239.IBPluginDependency</string> + <string>240.IBPluginDependency</string> <string>42.IBPluginDependency</string> <string>45.IBPluginDependency</string> <string>46.IBPluginDependency</string> @@ -1482,6 +1649,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{341, 837}, {616, 169}}</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> @@ -1516,7 +1689,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">224</int> + <int key="maxID">241</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib index e008bb9..4df97b3 100644 --- a/PBGitHistoryView.xib +++ b/PBGitHistoryView.xib @@ -95,7 +95,7 @@ </object> <object class="NSToolbar" id="65173285"> <object class="NSMutableString" key="NSToolbarIdentifier"> - <characters key="NS.bytes">B9F1B847-0DC3-4C13-A685-5F5A2D64BC93</characters> + <characters key="NS.bytes">F94591D2-A188-4B08-A8B2-8C8CEC03CB14</characters> </object> <nil key="NSToolbarDelegate"/> <bool key="NSToolbarPrefersToBeShown">YES</bool> @@ -108,12 +108,63 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>1E431E79-1591-49E7-9E17-49497CA4622A</string> <string>7FFB691C-2D2F-49A9-997F-AE1AE8BFF3F1</string> <string>99C2C9EB-AE16-42A9-BE52-46CE903E9AF9</string> <string>NSToolbarFlexibleSpaceItem</string> + <string>NSToolbarSeparatorItem</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSToolbarItem" id="215578734"> + <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="764711234"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{0, 14}, {142, 25}}</string> + <int key="NSTag">3</int> + <bool key="NSEnabled">YES</bool> + <object class="NSSegmentedCell" key="NSCell" id="266464607"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <object class="NSFont" key="NSSupport" id="924107556"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="764711234"/> + <object class="NSMutableArray" key="NSSegmentImages"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSSegmentItem"> + <string key="NSSegmentItemLabel">History</string> + <int key="NSSegmentItemImageScaling">0</int> + </object> + <object class="NSSegmentItem"> + <string key="NSSegmentItemLabel">Commit</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">{142, 25}</string> + <string key="NSToolbarItemMaxSize">{142, 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="479447135"> <object class="NSMutableString" key="NSToolbarItemIdentifier"> <characters key="NS.bytes">7FFB691C-2D2F-49A9-997F-AE1AE8BFF3F1</characters> @@ -131,11 +182,7 @@ <object class="NSSearchFieldCell" key="NSCell" id="449521666"> <int key="NSCellFlags">343014976</int> <int key="NSCellFlags2">268436480</int> - <object class="NSFont" key="NSSupport" id="924107556"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">1044</int> - </object> + <reference key="NSSupport" ref="924107556"/> <string key="NSPlaceholderString">Subject</string> <reference key="NSControlView" ref="845792858"/> <bool key="NSDrawsBackground">YES</bool> @@ -330,16 +377,47 @@ <reference key="NSMixedImage" ref="746375230"/> </object> </object> + <object class="NSToolbarSeparatorItem" id="776753395"> + <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="908677745"/> + <reference key="NSMixedImage" ref="746375230"/> + </object> + </object> </object> </object> <object class="NSArray" key="NSToolbarIBAllowedItems"> <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="215578734"/> + <reference ref="776753395"/> <reference ref="455812118"/> <reference ref="633367776"/> <reference ref="479447135"/> </object> <object class="NSMutableArray" key="NSToolbarIBDefaultItems"> <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="215578734"/> + <reference ref="776753395"/> <reference ref="455812118"/> <reference ref="633367776"/> <reference ref="479447135"/> @@ -2053,6 +2131,93 @@ <reference key="parent" ref="555671215"/> </object> <object class="IBObjectRecord"> + <int key="objectID">3</int> + <reference key="object" ref="663765878"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="942510576"/> + <reference ref="452331733"/> + <reference ref="152625445"/> + <reference ref="254268962"/> + </object> + <reference key="parent" ref="202620420"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">30</int> + <reference key="object" ref="942510576"/> + <reference key="parent" ref="663765878"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">29</int> + <reference key="object" ref="452331733"/> + <reference key="parent" ref="663765878"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">28</int> + <reference key="object" ref="152625445"/> + <reference key="parent" ref="663765878"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">27</int> + <reference key="object" ref="254268962"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="976830280"/> + <reference ref="1025472344"/> + <reference ref="792589327"/> + </object> + <reference key="parent" ref="663765878"/> + <string key="objectName">Commit List</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">33</int> + <reference key="object" ref="976830280"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="853819733"/> + </object> + <reference key="parent" ref="254268962"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">32</int> + <reference key="object" ref="1025472344"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="977219207"/> + </object> + <reference key="parent" ref="254268962"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">31</int> + <reference key="object" ref="792589327"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="746918365"/> + </object> + <reference key="parent" ref="254268962"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">36</int> + <reference key="object" ref="746918365"/> + <reference key="parent" ref="792589327"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">35</int> + <reference key="object" ref="977219207"/> + <reference key="parent" ref="1025472344"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">34</int> + <reference key="object" ref="853819733"/> + <reference key="parent" ref="976830280"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">190</int> + <reference key="object" ref="886549521"/> + <reference key="parent" ref="1002"/> + <string key="objectName">Branches Controller</string> + </object> + <object class="IBObjectRecord"> <int key="objectID">113</int> <reference key="object" ref="65173285"/> <object class="NSMutableArray" key="children"> @@ -2060,6 +2225,8 @@ <reference ref="455812118"/> <reference ref="633367776"/> <reference ref="479447135"/> + <reference ref="776753395"/> + <reference ref="215578734"/> </object> <reference key="parent" ref="1002"/> <string key="objectName">History Toolbar</string> @@ -2088,6 +2255,34 @@ <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"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="764711234"/> + </object> + <reference key="parent" ref="65173285"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">224</int> + <reference key="object" ref="764711234"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="266464607"/> + </object> + <reference key="parent" ref="215578734"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">225</int> + <reference key="object" ref="266464607"/> + <reference key="parent" ref="764711234"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">117</int> <reference key="object" ref="845792858"/> <object class="NSMutableArray" key="children"> @@ -2145,93 +2340,6 @@ <reference key="object" ref="882172208"/> <reference key="parent" ref="604026377"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">3</int> - <reference key="object" ref="663765878"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="942510576"/> - <reference ref="452331733"/> - <reference ref="152625445"/> - <reference ref="254268962"/> - </object> - <reference key="parent" ref="202620420"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">30</int> - <reference key="object" ref="942510576"/> - <reference key="parent" ref="663765878"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">29</int> - <reference key="object" ref="452331733"/> - <reference key="parent" ref="663765878"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">28</int> - <reference key="object" ref="152625445"/> - <reference key="parent" ref="663765878"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">27</int> - <reference key="object" ref="254268962"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="976830280"/> - <reference ref="1025472344"/> - <reference ref="792589327"/> - </object> - <reference key="parent" ref="663765878"/> - <string key="objectName">Commit List</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">33</int> - <reference key="object" ref="976830280"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="853819733"/> - </object> - <reference key="parent" ref="254268962"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">32</int> - <reference key="object" ref="1025472344"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="977219207"/> - </object> - <reference key="parent" ref="254268962"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">31</int> - <reference key="object" ref="792589327"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="746918365"/> - </object> - <reference key="parent" ref="254268962"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">36</int> - <reference key="object" ref="746918365"/> - <reference key="parent" ref="792589327"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">35</int> - <reference key="object" ref="977219207"/> - <reference key="parent" ref="1025472344"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">34</int> - <reference key="object" ref="853819733"/> - <reference key="parent" ref="976830280"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">190</int> - <reference key="object" ref="886549521"/> - <reference key="parent" ref="1002"/> - <string key="objectName">Branches Controller</string> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -2272,6 +2380,9 @@ <string>2.ImportedFromIB2</string> <string>21.IBAttributePlaceholdersKey</string> <string>21.IBPluginDependency</string> + <string>222.IBPluginDependency</string> + <string>224.IBPluginDependency</string> + <string>225.IBPluginDependency</string> <string>23.IBPluginDependency</string> <string>24.IBPluginDependency</string> <string>25.IBPluginDependency</string> @@ -2319,7 +2430,7 @@ <string>com.apple.InterfaceBuilderKit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{244, 901}, {616, 0}}</string> + <string>{{341, 957}, {616, 0}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{132, 614}, {616, 0}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2360,6 +2471,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> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>PBCommitList</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="0" id="8"/> @@ -2425,7 +2539,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">217</int> + <int key="maxID">225</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/PBGitWindowController.h b/PBGitWindowController.h index accde05..d243a37 100644 --- a/PBGitWindowController.h +++ b/PBGitWindowController.h @@ -14,8 +14,6 @@ int selectedViewIndex; IBOutlet NSView* contentView; NSViewController* viewController; - - IBOutlet NSToolbarItem *viewSelector; } @property (assign) __weak PBGitRepository *repository; diff --git a/PBGitWindowController.m b/PBGitWindowController.m index db530c0..18c2393 100644 --- a/PBGitWindowController.m +++ b/PBGitWindowController.m @@ -87,41 +87,11 @@ #pragma mark - #pragma mark Toolbar Delegates -- (NSToolbarItem *) toolbar:(NSToolbar *)toolbar - itemForItemIdentifier:(NSString *)itemIdentifier - willBeInsertedIntoToolbar:(BOOL)flag -{ - if ([itemIdentifier isEqualToString:[viewSelector itemIdentifier]]) - return viewSelector; - - return nil; -} - -- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar -{ - NSMutableArray *array = [NSMutableArray array]; - for (NSToolbarItem *item in [toolbar items]) - [array addObject:[item itemIdentifier]]; - return array; -} - -- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar -{ - NSMutableArray *array = [NSMutableArray array]; - for (NSToolbarItem *item in [toolbar items]) - [array addObject:[item itemIdentifier]]; - return array; -} - (void) useToolbar:(NSToolbar *)toolbar { - [toolbar setDelegate:self]; - - [toolbar insertItemWithItemIdentifier:NSToolbarSeparatorItemIdentifier atIndex:0]; - [toolbar insertItemWithItemIdentifier:[viewSelector itemIdentifier] atIndex:0]; - - NSSegmentedControl *viewSelect = (NSSegmentedControl *)[[[toolbar items] objectAtIndex:0] view]; - [viewSelect bind:@"selectedIndex" toObject:self withKeyPath:@"selectedViewIndex" options:0]; + NSSegmentedControl *item = (NSSegmentedControl *)[[[toolbar items] objectAtIndex:0] view]; + [item bind:@"selectedIndex" toObject:self withKeyPath:@"selectedViewIndex" options:0]; [self.window setToolbar:toolbar]; }