Skip to content

Commit 4fad6b6

Browse files
brotherbardbrotherbard
committed
Improve search UI
Previously searching would filter the commits in the commit tableview to only show the commits that matched the search. However the context of where those commits exist in the history is lost. With this patch all the commits are shown but the commits that match the search are highlighted with a light blue background. In addition there is a forward/back button to step through the matches. A new search controller: - keeps track of the matching results - finds the next or previous result - displays the number of matches found or "Not found" - shows/hides the # of matches text and the next/last stepper button - shows a small bezel style window with a rewind icon indicating that the selection has cycled (pressing next when at the last match or previous when at the first) - sets up the search predicate which covers Subject, Author and SHA (previously this was three different searches) - stores search results in an NSIndexSet to make finding if a row is in the set faster (needed at drawing time) Highlighting of search result rows is done in PBCommitList -drawRow:clipRect: PBGitTextFieldCell is a subclass of NSTextFieldCell that disables the cell's selection highlighting. Supporting Find Next and Find Previous (cmd-g and cmd-shift-g) menu commands required changing the action method of the menu items because NSTextFields (seem to) actively disable items in the Find menu. rewindImage.pdf created by Nathan Kinsinger
1 parent 80596ad commit 4fad6b6

13 files changed

+1057
-148
lines changed

Diff for: ‎English.lproj/MainMenu.xib

+149-21
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
<data>
44
<int key="IBDocument.SystemTarget">1050</int>
55
<string key="IBDocument.SystemVersion">10F569</string>
6-
<string key="IBDocument.InterfaceBuilderVersion">804</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">788</string>
77
<string key="IBDocument.AppKitVersion">1038.29</string>
88
<string key="IBDocument.HIToolboxVersion">461.00</string>
99
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
1010
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
11-
<string key="NS.object.0">804</string>
11+
<string key="NS.object.0">788</string>
1212
</object>
1313
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
1414
<bool key="EncodedWithXMLCoder">YES</bool>
15-
<integer value="169"/>
1615
</object>
1716
<object class="NSArray" key="IBDocument.PluginDependencies">
1817
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1104,22 +1103,6 @@
11041103
</object>
11051104
<int key="connectionID">199</int>
11061105
</object>
1107-
<object class="IBConnectionRecord">
1108-
<object class="IBActionConnection" key="connection">
1109-
<string key="label">performFindPanelAction:</string>
1110-
<reference key="source" ref="954860085"/>
1111-
<reference key="destination" ref="416521231"/>
1112-
</object>
1113-
<int key="connectionID">200</int>
1114-
</object>
1115-
<object class="IBConnectionRecord">
1116-
<object class="IBActionConnection" key="connection">
1117-
<string key="label">performFindPanelAction:</string>
1118-
<reference key="source" ref="954860085"/>
1119-
<reference key="destination" ref="219112383"/>
1120-
</object>
1121-
<int key="connectionID">201</int>
1122-
</object>
11231106
<object class="IBConnectionRecord">
11241107
<object class="IBActionConnection" key="connection">
11251108
<string key="label">performFindPanelAction:</string>
@@ -1368,6 +1351,22 @@
13681351
</object>
13691352
<int key="connectionID">966</int>
13701353
</object>
1354+
<object class="IBConnectionRecord">
1355+
<object class="IBActionConnection" key="connection">
1356+
<string key="label">selectNext:</string>
1357+
<reference key="source" ref="954860085"/>
1358+
<reference key="destination" ref="416521231"/>
1359+
</object>
1360+
<int key="connectionID">967</int>
1361+
</object>
1362+
<object class="IBConnectionRecord">
1363+
<object class="IBActionConnection" key="connection">
1364+
<string key="label">selectPrevious:</string>
1365+
<reference key="source" ref="954860085"/>
1366+
<reference key="destination" ref="219112383"/>
1367+
</object>
1368+
<int key="connectionID">968</int>
1369+
</object>
13711370
</object>
13721371
<object class="IBMutableOrderedSet" key="objectRecords">
13731372
<object class="NSArray" key="orderedObjects">
@@ -2332,7 +2331,7 @@
23322331
<integer value="1"/>
23332332
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23342333
<integer value="1"/>
2335-
<string>{{864, 473}, {238, 103}}</string>
2334+
<string>{{762, 747}, {238, 103}}</string>
23362335
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23372336
<integer value="1"/>
23382337
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2498,7 +2497,7 @@
24982497
</object>
24992498
</object>
25002499
<nil key="sourceID"/>
2501-
<int key="maxID">966</int>
2500+
<int key="maxID">968</int>
25022501
</object>
25032502
<object class="IBClassDescriber" key="IBDocument.Classes">
25042503
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2665,6 +2664,13 @@
26652664
<string key="minorKey"/>
26662665
</object>
26672666
</object>
2667+
<object class="IBPartialClassDescription">
2668+
<string key="className">NSApplication</string>
2669+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
2670+
<string key="majorKey">IBProjectSource</string>
2671+
<string key="minorKey">NSApplication+GitXScripting.h</string>
2672+
</object>
2673+
</object>
26682674
<object class="IBPartialClassDescription">
26692675
<string key="className">NSOutlineView</string>
26702676
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2688,12 +2694,14 @@
26882694
<object class="NSArray" key="dict.sortedKeys">
26892695
<bool key="EncodedWithXMLCoder">YES</bool>
26902696
<string>controller</string>
2697+
<string>searchController</string>
26912698
<string>webController</string>
26922699
<string>webView</string>
26932700
</object>
26942701
<object class="NSMutableArray" key="dict.values">
26952702
<bool key="EncodedWithXMLCoder">YES</bool>
26962703
<string>PBGitHistoryController</string>
2704+
<string>PBHistorySearchController</string>
26972705
<string>PBWebHistoryController</string>
26982706
<string>WebView</string>
26992707
</object>
@@ -2703,6 +2711,7 @@
27032711
<object class="NSArray" key="dict.sortedKeys">
27042712
<bool key="EncodedWithXMLCoder">YES</bool>
27052713
<string>controller</string>
2714+
<string>searchController</string>
27062715
<string>webController</string>
27072716
<string>webView</string>
27082717
</object>
@@ -2712,6 +2721,10 @@
27122721
<string key="name">controller</string>
27132722
<string key="candidateClassName">PBGitHistoryController</string>
27142723
</object>
2724+
<object class="IBToOneOutletInfo">
2725+
<string key="name">searchController</string>
2726+
<string key="candidateClassName">PBHistorySearchController</string>
2727+
</object>
27152728
<object class="IBToOneOutletInfo">
27162729
<string key="name">webController</string>
27172730
<string key="candidateClassName">PBWebHistoryController</string>
@@ -3148,6 +3161,7 @@
31483161
<string>rebaseButton</string>
31493162
<string>refController</string>
31503163
<string>scopeBarView</string>
3164+
<string>searchController</string>
31513165
<string>searchField</string>
31523166
<string>selectedBranchFilterItem</string>
31533167
<string>treeController</string>
@@ -3168,6 +3182,7 @@
31683182
<string>NSButton</string>
31693183
<string>PBRefController</string>
31703184
<string>PBGitGradientBarView</string>
3185+
<string>PBHistorySearchController</string>
31713186
<string>NSSearchField</string>
31723187
<string>NSButton</string>
31733188
<string>NSTreeController</string>
@@ -3191,6 +3206,7 @@
31913206
<string>rebaseButton</string>
31923207
<string>refController</string>
31933208
<string>scopeBarView</string>
3209+
<string>searchController</string>
31943210
<string>searchField</string>
31953211
<string>selectedBranchFilterItem</string>
31963212
<string>treeController</string>
@@ -3244,6 +3260,10 @@
32443260
<string key="name">scopeBarView</string>
32453261
<string key="candidateClassName">PBGitGradientBarView</string>
32463262
</object>
3263+
<object class="IBToOneOutletInfo">
3264+
<string key="name">searchController</string>
3265+
<string key="candidateClassName">PBHistorySearchController</string>
3266+
</object>
32473267
<object class="IBToOneOutletInfo">
32483268
<string key="name">searchField</string>
32493269
<string key="candidateClassName">NSSearchField</string>
@@ -3617,6 +3637,78 @@
36173637
<string key="minorKey"/>
36183638
</object>
36193639
</object>
3640+
<object class="IBPartialClassDescription">
3641+
<string key="className">PBHistorySearchController</string>
3642+
<string key="superclassName">NSObject</string>
3643+
<object class="NSMutableDictionary" key="actions">
3644+
<string key="NS.key.0">stepperPressed:</string>
3645+
<string key="NS.object.0">id</string>
3646+
</object>
3647+
<object class="NSMutableDictionary" key="actionInfosByName">
3648+
<string key="NS.key.0">stepperPressed:</string>
3649+
<object class="IBActionInfo" key="NS.object.0">
3650+
<string key="name">stepperPressed:</string>
3651+
<string key="candidateClassName">id</string>
3652+
</object>
3653+
</object>
3654+
<object class="NSMutableDictionary" key="outlets">
3655+
<bool key="EncodedWithXMLCoder">YES</bool>
3656+
<object class="NSArray" key="dict.sortedKeys">
3657+
<bool key="EncodedWithXMLCoder">YES</bool>
3658+
<string>commitController</string>
3659+
<string>historyController</string>
3660+
<string>numberOfMatchesField</string>
3661+
<string>searchField</string>
3662+
<string>stepper</string>
3663+
</object>
3664+
<object class="NSMutableArray" key="dict.values">
3665+
<bool key="EncodedWithXMLCoder">YES</bool>
3666+
<string>NSArrayController</string>
3667+
<string>PBGitHistoryController</string>
3668+
<string>NSTextField</string>
3669+
<string>NSSearchField</string>
3670+
<string>NSSegmentedControl</string>
3671+
</object>
3672+
</object>
3673+
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
3674+
<bool key="EncodedWithXMLCoder">YES</bool>
3675+
<object class="NSArray" key="dict.sortedKeys">
3676+
<bool key="EncodedWithXMLCoder">YES</bool>
3677+
<string>commitController</string>
3678+
<string>historyController</string>
3679+
<string>numberOfMatchesField</string>
3680+
<string>searchField</string>
3681+
<string>stepper</string>
3682+
</object>
3683+
<object class="NSMutableArray" key="dict.values">
3684+
<bool key="EncodedWithXMLCoder">YES</bool>
3685+
<object class="IBToOneOutletInfo">
3686+
<string key="name">commitController</string>
3687+
<string key="candidateClassName">NSArrayController</string>
3688+
</object>
3689+
<object class="IBToOneOutletInfo">
3690+
<string key="name">historyController</string>
3691+
<string key="candidateClassName">PBGitHistoryController</string>
3692+
</object>
3693+
<object class="IBToOneOutletInfo">
3694+
<string key="name">numberOfMatchesField</string>
3695+
<string key="candidateClassName">NSTextField</string>
3696+
</object>
3697+
<object class="IBToOneOutletInfo">
3698+
<string key="name">searchField</string>
3699+
<string key="candidateClassName">NSSearchField</string>
3700+
</object>
3701+
<object class="IBToOneOutletInfo">
3702+
<string key="name">stepper</string>
3703+
<string key="candidateClassName">NSSegmentedControl</string>
3704+
</object>
3705+
</object>
3706+
</object>
3707+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
3708+
<string key="majorKey">IBProjectSource</string>
3709+
<string key="minorKey">PBHistorySearchController.h</string>
3710+
</object>
3711+
</object>
36203712
<object class="IBPartialClassDescription">
36213713
<string key="className">PBNiceSplitView</string>
36223714
<string key="superclassName">NSSplitView</string>
@@ -4542,6 +4634,34 @@
45424634
<string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
45434635
</object>
45444636
</object>
4637+
<object class="IBPartialClassDescription">
4638+
<string key="className">NSObject</string>
4639+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
4640+
<string key="majorKey">IBFrameworkSource</string>
4641+
<string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
4642+
</object>
4643+
</object>
4644+
<object class="IBPartialClassDescription">
4645+
<string key="className">NSObject</string>
4646+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
4647+
<string key="majorKey">IBFrameworkSource</string>
4648+
<string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
4649+
</object>
4650+
</object>
4651+
<object class="IBPartialClassDescription">
4652+
<string key="className">NSObject</string>
4653+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
4654+
<string key="majorKey">IBFrameworkSource</string>
4655+
<string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
4656+
</object>
4657+
</object>
4658+
<object class="IBPartialClassDescription">
4659+
<string key="className">NSObject</string>
4660+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
4661+
<string key="majorKey">IBFrameworkSource</string>
4662+
<string key="minorKey">ScriptingBridge.framework/Headers/SBApplication.h</string>
4663+
</object>
4664+
</object>
45454665
<object class="IBPartialClassDescription">
45464666
<string key="className">NSObject</string>
45474667
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -4678,6 +4798,14 @@
46784798
<string key="minorKey">AppKit.framework/Headers/NSSearchField.h</string>
46794799
</object>
46804800
</object>
4801+
<object class="IBPartialClassDescription">
4802+
<string key="className">NSSegmentedControl</string>
4803+
<string key="superclassName">NSControl</string>
4804+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
4805+
<string key="majorKey">IBFrameworkSource</string>
4806+
<string key="minorKey">AppKit.framework/Headers/NSSegmentedControl.h</string>
4807+
</object>
4808+
</object>
46814809
<object class="IBPartialClassDescription">
46824810
<string key="className">NSSplitView</string>
46834811
<string key="superclassName">NSView</string>

0 commit comments

Comments
 (0)