Skip to content

Commit 1b09381

Browse files
dmoagxdmoagx
committed
Add the possibility to search for whole words in "Goto Database"
This is done by wrapping the search term in single or double quotes. re: #2165, #1857
1 parent c124db7 commit 1b09381

File tree

4 files changed

+359
-23
lines changed

4 files changed

+359
-23
lines changed

‎Interfaces/English.lproj/GotoDatabaseDialog.xib‎

Lines changed: 266 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
<data>
44
<int key="IBDocument.SystemTarget">1060</int>
55
<string key="IBDocument.SystemVersion">13F34</string>
6-
<string key="IBDocument.InterfaceBuilderVersion">6254</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">6751</string>
77
<string key="IBDocument.AppKitVersion">1265.21</string>
88
<string key="IBDocument.HIToolboxVersion">698.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">6254</string>
11+
<string key="NS.object.0">6751</string>
1212
</object>
1313
<array key="IBDocument.IntegratedClassDependencies">
1414
<string>NSButton</string>
1515
<string>NSButtonCell</string>
1616
<string>NSCustomObject</string>
17+
<string>NSMenu</string>
18+
<string>NSMenuItem</string>
1719
<string>NSScrollView</string>
1820
<string>NSScroller</string>
1921
<string>NSSearchField</string>
@@ -93,6 +95,7 @@
9395
<string key="NSFrame">{{14, 13}, {82, 32}}</string>
9496
<reference key="NSSuperview" ref="494101113"/>
9597
<reference key="NSWindow"/>
98+
<reference key="NSNextKeyView" ref="408151789"/>
9699
<string key="NSHuggingPriority">{250, 750}</string>
97100
<bool key="NSEnabled">YES</bool>
98101
<object class="NSButtonCell" key="NSCell" id="297449935">
@@ -117,6 +120,7 @@
117120
<string key="NSFrame">{{20, 238}, {440, 22}}</string>
118121
<reference key="NSSuperview" ref="494101113"/>
119122
<reference key="NSWindow"/>
123+
<reference key="NSNextKeyView" ref="456988473"/>
120124
<bool key="NSEnabled">YES</bool>
121125
<object class="NSSearchFieldCell" key="NSCell" id="280043953">
122126
<int key="NSCellFlags">342884417</int>
@@ -195,6 +199,7 @@
195199
<string key="NSFrameSize">{438, 178}</string>
196200
<reference key="NSSuperview" ref="106547063"/>
197201
<reference key="NSWindow"/>
202+
<reference key="NSNextKeyView" ref="815430156"/>
198203
<bool key="NSEnabled">YES</bool>
199204
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
200205
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -302,6 +307,7 @@
302307
<string key="NSFrame">{{1, 164}, {423, 15}}</string>
303308
<reference key="NSSuperview" ref="456988473"/>
304309
<reference key="NSWindow"/>
310+
<reference key="NSNextKeyView" ref="427081588"/>
305311
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
306312
<int key="NSsFlags">1</int>
307313
<reference key="NSTarget" ref="456988473"/>
@@ -313,6 +319,7 @@
313319
<string key="NSFrame">{{424, 17}, {15, 147}}</string>
314320
<reference key="NSSuperview" ref="456988473"/>
315321
<reference key="NSWindow"/>
322+
<reference key="NSNextKeyView" ref="1036243046"/>
316323
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
317324
<reference key="NSTarget" ref="456988473"/>
318325
<string key="NSAction">_doScroller:</string>
@@ -335,12 +342,33 @@
335342
<string key="NSFrameSize">{480, 280}</string>
336343
<reference key="NSSuperview"/>
337344
<reference key="NSWindow"/>
345+
<reference key="NSNextKeyView" ref="562345904"/>
338346
</object>
339347
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
340348
<string key="NSMinSize">{480, 302}</string>
341349
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
342350
<bool key="NSWindowIsRestorable">NO</bool>
343351
</object>
352+
<object class="NSMenu" id="745930594">
353+
<string key="NSTitle"/>
354+
<array class="NSMutableArray" key="NSMenuItems">
355+
<object class="NSMenuItem" id="704335543">
356+
<reference key="NSMenu" ref="745930594"/>
357+
<string key="NSTitle">Search as word</string>
358+
<string key="NSKeyEquiv"/>
359+
<int key="NSMnemonicLoc">2147483647</int>
360+
<object class="NSCustomResource" key="NSOnImage">
361+
<string key="NSClassName">NSImage</string>
362+
<string key="NSResourceName">NSMenuCheckmark</string>
363+
</object>
364+
<object class="NSCustomResource" key="NSMixedImage">
365+
<string key="NSClassName">NSImage</string>
366+
<string key="NSResourceName">NSMenuMixedState</string>
367+
</object>
368+
<int key="NSTag">1</int>
369+
</object>
370+
</array>
371+
</object>
344372
</array>
345373
<object class="IBObjectContainer" key="IBDocument.Objects">
346374
<bool key="usesAutoincrementingIDs">NO</bool>
@@ -409,6 +437,14 @@
409437
</object>
410438
<string key="id">aXN-gQ-VPQ</string>
411439
</object>
440+
<object class="IBConnectionRecord">
441+
<object class="IBActionConnection" key="connection">
442+
<string key="label">toggleWordSearch:</string>
443+
<reference key="source" ref="1042702399"/>
444+
<reference key="destination" ref="704335543"/>
445+
</object>
446+
<string key="id">Ue7-RW-Esm</string>
447+
</object>
412448
<object class="IBConnectionRecord">
413449
<object class="IBOutletConnection" key="connection">
414450
<string key="label">delegate</string>
@@ -417,6 +453,22 @@
417453
</object>
418454
<string key="id">DIs-zq-6Cv</string>
419455
</object>
456+
<object class="IBConnectionRecord">
457+
<object class="IBOutletConnection" key="connection">
458+
<string key="label">searchMenuTemplate</string>
459+
<reference key="source" ref="562345904"/>
460+
<reference key="destination" ref="745930594"/>
461+
</object>
462+
<string key="id">aXK-2C-8Fh</string>
463+
</object>
464+
<object class="IBConnectionRecord">
465+
<object class="IBOutletConnection" key="connection">
466+
<string key="label">delegate</string>
467+
<reference key="source" ref="745930594"/>
468+
<reference key="destination" ref="1042702399"/>
469+
</object>
470+
<string key="id">Aa3-t8-5Q0</string>
471+
</object>
420472
<object class="IBConnectionRecord">
421473
<object class="IBOutletConnection" key="connection">
422474
<string key="label">dataSource</string>
@@ -551,6 +603,20 @@
551603
<reference key="object" ref="843011558"/>
552604
<reference key="parent" ref="231532511"/>
553605
</object>
606+
<object class="IBObjectRecord">
607+
<string key="id">Ktg-oV-3Ad</string>
608+
<reference key="object" ref="745930594"/>
609+
<array class="NSMutableArray" key="children">
610+
<reference ref="704335543"/>
611+
</array>
612+
<reference key="parent" ref="0"/>
613+
<string key="objectName">Search Context Menu</string>
614+
</object>
615+
<object class="IBObjectRecord">
616+
<string key="id">ymj-Sv-49C</string>
617+
<reference key="object" ref="704335543"/>
618+
<reference key="parent" ref="745930594"/>
619+
</object>
554620
</array>
555621
</object>
556622
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -587,6 +653,8 @@
587653
<boolean value="NO" key="Ift-DE-ytF.showNotes"/>
588654
<string key="K2E-vc-mDT.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
589655
<boolean value="NO" key="K2E-vc-mDT.showNotes"/>
656+
<string key="Ktg-oV-3Ad.IBPersistedLastKnownCanvasPosition">{352, 435.5}</string>
657+
<string key="Ktg-oV-3Ad.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
590658
<string key="LoZ-sS-bTj.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
591659
<reference key="LoZ-sS-bTj.IBUserGuides" ref="0"/>
592660
<boolean value="NO" key="LoZ-sS-bTj.showNotes"/>
@@ -604,6 +672,7 @@
604672
<boolean value="NO" key="cDW-lq-Q6e.showNotes"/>
605673
<string key="mE5-9u-hCv.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
606674
<boolean value="NO" key="mE5-9u-hCv.showNotes"/>
675+
<string key="ymj-Sv-49C.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
607676
</dictionary>
608677
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
609678
<nil key="activeLocalization"/>
@@ -650,6 +719,8 @@
650719
<string key="cancelClicked:">id</string>
651720
<string key="okClicked:">id</string>
652721
<string key="searchChanged:">id</string>
722+
<string key="toggleWordSearch:">id</string>
723+
<string key="toogleWordSearch:">id</string>
653724
</dictionary>
654725
<dictionary class="NSMutableDictionary" key="actionInfosByName">
655726
<object class="IBActionInfo" key="cancelClicked:">
@@ -664,13 +735,202 @@
664735
<string key="name">searchChanged:</string>
665736
<string key="candidateClassName">id</string>
666737
</object>
738+
<object class="IBActionInfo" key="toggleWordSearch:">
739+
<string key="name">toggleWordSearch:</string>
740+
<string key="candidateClassName">id</string>
741+
</object>
742+
<object class="IBActionInfo" key="toogleWordSearch:">
743+
<string key="name">toogleWordSearch:</string>
744+
<string key="candidateClassName">id</string>
745+
</object>
667746
</dictionary>
668747
<object class="IBClassDescriptionSource" key="sourceIdentifier">
669748
<string key="majorKey">IBProjectSource</string>
670749
<string key="minorKey">../Source/SPGotoDatabaseController.m</string>
671750
</object>
672751
</object>
673752
</array>
753+
<array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
754+
<object class="IBPartialClassDescription">
755+
<string key="className">NSActionCell</string>
756+
<string key="superclassName">NSCell</string>
757+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
758+
<string key="majorKey">IBFrameworkSource</string>
759+
<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
760+
</object>
761+
</object>
762+
<object class="IBPartialClassDescription">
763+
<string key="className">NSApplication</string>
764+
<string key="superclassName">NSResponder</string>
765+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
766+
<string key="majorKey">IBFrameworkSource</string>
767+
<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
768+
</object>
769+
</object>
770+
<object class="IBPartialClassDescription">
771+
<string key="className">NSButton</string>
772+
<string key="superclassName">NSControl</string>
773+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
774+
<string key="majorKey">IBFrameworkSource</string>
775+
<string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
776+
</object>
777+
</object>
778+
<object class="IBPartialClassDescription">
779+
<string key="className">NSButtonCell</string>
780+
<string key="superclassName">NSActionCell</string>
781+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
782+
<string key="majorKey">IBFrameworkSource</string>
783+
<string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
784+
</object>
785+
</object>
786+
<object class="IBPartialClassDescription">
787+
<string key="className">NSCell</string>
788+
<string key="superclassName">NSObject</string>
789+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
790+
<string key="majorKey">IBFrameworkSource</string>
791+
<string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
792+
</object>
793+
</object>
794+
<object class="IBPartialClassDescription">
795+
<string key="className">NSControl</string>
796+
<string key="superclassName">NSView</string>
797+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
798+
<string key="majorKey">IBFrameworkSource</string>
799+
<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
800+
</object>
801+
</object>
802+
<object class="IBPartialClassDescription">
803+
<string key="className">NSFormatter</string>
804+
<string key="superclassName">NSObject</string>
805+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
806+
<string key="majorKey">IBFrameworkSource</string>
807+
<string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
808+
</object>
809+
</object>
810+
<object class="IBPartialClassDescription">
811+
<string key="className">NSMenu</string>
812+
<string key="superclassName">NSObject</string>
813+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
814+
<string key="majorKey">IBFrameworkSource</string>
815+
<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
816+
</object>
817+
</object>
818+
<object class="IBPartialClassDescription">
819+
<string key="className">NSMenuItem</string>
820+
<string key="superclassName">NSObject</string>
821+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
822+
<string key="majorKey">IBFrameworkSource</string>
823+
<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
824+
</object>
825+
</object>
826+
<object class="IBPartialClassDescription">
827+
<string key="className">NSResponder</string>
828+
<string key="superclassName">NSObject</string>
829+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
830+
<string key="majorKey">IBFrameworkSource</string>
831+
<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
832+
</object>
833+
</object>
834+
<object class="IBPartialClassDescription">
835+
<string key="className">NSScrollView</string>
836+
<string key="superclassName">NSView</string>
837+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
838+
<string key="majorKey">IBFrameworkSource</string>
839+
<string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string>
840+
</object>
841+
</object>
842+
<object class="IBPartialClassDescription">
843+
<string key="className">NSScroller</string>
844+
<string key="superclassName">NSControl</string>
845+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
846+
<string key="majorKey">IBFrameworkSource</string>
847+
<string key="minorKey">AppKit.framework/Headers/NSScroller.h</string>
848+
</object>
849+
</object>
850+
<object class="IBPartialClassDescription">
851+
<string key="className">NSSearchField</string>
852+
<string key="superclassName">NSTextField</string>
853+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
854+
<string key="majorKey">IBFrameworkSource</string>
855+
<string key="minorKey">AppKit.framework/Headers/NSSearchField.h</string>
856+
</object>
857+
</object>
858+
<object class="IBPartialClassDescription">
859+
<string key="className">NSSearchFieldCell</string>
860+
<string key="superclassName">NSTextFieldCell</string>
861+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
862+
<string key="majorKey">IBFrameworkSource</string>
863+
<string key="minorKey">AppKit.framework/Headers/NSSearchFieldCell.h</string>
864+
</object>
865+
</object>
866+
<object class="IBPartialClassDescription">
867+
<string key="className">NSTableColumn</string>
868+
<string key="superclassName">NSObject</string>
869+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
870+
<string key="majorKey">IBFrameworkSource</string>
871+
<string key="minorKey">AppKit.framework/Headers/NSTableColumn.h</string>
872+
</object>
873+
</object>
874+
<object class="IBPartialClassDescription">
875+
<string key="className">NSTableView</string>
876+
<string key="superclassName">NSControl</string>
877+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
878+
<string key="majorKey">IBFrameworkSource</string>
879+
<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
880+
</object>
881+
</object>
882+
<object class="IBPartialClassDescription">
883+
<string key="className">NSTextField</string>
884+
<string key="superclassName">NSControl</string>
885+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
886+
<string key="majorKey">IBFrameworkSource</string>
887+
<string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
888+
</object>
889+
</object>
890+
<object class="IBPartialClassDescription">
891+
<string key="className">NSTextFieldCell</string>
892+
<string key="superclassName">NSActionCell</string>
893+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
894+
<string key="majorKey">IBFrameworkSource</string>
895+
<string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
896+
</object>
897+
</object>
898+
<object class="IBPartialClassDescription">
899+
<string key="className">NSView</string>
900+
<string key="superclassName">NSResponder</string>
901+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
902+
<string key="majorKey">IBFrameworkSource</string>
903+
<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
904+
</object>
905+
</object>
906+
<object class="IBPartialClassDescription">
907+
<string key="className">NSWindow</string>
908+
<string key="superclassName">NSResponder</string>
909+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
910+
<string key="majorKey">IBFrameworkSource</string>
911+
<string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
912+
</object>
913+
</object>
914+
<object class="IBPartialClassDescription">
915+
<string key="className">NSWindowController</string>
916+
<string key="superclassName">NSResponder</string>
917+
<object class="NSMutableDictionary" key="actions">
918+
<string key="NS.key.0">showWindow:</string>
919+
<string key="NS.object.0">id</string>
920+
</object>
921+
<object class="NSMutableDictionary" key="actionInfosByName">
922+
<string key="NS.key.0">showWindow:</string>
923+
<object class="IBActionInfo" key="NS.object.0">
924+
<string key="name">showWindow:</string>
925+
<string key="candidateClassName">id</string>
926+
</object>
927+
</object>
928+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
929+
<string key="majorKey">IBFrameworkSource</string>
930+
<string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
931+
</object>
932+
</object>
933+
</array>
674934
</object>
675935
<int key="IBDocument.localizationMode">0</int>
676936
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
@@ -681,5 +941,9 @@
681941
</object>
682942
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
683943
<int key="IBDocument.defaultPropertyAccessControl">3</int>
944+
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
945+
<string key="NSMenuCheckmark">{11, 11}</string>
946+
<string key="NSMenuMixedState">{10, 3}</string>
947+
</dictionary>
684948
</data>
685949
</archive>

0 commit comments

Comments
 (0)