Skip to content

Commit e4725ae

Browse files
jphalipjphalip
committed
Added a checkbox to the 'Create tag' sheet to allow replacing existing tags.
1 parent fd49408 commit e4725ae

File tree

5 files changed

+168
-32
lines changed

5 files changed

+168
-32
lines changed

‎English.lproj/PBCreateTagSheet.xib

Lines changed: 153 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
33
<data>
44
<int key="IBDocument.SystemTarget">1070</int>
5-
<string key="IBDocument.SystemVersion">11C74</string>
6-
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
7-
<string key="IBDocument.AppKitVersion">1138.23</string>
8-
<string key="IBDocument.HIToolboxVersion">567.00</string>
5+
<string key="IBDocument.SystemVersion">11D50</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
7+
<string key="IBDocument.AppKitVersion">1138.32</string>
8+
<string key="IBDocument.HIToolboxVersion">568.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">1938</string>
11+
<string key="NS.object.0">2182</string>
1212
</object>
1313
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
1414
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -17,6 +17,7 @@
1717
<string>NSWindowTemplate</string>
1818
<string>NSCustomObject</string>
1919
<string>NSScrollView</string>
20+
<string>NSUserDefaultsController</string>
2021
<string>NSTextView</string>
2122
<string>NSButtonCell</string>
2223
<string>NSButton</string>
@@ -45,7 +46,7 @@
4546
<object class="NSWindowTemplate" id="1005">
4647
<int key="NSWindowStyleMask">9</int>
4748
<int key="NSWindowBacking">2</int>
48-
<string key="NSWindowRect">{{196, 233}, {462, 302}}</string>
49+
<string key="NSWindowRect">{{196, 233}, {462, 332}}</string>
4950
<int key="NSWTFlags">544736256</int>
5051
<string key="NSWindowTitle">Window</string>
5152
<string key="NSWindowClass">NSWindow</string>
@@ -60,7 +61,7 @@
6061
<object class="NSTextField" id="56080063">
6162
<reference key="NSNextResponder" ref="1006"/>
6263
<int key="NSvFlags">268</int>
63-
<string key="NSFrame">{{17, 265}, {77, 17}}</string>
64+
<string key="NSFrame">{{17, 295}, {77, 17}}</string>
6465
<reference key="NSSuperview" ref="1006"/>
6566
<reference key="NSWindow"/>
6667
<reference key="NSNextKeyView" ref="915130556"/>
@@ -98,7 +99,7 @@
9899
<object class="NSTextField" id="915130556">
99100
<reference key="NSNextResponder" ref="1006"/>
100101
<int key="NSvFlags">268</int>
101-
<string key="NSFrame">{{29, 229}, {71, 17}}</string>
102+
<string key="NSFrame">{{29, 259}, {71, 17}}</string>
102103
<reference key="NSSuperview" ref="1006"/>
103104
<reference key="NSWindow"/>
104105
<reference key="NSNextKeyView" ref="29339768"/>
@@ -120,7 +121,7 @@
120121
<object class="NSTextField" id="29339768">
121122
<reference key="NSNextResponder" ref="1006"/>
122123
<int key="NSvFlags">266</int>
123-
<string key="NSFrame">{{105, 227}, {337, 22}}</string>
124+
<string key="NSFrame">{{105, 257}, {337, 22}}</string>
124125
<reference key="NSSuperview" ref="1006"/>
125126
<reference key="NSWindow"/>
126127
<reference key="NSNextKeyView" ref="431805063"/>
@@ -153,7 +154,7 @@
153154
<object class="NSTextField" id="431805063">
154155
<reference key="NSNextResponder" ref="1006"/>
155156
<int key="NSvFlags">268</int>
156-
<string key="NSFrame">{{37, 197}, {63, 17}}</string>
157+
<string key="NSFrame">{{37, 227}, {63, 17}}</string>
157158
<reference key="NSSuperview" ref="1006"/>
158159
<reference key="NSWindow"/>
159160
<reference key="NSNextKeyView" ref="280543056"/>
@@ -239,7 +240,7 @@
239240
<string>NSBackgroundColor</string>
240241
<string>NSColor</string>
241242
</object>
242-
<object class="NSMutableArray" key="dict.values">
243+
<object class="NSArray" key="dict.values">
243244
<bool key="EncodedWithXMLCoder">YES</bool>
244245
<object class="NSColor">
245246
<int key="NSColorSpace">6</int>
@@ -264,7 +265,7 @@
264265
<string>NSCursor</string>
265266
<string>NSUnderline</string>
266267
</object>
267-
<object class="NSMutableArray" key="dict.values">
268+
<object class="NSArray" key="dict.values">
268269
<bool key="EncodedWithXMLCoder">YES</bool>
269270
<object class="NSColor">
270271
<int key="NSColorSpace">1</int>
@@ -327,7 +328,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
327328
<string key="NSFrame">{{339, 1}, {15, 133}}</string>
328329
<reference key="NSSuperview" ref="614131177"/>
329330
<reference key="NSWindow"/>
330-
<reference key="NSNextKeyView" ref="54701648"/>
331+
<reference key="NSNextKeyView" ref="216305932"/>
331332
<reference key="NSTarget" ref="614131177"/>
332333
<string key="NSAction">_doScroller:</string>
333334
<double key="NSCurValue">1</double>
@@ -347,7 +348,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
347348
<double key="NSPercent">0.94565218687057495</double>
348349
</object>
349350
</object>
350-
<string key="NSFrame">{{105, 84}, {337, 135}}</string>
351+
<string key="NSFrame">{{105, 114}, {337, 135}}</string>
351352
<reference key="NSSuperview" ref="1006"/>
352353
<reference key="NSWindow"/>
353354
<reference key="NSNextKeyView" ref="43268108"/>
@@ -424,7 +425,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
424425
<object class="NSTextField" id="280543056">
425426
<reference key="NSNextResponder" ref="1006"/>
426427
<int key="NSvFlags">268</int>
427-
<string key="NSFrame">{{50, 182}, {46, 11}}</string>
428+
<string key="NSFrame">{{50, 212}, {46, 11}}</string>
428429
<reference key="NSSuperview" ref="1006"/>
429430
<reference key="NSWindow"/>
430431
<reference key="NSNextKeyView" ref="614131177"/>
@@ -443,17 +444,73 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
443444
<reference key="NSTextColor" ref="1010501519"/>
444445
</object>
445446
</object>
447+
<object class="NSButton" id="216305932">
448+
<reference key="NSNextResponder" ref="1006"/>
449+
<int key="NSvFlags">268</int>
450+
<string key="NSFrame">{{103, 90}, {150, 18}}</string>
451+
<reference key="NSSuperview" ref="1006"/>
452+
<reference key="NSWindow"/>
453+
<reference key="NSNextKeyView" ref="1004093344"/>
454+
<string key="NSReuseIdentifierKey">_NS:9</string>
455+
<bool key="NSEnabled">YES</bool>
456+
<object class="NSButtonCell" key="NSCell" id="660037974">
457+
<int key="NSCellFlags">67239424</int>
458+
<int key="NSCellFlags2">0</int>
459+
<string key="NSContents">Replace existing tag</string>
460+
<reference key="NSSupport" ref="802204130"/>
461+
<string key="NSCellIdentifier">_NS:9</string>
462+
<reference key="NSControlView" ref="216305932"/>
463+
<int key="NSButtonFlags">1211912703</int>
464+
<int key="NSButtonFlags2">2</int>
465+
<object class="NSCustomResource" key="NSNormalImage">
466+
<string key="NSClassName">NSImage</string>
467+
<string key="NSResourceName">NSSwitch</string>
468+
</object>
469+
<object class="NSButtonImageSource" key="NSAlternateImage">
470+
<string key="NSImageName">NSSwitch</string>
471+
</object>
472+
<string key="NSAlternateContents"/>
473+
<string key="NSKeyEquivalent"/>
474+
<int key="NSPeriodicDelay">200</int>
475+
<int key="NSPeriodicInterval">25</int>
476+
</object>
477+
</object>
478+
<object class="NSTextField" id="1004093344">
479+
<reference key="NSNextResponder" ref="1006"/>
480+
<int key="NSvFlags">268</int>
481+
<string key="NSFrame">{{122, 72}, {278, 17}}</string>
482+
<reference key="NSSuperview" ref="1006"/>
483+
<reference key="NSWindow"/>
484+
<reference key="NSNextKeyView" ref="54701648"/>
485+
<bool key="NSEnabled">YES</bool>
486+
<object class="NSTextFieldCell" key="NSCell" id="602102907">
487+
<int key="NSCellFlags">68288064</int>
488+
<int key="NSCellFlags2">272761856</int>
489+
<string key="NSContents">(Not recommended if tag has already been pushed)</string>
490+
<object class="NSFont" key="NSSupport">
491+
<string key="NSName">LucidaGrande</string>
492+
<double key="NSSize">11</double>
493+
<int key="NSfFlags">3100</int>
494+
</object>
495+
<reference key="NSControlView" ref="1004093344"/>
496+
<reference key="NSBackgroundColor" ref="668144010"/>
497+
<reference key="NSTextColor" ref="1010501519"/>
498+
</object>
499+
</object>
446500
</object>
447-
<string key="NSFrameSize">{462, 302}</string>
501+
<string key="NSFrameSize">{462, 332}</string>
448502
<reference key="NSSuperview"/>
449503
<reference key="NSWindow"/>
450504
<reference key="NSNextKeyView" ref="56080063"/>
451505
</object>
452-
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
506+
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
453507
<string key="NSMinSize">{425, 299}</string>
454508
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
455509
<bool key="NSWindowIsRestorable">YES</bool>
456510
</object>
511+
<object class="NSUserDefaultsController" id="759304026">
512+
<bool key="NSSharedInstance">YES</bool>
513+
</object>
457514
</object>
458515
<object class="IBObjectContainer" key="IBDocument.Objects">
459516
<object class="NSMutableArray" key="connectionRecords">
@@ -506,6 +563,30 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
506563
</object>
507564
<int key="connectionID">33</int>
508565
</object>
566+
<object class="IBConnectionRecord">
567+
<object class="IBOutletConnection" key="connection">
568+
<string key="label">replaceExistingCheckbox</string>
569+
<reference key="source" ref="1001"/>
570+
<reference key="destination" ref="216305932"/>
571+
</object>
572+
<int key="connectionID">40</int>
573+
</object>
574+
<object class="IBConnectionRecord">
575+
<object class="IBBindingConnection" key="connection">
576+
<string key="label">value: replaceExisting</string>
577+
<reference key="source" ref="216305932"/>
578+
<reference key="destination" ref="1001"/>
579+
<object class="NSNibBindingConnector" key="connector">
580+
<reference key="NSSource" ref="216305932"/>
581+
<reference key="NSDestination" ref="1001"/>
582+
<string key="NSLabel">value: replaceExisting</string>
583+
<string key="NSBinding">value</string>
584+
<string key="NSKeyPath">replaceExisting</string>
585+
<int key="NSNibBindingConnectorVersion">2</int>
586+
</object>
587+
</object>
588+
<int key="connectionID">44</int>
589+
</object>
509590
</object>
510591
<object class="IBMutableOrderedSet" key="objectRecords">
511592
<object class="NSArray" key="orderedObjects">
@@ -559,6 +640,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
559640
<reference ref="280543056"/>
560641
<reference ref="913729395"/>
561642
<reference ref="935255513"/>
643+
<reference ref="216305932"/>
644+
<reference ref="1004093344"/>
562645
</object>
563646
<reference key="parent" ref="1005"/>
564647
</object>
@@ -700,6 +783,39 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
700783
<reference key="object" ref="871473650"/>
701784
<reference key="parent" ref="280543056"/>
702785
</object>
786+
<object class="IBObjectRecord">
787+
<int key="objectID">36</int>
788+
<reference key="object" ref="216305932"/>
789+
<object class="NSMutableArray" key="children">
790+
<bool key="EncodedWithXMLCoder">YES</bool>
791+
<reference ref="660037974"/>
792+
</object>
793+
<reference key="parent" ref="1006"/>
794+
</object>
795+
<object class="IBObjectRecord">
796+
<int key="objectID">37</int>
797+
<reference key="object" ref="660037974"/>
798+
<reference key="parent" ref="216305932"/>
799+
</object>
800+
<object class="IBObjectRecord">
801+
<int key="objectID">38</int>
802+
<reference key="object" ref="1004093344"/>
803+
<object class="NSMutableArray" key="children">
804+
<bool key="EncodedWithXMLCoder">YES</bool>
805+
<reference ref="602102907"/>
806+
</object>
807+
<reference key="parent" ref="1006"/>
808+
</object>
809+
<object class="IBObjectRecord">
810+
<int key="objectID">39</int>
811+
<reference key="object" ref="602102907"/>
812+
<reference key="parent" ref="1004093344"/>
813+
</object>
814+
<object class="IBObjectRecord">
815+
<int key="objectID">41</int>
816+
<reference key="object" ref="759304026"/>
817+
<reference key="parent" ref="0"/>
818+
</object>
703819
</object>
704820
</object>
705821
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -728,13 +844,18 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
728844
<string>26.IBPluginDependency</string>
729845
<string>27.IBPluginDependency</string>
730846
<string>3.IBPluginDependency</string>
847+
<string>36.IBPluginDependency</string>
848+
<string>37.IBPluginDependency</string>
849+
<string>38.IBPluginDependency</string>
850+
<string>39.IBPluginDependency</string>
731851
<string>4.IBPluginDependency</string>
852+
<string>41.IBPluginDependency</string>
732853
<string>5.IBPluginDependency</string>
733854
<string>6.IBPluginDependency</string>
734855
<string>7.IBPluginDependency</string>
735856
<string>8.IBPluginDependency</string>
736857
</object>
737-
<object class="NSMutableArray" key="dict.values">
858+
<object class="NSArray" key="dict.values">
738859
<bool key="EncodedWithXMLCoder">YES</bool>
739860
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
740861
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -763,6 +884,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
763884
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
764885
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
765886
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
887+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
888+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
889+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
890+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
891+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
766892
</object>
767893
</object>
768894
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -777,7 +903,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
777903
<reference key="dict.values" ref="0"/>
778904
</object>
779905
<nil key="sourceID"/>
780-
<int key="maxID">33</int>
906+
<int key="maxID">44</int>
781907
</object>
782908
<object class="IBClassDescriber" key="IBDocument.Classes">
783909
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -792,7 +918,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
792918
<string>closeCreateTagSheet:</string>
793919
<string>createTag:</string>
794920
</object>
795-
<object class="NSMutableArray" key="dict.values">
921+
<object class="NSArray" key="dict.values">
796922
<bool key="EncodedWithXMLCoder">YES</bool>
797923
<string>id</string>
798924
<string>id</string>
@@ -805,7 +931,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
805931
<string>closeCreateTagSheet:</string>
806932
<string>createTag:</string>
807933
</object>
808-
<object class="NSMutableArray" key="dict.values">
934+
<object class="NSArray" key="dict.values">
809935
<bool key="EncodedWithXMLCoder">YES</bool>
810936
<object class="IBActionInfo">
811937
<string key="name">closeCreateTagSheet:</string>
@@ -825,7 +951,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
825951
<string>tagMessageText</string>
826952
<string>tagNameField</string>
827953
</object>
828-
<object class="NSMutableArray" key="dict.values">
954+
<object class="NSArray" key="dict.values">
829955
<bool key="EncodedWithXMLCoder">YES</bool>
830956
<string>NSTextField</string>
831957
<string>NSTextView</string>
@@ -840,7 +966,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
840966
<string>tagMessageText</string>
841967
<string>tagNameField</string>
842968
</object>
843-
<object class="NSMutableArray" key="dict.values">
969+
<object class="NSArray" key="dict.values">
844970
<bool key="EncodedWithXMLCoder">YES</bool>
845971
<object class="IBToOneOutletInfo">
846972
<string key="name">errorMessageField</string>
@@ -871,5 +997,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
871997
</object>
872998
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
873999
<int key="IBDocument.defaultPropertyAccessControl">3</int>
1000+
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
1001+
<string key="NS.key.0">NSSwitch</string>
1002+
<string key="NS.object.0">{15, 15}</string>
1003+
</object>
8741004
</data>
8751005
</archive>

‎PBCreateTagSheet.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,6 @@
3434
@property (strong) IBOutlet NSTextField *tagNameField;
3535
@property (strong) IBOutlet NSTextView *tagMessageText;
3636
@property (strong) IBOutlet NSTextField *errorMessageField;
37+
@property (assign) BOOL replaceExisting;
3738

3839
@end

0 commit comments

Comments
 (0)