Skip to content

Commit 3bed497

Browse files
nrileypieter
nriley
authored and
pieter
committed
Clean up UI and add keyboard support for create branch sheet.
Maps Return to OK and Escape/Command-Period to Cancel. Renames OK to Create (a verb is better). Fixes autoresizing masks so the layout doesn't break when you resize the sheet.
1 parent f2a37df commit 3bed497

File tree

1 file changed

+37
-62
lines changed

1 file changed

+37
-62
lines changed

‎PBGitHistoryView.xib

Lines changed: 37 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
33
<data>
44
<int key="IBDocument.SystemTarget">1050</int>
5-
<string key="IBDocument.SystemVersion">9G55</string>
5+
<string key="IBDocument.SystemVersion">9J61</string>
66
<string key="IBDocument.InterfaceBuilderVersion">677</string>
7-
<string key="IBDocument.AppKitVersion">949.43</string>
7+
<string key="IBDocument.AppKitVersion">949.46</string>
88
<string key="IBDocument.HIToolboxVersion">353.00</string>
99
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
1010
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -345,6 +345,7 @@
345345
<object class="NSMutableArray" key="set.sortedObjects">
346346
<bool key="EncodedWithXMLCoder">YES</bool>
347347
<string>Apple HTML pasteboard type</string>
348+
<string>Apple PDF pasteboard type</string>
348349
<string>Apple PICT pasteboard type</string>
349350
<string>Apple URL pasteboard type</string>
350351
<string>Apple Web Archive pasteboard type</string>
@@ -355,6 +356,7 @@
355356
<string>NeXT Rich Text Format v1.0 pasteboard type</string>
356357
<string>NeXT TIFF v4.0 pasteboard type</string>
357358
<string>WebURLsWithTitlesPboardType</string>
359+
<string>public.png</string>
358360
<string>public.url</string>
359361
<string>public.url-name</string>
360362
</object>
@@ -1009,21 +1011,22 @@
10091011
<object class="NSWindowTemplate" id="296392339">
10101012
<int key="NSWindowStyleMask">15</int>
10111013
<int key="NSWindowBacking">2</int>
1012-
<string key="NSWindowRect">{{196, 377}, {346, 133}}</string>
1014+
<string key="NSWindowRect">{{196, 408}, {346, 102}}</string>
10131015
<int key="NSWTFlags">603979776</int>
10141016
<string key="NSWindowTitle">New Branch Sheet</string>
10151017
<string key="NSWindowClass">NSWindow</string>
10161018
<nil key="NSViewClass"/>
1017-
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
1019+
<string key="NSWindowContentMaxSize">{1000, 102}</string>
1020+
<string key="NSWindowContentMinSize">{346, 102}</string>
10181021
<object class="NSView" key="NSWindowView" id="562356688">
10191022
<reference key="NSNextResponder"/>
10201023
<int key="NSvFlags">256</int>
10211024
<object class="NSMutableArray" key="NSSubviews">
10221025
<bool key="EncodedWithXMLCoder">YES</bool>
10231026
<object class="NSTextField" id="657747237">
10241027
<reference key="NSNextResponder" ref="562356688"/>
1025-
<int key="NSvFlags">268</int>
1026-
<string key="NSFrame">{{145, 60}, {96, 22}}</string>
1028+
<int key="NSvFlags">266</int>
1029+
<string key="NSFrame">{{177, 60}, {149, 22}}</string>
10271030
<reference key="NSSuperview" ref="562356688"/>
10281031
<bool key="NSEnabled">YES</bool>
10291032
<object class="NSTextFieldCell" key="NSCell" id="574819353">
@@ -1048,32 +1051,16 @@
10481051
</object>
10491052
</object>
10501053
</object>
1051-
<object class="NSTextField" id="60467344">
1052-
<reference key="NSNextResponder" ref="562356688"/>
1053-
<int key="NSvFlags">268</int>
1054-
<string key="NSFrame">{{17, 62}, {123, 17}}</string>
1055-
<reference key="NSSuperview" ref="562356688"/>
1056-
<bool key="NSEnabled">YES</bool>
1057-
<object class="NSTextFieldCell" key="NSCell" id="588730226">
1058-
<int key="NSCellFlags">68288064</int>
1059-
<int key="NSCellFlags2">272630784</int>
1060-
<string key="NSContents">New Branch Name:</string>
1061-
<reference key="NSSupport" ref="924107556"/>
1062-
<reference key="NSControlView" ref="60467344"/>
1063-
<reference key="NSBackgroundColor" ref="457244339"/>
1064-
<reference key="NSTextColor" ref="57062640"/>
1065-
</object>
1066-
</object>
10671054
<object class="NSTextField" id="383988892">
10681055
<reference key="NSNextResponder" ref="562356688"/>
10691056
<int key="NSvFlags">268</int>
1070-
<string key="NSFrame">{{17, 96}, {134, 17}}</string>
1057+
<string key="NSFrame">{{17, 62}, {155, 17}}</string>
10711058
<reference key="NSSuperview" ref="562356688"/>
10721059
<bool key="NSEnabled">YES</bool>
10731060
<object class="NSTextFieldCell" key="NSCell" id="391824980">
10741061
<int key="NSCellFlags">68288064</int>
10751062
<int key="NSCellFlags2">272630784</int>
1076-
<string key="NSContents">Create a new branch</string>
1063+
<string key="NSContents">Create a branch named:</string>
10771064
<reference key="NSSupport" ref="924107556"/>
10781065
<reference key="NSControlView" ref="383988892"/>
10791066
<reference key="NSBackgroundColor" ref="457244339"/>
@@ -1082,28 +1069,28 @@
10821069
</object>
10831070
<object class="NSButton" id="150049899">
10841071
<reference key="NSNextResponder" ref="562356688"/>
1085-
<int key="NSvFlags">268</int>
1086-
<string key="NSFrame">{{236, 11}, {96, 32}}</string>
1072+
<int key="NSvFlags">289</int>
1073+
<string key="NSFrame">{{236, 12}, {96, 32}}</string>
10871074
<reference key="NSSuperview" ref="562356688"/>
10881075
<bool key="NSEnabled">YES</bool>
10891076
<object class="NSButtonCell" key="NSCell" id="138101463">
10901077
<int key="NSCellFlags">67239424</int>
10911078
<int key="NSCellFlags2">134217728</int>
1092-
<string key="NSContents">OK</string>
1079+
<string key="NSContents">Create</string>
10931080
<reference key="NSSupport" ref="924107556"/>
10941081
<reference key="NSControlView" ref="150049899"/>
10951082
<int key="NSButtonFlags">-2038284033</int>
10961083
<int key="NSButtonFlags2">129</int>
10971084
<string key="NSAlternateContents"/>
1098-
<string key="NSKeyEquivalent"/>
1085+
<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
10991086
<int key="NSPeriodicDelay">200</int>
11001087
<int key="NSPeriodicInterval">25</int>
11011088
</object>
11021089
</object>
11031090
<object class="NSButton" id="78666935">
11041091
<reference key="NSNextResponder" ref="562356688"/>
1105-
<int key="NSvFlags">268</int>
1106-
<string key="NSFrame">{{139, 12}, {96, 32}}</string>
1092+
<int key="NSvFlags">289</int>
1093+
<string key="NSFrame">{{140, 12}, {96, 32}}</string>
11071094
<reference key="NSSuperview" ref="562356688"/>
11081095
<bool key="NSEnabled">YES</bool>
11091096
<object class="NSButtonCell" key="NSCell" id="771535241">
@@ -1115,15 +1102,15 @@
11151102
<int key="NSButtonFlags">-2038284033</int>
11161103
<int key="NSButtonFlags2">129</int>
11171104
<string key="NSAlternateContents"/>
1118-
<string key="NSKeyEquivalent"/>
1105+
<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
11191106
<int key="NSPeriodicDelay">200</int>
11201107
<int key="NSPeriodicInterval">25</int>
11211108
</object>
11221109
</object>
11231110
<object class="NSTextField" id="27300806">
11241111
<reference key="NSNextResponder" ref="562356688"/>
1125-
<int key="NSvFlags">268</int>
1126-
<string key="NSFrame">{{251, 62}, {85, 17}}</string>
1112+
<int key="NSvFlags">292</int>
1113+
<string key="NSFrame">{{17, 22}, {85, 17}}</string>
11271114
<reference key="NSSuperview" ref="562356688"/>
11281115
<bool key="NSEnabled">YES</bool>
11291116
<object class="NSTextFieldCell" key="NSCell" id="217429948">
@@ -1140,11 +1127,12 @@
11401127
</object>
11411128
</object>
11421129
</object>
1143-
<string key="NSFrameSize">{346, 133}</string>
1130+
<string key="NSFrameSize">{346, 102}</string>
11441131
<reference key="NSSuperview"/>
11451132
</object>
11461133
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
1147-
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
1134+
<string key="NSMinSize">{346, 124}</string>
1135+
<string key="NSMaxSize">{1000, 124}</string>
11481136
</object>
11491137
<object class="NSToolbar" id="65173285">
11501138
<object class="NSMutableString" key="NSToolbarIdentifier">
@@ -2414,11 +2402,10 @@
24142402
<reference key="object" ref="562356688"/>
24152403
<object class="NSMutableArray" key="children">
24162404
<bool key="EncodedWithXMLCoder">YES</bool>
2417-
<reference ref="78666935"/>
2418-
<reference ref="150049899"/>
2419-
<reference ref="383988892"/>
2420-
<reference ref="60467344"/>
24212405
<reference ref="657747237"/>
2406+
<reference ref="383988892"/>
2407+
<reference ref="150049899"/>
2408+
<reference ref="78666935"/>
24222409
<reference ref="27300806"/>
24232410
</object>
24242411
<reference key="parent" ref="296392339"/>
@@ -2450,15 +2437,6 @@
24502437
</object>
24512438
<reference key="parent" ref="562356688"/>
24522439
</object>
2453-
<object class="IBObjectRecord">
2454-
<int key="objectID">241</int>
2455-
<reference key="object" ref="60467344"/>
2456-
<object class="NSMutableArray" key="children">
2457-
<bool key="EncodedWithXMLCoder">YES</bool>
2458-
<reference ref="588730226"/>
2459-
</object>
2460-
<reference key="parent" ref="562356688"/>
2461-
</object>
24622440
<object class="IBObjectRecord">
24632441
<int key="objectID">242</int>
24642442
<reference key="object" ref="657747237"/>
@@ -2473,11 +2451,6 @@
24732451
<reference key="object" ref="574819353"/>
24742452
<reference key="parent" ref="657747237"/>
24752453
</object>
2476-
<object class="IBObjectRecord">
2477-
<int key="objectID">244</int>
2478-
<reference key="object" ref="588730226"/>
2479-
<reference key="parent" ref="60467344"/>
2480-
</object>
24812454
<object class="IBObjectRecord">
24822455
<int key="objectID">245</int>
24832456
<reference key="object" ref="391824980"/>
@@ -2786,16 +2759,17 @@
27862759
<string>236.IBEditorWindowLastContentRect</string>
27872760
<string>236.IBWindowTemplateEditedContentRect</string>
27882761
<string>236.NSWindowTemplate.visibleAtLaunch</string>
2762+
<string>236.windowTemplate.hasMaxSize</string>
2763+
<string>236.windowTemplate.hasMinSize</string>
27892764
<string>236.windowTemplate.maxSize</string>
2765+
<string>236.windowTemplate.minSize</string>
27902766
<string>237.IBPluginDependency</string>
27912767
<string>238.IBPluginDependency</string>
27922768
<string>239.IBPluginDependency</string>
27932769
<string>24.IBPluginDependency</string>
27942770
<string>240.IBPluginDependency</string>
2795-
<string>241.IBPluginDependency</string>
27962771
<string>242.IBPluginDependency</string>
27972772
<string>243.IBPluginDependency</string>
2798-
<string>244.IBPluginDependency</string>
27992773
<string>245.IBPluginDependency</string>
28002774
<string>246.IBPluginDependency</string>
28012775
<string>247.IBPluginDependency</string>
@@ -2906,12 +2880,13 @@
29062880
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
29072881
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
29082882
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2909-
<string>{{504, 581}, {346, 133}}</string>
2910-
<string>{{504, 581}, {346, 133}}</string>
2883+
<string>{{504, 612}, {346, 102}}</string>
2884+
<string>{{504, 612}, {346, 102}}</string>
29112885
<reference ref="8"/>
2912-
<string>{3.40282e+38, 3.40282e+38}</string>
2913-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2914-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2886+
<boolean value="YES" id="5"/>
2887+
<reference ref="5"/>
2888+
<string>{1000, 102}</string>
2889+
<string>{346, 102}</string>
29152890
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
29162891
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
29172892
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2978,7 +2953,7 @@
29782953
</object>
29792954
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
29802955
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2981-
<string>{{321, 79}, {852, 432}}</string>
2956+
<string>{{178, 79}, {852, 432}}</string>
29822957
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
29832958
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
29842959
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3032,7 +3007,7 @@
30323007
<object class="NSMutableArray" key="dict.values">
30333008
<bool key="EncodedWithXMLCoder">YES</bool>
30343009
<string>PBGitHistoryController</string>
3035-
<string>id</string>
3010+
<string>PBWebHistoryController</string>
30363011
<string>WebView</string>
30373012
</object>
30383013
</object>

0 commit comments

Comments
 (0)