diff --git a/macosx/en.lproj/GlobalOptionsPopover.xib b/macosx/en.lproj/GlobalOptionsPopover.xib
index d72ec7b37..bbb312541 100644
--- a/macosx/en.lproj/GlobalOptionsPopover.xib
+++ b/macosx/en.lproj/GlobalOptionsPopover.xib
@@ -16,6 +16,7 @@
NSNumberFormatter
NSCustomView
NSButtonCell
+ IBNSLayoutConstraint
NSButton
NSUserDefaultsController
NSTextFieldCell
@@ -476,6 +477,7 @@
{{255, 13}, {47, 14}}
+
YES
- {309, 161}
+ {311, 161}
@@ -1013,6 +1015,711 @@
+
+
+
+ 3
+ 0
+
+ 4
+ 1
+
+ 8
+
+ 1000
+ 9
+ 3
+
+
+
+
+ 6
+ 1
+
+ 6
+ 1
+
+ 12
+
+ 1000
+ 9
+ 3
+
+
+
+
+ 10
+ 0
+
+ 10
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 11
+ 0
+
+ 11
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 3
+ 0
+
+ 4
+ 1
+
+ 8
+
+ 1000
+ 6
+ 3
+
+
+
+
+ 6
+ 1
+
+ 6
+ 1
+
+ 12
+
+ 1000
+ 9
+ 3
+
+
+
+
+ 6
+ 1
+
+ 6
+ 1
+
+ 12
+
+ 1000
+ 9
+ 3
+
+
+
+
+ 6
+ 1
+
+ 6
+ 1
+
+ 12
+
+ 1000
+ 9
+ 3
+
+
+
+
+ 6
+ 1
+
+ 6
+ 1
+
+ 12
+
+ 1000
+ 9
+ 3
+
+
+
+
+ 6
+ 1
+
+ 6
+ 1
+
+ 12
+
+ 1000
+ 9
+ 3
+
+
+
+
+ 5
+ 0
+
+ 5
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 3
+ 0
+
+ 3
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 4
+ 0
+
+ 4
+ 1
+
+ 32
+
+ 1000
+ 3
+ 3
+
+
+
+
+ 5
+ 0
+
+ 5
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 5
+ 1
+
+ 6
+ 1
+
+ 8
+
+ 1000
+ 9
+ 3
+
+
+
+
+ 3
+ 0
+
+ 3
+ 1
+
+ 43
+
+ 1000
+ 3
+ 3
+
+
+
+
+ 5
+ 0
+
+ 5
+ 1
+
+ 13
+
+ 1000
+ 3
+ 3
+
+
+
+
+ 4
+ 0
+
+ 4
+ 1
+
+ 10
+
+ 1000
+ 3
+ 3
+
+
+
+
+ 5
+ 0
+
+ 5
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 5
+ 0
+
+ 5
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 8
+ 0
+
+ 0
+ 1
+
+ 17
+
+ 1000
+ 3
+ 1
+
+
+
+
+ 5
+ 0
+
+ 5
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 5
+ 0
+
+ 5
+ 1
+
+ 12
+
+ 1000
+ 3
+ 3
+
+
+
+
+ 11
+ 0
+
+ 11
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 5
+ 0
+
+ 5
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 5
+ 0
+
+ 6
+ 1
+
+ 8
+
+ 1000
+ 6
+ 3
+
+
+
+
+ 10
+ 0
+
+ 10
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 7
+ 0
+
+ 0
+ 1
+
+ 45
+
+ 1000
+ 3
+ 1
+
+
+
+
+ 8
+ 0
+
+ 0
+ 1
+
+ 20
+
+ 1000
+ 3
+ 1
+
+
+
+
+ 5
+ 0
+
+ 5
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 8
+ 0
+
+ 0
+ 1
+
+ 20
+
+ 1000
+ 3
+ 1
+
+
+
+
+ 5
+ 0
+
+ 6
+ 1
+
+ 8
+
+ 1000
+ 6
+ 3
+
+
+
+
+ 7
+ 0
+
+ 0
+ 1
+
+ 45
+
+ 1000
+ 3
+ 1
+
+
+
+
+ 5
+ 0
+
+ 6
+ 1
+
+ 8
+
+ 1000
+ 6
+ 3
+
+
+
+
+ 5
+ 1
+
+ 6
+ 1
+
+ 8
+
+ 1000
+ 9
+ 3
+
+
+
+
+ 5
+ 0
+
+ 6
+ 1
+
+ 8
+
+ 1000
+ 6
+ 3
+
+
+
+
+ 8
+ 0
+
+ 0
+ 1
+
+ 20
+
+ 1000
+ 3
+ 1
+
+
+
+
+ 10
+ 0
+
+ 10
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 8
+ 0
+
+ 0
+ 1
+
+ 20
+
+ 1000
+ 3
+ 1
+
+
+
+
+ 5
+ 0
+
+ 5
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 7
+ 0
+
+ 0
+ 1
+
+ 45
+
+ 1000
+ 3
+ 1
+
+
+
+
+ 5
+ 0
+
+ 6
+ 1
+
+ 8
+
+ 1000
+ 6
+ 3
+
+
+
+
+ 10
+ 0
+
+ 10
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
+
+
+ 3
+ 0
+
+ 4
+ 1
+
+ 8
+
+ 1000
+ 6
+ 3
+
+
+
+
+ 5
+ 0
+
+ 6
+ 1
+
+ 8
+
+ 1000
+ 6
+ 3
+
+
+
+
+ 11
+ 0
+
+ 11
+ 1
+
+ 0.0
+
+ 1000
+ 6
+ 2
+
+
Options
@@ -1249,54 +1956,400 @@
+
+ 204
+
+
+
+
+ 248
+
+
+
+
+ 261
+
+
+
+
+ 270
+
+
+
+
+ 272
+
+
+
+
+ 273
+
+
+
+
+ 278
+
+
+
+
+ 279
+
+
+
+
+ 280
+
+
+
+
+ 281
+
+
+
+
+ 282
+
+
+
+
+ 286
+
+
+
+
+ 288
+
+
+
+
+ 297
+
+
+
+
+ 298
+
+
+
+
+ 299
+
+
+
+
+ 300
+
+
+
+
+ 305
+
+
+
+
+ 310
+
+
+
+
+ 313
+
+
+
+
+ 315
+
+
+
+
+ 316
+
+
+
+
+ 318
+
+
+
+
+ 319
+
+
+
+
+ 320
+
+
+
+
+ 321
+
+
+
+
+ 322
+
+
+
+
+ 323
+
+
+
+
+ 324
+
+
+
+
+ 325
+
+
+
+
+ 326
+
+
+
+
+ 327
+
+
+
+
+ 328
+
+
+
+
+ 329
+
+
+
+
+ 330
+
+
+
+
+ 331
+
+
+
+
+ 332
+
+
+
+
+ 334
+
+
+
+
+ 335
+
+
+
+
+ 336
+
+
+
+
+ 337
+
+
+
+
+ 338
+
+
+
+
+ 339
+
+
+
+
+ 340
+
+
+
+
+ 341
+
+
+
+
+ 342
+
+
+
+
+ 343
+
+
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
ColorTextField
+
com.apple.InterfaceBuilder.CocoaPlugin
ColorTextField
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
ColorTextField
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -1304,7 +2357,7 @@
- 193
+ 343
@@ -1397,6 +2450,14 @@
./Classes/GlobalOptionsPopoverViewController.h
+
+ NSLayoutConstraint
+ NSObject
+
+ IBProjectSource
+ ./Classes/NSLayoutConstraint.h
+
+
0
@@ -1415,5 +2476,6 @@
NSSwitch
{15, 15}
+ YES