summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-06-25 22:50:14 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-06-25 22:50:14 +0000
commit03e3c01771cd7c1b502f5b79b902123fbee96d02 (patch)
treec75207320cadfd8b6b5b7c17bc294f50653cec7f
parent6c9a81db199b7c6f86cc28d14255ab81d25a0f58 (diff)
downloadpcsxr-03e3c01771cd7c1b502f5b79b902123fbee96d02.tar.gz
Implement creating and selecting memory cards in the memory card manager.
Get rid of imageFromMcd:index: and move the code to imagesFromMcd:. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85555 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat
-rw-r--r--macosx/English.lproj/MemCardManager.xib1629
-rwxr-xr-xmacosx/PcsxrMemCardController.h5
-rwxr-xr-xmacosx/PcsxrMemCardController.m123
-rwxr-xr-xmacosx/PcsxrMemoryObject.h1
-rwxr-xr-xmacosx/PcsxrMemoryObject.m52
5 files changed, 1730 insertions, 80 deletions
diff --git a/macosx/English.lproj/MemCardManager.xib b/macosx/English.lproj/MemCardManager.xib
index 9b690aae..1ac73c77 100644
--- a/macosx/English.lproj/MemCardManager.xib
+++ b/macosx/English.lproj/MemCardManager.xib
@@ -2,15 +2,16 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1070</int>
- <string key="IBDocument.SystemVersion">12C60</string>
- <string key="IBDocument.InterfaceBuilderVersion">2844</string>
- <string key="IBDocument.AppKitVersion">1187.34</string>
- <string key="IBDocument.HIToolboxVersion">625.00</string>
+ <string key="IBDocument.SystemVersion">12E55</string>
+ <string key="IBDocument.InterfaceBuilderVersion">3084</string>
+ <string key="IBDocument.AppKitVersion">1187.39</string>
+ <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2844</string>
+ <string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>IBNSLayoutConstraint</string>
<string>NSArrayController</string>
<string>NSBox</string>
<string>NSButton</string>
@@ -47,14 +48,14 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{196, 240}, {469, 316}}</string>
+ <string key="NSWindowRect">{{196, 240}, {469, 351}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Memory Card Manager</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
- <string key="NSWindowContentMaxSize">{469, 316}</string>
- <string key="NSWindowContentMinSize">{469, 316}</string>
+ <string key="NSWindowContentMaxSize">{469, 351}</string>
+ <string key="NSWindowContentMinSize">{469, 351}</string>
<object class="NSView" key="NSWindowView" id="1006">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -62,7 +63,7 @@
<object class="NSButton" id="146799775">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">269</int>
- <string key="NSFrame">{{203, 215}, {63, 32}}</string>
+ <string key="NSFrame">{{203, 216}, {63, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="589069415"/>
@@ -92,7 +93,7 @@
<object class="NSButton" id="589069415">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">293</int>
- <string key="NSFrame">{{203, 81}, {63, 32}}</string>
+ <string key="NSFrame">{{203, 82}, {63, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="3271293"/>
@@ -194,7 +195,7 @@
<double key="NSPercent">0.63157892227172852</double>
</object>
</array>
- <string key="NSFrame">{{268, 48}, {181, 248}}</string>
+ <string key="NSFrame">{{268, 49}, {181, 248}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="461514026"/>
@@ -264,7 +265,7 @@
<string key="NSFrame">{{1, 144}, {233, 15}}</string>
<reference key="NSSuperview" ref="61726387"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="146799775"/>
+ <reference key="NSNextKeyView" ref="893282137"/>
<string key="NSReuseIdentifierKey">_NS:3374</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@ -273,7 +274,7 @@
<double key="NSPercent">0.63157892227172852</double>
</object>
</array>
- <string key="NSFrame">{{20, 48}, {181, 248}}</string>
+ <string key="NSFrame">{{20, 49}, {181, 248}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="959059855"/>
@@ -289,7 +290,7 @@
<object class="NSButton" id="487496353">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{262, 12}, {98, 32}}</string>
+ <string key="NSFrame">{{262, 13}, {98, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="740252127"/>
@@ -315,7 +316,7 @@
<object class="NSButton" id="585997809">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{14, 12}, {98, 32}}</string>
+ <string key="NSFrame">{{14, 13}, {98, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="19827681"/>
@@ -341,7 +342,7 @@
<object class="NSButton" id="19827681">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{114, 12}, {93, 32}}</string>
+ <string key="NSFrame">{{114, 13}, {93, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="487496353"/>
@@ -367,7 +368,7 @@
<object class="NSButton" id="740252127">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{362, 12}, {93, 32}}</string>
+ <string key="NSFrame">{{362, 13}, {93, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:687</string>
@@ -389,20 +390,172 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
+ <object class="NSButton" id="985476185">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{14, 296}, {80, 32}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="61726387"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <int key="NSTag">1</int>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="417567195">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">New…</string>
+ <reference key="NSSupport" ref="172555512"/>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="985476185"/>
+ <int key="NSButtonFlags">-2038284288</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSButton" id="893282137">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{106, 296}, {101, 32}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="146799775"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <int key="NSTag">1</int>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="668303440">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Change…</string>
+ <reference key="NSSupport" ref="172555512"/>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="893282137"/>
+ <int key="NSButtonFlags">-2038284288</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="321103211">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{17, 332}, {187, 17}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="985476185"/>
+ <string key="NSReuseIdentifierKey">_NS:1535</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="915487356">
+ <int key="NSCellFlags">68157504</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents">Label</string>
+ <reference key="NSSupport" ref="172555512"/>
+ <string key="NSCellIdentifier">_NS:1535</string>
+ <reference key="NSControlView" ref="321103211"/>
+ <reference key="NSBackgroundColor" ref="97894706"/>
+ <object class="NSColor" key="NSTextColor" id="24740116">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlTextColor</string>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
+ </object>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSButton" id="344811156">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{262, 296}, {80, 32}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <int key="NSTag">2</int>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="797955022">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">New…</string>
+ <reference key="NSSupport" ref="172555512"/>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="344811156"/>
+ <int key="NSButtonFlags">-2038284288</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSButton" id="472280771">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{354, 296}, {101, 32}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <int key="NSTag">2</int>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="982330358">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Change…</string>
+ <reference key="NSSupport" ref="172555512"/>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="472280771"/>
+ <int key="NSButtonFlags">-2038284288</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="289902046">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{265, 332}, {187, 17}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="344811156"/>
+ <string key="NSReuseIdentifierKey">_NS:1535</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="605687208">
+ <int key="NSCellFlags">68157504</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents">Label</string>
+ <reference key="NSSupport" ref="172555512"/>
+ <string key="NSCellIdentifier">_NS:1535</string>
+ <reference key="NSControlView" ref="289902046"/>
+ <reference key="NSBackgroundColor" ref="97894706"/>
+ <reference key="NSTextColor" ref="24740116"/>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
</array>
- <string key="NSFrameSize">{469, 316}</string>
+ <string key="NSFrameSize">{469, 351}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="61726387"/>
+ <reference key="NSNextKeyView" ref="321103211"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
- <string key="NSMinSize">{469, 338}</string>
- <string key="NSMaxSize">{469, 338}</string>
+ <string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+ <string key="NSMinSize">{469, 373}</string>
+ <string key="NSMaxSize">{469, 373}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSCollectionViewItem" id="613808531"/>
<object class="NSView" id="31895823">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSBox" id="1010857926">
@@ -457,15 +610,7 @@
<string key="NSCellIdentifier">_NS:3944</string>
<reference key="NSControlView" ref="953575115"/>
<reference key="NSBackgroundColor" ref="97894706"/>
- <object class="NSColor" key="NSTextColor" id="24740116">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
+ <reference key="NSTextColor" ref="24740116"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
@@ -560,6 +705,7 @@
</object>
</array>
<string key="NSFrameSize">{179, 115}</string>
+ <reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="1010857926"/>
</object>
<object class="NSArrayController" id="625795604">
@@ -669,6 +815,46 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
+ <string key="label">memCard1Label</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="321103211"/>
+ </object>
+ <int key="connectionID">196</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">memCard2Label</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="289902046"/>
+ </object>
+ <int key="connectionID">197</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">newMemCard:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="985476185"/>
+ </object>
+ <int key="connectionID">203</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">newMemCard:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="344811156"/>
+ </object>
+ <int key="connectionID">204</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">changeMemCard:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="893282137"/>
+ </object>
+ <int key="connectionID">206</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
<string key="label">itemPrototype</string>
<reference key="source" ref="810056114"/>
<reference key="destination" ref="613808531"/>
@@ -882,10 +1068,576 @@
<reference ref="589069415"/>
<reference ref="3271293"/>
<reference ref="61726387"/>
+ <reference ref="487496353"/>
<reference ref="585997809"/>
<reference ref="19827681"/>
- <reference ref="487496353"/>
<reference ref="740252127"/>
+ <reference ref="321103211"/>
+ <object class="IBNSLayoutConstraint" id="113768043">
+ <reference key="firstItem" ref="1006"/>
+ <int key="firstAttribute">4</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="740252127"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="948733145">
+ <reference key="firstItem" ref="1006"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="740252127"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="583886578">
+ <reference key="firstItem" ref="1006"/>
+ <int key="firstAttribute">4</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="487496353"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="658067122">
+ <reference key="firstItem" ref="487496353"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="3271293"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="912985424">
+ <reference key="firstItem" ref="472280771"/>
+ <int key="firstAttribute">11</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="344811156"/>
+ <int key="secondAttribute">11</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="495215262">
+ <reference key="firstItem" ref="1006"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="472280771"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="403669089">
+ <reference key="firstItem" ref="1006"/>
+ <int key="firstAttribute">4</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="19827681"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="464184947">
+ <reference key="firstItem" ref="19827681"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="61726387"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="869716771">
+ <reference key="firstItem" ref="1006"/>
+ <int key="firstAttribute">4</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="589069415"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">89</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="110243623">
+ <reference key="firstItem" ref="589069415"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="61726387"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="140422036">
+ <reference key="firstItem" ref="1006"/>
+ <int key="firstAttribute">4</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="585997809"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="149053922">
+ <reference key="firstItem" ref="585997809"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="1006"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="308097778">
+ <reference key="firstItem" ref="3271293"/>
+ <int key="firstAttribute">4</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="61726387"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="1071971529">
+ <reference key="firstItem" ref="3271293"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="589069415"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="792044371">
+ <reference key="firstItem" ref="3271293"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="146799775"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="149539645">
+ <reference key="firstItem" ref="1006"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="3271293"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="416086632">
+ <reference key="firstItem" ref="289902046"/>
+ <int key="firstAttribute">11</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="321103211"/>
+ <int key="secondAttribute">11</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="1024733558">
+ <reference key="firstItem" ref="289902046"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="1006"/>
+ <int key="secondAttribute">3</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">2</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="385139934">
+ <reference key="firstItem" ref="1006"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="289902046"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="620113684">
+ <reference key="firstItem" ref="344811156"/>
+ <int key="firstAttribute">11</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="893282137"/>
+ <int key="secondAttribute">11</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="592412163">
+ <reference key="firstItem" ref="344811156"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="3271293"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="660563221">
+ <reference key="firstItem" ref="344811156"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="289902046"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="27158647">
+ <reference key="firstItem" ref="146799775"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="61726387"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="980558064">
+ <reference key="firstItem" ref="146799775"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="1006"/>
+ <int key="secondAttribute">3</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">107</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="706519229">
+ <reference key="firstItem" ref="146799775"/>
+ <int key="firstAttribute">9</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="1006"/>
+ <int key="secondAttribute">9</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">5</int>
+ <float key="scoringTypeFloat">22</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="159490233">
+ <reference key="firstItem" ref="893282137"/>
+ <int key="firstAttribute">11</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="985476185"/>
+ <int key="secondAttribute">11</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="1055687989">
+ <reference key="firstItem" ref="893282137"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="61726387"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="653471729">
+ <reference key="firstItem" ref="61726387"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="1006"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="866408655">
+ <reference key="firstItem" ref="61726387"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="1006"/>
+ <int key="secondAttribute">3</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">54</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="856049075">
+ <reference key="firstItem" ref="61726387"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="3271293"/>
+ <int key="secondAttribute">3</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="99344870">
+ <reference key="firstItem" ref="1006"/>
+ <int key="firstAttribute">4</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="61726387"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">49</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="166320383">
+ <reference key="firstItem" ref="985476185"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="321103211"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="524906614">
+ <reference key="firstItem" ref="985476185"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="1006"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="767783435">
+ <reference key="firstItem" ref="321103211"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="1006"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="705366302">
+ <reference key="firstItem" ref="321103211"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="893282137"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1006"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <reference ref="985476185"/>
+ <reference ref="893282137"/>
+ <reference ref="344811156"/>
+ <reference ref="472280771"/>
+ <reference ref="289902046"/>
</array>
<reference key="parent" ref="1005"/>
</object>
@@ -894,6 +1646,22 @@
<reference key="object" ref="146799775"/>
<array class="NSMutableArray" key="children">
<reference ref="786361046"/>
+ <object class="IBNSLayoutConstraint" id="457150700">
+ <reference key="firstItem" ref="146799775"/>
+ <int key="firstAttribute">7</int>
+ <int key="relation">0</int>
+ <nil key="secondItem"/>
+ <int key="secondAttribute">0</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">51</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="146799775"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">1</int>
+ </object>
</array>
<reference key="parent" ref="1006"/>
</object>
@@ -951,6 +1719,70 @@
<reference key="object" ref="31895823"/>
<array class="NSMutableArray" key="children">
<reference ref="1010857926"/>
+ <object class="IBNSLayoutConstraint" id="520537834">
+ <reference key="firstItem" ref="1010857926"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="31895823"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="31895823"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="43970098">
+ <reference key="firstItem" ref="1010857926"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="31895823"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">1</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="31895823"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="9104811">
+ <reference key="firstItem" ref="1010857926"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="31895823"/>
+ <int key="secondAttribute">3</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="31895823"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="370999189">
+ <reference key="firstItem" ref="1010857926"/>
+ <int key="firstAttribute">4</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="31895823"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="31895823"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">MemCardObjectView</string>
@@ -1001,6 +1833,166 @@
<reference ref="923740855"/>
<reference ref="552567303"/>
<reference ref="521369065"/>
+ <object class="IBNSLayoutConstraint" id="153313241">
+ <reference key="firstItem" ref="552567303"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="923740855"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1010857926"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="145204986">
+ <reference key="firstItem" ref="521369065"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="1010857926"/>
+ <int key="secondAttribute">3</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">3</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1010857926"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="95210068">
+ <reference key="firstItem" ref="521369065"/>
+ <int key="firstAttribute">9</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="953575115"/>
+ <int key="secondAttribute">9</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1010857926"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="463585590">
+ <reference key="firstItem" ref="923740855"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="953575115"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1010857926"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="78448654">
+ <reference key="firstItem" ref="923740855"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="552567303"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1010857926"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="741935013">
+ <reference key="firstItem" ref="923740855"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="552567303"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1010857926"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="44558860">
+ <reference key="firstItem" ref="953575115"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="1010857926"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">3</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1010857926"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="362897736">
+ <reference key="firstItem" ref="953575115"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="923740855"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1010857926"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="326258312">
+ <reference key="firstItem" ref="953575115"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="521369065"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1010857926"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="263555864">
+ <reference key="firstItem" ref="953575115"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="923740855"/>
+ <int key="secondAttribute">5</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="1010857926"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
+ </object>
</array>
<reference key="parent" ref="31895823"/>
</object>
@@ -1009,6 +2001,38 @@
<reference key="object" ref="521369065"/>
<array class="NSMutableArray" key="children">
<reference ref="876299043"/>
+ <object class="IBNSLayoutConstraint" id="992700246">
+ <reference key="firstItem" ref="521369065"/>
+ <int key="firstAttribute">7</int>
+ <int key="relation">0</int>
+ <nil key="secondItem"/>
+ <int key="secondAttribute">0</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">32</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="521369065"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">1</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="601515975">
+ <reference key="firstItem" ref="521369065"/>
+ <int key="firstAttribute">8</int>
+ <int key="relation">0</int>
+ <nil key="secondItem"/>
+ <int key="secondAttribute">0</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">32</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="521369065"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">1</int>
+ </object>
</array>
<reference key="parent" ref="1010857926"/>
</object>
@@ -1022,6 +2046,22 @@
<reference key="object" ref="953575115"/>
<array class="NSMutableArray" key="children">
<reference ref="522673337"/>
+ <object class="IBNSLayoutConstraint" id="910966515">
+ <reference key="firstItem" ref="953575115"/>
+ <int key="firstAttribute">7</int>
+ <int key="relation">0</int>
+ <nil key="secondItem"/>
+ <int key="secondAttribute">0</int>
+ <float key="multiplier">1</float>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">171</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="953575115"/>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">1</int>
+ </object>
</array>
<reference key="parent" ref="1010857926"/>
</object>
@@ -1108,6 +2148,349 @@
<reference key="object" ref="351504988"/>
<reference key="parent" ref="552567303"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">131</int>
+ <reference key="object" ref="985476185"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="417567195"/>
+ </array>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">132</int>
+ <reference key="object" ref="417567195"/>
+ <reference key="parent" ref="985476185"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">133</int>
+ <reference key="object" ref="893282137"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="668303440"/>
+ </array>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">134</int>
+ <reference key="object" ref="668303440"/>
+ <reference key="parent" ref="893282137"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">135</int>
+ <reference key="object" ref="321103211"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="915487356"/>
+ </array>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">136</int>
+ <reference key="object" ref="915487356"/>
+ <reference key="parent" ref="321103211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">137</int>
+ <reference key="object" ref="344811156"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="797955022"/>
+ </array>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">138</int>
+ <reference key="object" ref="472280771"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="982330358"/>
+ </array>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">139</int>
+ <reference key="object" ref="289902046"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="605687208"/>
+ </array>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">140</int>
+ <reference key="object" ref="605687208"/>
+ <reference key="parent" ref="289902046"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">141</int>
+ <reference key="object" ref="982330358"/>
+ <reference key="parent" ref="472280771"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">142</int>
+ <reference key="object" ref="797955022"/>
+ <reference key="parent" ref="344811156"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">143</int>
+ <reference key="object" ref="149053922"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">144</int>
+ <reference key="object" ref="464184947"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">145</int>
+ <reference key="object" ref="1055687989"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">146</int>
+ <reference key="object" ref="660563221"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">148</int>
+ <reference key="object" ref="149539645"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">149</int>
+ <reference key="object" ref="592412163"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">150</int>
+ <reference key="object" ref="948733145"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">151</int>
+ <reference key="object" ref="706519229"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">152</int>
+ <reference key="object" ref="140422036"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">153</int>
+ <reference key="object" ref="159490233"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">154</int>
+ <reference key="object" ref="110243623"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">155</int>
+ <reference key="object" ref="658067122"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">156</int>
+ <reference key="object" ref="385139934"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">157</int>
+ <reference key="object" ref="99344870"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">158</int>
+ <reference key="object" ref="792044371"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">161</int>
+ <reference key="object" ref="705366302"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">162</int>
+ <reference key="object" ref="856049075"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">163</int>
+ <reference key="object" ref="866408655"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">164</int>
+ <reference key="object" ref="524906614"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">165</int>
+ <reference key="object" ref="767783435"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">166</int>
+ <reference key="object" ref="113768043"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">167</int>
+ <reference key="object" ref="869716771"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">168</int>
+ <reference key="object" ref="166320383"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">169</int>
+ <reference key="object" ref="403669089"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">170</int>
+ <reference key="object" ref="653471729"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">171</int>
+ <reference key="object" ref="583886578"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">172</int>
+ <reference key="object" ref="1071971529"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">173</int>
+ <reference key="object" ref="495215262"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">174</int>
+ <reference key="object" ref="308097778"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">176</int>
+ <reference key="object" ref="980558064"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">177</int>
+ <reference key="object" ref="27158647"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">178</int>
+ <reference key="object" ref="457150700"/>
+ <reference key="parent" ref="146799775"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">179</int>
+ <reference key="object" ref="370999189"/>
+ <reference key="parent" ref="31895823"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">180</int>
+ <reference key="object" ref="9104811"/>
+ <reference key="parent" ref="31895823"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">181</int>
+ <reference key="object" ref="43970098"/>
+ <reference key="parent" ref="31895823"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">182</int>
+ <reference key="object" ref="520537834"/>
+ <reference key="parent" ref="31895823"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">183</int>
+ <reference key="object" ref="601515975"/>
+ <reference key="parent" ref="521369065"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">184</int>
+ <reference key="object" ref="992700246"/>
+ <reference key="parent" ref="521369065"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">185</int>
+ <reference key="object" ref="153313241"/>
+ <reference key="parent" ref="1010857926"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">186</int>
+ <reference key="object" ref="741935013"/>
+ <reference key="parent" ref="1010857926"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">187</int>
+ <reference key="object" ref="78448654"/>
+ <reference key="parent" ref="1010857926"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">188</int>
+ <reference key="object" ref="263555864"/>
+ <reference key="parent" ref="1010857926"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">189</int>
+ <reference key="object" ref="326258312"/>
+ <reference key="parent" ref="1010857926"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">190</int>
+ <reference key="object" ref="463585590"/>
+ <reference key="parent" ref="1010857926"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">191</int>
+ <reference key="object" ref="362897736"/>
+ <reference key="parent" ref="1010857926"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">192</int>
+ <reference key="object" ref="44558860"/>
+ <reference key="parent" ref="1010857926"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">193</int>
+ <reference key="object" ref="95210068"/>
+ <reference key="parent" ref="1010857926"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">194</int>
+ <reference key="object" ref="145204986"/>
+ <reference key="parent" ref="1010857926"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">195</int>
+ <reference key="object" ref="910966515"/>
+ <reference key="parent" ref="953575115"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">198</int>
+ <reference key="object" ref="620113684"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">200</int>
+ <reference key="object" ref="912985424"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">201</int>
+ <reference key="object" ref="1024733558"/>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">202</int>
+ <reference key="object" ref="416086632"/>
+ <reference key="parent" ref="1006"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1118,45 +2501,194 @@
<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="131.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="132.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="133.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="133.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="135.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="135.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="137.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="137.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="138.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="138.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="139.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="139.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="140.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="141.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="142.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="146.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="15.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="151.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="154.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="155.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="156.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="158.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="161.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="162.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="164.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="165.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="166.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="167.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="168.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="171.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="172.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="173.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="174.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="176.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="177.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="178.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="179.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="180.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="181.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="182.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="183.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="184.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="185.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="186.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="187.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="188.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="190.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="191.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="192.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="193.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="194.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="198.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <array class="NSMutableArray" key="2.IBNSViewMetadataConstraints">
+ <reference ref="705366302"/>
+ <reference ref="767783435"/>
+ <reference ref="524906614"/>
+ <reference ref="166320383"/>
+ <reference ref="99344870"/>
+ <reference ref="856049075"/>
+ <reference ref="866408655"/>
+ <reference ref="653471729"/>
+ <reference ref="1055687989"/>
+ <reference ref="159490233"/>
+ <reference ref="706519229"/>
+ <reference ref="980558064"/>
+ <reference ref="27158647"/>
+ <reference ref="660563221"/>
+ <reference ref="592412163"/>
+ <reference ref="620113684"/>
+ <reference ref="385139934"/>
+ <reference ref="1024733558"/>
+ <reference ref="416086632"/>
+ <reference ref="149539645"/>
+ <reference ref="792044371"/>
+ <reference ref="1071971529"/>
+ <reference ref="308097778"/>
+ <reference ref="149053922"/>
+ <reference ref="140422036"/>
+ <reference ref="110243623"/>
+ <reference ref="869716771"/>
+ <reference ref="464184947"/>
+ <reference ref="403669089"/>
+ <reference ref="495215262"/>
+ <reference ref="912985424"/>
+ <reference ref="658067122"/>
+ <reference ref="583886578"/>
+ <reference ref="948733145"/>
+ <reference ref="113768043"/>
+ </array>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <array key="20.IBNSViewMetadataConstraints">
+ <reference ref="370999189"/>
+ <reference ref="9104811"/>
+ <reference ref="43970098"/>
+ <reference ref="520537834"/>
+ </array>
<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="200.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="202.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="23.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <array key="30.IBNSViewMetadataConstraints">
+ <reference ref="601515975"/>
+ <reference ref="992700246"/>
+ </array>
+ <boolean value="NO" key="30.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <array key="32.IBNSViewMetadataConstraints">
+ <reference ref="910966515"/>
+ </array>
+ <boolean value="NO" key="32.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="32.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="34.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <array key="61.IBNSViewMetadataConstraints">
+ <reference ref="263555864"/>
+ <reference ref="326258312"/>
+ <reference ref="362897736"/>
+ <reference ref="44558860"/>
+ <reference ref="741935013"/>
+ <reference ref="78448654"/>
+ <reference ref="463585590"/>
+ <reference ref="95210068"/>
+ <reference ref="145204986"/>
+ <reference ref="153313241"/>
+ </array>
+ <boolean value="NO" key="61.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="62.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="62.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="63.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="64.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="64.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="65.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="66.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="67.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="68.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <array key="7.IBNSViewMetadataConstraints">
+ <reference ref="457150700"/>
+ </array>
+ <boolean value="NO" key="7.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="78.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="9.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">91</int>
+ <int key="maxID">206</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1182,14 +2714,28 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">NSLayoutConstraint</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">PcsxrMemCardController</string>
<string key="superclassName">NSWindowController</string>
<dictionary class="NSMutableDictionary" key="actions">
+ <string key="changeMemCard:">id</string>
<string key="deleteMemoryObject:">id</string>
<string key="formatCard:">id</string>
<string key="moveBlock:">id</string>
+ <string key="newMemCard:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="changeMemCard:">
+ <string key="name">changeMemCard:</string>
+ <string key="candidateClassName">id</string>
+ </object>
<object class="IBActionInfo" key="deleteMemoryObject:">
<string key="name">deleteMemoryObject:</string>
<string key="candidateClassName">id</string>
@@ -1202,16 +2748,30 @@
<string key="name">moveBlock:</string>
<string key="candidateClassName">id</string>
</object>
+ <object class="IBActionInfo" key="newMemCard:">
+ <string key="name">newMemCard:</string>
+ <string key="candidateClassName">id</string>
+ </object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
+ <string key="memCard1Label">NSTextField</string>
<string key="memCard1view">NSCollectionView</string>
+ <string key="memCard2Label">NSTextField</string>
<string key="memCard2view">NSCollectionView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="memCard1Label">
+ <string key="name">memCard1Label</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
<object class="IBToOneOutletInfo" key="memCard1view">
<string key="name">memCard1view</string>
<string key="candidateClassName">NSCollectionView</string>
</object>
+ <object class="IBToOneOutletInfo" key="memCard2Label">
+ <string key="name">memCard2Label</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
<object class="IBToOneOutletInfo" key="memCard2view">
<string key="name">memCard2view</string>
<string key="candidateClassName">NSCollectionView</string>
@@ -1232,5 +2792,6 @@
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <bool key="IBDocument.UseAutolayout">YES</bool>
</data>
</archive>
diff --git a/macosx/PcsxrMemCardController.h b/macosx/PcsxrMemCardController.h
index 8e9eb906..bbdc6fc5 100755
--- a/macosx/PcsxrMemCardController.h
+++ b/macosx/PcsxrMemCardController.h
@@ -13,6 +13,9 @@
{
IBOutlet NSCollectionView *memCard1view;
IBOutlet NSCollectionView *memCard2view;
+ IBOutlet NSTextField *memCard1Label;
+ IBOutlet NSTextField *memCard2Label;
+
NSMutableArray *memCard1Array;
NSMutableArray *memCard2Array;
NSTimer *imageAnimateTimer;
@@ -21,6 +24,8 @@
- (IBAction)moveBlock:(id)sender;
- (IBAction)formatCard:(id)sender;
- (IBAction)deleteMemoryObject:(id)sender;
+- (IBAction)newMemCard:(id)sender;
+- (IBAction)changeMemCard:(id)sender;
- (void)loadMemoryCardInfoForCard:(int)theCard;
- (BOOL)isMemoryBlockEmptyOnCard:(int)aCard block:(int)aBlock;
- (int)countFreeBlocksOnCard:(int)aCard;
diff --git a/macosx/PcsxrMemCardController.m b/macosx/PcsxrMemCardController.m
index d1bc8e4d..9729fa74 100755
--- a/macosx/PcsxrMemCardController.m
+++ b/macosx/PcsxrMemCardController.m
@@ -9,13 +9,15 @@
#import "PcsxrMemCardController.h"
#import "PcsxrMemoryObject.h"
#import "ConfigurationController.h"
+#import "PcsxrMemCardHandler.h"
#include "sio.h"
#import "ARCBridge.h"
#define MAX_MEMCARD_BLOCKS 15
-static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, char *str) {
+static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, char *str)
+{
// header
memcpy(to + (dsti + 1) * 128, from + (srci + 1) * 128, 128);
SaveMcd(str, to, (dsti + 1) * 128, 128);
@@ -32,11 +34,39 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
//memCard1Array KVO functions
--(void)insertObject:(PcsxrMemoryObject *)p inMemCard1ArrayAtIndex:(NSUInteger)index {
+- (void)setupValues
+{
+ LoadMcds(Config.Mcd1, Config.Mcd2);
+ NSFileManager *fm = [NSFileManager defaultManager];
+ NSString *fileName1 = nil;
+ NSString *fileName2 = nil;
+ NSString *fullPath1 = [fm stringWithFileSystemRepresentation:Config.Mcd1 length:sizeof(Config.Mcd1)];
+ NSString *fullPath2 = [fm stringWithFileSystemRepresentation:Config.Mcd2 length:sizeof(Config.Mcd2)];
+#if 0
+ fileName1 = [fm displayNameAtPath:fullPath1];
+ fileName2 = [fm displayNameAtPath:fullPath2];
+#else
+ fileName1 = [fullPath1 lastPathComponent];
+ fileName2 = [fullPath2 lastPathComponent];
+#endif
+
+ [memCard1Label setTitleWithMnemonic:fileName1];
+ [memCard2Label setTitleWithMnemonic:fileName2];
+
+ [memCard1Label setToolTip:fullPath1];
+ [memCard2Label setToolTip:fullPath2];
+
+ [self loadMemoryCardInfoForCard:1];
+ [self loadMemoryCardInfoForCard:2];
+}
+
+-(void)insertObject:(PcsxrMemoryObject *)p inMemCard1ArrayAtIndex:(NSUInteger)index
+{
[memCard1Array insertObject:p atIndex:index];
}
--(void)removeObjectFromMemCard1ArrayAtIndex:(NSUInteger)index {
+-(void)removeObjectFromMemCard1ArrayAtIndex:(NSUInteger)index
+{
[memCard1Array removeObjectAtIndex:index];
}
@@ -52,16 +82,18 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
- (NSArray *)memCard1Array
{
- return memCard1Array;
+ return [NSArray arrayWithArray:memCard1Array];
}
//memCard2Array KVO functions
--(void)insertObject:(PcsxrMemoryObject *)p inMemCard2ArrayAtIndex:(NSUInteger)index {
+-(void)insertObject:(PcsxrMemoryObject *)p inMemCard2ArrayAtIndex:(NSUInteger)index
+{
[memCard2Array insertObject:p atIndex:index];
}
--(void)removeObjectFromMemCard2ArrayAtIndex:(NSUInteger)index {
+-(void)removeObjectFromMemCard2ArrayAtIndex:(NSUInteger)index
+{
[memCard2Array removeObjectAtIndex:index];
}
@@ -77,7 +109,7 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
- (NSArray *)memCard2Array
{
- return memCard2Array;
+ return [NSArray arrayWithArray:memCard2Array];
}
- (id)init
@@ -90,7 +122,7 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
{
self = [super initWithWindow:window];
if (self) {
- LoadMcds(Config.Mcd1, Config.Mcd2);
+ //LoadMcds(Config.Mcd1, Config.Mcd2);
}
return self;
@@ -145,9 +177,7 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
- (void)memoryCardDidChangeNotification:(NSNotification *)aNote
{
- LoadMcds(Config.Mcd1, Config.Mcd2);
- [self loadMemoryCardInfoForCard:1];
- [self loadMemoryCardInfoForCard:2];
+ [self setupValues];
}
- (void)windowDidLoad
@@ -156,9 +186,10 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
// Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
[[self window] setDelegate:self];
+ //[self setupValues];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(memoryCardDidChangeNotification:) name:memChangeNotifier object:nil];
- imageAnimateTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:2] interval:2.0/3.0 target:self selector:@selector(animateMemCards:) userInfo:nil repeats:YES];
+ imageAnimateTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:2] interval:2.0/5.0 target:self selector:@selector(animateMemCards:) userInfo:nil repeats:YES];
[[NSRunLoop mainRunLoop] addTimer:imageAnimateTimer forMode:NSDefaultRunLoopMode];
}
@@ -167,11 +198,10 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
[[NSNotificationCenter defaultCenter] postNotificationName:memoryAnimateTimerKey object:self];
}
-- (void)windowDidBecomeKey:(NSNotification *)notification
+- (IBAction)showWindow:(id)sender
{
- LoadMcds(Config.Mcd1, Config.Mcd2);
- [self loadMemoryCardInfoForCard:1];
- [self loadMemoryCardInfoForCard:2];
+ [super showWindow:sender];
+ [self setupValues];
}
- (int)findFreeMemCardBlockInCard:(int)target_card length:(int)len
@@ -221,7 +251,6 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
return (i-foundcount);
return -1;
-
}
- (int)findFreeMemCardBlockInCard:(int)target_card
@@ -376,7 +405,6 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
*ptr = xor;
SaveMcd(filename, data, i * 128, 128);
-
}
- (IBAction)deleteMemoryObject:(id)sender {
@@ -407,6 +435,65 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
}
}
+- (IBAction)newMemCard:(id)sender {
+ int tag = [sender tag];
+ char *mcd;
+ NSTextField *label;
+ NSOpenPanel *openDlg = RETAINOBJ([NSOpenPanel openPanel]);
+ NSString *path;
+
+ if (tag == 1) { mcd = Config.Mcd1; label = memCard1Label; }
+ else { mcd = Config.Mcd2; label = memCard2Label; }
+
+ [openDlg setCanChooseFiles:YES];
+ [openDlg setCanChooseDirectories:NO];
+ [openDlg setAllowedFileTypes:[PcsxrMemCardHandler supportedUTIs]];
+
+ path = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:mcd length:strlen(mcd)];
+
+ [openDlg setDirectoryURL:[NSURL fileURLWithPath:[path stringByDeletingLastPathComponent]]];
+ [openDlg setNameFieldStringValue:[path lastPathComponent]];
+
+ if ([openDlg runModal] == NSFileHandlingPanelOKButton) {
+ NSArray* urls = [openDlg URLs];
+ NSString *mcdPath = [[urls objectAtIndex:0] path];
+
+ [ConfigurationController setMemoryCard:tag toPath:mcdPath];
+ }
+ RELEASEOBJ(openDlg);
+
+}
+
+- (IBAction)changeMemCard:(id)sender {
+ int tag = [sender tag];
+ char *mcd;
+ NSTextField *label;
+ NSSavePanel *openDlg = RETAINOBJ([NSSavePanel savePanel]);
+ NSString *path;
+
+ if (tag == 1) { mcd = Config.Mcd1; label = memCard1Label; }
+ else { mcd = Config.Mcd2; label = memCard2Label; }
+
+ path = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:mcd length:strlen(mcd)];
+
+ [openDlg setDirectoryURL:[NSURL fileURLWithPath:[path stringByDeletingLastPathComponent]]];
+ [openDlg setNameFieldStringValue:@"New Memory Card File.mcr"];
+ [openDlg setAllowedFileTypes:[PcsxrMemCardHandler supportedUTIs]];
+
+ if ([openDlg runModal] == NSFileHandlingPanelOKButton) {
+ NSString *mcdPath = [[openDlg URL] path];
+
+ //Workaround/kludge to make sure we create a memory card before posting a notification
+ strlcpy(mcd, [mcdPath fileSystemRepresentation], MAXPATHLEN);
+
+ CreateMcd(mcd);
+
+ [ConfigurationController setMemoryCard:tag toPath:mcdPath];
+ }
+ RELEASEOBJ(openDlg);
+
+}
+
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
diff --git a/macosx/PcsxrMemoryObject.h b/macosx/PcsxrMemoryObject.h
index e197c21a..3cce4796 100755
--- a/macosx/PcsxrMemoryObject.h
+++ b/macosx/PcsxrMemoryObject.h
@@ -27,7 +27,6 @@ extern NSString *const memoryAnimateTimerKey;
BOOL notDeleted;
unsigned char memFlags;
}
-+ (NSImage *)imageFromMcd:(McdBlock *)block index:(int)idx;
+ (NSArray *)imagesFromMcd:(McdBlock *)block;
- (id)initWithMcdBlock:(McdBlock *)infoBlock;
diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m
index 16989b67..3b0818c8 100755
--- a/macosx/PcsxrMemoryObject.m
+++ b/macosx/PcsxrMemoryObject.m
@@ -34,11 +34,33 @@ NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate";
{
NSMutableArray *imagesArray = [[NSMutableArray alloc] initWithCapacity:block->IconCount];
for (int i = 0; i < block->IconCount; i++) {
- [imagesArray addObject:[self imageFromMcd:block index:i]];
+ NSImage *memImage = nil;
+ {
+ NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:16 pixelsHigh:16 bitsPerSample:8 samplesPerPixel:3 hasAlpha:NO isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0];
+
+ short *icon = block->Icon;
+
+ int x, y, c, v, r, g, b;
+ for (v = 0; v < 256; v++) {
+ x = (v % 16);
+ y = (v / 16);
+ c = icon[(i * 256) + v];
+ r = (c & 0x001f) << 3;
+ g = ((c & 0x03e0) >> 5) << 3;
+ b = ((c & 0x7c00) >> 10) << 3;
+ [imageRep setColor:[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1.0] atX:x y:y];
+ }
+ memImage = [[NSImage alloc] init];
+ [memImage addRepresentation:imageRep];
+ RELEASEOBJ(imageRep);
+ [memImage setSize:NSMakeSize(32, 32)];
+ }
+ [imagesArray addObject:memImage];
+ RELEASEOBJ(memImage);
}
- NSArray *retArray = [[NSArray alloc] initWithArray:imagesArray];
+ NSArray *retArray = [NSArray arrayWithArray:imagesArray];
RELEASEOBJ(imagesArray);
- return AUTORELEASEOBJ(retArray);
+ return retArray;
}
+ (NSImage *)blankImage
@@ -51,34 +73,10 @@ NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate";
[[NSColor blackColor] set];
[NSBezierPath fillRect:imageRect];
[imageBlank unlockFocus];
-
}
return imageBlank;
}
-+ (NSImage *)imageFromMcd:(McdBlock *)block index:(int)idx
-{
- NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:16 pixelsHigh:16 bitsPerSample:8 samplesPerPixel:3 hasAlpha:NO isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0];
-
- short *icon = block->Icon;
-
- int x, y, c, i, r, g, b;
- for (i = 0; i < 256 * (idx + 1); i++) {
- x = (i % 16);
- y = (i / 16);
- c = icon[(idx * 256) + i];
- r = (c & 0x001f) << 3;
- g = ((c & 0x03e0) >> 5) << 3;
- b = ((c & 0x7c00) >> 10) << 3;
- [imageRep setColor:[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1.0] atX:x y:y];
- }
- NSImage *theImage = [[NSImage alloc] init];
- [theImage addRepresentation:imageRep];
- RELEASEOBJ(imageRep);
- [theImage setSize:NSMakeSize(32, 32)];
- return AUTORELEASEOBJ(theImage);
-}
-
- (id)initWithMcdBlock:(McdBlock *)infoBlock
{
if (self = [super init]) {
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-11 15:36:55 +0000