Skip to content

Commit 64f4276

Browse files
brotherbardbrotherbard
committed
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
1 parent b1e632c commit 64f4276

11 files changed

+1560
-1496
lines changed

‎English.lproj/RepositoryWindow.xib

Lines changed: 200 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,152 @@
4545
<int key="NSWTFlags">1886912512</int>
4646
<string key="NSWindowTitle">GitX</string>
4747
<string key="NSWindowClass">NSWindow</string>
48-
<nil key="NSViewClass"/>
48+
<object class="NSToolbar" key="NSViewClass" id="515950937">
49+
<object class="NSMutableString" key="NSToolbarIdentifier">
50+
<characters key="NS.bytes">A66F2540-5B64-4016-89F7-892563371FAF</characters>
51+
</object>
52+
<nil key="NSToolbarDelegate"/>
53+
<bool key="NSToolbarPrefersToBeShown">NO</bool>
54+
<bool key="NSToolbarShowsBaselineSeparator">YES</bool>
55+
<bool key="NSToolbarAllowsUserCustomization">YES</bool>
56+
<bool key="NSToolbarAutosavesConfiguration">YES</bool>
57+
<int key="NSToolbarDisplayMode">1</int>
58+
<int key="NSToolbarSizeMode">1</int>
59+
<object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
60+
<bool key="EncodedWithXMLCoder">YES</bool>
61+
<object class="NSArray" key="dict.sortedKeys">
62+
<bool key="EncodedWithXMLCoder">YES</bool>
63+
<string>NSToolbarCustomizeToolbarItem</string>
64+
<string>NSToolbarFlexibleSpaceItem</string>
65+
<string>NSToolbarSeparatorItem</string>
66+
<string>NSToolbarSpaceItem</string>
67+
</object>
68+
<object class="NSMutableArray" key="dict.values">
69+
<bool key="EncodedWithXMLCoder">YES</bool>
70+
<object class="NSToolbarItem" id="98293483">
71+
<string key="NSToolbarItemIdentifier">NSToolbarCustomizeToolbarItem</string>
72+
<string key="NSToolbarItemLabel">Customize</string>
73+
<string key="NSToolbarItemPaletteLabel">Customize</string>
74+
<string key="NSToolbarItemToolTip">Customize Toolbar</string>
75+
<nil key="NSToolbarItemView"/>
76+
<object class="NSCustomResource" key="NSToolbarItemImage">
77+
<string key="NSClassName">NSImage</string>
78+
<string key="NSResourceName">NSToolbarCustomizeToolbarItemImage</string>
79+
</object>
80+
<nil key="NSToolbarItemTarget"/>
81+
<string key="NSToolbarItemAction">runToolbarCustomizationPalette:</string>
82+
<string key="NSToolbarItemMinSize">{0, 0}</string>
83+
<string key="NSToolbarItemMaxSize">{0, 0}</string>
84+
<bool key="NSToolbarItemEnabled">YES</bool>
85+
<bool key="NSToolbarItemAutovalidates">YES</bool>
86+
<int key="NSToolbarItemTag">-1</int>
87+
<bool key="NSToolbarIsUserRemovable">YES</bool>
88+
<int key="NSToolbarItemVisibilityPriority">0</int>
89+
</object>
90+
<object class="NSToolbarFlexibleSpaceItem" id="381044771">
91+
<string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
92+
<string key="NSToolbarItemLabel"/>
93+
<string key="NSToolbarItemPaletteLabel">Flexible Space</string>
94+
<nil key="NSToolbarItemToolTip"/>
95+
<nil key="NSToolbarItemView"/>
96+
<nil key="NSToolbarItemImage"/>
97+
<nil key="NSToolbarItemTarget"/>
98+
<nil key="NSToolbarItemAction"/>
99+
<string key="NSToolbarItemMinSize">{1, 5}</string>
100+
<string key="NSToolbarItemMaxSize">{20000, 32}</string>
101+
<bool key="NSToolbarItemEnabled">YES</bool>
102+
<bool key="NSToolbarItemAutovalidates">YES</bool>
103+
<int key="NSToolbarItemTag">-1</int>
104+
<bool key="NSToolbarIsUserRemovable">YES</bool>
105+
<int key="NSToolbarItemVisibilityPriority">0</int>
106+
<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
107+
<bool key="NSIsDisabled">YES</bool>
108+
<bool key="NSIsSeparator">YES</bool>
109+
<string key="NSTitle"/>
110+
<string key="NSKeyEquiv"/>
111+
<int key="NSKeyEquivModMask">1048576</int>
112+
<int key="NSMnemonicLoc">2147483647</int>
113+
<object class="NSCustomResource" key="NSOnImage" id="340924780">
114+
<string key="NSClassName">NSImage</string>
115+
<string key="NSResourceName">NSMenuCheckmark</string>
116+
</object>
117+
<object class="NSCustomResource" key="NSMixedImage" id="779392969">
118+
<string key="NSClassName">NSImage</string>
119+
<string key="NSResourceName">NSMenuMixedState</string>
120+
</object>
121+
</object>
122+
</object>
123+
<object class="NSToolbarSeparatorItem" id="128876649">
124+
<string key="NSToolbarItemIdentifier">NSToolbarSeparatorItem</string>
125+
<string key="NSToolbarItemLabel"/>
126+
<string key="NSToolbarItemPaletteLabel">Separator</string>
127+
<nil key="NSToolbarItemToolTip"/>
128+
<nil key="NSToolbarItemView"/>
129+
<nil key="NSToolbarItemImage"/>
130+
<nil key="NSToolbarItemTarget"/>
131+
<nil key="NSToolbarItemAction"/>
132+
<string key="NSToolbarItemMinSize">{12, 5}</string>
133+
<string key="NSToolbarItemMaxSize">{12, 1000}</string>
134+
<bool key="NSToolbarItemEnabled">YES</bool>
135+
<bool key="NSToolbarItemAutovalidates">YES</bool>
136+
<int key="NSToolbarItemTag">-1</int>
137+
<bool key="NSToolbarIsUserRemovable">YES</bool>
138+
<int key="NSToolbarItemVisibilityPriority">0</int>
139+
<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
140+
<bool key="NSIsDisabled">YES</bool>
141+
<bool key="NSIsSeparator">YES</bool>
142+
<string key="NSTitle"/>
143+
<string key="NSKeyEquiv"/>
144+
<int key="NSKeyEquivModMask">1048576</int>
145+
<int key="NSMnemonicLoc">2147483647</int>
146+
<reference key="NSOnImage" ref="340924780"/>
147+
<reference key="NSMixedImage" ref="779392969"/>
148+
</object>
149+
</object>
150+
<object class="NSToolbarSpaceItem" id="847356444">
151+
<string key="NSToolbarItemIdentifier">NSToolbarSpaceItem</string>
152+
<string key="NSToolbarItemLabel"/>
153+
<string key="NSToolbarItemPaletteLabel">Space</string>
154+
<nil key="NSToolbarItemToolTip"/>
155+
<nil key="NSToolbarItemView"/>
156+
<nil key="NSToolbarItemImage"/>
157+
<nil key="NSToolbarItemTarget"/>
158+
<nil key="NSToolbarItemAction"/>
159+
<string key="NSToolbarItemMinSize">{32, 5}</string>
160+
<string key="NSToolbarItemMaxSize">{32, 32}</string>
161+
<bool key="NSToolbarItemEnabled">YES</bool>
162+
<bool key="NSToolbarItemAutovalidates">YES</bool>
163+
<int key="NSToolbarItemTag">-1</int>
164+
<bool key="NSToolbarIsUserRemovable">YES</bool>
165+
<int key="NSToolbarItemVisibilityPriority">0</int>
166+
<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
167+
<bool key="NSIsDisabled">YES</bool>
168+
<bool key="NSIsSeparator">YES</bool>
169+
<string key="NSTitle"/>
170+
<string key="NSKeyEquiv"/>
171+
<int key="NSKeyEquivModMask">1048576</int>
172+
<int key="NSMnemonicLoc">2147483647</int>
173+
<reference key="NSOnImage" ref="340924780"/>
174+
<reference key="NSMixedImage" ref="779392969"/>
175+
</object>
176+
</object>
177+
</object>
178+
</object>
179+
<object class="NSArray" key="NSToolbarIBAllowedItems">
180+
<bool key="EncodedWithXMLCoder">YES</bool>
181+
<reference ref="128876649"/>
182+
<reference ref="847356444"/>
183+
<reference ref="381044771"/>
184+
<reference ref="98293483"/>
185+
</object>
186+
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
187+
<bool key="EncodedWithXMLCoder">YES</bool>
188+
<reference ref="381044771"/>
189+
</object>
190+
<object class="NSMutableArray" key="NSToolbarIBSelectableItems">
191+
<bool key="EncodedWithXMLCoder">YES</bool>
192+
</object>
193+
</object>
49194
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
50195
<string key="NSWindowContentMinSize">{213, 107}</string>
51196
<object class="NSView" key="NSWindowView" id="751230759">
@@ -166,6 +311,7 @@
166311
<object class="NSMutableArray" key="children">
167312
<bool key="EncodedWithXMLCoder">YES</bool>
168313
<reference ref="751230759"/>
314+
<reference ref="515950937"/>
169315
</object>
170316
<reference key="parent" ref="0"/>
171317
<string key="objectName">Window</string>
@@ -204,6 +350,38 @@
204350
<reference key="parent" ref="120427370"/>
205351
<string key="objectName">Content SplitView</string>
206352
</object>
353+
<object class="IBObjectRecord">
354+
<int key="objectID">367</int>
355+
<reference key="object" ref="515950937"/>
356+
<object class="NSMutableArray" key="children">
357+
<bool key="EncodedWithXMLCoder">YES</bool>
358+
<reference ref="128876649"/>
359+
<reference ref="847356444"/>
360+
<reference ref="381044771"/>
361+
<reference ref="98293483"/>
362+
</object>
363+
<reference key="parent" ref="491121796"/>
364+
</object>
365+
<object class="IBObjectRecord">
366+
<int key="objectID">370</int>
367+
<reference key="object" ref="128876649"/>
368+
<reference key="parent" ref="515950937"/>
369+
</object>
370+
<object class="IBObjectRecord">
371+
<int key="objectID">372</int>
372+
<reference key="object" ref="847356444"/>
373+
<reference key="parent" ref="515950937"/>
374+
</object>
375+
<object class="IBObjectRecord">
376+
<int key="objectID">373</int>
377+
<reference key="object" ref="381044771"/>
378+
<reference key="parent" ref="515950937"/>
379+
</object>
380+
<object class="IBObjectRecord">
381+
<int key="objectID">374</int>
382+
<reference key="object" ref="98293483"/>
383+
<reference key="parent" ref="515950937"/>
384+
</object>
207385
</object>
208386
</object>
209387
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -224,6 +402,9 @@
224402
<string>351.IBPluginDependency</string>
225403
<string>352.IBPluginDependency</string>
226404
<string>353.IBPluginDependency</string>
405+
<string>367.IBEditorWindowLastContentRect</string>
406+
<string>367.IBPluginDependency</string>
407+
<string>374.IBPluginDependency</string>
227408
<string>5.IBPluginDependency</string>
228409
<string>5.ImportedFromIB2</string>
229410
</object>
@@ -243,6 +424,9 @@
243424
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
244425
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
245426
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
427+
<string>{{621, 1213}, {616, 0}}</string>
428+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
429+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
246430
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
247431
<integer value="1"/>
248432
</object>
@@ -263,7 +447,7 @@
263447
</object>
264448
</object>
265449
<nil key="sourceID"/>
266-
<int key="maxID">366</int>
450+
<int key="maxID">374</int>
267451
</object>
268452
<object class="IBClassDescriber" key="IBDocument.Classes">
269453
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -474,7 +658,7 @@
474658
</object>
475659
<object class="IBPartialClassDescription">
476660
<string key="className">NSObject</string>
477-
<object class="IBClassDescriptionSource" key="sourceIdentifier">
661+
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="168026191">
478662
<string key="majorKey">IBFrameworkSource</string>
479663
<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
480664
</object>
@@ -726,6 +910,19 @@
726910
<string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string>
727911
</object>
728912
</object>
913+
<object class="IBPartialClassDescription">
914+
<string key="className">NSToolbar</string>
915+
<string key="superclassName">NSObject</string>
916+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
917+
<string key="majorKey">IBFrameworkSource</string>
918+
<string key="minorKey">AppKit.framework/Headers/NSToolbar.h</string>
919+
</object>
920+
</object>
921+
<object class="IBPartialClassDescription">
922+
<string key="className">NSToolbarItem</string>
923+
<string key="superclassName">NSObject</string>
924+
<reference key="sourceIdentifier" ref="168026191"/>
925+
</object>
729926
<object class="IBPartialClassDescription">
730927
<string key="className">NSView</string>
731928
<object class="IBClassDescriptionSource" key="sourceIdentifier">

‎GitX.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
D858108511274D28007F254B /* Tag.png in Resources */ = {isa = PBXBuildFile; fileRef = D858108211274D28007F254B /* Tag.png */; };
5959
D85B939310E3D8B4007F3C28 /* PBCreateBranchSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = D85B939210E3D8B4007F3C28 /* PBCreateBranchSheet.xib */; };
6060
D889EB3110E6BCBB00F08413 /* PBCreateTagSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = D889EB3010E6BCBB00F08413 /* PBCreateTagSheet.xib */; };
61+
D8A4BB6F11337D5C00E92D51 /* PBGitGradientBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = D8A4BB6E11337D5C00E92D51 /* PBGitGradientBarView.m */; };
6162
D8E3B2B810DC9FB2001096A3 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */; };
6263
D8E3B34D10DCA958001096A3 /* PBCreateTagSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D8E3B34C10DCA958001096A3 /* PBCreateTagSheet.m */; };
6364
D8FDD9F711432A12005647F6 /* PBCloneRepositoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8FDD9F511432A12005647F6 /* PBCloneRepositoryPanel.xib */; };
@@ -255,6 +256,8 @@
255256
D858108111274D28007F254B /* RemoteBranch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RemoteBranch.png; path = Images/RemoteBranch.png; sourceTree = "<group>"; };
256257
D858108211274D28007F254B /* Tag.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Tag.png; path = Images/Tag.png; sourceTree = "<group>"; };
257258
D85B93F610E51279007F3C28 /* PBGitRefish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRefish.h; sourceTree = "<group>"; };
259+
D8A4BB6D11337D5C00E92D51 /* PBGitGradientBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitGradientBarView.h; sourceTree = "<group>"; };
260+
D8A4BB6E11337D5C00E92D51 /* PBGitGradientBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitGradientBarView.m; sourceTree = "<group>"; };
258261
D8C1B77210E875CF009B7F8B /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PBRemoteProgressSheet.xib; sourceTree = "<group>"; };
259262
D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = /System/Library/Frameworks/ScriptingBridge.framework; sourceTree = "<absolute>"; };
260263
D8E3B34B10DCA958001096A3 /* PBCreateTagSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBCreateTagSheet.h; sourceTree = "<group>"; };
@@ -705,6 +708,8 @@
705708
D823487410CB382C00944BDE /* Terminal.h */,
706709
F567B88B1057FA9F000DB976 /* NSOutlineViewExt.h */,
707710
F567B88C1057FA9F000DB976 /* NSOutlineViewExt.m */,
711+
D8A4BB6D11337D5C00E92D51 /* PBGitGradientBarView.h */,
712+
D8A4BB6E11337D5C00E92D51 /* PBGitGradientBarView.m */,
708713
);
709714
name = Aux;
710715
sourceTree = "<group>";
@@ -1113,6 +1118,7 @@
11131118
D8FDDA6E114335E8005647F6 /* PBGitSVRemoteItem.m in Sources */,
11141119
D8FDDA6F114335E8005647F6 /* PBGitSVStageItem.m in Sources */,
11151120
D8FDDA70114335E8005647F6 /* PBGitSVTagItem.m in Sources */,
1121+
D8A4BB6F11337D5C00E92D51 /* PBGitGradientBarView.m in Sources */,
11161122
);
11171123
runOnlyForDeploymentPostprocessing = 0;
11181124
};

0 commit comments

Comments
 (0)