Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Delete old toolbars and create new ones

    - remove the separate window toolbars from the history and commit views and create a new window toolbar in the repository window
    - add new toolbars inside the history view
        - new class to draw a gradient in the background of a view
        - moved the search field from the main toolbar to the scope bar
  • Loading branch information...
commit 64f4276e21148670142f71af9d21d9dc34e3f813 1 parent b1e632c
@brotherbard authored
View
203 English.lproj/RepositoryWindow.xib
@@ -45,7 +45,152 @@
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">GitX</string>
<string key="NSWindowClass">NSWindow</string>
- <nil key="NSViewClass"/>
+ <object class="NSToolbar" key="NSViewClass" id="515950937">
+ <object class="NSMutableString" key="NSToolbarIdentifier">
+ <characters key="NS.bytes">A66F2540-5B64-4016-89F7-892563371FAF</characters>
+ </object>
+ <nil key="NSToolbarDelegate"/>
+ <bool key="NSToolbarPrefersToBeShown">NO</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="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSToolbarCustomizeToolbarItem</string>
+ <string>NSToolbarFlexibleSpaceItem</string>
+ <string>NSToolbarSeparatorItem</string>
+ <string>NSToolbarSpaceItem</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSToolbarItem" id="98293483">
+ <string key="NSToolbarItemIdentifier">NSToolbarCustomizeToolbarItem</string>
+ <string key="NSToolbarItemLabel">Customize</string>
+ <string key="NSToolbarItemPaletteLabel">Customize</string>
+ <string key="NSToolbarItemToolTip">Customize Toolbar</string>
+ <nil key="NSToolbarItemView"/>
+ <object class="NSCustomResource" key="NSToolbarItemImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSToolbarCustomizeToolbarItemImage</string>
+ </object>
+ <nil key="NSToolbarItemTarget"/>
+ <string key="NSToolbarItemAction">runToolbarCustomizationPalette:</string>
+ <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">-1</int>
+ <bool key="NSToolbarIsUserRemovable">YES</bool>
+ <int key="NSToolbarItemVisibilityPriority">0</int>
+ </object>
+ <object class="NSToolbarFlexibleSpaceItem" id="381044771">
+ <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>
+ <object class="NSCustomResource" key="NSOnImage" id="340924780">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage" id="779392969">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSToolbarSeparatorItem" id="128876649">
+ <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="340924780"/>
+ <reference key="NSMixedImage" ref="779392969"/>
+ </object>
+ </object>
+ <object class="NSToolbarSpaceItem" id="847356444">
+ <string key="NSToolbarItemIdentifier">NSToolbarSpaceItem</string>
+ <string key="NSToolbarItemLabel"/>
+ <string key="NSToolbarItemPaletteLabel">Space</string>
+ <nil key="NSToolbarItemToolTip"/>
+ <nil key="NSToolbarItemView"/>
+ <nil key="NSToolbarItemImage"/>
+ <nil key="NSToolbarItemTarget"/>
+ <nil key="NSToolbarItemAction"/>
+ <string key="NSToolbarItemMinSize">{32, 5}</string>
+ <string key="NSToolbarItemMaxSize">{32, 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="340924780"/>
+ <reference key="NSMixedImage" ref="779392969"/>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="NSArray" key="NSToolbarIBAllowedItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="128876649"/>
+ <reference ref="847356444"/>
+ <reference ref="381044771"/>
+ <reference ref="98293483"/>
+ </object>
+ <object class="NSMutableArray" key="NSToolbarIBDefaultItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="381044771"/>
+ </object>
+ <object class="NSMutableArray" key="NSToolbarIBSelectableItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="751230759">
@@ -166,6 +311,7 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="751230759"/>
+ <reference ref="515950937"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Window</string>
@@ -204,6 +350,38 @@
<reference key="parent" ref="120427370"/>
<string key="objectName">Content SplitView</string>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">367</int>
+ <reference key="object" ref="515950937"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="128876649"/>
+ <reference ref="847356444"/>
+ <reference ref="381044771"/>
+ <reference ref="98293483"/>
+ </object>
+ <reference key="parent" ref="491121796"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">370</int>
+ <reference key="object" ref="128876649"/>
+ <reference key="parent" ref="515950937"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">372</int>
+ <reference key="object" ref="847356444"/>
+ <reference key="parent" ref="515950937"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">373</int>
+ <reference key="object" ref="381044771"/>
+ <reference key="parent" ref="515950937"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">374</int>
+ <reference key="object" ref="98293483"/>
+ <reference key="parent" ref="515950937"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -224,6 +402,9 @@
<string>351.IBPluginDependency</string>
<string>352.IBPluginDependency</string>
<string>353.IBPluginDependency</string>
+ <string>367.IBEditorWindowLastContentRect</string>
+ <string>367.IBPluginDependency</string>
+ <string>374.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string>
</object>
@@ -243,6 +424,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{621, 1213}, {616, 0}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
</object>
@@ -263,7 +447,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">366</int>
+ <int key="maxID">374</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -474,7 +658,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="168026191">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
</object>
@@ -727,6 +911,19 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">NSToolbar</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">AppKit.framework/Headers/NSToolbar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSToolbarItem</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="168026191"/>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
View
6 GitX.xcodeproj/project.pbxproj
@@ -58,6 +58,7 @@
D858108511274D28007F254B /* Tag.png in Resources */ = {isa = PBXBuildFile; fileRef = D858108211274D28007F254B /* Tag.png */; };
D85B939310E3D8B4007F3C28 /* PBCreateBranchSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = D85B939210E3D8B4007F3C28 /* PBCreateBranchSheet.xib */; };
D889EB3110E6BCBB00F08413 /* PBCreateTagSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = D889EB3010E6BCBB00F08413 /* PBCreateTagSheet.xib */; };
+ D8A4BB6F11337D5C00E92D51 /* PBGitGradientBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = D8A4BB6E11337D5C00E92D51 /* PBGitGradientBarView.m */; };
D8E3B2B810DC9FB2001096A3 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */; };
D8E3B34D10DCA958001096A3 /* PBCreateTagSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D8E3B34C10DCA958001096A3 /* PBCreateTagSheet.m */; };
D8FDD9F711432A12005647F6 /* PBCloneRepositoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8FDD9F511432A12005647F6 /* PBCloneRepositoryPanel.xib */; };
@@ -255,6 +256,8 @@
D858108111274D28007F254B /* RemoteBranch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RemoteBranch.png; path = Images/RemoteBranch.png; sourceTree = "<group>"; };
D858108211274D28007F254B /* Tag.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Tag.png; path = Images/Tag.png; sourceTree = "<group>"; };
D85B93F610E51279007F3C28 /* PBGitRefish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRefish.h; sourceTree = "<group>"; };
+ D8A4BB6D11337D5C00E92D51 /* PBGitGradientBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitGradientBarView.h; sourceTree = "<group>"; };
+ D8A4BB6E11337D5C00E92D51 /* PBGitGradientBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitGradientBarView.m; sourceTree = "<group>"; };
D8C1B77210E875CF009B7F8B /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PBRemoteProgressSheet.xib; sourceTree = "<group>"; };
D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = /System/Library/Frameworks/ScriptingBridge.framework; sourceTree = "<absolute>"; };
D8E3B34B10DCA958001096A3 /* PBCreateTagSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBCreateTagSheet.h; sourceTree = "<group>"; };
@@ -705,6 +708,8 @@
D823487410CB382C00944BDE /* Terminal.h */,
F567B88B1057FA9F000DB976 /* NSOutlineViewExt.h */,
F567B88C1057FA9F000DB976 /* NSOutlineViewExt.m */,
+ D8A4BB6D11337D5C00E92D51 /* PBGitGradientBarView.h */,
+ D8A4BB6E11337D5C00E92D51 /* PBGitGradientBarView.m */,
);
name = Aux;
sourceTree = "<group>";
@@ -1113,6 +1118,7 @@
D8FDDA6E114335E8005647F6 /* PBGitSVRemoteItem.m in Sources */,
D8FDDA6F114335E8005647F6 /* PBGitSVStageItem.m in Sources */,
D8FDDA70114335E8005647F6 /* PBGitSVTagItem.m in Sources */,
+ D8A4BB6F11337D5C00E92D51 /* PBGitGradientBarView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
140 PBGitCommitView.xib
@@ -789,102 +789,6 @@
<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">A24FCE70-61F0-46AC-8017-F662C25122F8</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="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSToolbarSeparatorItem</string>
- <string>NSToolbarSpaceItem</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <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" id="37645952">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="58622618">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- </object>
- </object>
- <object class="NSToolbarSpaceItem" id="895508341">
- <string key="NSToolbarItemIdentifier">NSToolbarSpaceItem</string>
- <string key="NSToolbarItemLabel"/>
- <string key="NSToolbarItemPaletteLabel">Space</string>
- <nil key="NSToolbarItemToolTip"/>
- <nil key="NSToolbarItemView"/>
- <nil key="NSToolbarItemImage"/>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{32, 5}</string>
- <string key="NSToolbarItemMaxSize">{32, 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="37645952"/>
- <reference key="NSMixedImage" ref="58622618"/>
- </object>
- </object>
- </object>
- </object>
- <object class="NSArray" key="NSToolbarIBAllowedItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="354340151"/>
- <reference ref="895508341"/>
- </object>
- <object class="NSMutableArray" key="NSToolbarIBDefaultItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="354340151"/>
- <reference ref="895508341"/>
- </object>
- <object class="NSMutableArray" key="NSToolbarIBSelectableItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
<object class="NSCustomObject" id="446885874">
<string key="NSClassName">PBGitIndexController</string>
</object>
@@ -1038,14 +942,6 @@
</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 class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">webController</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="1007648253"/>
@@ -1525,27 +1421,6 @@
<reference key="object" ref="471472652"/>
<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="354340151"/>
- <reference ref="895508341"/>
- </object>
- <reference key="parent" ref="0"/>
- <string key="objectName">Commit Toolbar</string>
- </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">309</int>
- <reference key="object" ref="895508341"/>
- <reference key="parent" ref="570289088"/>
- </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1579,15 +1454,11 @@
<string>208.IBPluginDependency</string>
<string>209.IBPluginDependency</string>
<string>217.IBPluginDependency</string>
- <string>225.IBEditorWindowLastContentRect</string>
- <string>225.IBPluginDependency</string>
- <string>225.editorWindowContentRectSynchronizationRect</string>
<string>247.IBPluginDependency</string>
<string>248.IBPluginDependency</string>
<string>278.IBPluginDependency</string>
<string>279.IBPluginDependency</string>
<string>308.IBPluginDependency</string>
- <string>309.IBPluginDependency</string>
<string>42.IBPluginDependency</string>
<string>45.IBPluginDependency</string>
<string>46.IBPluginDependency</string>
@@ -1632,10 +1503,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{16, 1434}, {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>
@@ -2085,7 +1952,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1049608449">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
</object>
@@ -2423,11 +2290,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSToolbarItem</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="1049608449"/>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSUserDefaultsController</string>
<string key="superclassName">NSController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
View
19 PBGitGradientBarView.h
@@ -0,0 +1,19 @@
+//
+// PBGitGradientBarView.h
+// GitX
+//
+// Created by Nathan Kinsinger on 2/22/10.
+// Copyright 2010 Nathan Kinsinger. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface PBGitGradientBarView : NSView {
+ NSGradient *gradient;
+}
+
+- (void) setTopShade:(float)topShade bottomShade:(float)bottomShade;
+- (void) setTopColor:(NSColor *)topShade bottomColor:(NSColor *)bottomColor;
+
+@end
View
52 PBGitGradientBarView.m
@@ -0,0 +1,52 @@
+//
+// PBGitGradientBarView.m
+// GitX
+//
+// Created by Nathan Kinsinger on 2/22/10.
+// Copyright 2010 Nathan Kinsinger. All rights reserved.
+//
+
+#import "PBGitGradientBarView.h"
+
+
+
+@implementation PBGitGradientBarView
+
+
+- (id) initWithFrame:(NSRect)frame
+{
+ self = [super initWithFrame:frame];
+ if (!self)
+ return nil;
+
+ [self setTopShade:1.0 bottomShade:0.0];
+
+ return self;
+}
+
+
+- (void) drawRect:(NSRect)dirtyRect
+{
+ [gradient drawInRect:[self bounds] angle:90];
+}
+
+
+- (void) setTopColor:(NSColor *)topColor bottomColor:(NSColor *)bottomColor
+{
+ if (!topColor || !bottomColor)
+ return;
+
+ gradient = [[NSGradient alloc] initWithStartingColor:bottomColor endingColor:topColor];
+ [self setNeedsDisplay:YES];
+}
+
+
+- (void) setTopShade:(float)topShade bottomShade:(float)bottomShade
+{
+ NSColor *topColor = [NSColor colorWithCalibratedWhite:topShade alpha:1.0];
+ NSColor *bottomColor = [NSColor colorWithCalibratedWhite:bottomShade alpha:1.0];
+ [self setTopColor:topColor bottomColor:bottomColor];
+}
+
+
+@end
View
3  PBGitHistoryController.h
@@ -13,6 +13,7 @@
#import "PBCollapsibleSplitView.h"
@class PBGitSidebarController;
+@class PBGitGradientBarView;
@interface PBGitHistoryController : PBViewController {
IBOutlet NSSearchField *searchField;
@@ -21,6 +22,8 @@
IBOutlet NSOutlineView* fileBrowser;
IBOutlet NSTableView* commitList;
IBOutlet PBCollapsibleSplitView *historySplitView;
+ IBOutlet PBGitGradientBarView *upperToolbarView;
+ IBOutlet PBGitGradientBarView *scopeBarView;
IBOutlet id webView;
int selectedTab;
View
9 PBGitHistoryController.m
@@ -15,6 +15,7 @@
#import "PBCreateTagSheet.h"
#import "PBAddRemoteSheet.h"
#import "PBGitSidebarController.h"
+#import "PBGitGradientBarView.h"
#define QLPreviewPanel NSClassFromString(@"QLPreviewPanel")
@@ -45,8 +46,14 @@ - (void)awakeFromNib
[[commitList tableColumnWithIdentifier:@"subject"] setSortDescriptorPrototype:[[NSSortDescriptor alloc] initWithKey:@"subject" ascending:YES]];
// Add a menu that allows a user to select which columns to view
[[commitList headerView] setMenu:[self tableColumnMenu]];
- [historySplitView setTopMin:33.0 andBottomMin:100.0];
+ [historySplitView setTopMin:58.0 andBottomMin:100.0];
[historySplitView uncollapse];
+
+ [upperToolbarView setTopShade:237/255.0 bottomShade:216/255.0];
+ [scopeBarView setTopColor:[NSColor colorWithCalibratedHue:0.579 saturation:0.068 brightness:0.898 alpha:1.000]
+ bottomColor:[NSColor colorWithCalibratedHue:0.579 saturation:0.119 brightness:0.765 alpha:1.000]];
+ //[scopeBarView setTopShade:207/255.0 bottomShade:180/255.0];
+
[super awakeFromNib];
}
View
2,617 PBGitHistoryView.xib
1,270 additions, 1,347 deletions not shown
View
2  PBGitWindowController.m
@@ -76,8 +76,6 @@ - (void) changeContentController:(PBViewController *)controller
[self setNextResponder: contentController];
[[self window] makeFirstResponder:[contentController firstResponder]];
-
- [[self window] setToolbar:[contentController viewToolbar]];
[contentController updateView];
}
View
3  PBViewController.h
@@ -13,12 +13,9 @@
@interface PBViewController : NSViewController {
__weak PBGitRepository *repository;
__weak PBGitWindowController *superController;
-
- IBOutlet NSToolbar *viewToolbar;
}
@property (readonly) __weak PBGitRepository *repository;
-@property (readonly) NSToolbar *viewToolbar;
- (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGitWindowController *)controller;
- (void) removeView;
View
2  PBViewController.m
@@ -11,7 +11,7 @@
@implementation PBViewController
-@synthesize repository, viewToolbar;
+@synthesize repository;
- (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGitWindowController *)controller
{
Please sign in to comment.
Something went wrong with that request. Please try again.