ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: Tweak the "View" menu in the standalone app and the "Display Modes" menu in the OpenEmu plug-in to better match each other.

This commit is contained in:
rogerman 2022-05-06 20:08:40 -07:00
parent 3c04e8f4c7
commit 289c68fae8
3 changed files with 181 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/frontend/cocoa/openemu/NDSGameCore.h
View File

@ -54,8 +54,8 @@ class OE_OGLDisplayPresenter;
#define NDSDISPLAYMODE_NAMEKEY_LAYOUT_HYBRID_16_9 "Hybrid (16:9)"
#define NDSDISPLAYMODE_NAMEKEY_LAYOUT_HYBRID_16_10 "Hybrid (16:10)"
#define NDSDISPLAYMODE_NAMEKEY_DISPLAYORDER_MAIN "Main First"
#define NDSDISPLAYMODE_NAMEKEY_DISPLAYORDER_TOUCH "Touch First"
#define NDSDISPLAYMODE_NAMEKEY_DISPLAYORDER_MAIN "Main Display First"
#define NDSDISPLAYMODE_NAMEKEY_DISPLAYORDER_TOUCH "Touch Display First"
#define NDSDISPLAYMODE_NAMEKEY_ROTATION_0 "0°"
#define NDSDISPLAYMODE_NAMEKEY_ROTATION_90 "90°"
@ -78,7 +78,7 @@ class OE_OGLDisplayPresenter;
#define NDSDISPLAYMODE_NAMEKEY_VIDEOSOURCETOUCH_FORCEMAIN "Touch Display - Force Main Engine"
#define NDSDISPLAYMODE_NAMEKEY_VIDEOSOURCETOUCH_FORCESUB "Touch Display - Force Sub Engine"
#define NDSDISPLAYMODE_NAMEKEY_HUD_ENABLE "Enable HUD"
#define NDSDISPLAYMODE_NAMEKEY_HUD_ENABLE "Enable Heads-Up Display"
#define NDSDISPLAYMODE_NAMEKEY_HUD_EXECUTIONSPEED "Execution Speed"
#define NDSDISPLAYMODE_NAMEKEY_HUD_VIDEOFPS "Video FPS"
#define NDSDISPLAYMODE_NAMEKEY_HUD_3DRENDERERFPS "3D Renderer FPS"

7
desmume/src/frontend/cocoa/openemu/NDSGameCore.mm
View File

@ -1293,8 +1293,6 @@ void UpdateDisplayPropertiesFromStates(uint64_t displayModeStates, ClientDisplay
NSArray< NSDictionary<NSString *, id> *> *displayHUDMenu =
[NSArray arrayWithObjects:
[self generateDisplayModeItemByID:NDSDisplayOptionID_HUD_Enable states:s],
[NSDictionary dictionaryWithObjectsAndKeys:@"---", OEGameCoreDisplayModeSeparatorItemKey, nil],
[self generateDisplayModeItemByID:NDSDisplayOptionID_HUD_ExecutionSpeed states:s],
[self generateDisplayModeItemByID:NDSDisplayOptionID_HUD_VideoFPS states:s],
[self generateDisplayModeItemByID:NDSDisplayOptionID_HUD_3DRendererFPS states:s],
@ -1349,13 +1347,14 @@ void UpdateDisplayPropertiesFromStates(uint64_t displayModeStates, ClientDisplay
NSArray< NSDictionary<NSString *, id> *> *newDisplayModeMenuDescription =
[[NSArray alloc] initWithObjects:
[NSDictionary dictionaryWithObjectsAndKeys: @"Mode", OEGameCoreDisplayModeGroupNameKey, displayModeMenu, OEGameCoreDisplayModeGroupItemsKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys: @"Rotation", OEGameCoreDisplayModeGroupNameKey, displayRotationMenu, OEGameCoreDisplayModeGroupItemsKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys: @"Layout", OEGameCoreDisplayModeGroupNameKey, displayLayoutMenu, OEGameCoreDisplayModeGroupItemsKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys: @"Rotation", OEGameCoreDisplayModeGroupNameKey, displayRotationMenu, OEGameCoreDisplayModeGroupItemsKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys: @"Order", OEGameCoreDisplayModeGroupNameKey, displayOrderMenu, OEGameCoreDisplayModeGroupItemsKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys: @"Separation", OEGameCoreDisplayModeGroupNameKey, displaySeparationMenu, OEGameCoreDisplayModeGroupItemsKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys: @"Video Source", OEGameCoreDisplayModeGroupNameKey, displayVideoSourceMenu, OEGameCoreDisplayModeGroupItemsKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys:@"---", OEGameCoreDisplayModeSeparatorItemKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys: @"Heads-Up Display", OEGameCoreDisplayModeGroupNameKey, displayHUDMenu, OEGameCoreDisplayModeGroupItemsKey, nil],
[self generateDisplayModeItemByID:NDSDisplayOptionID_HUD_Enable states:s],
[NSDictionary dictionaryWithObjectsAndKeys: @"HUD Info Visibility", OEGameCoreDisplayModeGroupNameKey, displayHUDMenu, OEGameCoreDisplayModeGroupItemsKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys:@"---", OEGameCoreDisplayModeSeparatorItemKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys: @"GPU Emulation", OEGameCoreDisplayModeGroupNameKey, displayGPUEmulationMenu, OEGameCoreDisplayModeGroupItemsKey, nil],
[NSDictionary dictionaryWithObjectsAndKeys: @"3D Rendering", OEGameCoreDisplayModeGroupNameKey, display3DRenderingMenu, OEGameCoreDisplayModeGroupItemsKey, nil],

380
desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib
View File

@ -1089,6 +1089,15 @@
<object class="NSMenu" key="NSSubmenu" id="820803629">
<string key="NSTitle">Display Mode</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="858728270">
<reference key="NSMenu" ref="820803629"/>
<string key="NSTitle">Dual Screen</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">2</int>
</object>
<object class="NSMenuItem" id="242781964">
<reference key="NSMenu" ref="820803629"/>
<string key="NSTitle">Main</string>
@ -1106,14 +1115,64 @@
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1</int>
</object>
<object class="NSMenuItem" id="858728270">
<reference key="NSMenu" ref="820803629"/>
<string key="NSTitle">Dual Screen</string>
</array>
</object>
</object>
<object class="NSMenuItem" id="993127302">
<reference key="NSMenu" ref="466310130"/>
<string key="NSTitle">Display Layout</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<string key="NSAction">submenuAction:</string>
<reference key="NSTarget" ref="696122360"/>
<object class="NSMenu" key="NSSubmenu" id="696122360">
<string key="NSTitle">Display Layout</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="172785222">
<reference key="NSMenu" ref="696122360"/>
<string key="NSTitle">Vertical</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">2</int>
</object>
<object class="NSMenuItem" id="593656559">
<reference key="NSMenu" ref="696122360"/>
<string key="NSTitle">Horizontal</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1</int>
</object>
<object class="NSMenuItem" id="495023019">
<reference key="NSMenu" ref="696122360"/>
<string key="NSTitle">Hybrid (2:1)</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1000</int>
</object>
<object class="NSMenuItem" id="360918133">
<reference key="NSMenu" ref="696122360"/>
<string key="NSTitle">Hybrid (16:9)</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1001</int>
</object>
<object class="NSMenuItem" id="613673496">
<reference key="NSMenu" ref="696122360"/>
<string key="NSTitle">Hybrid (16:10)</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1002</int>
</object>
</array>
</object>
@ -1275,162 +1334,6 @@
</array>
</object>
</object>
<object class="NSMenuItem" id="268538746">
<reference key="NSMenu" ref="466310130"/>
<string key="NSTitle">Display Video Source</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<string key="NSAction">submenuAction:</string>
<reference key="NSTarget" ref="149312066"/>
<object class="NSMenu" key="NSSubmenu" id="149312066">
<string key="NSTitle">Display Video Source</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="389490586">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Main Display - None</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1000</int>
</object>
<object class="NSMenuItem" id="55283465">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Main Display - Let NDS Decide</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1001</int>
</object>
<object class="NSMenuItem" id="768862416">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Main Display - Force Main Engine</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1002</int>
</object>
<object class="NSMenuItem" id="758351946">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Main Display - Force Sub Engine</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1003</int>
</object>
<object class="NSMenuItem" id="920510700">
<reference key="NSMenu" ref="149312066"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
</object>
<object class="NSMenuItem" id="306430730">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Touch Display - None</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">2000</int>
</object>
<object class="NSMenuItem" id="368513193">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Touch Display - Let NDS Decide</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">2001</int>
</object>
<object class="NSMenuItem" id="230480088">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Touch Display - Force Main Engine</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">2002</int>
</object>
<object class="NSMenuItem" id="160903211">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Touch Display - Force Sub Engine</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">2003</int>
</object>
</array>
</object>
</object>
<object class="NSMenuItem" id="993127302">
<reference key="NSMenu" ref="466310130"/>
<string key="NSTitle">Display Layout</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<string key="NSAction">submenuAction:</string>
<reference key="NSTarget" ref="696122360"/>
<object class="NSMenu" key="NSSubmenu" id="696122360">
<string key="NSTitle">Display Layout</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="172785222">
<reference key="NSMenu" ref="696122360"/>
<string key="NSTitle">Vertical</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
</object>
<object class="NSMenuItem" id="593656559">
<reference key="NSMenu" ref="696122360"/>
<string key="NSTitle">Horizontal</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1</int>
</object>
<object class="NSMenuItem" id="495023019">
<reference key="NSMenu" ref="696122360"/>
<string key="NSTitle">Hybrid (2:1)</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1000</int>
</object>
<object class="NSMenuItem" id="360918133">
<reference key="NSMenu" ref="696122360"/>
<string key="NSTitle">Hybrid (16:9)</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1001</int>
</object>
<object class="NSMenuItem" id="613673496">
<reference key="NSMenu" ref="696122360"/>
<string key="NSTitle">Hybrid (16:10)</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1002</int>
</object>
</array>
</object>
</object>
<object class="NSMenuItem" id="396621462">
<reference key="NSMenu" ref="466310130"/>
<string key="NSTitle">Display Order</string>
@ -1541,6 +1444,103 @@
</array>
</object>
</object>
<object class="NSMenuItem" id="268538746">
<reference key="NSMenu" ref="466310130"/>
<string key="NSTitle">Display Video Source</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<string key="NSAction">submenuAction:</string>
<reference key="NSTarget" ref="149312066"/>
<object class="NSMenu" key="NSSubmenu" id="149312066">
<string key="NSTitle">Display Video Source</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="389490586">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Main Display - None</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1000</int>
</object>
<object class="NSMenuItem" id="55283465">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Main Display - Let NDS Decide</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1001</int>
</object>
<object class="NSMenuItem" id="768862416">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Main Display - Force Main Engine</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1002</int>
</object>
<object class="NSMenuItem" id="758351946">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Main Display - Force Sub Engine</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">1003</int>
</object>
<object class="NSMenuItem" id="920510700">
<reference key="NSMenu" ref="149312066"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
</object>
<object class="NSMenuItem" id="306430730">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Touch Display - None</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">2000</int>
</object>
<object class="NSMenuItem" id="368513193">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Touch Display - Let NDS Decide</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">2001</int>
</object>
<object class="NSMenuItem" id="230480088">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Touch Display - Force Main Engine</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">2002</int>
</object>
<object class="NSMenuItem" id="160903211">
<reference key="NSMenu" ref="149312066"/>
<string key="NSTitle">Touch Display - Force Sub Engine</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="396634170"/>
<reference key="NSMixedImage" ref="678976864"/>
<int key="NSTag">2003</int>
</object>
</array>
</object>
</object>
<object class="NSMenuItem" id="87882849">
<reference key="NSMenu" ref="466310130"/>
<bool key="NSIsDisabled">YES</bool>
@ -7348,7 +7348,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="748902585">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<nil key="NSNibTouchBar"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
@ -7361,7 +7361,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
</set>
<string key="NSFrame">{{13, 10}, {528, 441}}</string>
<reference key="NSSuperview" ref="748902585"/>
<reference key="NSWindow"/>
<array class="NSMutableArray" key="NSTabViewItems">
<object class="NSTabViewItem" id="1008833987">
<string key="NSIdentifier">1</string>
@ -7386,7 +7385,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 52}, {198, 18}}</string>
<reference key="NSSuperview" ref="330186328"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="689857730"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="152711854">
@ -7412,7 +7410,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 32}, {217, 18}}</string>
<reference key="NSSuperview" ref="330186328"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1034534989"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="683227590">
@ -7438,7 +7435,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 12}, {183, 18}}</string>
<reference key="NSSuperview" ref="330186328"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="454112021">
<int key="NSCellFlags">-2080374784</int>
@ -7460,13 +7456,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
</array>
<string key="NSFrame">{{1, 1}, {494, 78}}</string>
<reference key="NSSuperview" ref="699930286"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="621197304"/>
</object>
</array>
<string key="NSFrame">{{6, 301}, {496, 94}}</string>
<reference key="NSSuperview" ref="461624007"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="330186328"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@ -7499,7 +7493,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{18, 14}, {165, 38}}</string>
<reference key="NSSuperview" ref="16233"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="923192764"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@ -7743,7 +7736,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{242, 15}, {73, 17}}</string>
<reference key="NSSuperview" ref="16233"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="156454980"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="206408938">
@ -7764,7 +7756,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{320, 13}, {50, 22}}</string>
<reference key="NSSuperview" ref="16233"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="636878832"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1033938841">
@ -7826,7 +7817,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{371, 10}, {19, 27}}</string>
<reference key="NSSuperview" ref="16233"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="704971554"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="401365162">
@ -7845,13 +7835,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
</array>
<string key="NSFrame">{{1, 1}, {494, 62}}</string>
<reference key="NSSuperview" ref="1034534989"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1002748640"/>
</object>
</array>
<string key="NSFrame">{{6, 219}, {496, 78}}</string>
<reference key="NSSuperview" ref="461624007"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="16233"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@ -7884,7 +7872,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{95, 14}, {66, 17}}</string>
<reference key="NSSuperview" ref="987276464"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="239207266"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="925694308">
@ -7905,7 +7892,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{164, 12}, {176, 26}}</string>
<reference key="NSSuperview" ref="987276464"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="642300079"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="660652407">
@ -7930,7 +7916,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{343, 14}, {52, 17}}</string>
<reference key="NSSuperview" ref="987276464"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="308235019">
<int key="NSCellFlags">68157504</int>
@ -7987,7 +7972,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{161, 36}, {26, 14}}</string>
<reference key="NSSuperview" ref="987276464"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="943830921"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1059052938">
@ -8008,7 +7992,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{239, 36}, {26, 14}}</string>
<reference key="NSSuperview" ref="987276464"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="636105289"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="30018622">
@ -8029,7 +8012,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{314, 36}, {31, 14}}</string>
<reference key="NSSuperview" ref="987276464"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="90098197"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="665264944">
@ -8047,13 +8029,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
</array>
<string key="NSFrame">{{1, 1}, {494, 60}}</string>
<reference key="NSSuperview" ref="704971554"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="765549650"/>
</object>
</array>
<string key="NSFrame">{{6, 139}, {496, 76}}</string>
<reference key="NSSuperview" ref="461624007"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="987276464"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@ -8086,7 +8066,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 12}, {462, 18}}</string>
<reference key="NSSuperview" ref="675831467"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="337932383"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="830122320">
@ -8109,13 +8088,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
</array>
<string key="NSFrame">{{1, 1}, {494, 38}}</string>
<reference key="NSSuperview" ref="808054783"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="361866954"/>
</object>
</array>
<string key="NSFrame">{{6, 81}, {496, 54}}</string>
<reference key="NSSuperview" ref="461624007"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="675831467"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@ -8148,7 +8125,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 32}, {146, 18}}</string>
<reference key="NSSuperview" ref="808083999"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="743074144"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="340220192">
@ -8174,7 +8150,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 12}, {118, 18}}</string>
<reference key="NSSuperview" ref="808083999"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="16571944">
<int key="NSCellFlags">67108864</int>
@ -8196,13 +8171,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
</array>
<string key="NSFrame">{{1, 1}, {494, 58}}</string>
<reference key="NSSuperview" ref="337932383"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="396299062"/>
</object>
</array>
<string key="NSFrame">{{6, 3}, {496, 74}}</string>
<reference key="NSSuperview" ref="461624007"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="808083999"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@ -8222,7 +8195,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
</array>
<string key="NSFrame">{{10, 33}, {508, 395}}</string>
<reference key="NSSuperview" ref="626099"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="699930286"/>
</object>
<string key="NSLabel">General Settings</string>
@ -9697,8 +9669,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
</object>
</array>
<string key="NSFrameSize">{554, 465}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="626099"/>
<string key="NSClassName">NSView</string>
</object>
@ -61295,7 +61265,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<reference ref="619434875"/>
<reference ref="944458111"/>
<reference ref="393099749"/>
<reference ref="993127302"/>
<reference ref="396621462"/>
<reference ref="347989340"/>
<reference ref="920883390"/>
@ -61312,6 +61281,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<reference ref="138595086"/>
<reference ref="836576903"/>
<reference ref="268538746"/>
<reference ref="993127302"/>
</array>
<reference key="parent" ref="586577488"/>
</object>
@ -83013,7 +82983,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
</object>
<string key="10306.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="10308.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="10309.IBEditorWindowLastContentRect">{{813, 603}, {289, 173}}</string>
<string key="10309.IBEditorWindowLastContentRect">{{966, 842}, {275, 173}}</string>
<string key="10309.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="10310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="10311.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -85795,7 +85765,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<string key="2397.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2398.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2399.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="24.IBEditorWindowLastContentRect">{{598, 1061}, {187, 73}}</string>
<string key="24.IBEditorWindowLastContentRect">{{767, 1062}, {187, 73}}</string>
<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary" key="2427.IBAttributePlaceholdersKey">
<string key="NS.key.0">ToolTip</string>
@ -85906,14 +85876,14 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<string key="2895.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2896.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2897.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="29.IBEditorWindowLastContentRect">{{228, 1135}, {500, 20}}</string>
<string key="29.IBEditorWindowLastContentRect">{{397, 1135}, {500, 20}}</string>
<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2900.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2901.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2902.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2903.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="296.IBEditorWindowLastContentRect">{{469, 363}, {315, 473}}</string>
<string key="296.IBEditorWindowLastContentRect">{{664, 662}, {302, 473}}</string>
<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -86370,7 +86340,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<string key="3900.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3901.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3935.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3936.IBEditorWindowLastContentRect">{{784, 773}, {132, 63}}</string>
<string key="3936.IBEditorWindowLastContentRect">{{966, 1072}, {130, 63}}</string>
<string key="3936.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3937.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3938.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -86875,7 +86845,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<string key="4907.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="4908.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="4909.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="491.IBEditorWindowLastContentRect">{{646, 723}, {261, 113}}</string>
<string key="491.IBEditorWindowLastContentRect">{{837, 1022}, {255, 113}}</string>
<string key="491.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<dictionary class="NSMutableDictionary" key="4910.IBAttributePlaceholdersKey"/>
<string key="4910.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -87044,7 +87014,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<string key="5702.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5713.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="576.IBEditorWindowLastContentRect">{{413, 682}, {249, 453}}</string>
<string key="576.IBEditorWindowLastContentRect">{{582, 682}, {249, 453}}</string>
<string key="576.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5933.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -87059,7 +87029,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<string key="596.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5963.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="607.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="608.IBEditorWindowLastContentRect">{{545, 961}, {281, 173}}</string>
<string key="608.IBEditorWindowLastContentRect">{{714, 962}, {281, 173}}</string>
<string key="608.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference key="6126.IBNSViewMetadataGestureRecognizers" ref="0"/>
<string key="6126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -87105,11 +87075,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<string key="6134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6135.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6168.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6169.IBEditorWindowLastContentRect">{{863, 653}, {151, 103}}</string>
<string key="6169.IBEditorWindowLastContentRect">{{966, 1012}, {149, 103}}</string>
<string key="6169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6171.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6172.IBEditorWindowLastContentRect">{{813, 693}, {182, 43}}</string>
<string key="6172.IBEditorWindowLastContentRect">{{966, 1012}, {175, 43}}</string>
<string key="6172.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6173.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6174.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -87633,7 +87603,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<string key="7766.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7767.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7771.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7772.IBEditorWindowLastContentRect">{{714, 583}, {118, 133}}</string>
<string key="7772.IBEditorWindowLastContentRect">{{966, 902}, {114, 133}}</string>
<string key="7772.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7773.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7774.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -87721,7 +87691,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<bytes key="NSTransformStruct">P4AAAL+AAABDp4AAwwIAAA</bytes>
</object>
<string key="7839.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="784.IBEditorWindowLastContentRect">{{863, 633}, {136, 163}}</string>
<string key="784.IBEditorWindowLastContentRect">{{966, 912}, {132, 163}}</string>
<string key="784.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1040" key="7840.IBNumberFormatterBehaviorMetadataKey"/>
<boolean value="YES" key="7840.IBNumberFormatterLocalizesFormatMetadataKey"/>
@ -87807,7 +87777,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ
<string key="7875.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7876.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7879.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="788.IBEditorWindowLastContentRect">{{784, 713}, {70, 103}}</string>
<string key="788.IBEditorWindowLastContentRect">{{966, 992}, {69, 103}}</string>
<string key="788.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7880.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7881.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>