Skip to content

Commit b1e632c

Browse files
brotherbardbrotherbard
committed
Move the sidebar to the window controller
Remove the sidebar from the history controller and put it under the control of the window controller. - the window controller is the delegate of the split view and controls resizing so the source list stays the same width as the window resizes - the sidebar controller tells the window controller which content view to show - removed the view selector from the toolbars of the history and commit xibs (the menu and keyboard shortcuts command-1 and command-2 still switch between the views) - added horizontal lines to the history and commit xibs to delineate the bottom toolbar area
1 parent c36726b commit b1e632c

10 files changed

+1849
-627
lines changed

‎English.lproj/RepositoryWindow.xib

Lines changed: 625 additions & 46 deletions
Large diffs are not rendered by default.

‎PBGitCommitView.xib

Lines changed: 888 additions & 212 deletions
Large diffs are not rendered by default.

‎PBGitHistoryController.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
@class PBGitSidebarController;
1616

1717
@interface PBGitHistoryController : PBViewController {
18-
PBGitSidebarController *sidebarController;
1918
IBOutlet NSSearchField *searchField;
2019
IBOutlet NSArrayController* commitController;
2120
IBOutlet NSTreeController* treeController;

‎PBGitHistoryController.m

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,6 @@ - (void)awakeFromNib
3333
[fileBrowser setTarget:self];
3434
[fileBrowser setDoubleAction:@selector(openSelectedFile:)];
3535

36-
[historySplitView removeFromSuperview];
37-
NSSplitView *newView = [[NSSplitView alloc] initWithFrame:[historySplitView frame]];
38-
39-
sidebarController = [[PBGitSidebarController alloc] initWithRepository:repository superController:superController];
40-
[newView setDividerStyle:NSSplitViewDividerStyleThin];
41-
[newView addSubview:[sidebarController view]];
42-
[newView addSubview:historySplitView];
43-
[newView setVertical:YES];
44-
[newView adjustSubviews];
45-
[newView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
46-
47-
[[self view] addSubview:newView];
48-
4936
if (!repository.currentBranch) {
5037
[repository reloadRefs];
5138
[repository readCurrentBranch];
@@ -107,6 +94,7 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
10794
else if([(NSString *)context isEqualToString:@"branchChange"]) {
10895
// Reset the sorting
10996
commitController.sortDescriptors = [NSArray array];
97+
[repository reloadRefs];
11098
}
11199
else {
112100
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
@@ -194,7 +182,7 @@ - (IBAction) refresh: sender
194182

195183
- (void) updateView
196184
{
197-
[self refresh:nil];
185+
198186
}
199187

200188
- (NSResponder *)firstResponder;

‎PBGitHistoryView.xib

Lines changed: 58 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
</object>
2222
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
2323
<bool key="EncodedWithXMLCoder">YES</bool>
24-
<integer value="2"/>
24+
<integer value="113"/>
25+
<integer value="46"/>
2526
</object>
2627
<object class="NSArray" key="IBDocument.PluginDependencies">
2728
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -106,6 +107,40 @@
106107
<int key="NSvFlags">4370</int>
107108
<object class="NSMutableArray" key="NSSubviews">
108109
<bool key="EncodedWithXMLCoder">YES</bool>
110+
<object class="NSBox" id="530497696">
111+
<reference key="NSNextResponder" ref="319362431"/>
112+
<int key="NSvFlags">34</int>
113+
<string key="NSFrame">{{0, 32}, {852, 5}}</string>
114+
<reference key="NSSuperview" ref="319362431"/>
115+
<string key="NSOffsets">{0, 0}</string>
116+
<object class="NSTextFieldCell" key="NSTitleCell">
117+
<int key="NSCellFlags">67239424</int>
118+
<int key="NSCellFlags2">0</int>
119+
<string key="NSContents">Box</string>
120+
<object class="NSFont" key="NSSupport" id="924107556">
121+
<string key="NSName">LucidaGrande</string>
122+
<double key="NSSize">13</double>
123+
<int key="NSfFlags">1044</int>
124+
</object>
125+
<object class="NSColor" key="NSBackgroundColor" id="870781813">
126+
<int key="NSColorSpace">6</int>
127+
<string key="NSCatalogName">System</string>
128+
<string key="NSColorName">textBackgroundColor</string>
129+
<object class="NSColor" key="NSColor" id="965176493">
130+
<int key="NSColorSpace">3</int>
131+
<bytes key="NSWhite">MQA</bytes>
132+
</object>
133+
</object>
134+
<object class="NSColor" key="NSTextColor">
135+
<int key="NSColorSpace">3</int>
136+
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
137+
</object>
138+
</object>
139+
<int key="NSBorderType">3</int>
140+
<int key="NSBoxType">2</int>
141+
<int key="NSTitlePosition">0</int>
142+
<bool key="NSTransparent">NO</bool>
143+
</object>
109144
<object class="NSSegmentedControl" id="802449565">
110145
<reference key="NSNextResponder" ref="319362431"/>
111146
<int key="NSvFlags">293</int>
@@ -115,11 +150,7 @@
115150
<object class="NSSegmentedCell" key="NSCell" id="534046869">
116151
<int key="NSCellFlags">-2080244224</int>
117152
<int key="NSCellFlags2">0</int>
118-
<object class="NSFont" key="NSSupport" id="924107556">
119-
<string key="NSName">LucidaGrande</string>
120-
<double key="NSSize">13</double>
121-
<int key="NSfFlags">1044</int>
122-
</object>
153+
<reference key="NSSupport" ref="924107556"/>
123154
<reference key="NSControlView" ref="802449565"/>
124155
<object class="NSMutableArray" key="NSSegmentImages">
125156
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -278,10 +309,7 @@
278309
<int key="NSColorSpace">6</int>
279310
<string key="NSCatalogName">System</string>
280311
<string key="NSColorName">headerColor</string>
281-
<object class="NSColor" key="NSColor" id="965176493">
282-
<int key="NSColorSpace">3</int>
283-
<bytes key="NSWhite">MQA</bytes>
284-
</object>
312+
<reference key="NSColor" ref="965176493"/>
285313
</object>
286314
<reference key="NSTextColor" ref="160578461"/>
287315
</object>
@@ -875,7 +903,7 @@
875903
<object class="NSTextField" id="555671215">
876904
<reference key="NSNextResponder" ref="319362431"/>
877905
<int key="NSvFlags">292</int>
878-
<string key="NSFrame">{{17, 7}, {305, 17}}</string>
906+
<string key="NSFrame">{{17, 8}, {305, 17}}</string>
879907
<reference key="NSSuperview" ref="319362431"/>
880908
<bool key="NSEnabled">YES</bool>
881909
<object class="NSTextFieldCell" key="NSCell" id="144370985">
@@ -935,73 +963,13 @@
935963
<bool key="EncodedWithXMLCoder">YES</bool>
936964
<object class="NSArray" key="dict.sortedKeys">
937965
<bool key="EncodedWithXMLCoder">YES</bool>
938-
<string>1E431E79-1591-49E7-9E17-49497CA4622A</string>
939966
<string>7FFB691C-2D2F-49A9-997F-AE1AE8BFF3F1</string>
940967
<string>86360841-A2B1-4802-845A-AE424521FE99</string>
941968
<string>NSToolbarFlexibleSpaceItem</string>
942969
<string>NSToolbarSeparatorItem</string>
943970
</object>
944971
<object class="NSMutableArray" key="dict.values">
945972
<bool key="EncodedWithXMLCoder">YES</bool>
946-
<object class="NSToolbarItem" id="215578734">
947-
<object class="NSMutableString" key="NSToolbarItemIdentifier">
948-
<characters key="NS.bytes">1E431E79-1591-49E7-9E17-49497CA4622A</characters>
949-
</object>
950-
<string key="NSToolbarItemLabel">View</string>
951-
<string key="NSToolbarItemPaletteLabel">View selector</string>
952-
<nil key="NSToolbarItemToolTip"/>
953-
<object class="NSSegmentedControl" key="NSToolbarItemView" id="764711234">
954-
<reference key="NSNextResponder"/>
955-
<int key="NSvFlags">268</int>
956-
<string key="NSFrame">{{0, 14}, {87, 25}}</string>
957-
<reference key="NSSuperview"/>
958-
<reference key="NSWindow"/>
959-
<int key="NSTag">3</int>
960-
<bool key="NSEnabled">YES</bool>
961-
<object class="NSSegmentedCell" key="NSCell" id="266464607">
962-
<int key="NSCellFlags">67239424</int>
963-
<int key="NSCellFlags2">0</int>
964-
<reference key="NSSupport" ref="924107556"/>
965-
<reference key="NSControlView" ref="764711234"/>
966-
<object class="NSMutableArray" key="NSSegmentImages">
967-
<bool key="EncodedWithXMLCoder">YES</bool>
968-
<object class="NSSegmentItem">
969-
<double key="NSSegmentItemWidth">40</double>
970-
<object class="NSCustomResource" key="NSSegmentItemImage">
971-
<string key="NSClassName">NSImage</string>
972-
<string key="NSResourceName">HistoryViewTemplate</string>
973-
</object>
974-
<string key="NSSegmentItemLabel"/>
975-
<string key="NSSegmentItemTooltip">History View</string>
976-
<int key="NSSegmentItemImageScaling">0</int>
977-
</object>
978-
<object class="NSSegmentItem">
979-
<double key="NSSegmentItemWidth">40</double>
980-
<object class="NSCustomResource" key="NSSegmentItemImage">
981-
<string key="NSClassName">NSImage</string>
982-
<string key="NSResourceName">CommitViewTemplate</string>
983-
</object>
984-
<string key="NSSegmentItemLabel"/>
985-
<string key="NSSegmentItemTooltip">Commit View</string>
986-
<bool key="NSSegmentItemSelected">YES</bool>
987-
<int key="NSSegmentItemImageScaling">0</int>
988-
</object>
989-
</object>
990-
<int key="NSSelectedSegment">1</int>
991-
<int key="NSSegmentStyle">2</int>
992-
</object>
993-
</object>
994-
<nil key="NSToolbarItemImage"/>
995-
<nil key="NSToolbarItemTarget"/>
996-
<nil key="NSToolbarItemAction"/>
997-
<string key="NSToolbarItemMinSize">{87, 25}</string>
998-
<string key="NSToolbarItemMaxSize">{87, 25}</string>
999-
<bool key="NSToolbarItemEnabled">YES</bool>
1000-
<bool key="NSToolbarItemAutovalidates">YES</bool>
1001-
<int key="NSToolbarItemTag">3</int>
1002-
<bool key="NSToolbarIsUserRemovable">YES</bool>
1003-
<int key="NSToolbarItemVisibilityPriority">0</int>
1004-
</object>
1005973
<object class="NSToolbarItem" id="479447135">
1006974
<object class="NSMutableString" key="NSToolbarItemIdentifier">
1007975
<characters key="NS.bytes">7FFB691C-2D2F-49A9-997F-AE1AE8BFF3F1</characters>
@@ -1016,7 +984,6 @@
1016984
<int key="NSvFlags">265</int>
1017985
<string key="NSFrame">{{0, 14}, {183, 22}}</string>
1018986
<reference key="NSSuperview"/>
1019-
<reference key="NSWindow"/>
1020987
<bool key="NSEnabled">YES</bool>
1021988
<object class="NSSearchFieldCell" key="NSCell" id="449521666">
1022989
<int key="NSCellFlags">343014976</int>
@@ -1026,12 +993,7 @@
1026993
<reference key="NSControlView" ref="845792858"/>
1027994
<bool key="NSDrawsBackground">YES</bool>
1028995
<int key="NSTextBezelStyle">1</int>
1029-
<object class="NSColor" key="NSBackgroundColor">
1030-
<int key="NSColorSpace">6</int>
1031-
<string key="NSCatalogName">System</string>
1032-
<string key="NSColorName">textBackgroundColor</string>
1033-
<reference key="NSColor" ref="965176493"/>
1034-
</object>
996+
<reference key="NSBackgroundColor" ref="870781813"/>
1035997
<reference key="NSTextColor" ref="57062640"/>
1036998
<object class="NSButtonCell" key="NSSearchButtonCell">
1037999
<int key="NSCellFlags">130560</int>
@@ -1102,7 +1064,6 @@
11021064
<int key="NSvFlags">268</int>
11031065
<string key="NSFrame">{{21, 14}, {40, 25}}</string>
11041066
<reference key="NSSuperview"/>
1105-
<reference key="NSWindow"/>
11061067
<bool key="NSEnabled">YES</bool>
11071068
<object class="NSButtonCell" key="NSCell" id="596537926">
11081069
<int key="NSCellFlags">-2080244224</int>
@@ -1197,15 +1158,13 @@
11971158
</object>
11981159
<object class="NSArray" key="NSToolbarIBAllowedItems">
11991160
<bool key="EncodedWithXMLCoder">YES</bool>
1200-
<reference ref="215578734"/>
12011161
<reference ref="776753395"/>
12021162
<reference ref="633367776"/>
12031163
<reference ref="479447135"/>
12041164
<reference ref="608989609"/>
12051165
</object>
12061166
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
12071167
<bool key="EncodedWithXMLCoder">YES</bool>
1208-
<reference ref="215578734"/>
12091168
<reference ref="776753395"/>
12101169
<reference ref="608989609"/>
12111170
<reference ref="633367776"/>
@@ -1810,6 +1769,7 @@
18101769
<reference ref="16222431"/>
18111770
<reference ref="802449565"/>
18121771
<reference ref="555671215"/>
1772+
<reference ref="530497696"/>
18131773
</object>
18141774
<reference key="parent" ref="0"/>
18151775
</object>
@@ -2094,7 +2054,6 @@
20942054
<reference ref="633367776"/>
20952055
<reference ref="479447135"/>
20962056
<reference ref="776753395"/>
2097-
<reference ref="215578734"/>
20982057
<reference ref="608989609"/>
20992058
</object>
21002059
<reference key="parent" ref="0"/>
@@ -2119,15 +2078,6 @@
21192078
<reference key="object" ref="776753395"/>
21202079
<reference key="parent" ref="65173285"/>
21212080
</object>
2122-
<object class="IBObjectRecord">
2123-
<int key="objectID">223</int>
2124-
<reference key="object" ref="215578734"/>
2125-
<object class="NSMutableArray" key="children">
2126-
<bool key="EncodedWithXMLCoder">YES</bool>
2127-
<reference ref="764711234"/>
2128-
</object>
2129-
<reference key="parent" ref="65173285"/>
2130-
</object>
21312081
<object class="IBObjectRecord">
21322082
<int key="objectID">263</int>
21332083
<reference key="object" ref="608989609"/>
@@ -2151,20 +2101,6 @@
21512101
<reference key="object" ref="596537926"/>
21522102
<reference key="parent" ref="733802043"/>
21532103
</object>
2154-
<object class="IBObjectRecord">
2155-
<int key="objectID">224</int>
2156-
<reference key="object" ref="764711234"/>
2157-
<object class="NSMutableArray" key="children">
2158-
<bool key="EncodedWithXMLCoder">YES</bool>
2159-
<reference ref="266464607"/>
2160-
</object>
2161-
<reference key="parent" ref="215578734"/>
2162-
</object>
2163-
<object class="IBObjectRecord">
2164-
<int key="objectID">225</int>
2165-
<reference key="object" ref="266464607"/>
2166-
<reference key="parent" ref="764711234"/>
2167-
</object>
21682104
<object class="IBObjectRecord">
21692105
<int key="objectID">117</int>
21702106
<reference key="object" ref="845792858"/>
@@ -2193,6 +2129,11 @@
21932129
<reference key="object" ref="671609291"/>
21942130
<reference key="parent" ref="456964926"/>
21952131
</object>
2132+
<object class="IBObjectRecord">
2133+
<int key="objectID">296</int>
2134+
<reference key="object" ref="530497696"/>
2135+
<reference key="parent" ref="319362431"/>
2136+
</object>
21962137
</object>
21972138
</object>
21982139
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2224,9 +2165,6 @@
22242165
<string>20.IBPluginDependency</string>
22252166
<string>21.IBAttributePlaceholdersKey</string>
22262167
<string>21.IBPluginDependency</string>
2227-
<string>223.IBPluginDependency</string>
2228-
<string>224.IBPluginDependency</string>
2229-
<string>225.IBPluginDependency</string>
22302168
<string>261.IBAttributePlaceholdersKey</string>
22312169
<string>261.IBPluginDependency</string>
22322170
<string>262.IBPluginDependency</string>
@@ -2244,6 +2182,7 @@
22442182
<string>288.IBPluginDependency</string>
22452183
<string>29.IBPluginDependency</string>
22462184
<string>29.IBShouldRemoveOnLegacySave</string>
2185+
<string>296.IBPluginDependency</string>
22472186
<string>3.IBPluginDependency</string>
22482187
<string>3.ImportedFromIB2</string>
22492188
<string>30.CustomClassName</string>
@@ -2311,9 +2250,6 @@
23112250
</object>
23122251
</object>
23132252
<string>com.apple.WebKitIBPlugin</string>
2314-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2315-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2316-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23172253
<object class="NSMutableDictionary">
23182254
<string key="NS.key.0">ToolTip</string>
23192255
<object class="IBToolTipAttribute" key="NS.object.0">
@@ -2339,6 +2275,7 @@
23392275
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23402276
<integer value="1"/>
23412277
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2278+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23422279
<integer value="1"/>
23432280
<string>PBUnsortableTableHeader</string>
23442281
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2365,7 +2302,7 @@
23652302
</object>
23662303
</object>
23672304
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2368-
<string>{{486, 542}, {852, 432}}</string>
2305+
<string>{{612, 517}, {852, 432}}</string>
23692306
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23702307
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23712308
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2395,7 +2332,7 @@
23952332
</object>
23962333
</object>
23972334
<nil key="sourceID"/>
2398-
<int key="maxID">295</int>
2335+
<int key="maxID">296</int>
23992336
</object>
24002337
<object class="IBClassDescriber" key="IBDocument.Classes">
24012338
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2769,6 +2706,14 @@
27692706
<string key="minorKey">AppKit.framework/Headers/NSArrayController.h</string>
27702707
</object>
27712708
</object>
2709+
<object class="IBPartialClassDescription">
2710+
<string key="className">NSBox</string>
2711+
<string key="superclassName">NSView</string>
2712+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
2713+
<string key="majorKey">IBFrameworkSource</string>
2714+
<string key="minorKey">AppKit.framework/Headers/NSBox.h</string>
2715+
</object>
2716+
</object>
27722717
<object class="IBPartialClassDescription">
27732718
<string key="className">NSButton</string>
27742719
<string key="superclassName">NSControl</string>

0 commit comments

Comments
 (0)