diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-22 23:53:37 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-22 23:53:37 +0000 |
| commit | 531ad373b2c22e00a341a6635023cf8949571bd5 (patch) | |
| tree | 029961f0aa19ec396f6d7cc09f3ff93987c9aa62 /macosx/plugins/DFSound | |
| parent | 9628a367530657e7fefb17be0a125dbe3f5d7614 (diff) | |
| download | pcsxr-531ad373b2c22e00a341a6635023cf8949571bd5.tar.gz | |
Moving most of the OS X preferences to auto layout, and all to 10.7.
Changing some lists of independent checkbox buttons to matrices.
Fix a discrepancy between SDL versions 1.2 and 2.0 APIs in OS X's input preferences.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86849 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFSound')
4 files changed, 1567 insertions, 285 deletions
diff --git a/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib index 86afd475..6deb8a23 100644 --- a/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib +++ b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <data> - <int key="IBDocument.SystemTarget">1060</int> + <int key="IBDocument.SystemTarget">1070</int> <string key="IBDocument.SystemVersion">12E55</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.AppKitVersion">1187.39</string> @@ -11,10 +11,12 @@ <string key="NS.object.0">3084</string> </object> <array key="IBDocument.IntegratedClassDependencies"> + <string>IBNSLayoutConstraint</string> <string>NSBox</string> <string>NSButton</string> <string>NSButtonCell</string> <string>NSCustomObject</string> + <string>NSMatrix</string> <string>NSSlider</string> <string>NSSliderCell</string> <string>NSTextField</string> @@ -70,6 +72,7 @@ <reference key="NSSuperview" ref="517400347"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1507912"/> + <string key="NSAntiCompressionPriority">{250, 750}</string> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="429556832"> <int key="NSCellFlags">67108864</int> @@ -140,6 +143,7 @@ <reference key="NSSuperview" ref="517400347"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="398137737"/> + <string key="NSAntiCompressionPriority">{250, 750}</string> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="74472058"> <int key="NSCellFlags">67108864</int> @@ -182,10 +186,11 @@ <object class="NSTextField" id="184943800"> <reference key="NSNextResponder" ref="517400347"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{274, 83}, {133, 17}}</string> + <string key="NSFrame">{{274, 86}, {133, 17}}</string> <reference key="NSSuperview" ref="517400347"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="197077555"/> + <string key="NSAntiCompressionPriority">{250, 750}</string> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="909159478"> <int key="NSCellFlags">67108864</int> @@ -205,10 +210,11 @@ <object class="NSTextField" id="261829518"> <reference key="NSNextResponder" ref="517400347"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{274, 51}, {133, 17}}</string> + <string key="NSFrame">{{274, 54}, {133, 17}}</string> <reference key="NSSuperview" ref="517400347"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="74783790"/> + <string key="NSAntiCompressionPriority">{250, 750}</string> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="336300577"> <int key="NSCellFlags">67108864</int> @@ -224,10 +230,11 @@ <object class="NSTextField" id="74783790"> <reference key="NSNextResponder" ref="517400347"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 21}, {96, 17}}</string> + <string key="NSFrame">{{14, 26}, {96, 17}}</string> <reference key="NSSuperview" ref="517400347"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1011324224"/> + <string key="NSAntiCompressionPriority">{250, 750}</string> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="902474361"> <int key="NSCellFlags">67108864</int> @@ -243,7 +250,7 @@ <object class="NSSlider" id="1011324224"> <reference key="NSNextResponder" ref="517400347"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{127, 19}, {144, 26}}</string> + <string key="NSFrame">{{127, 20}, {144, 26}}</string> <reference key="NSSuperview" ref="517400347"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="387662915"/> @@ -270,10 +277,11 @@ <object class="NSTextField" id="387662915"> <reference key="NSNextResponder" ref="517400347"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{274, 18}, {133, 17}}</string> + <string key="NSFrame">{{274, 26}, {133, 17}}</string> <reference key="NSSuperview" ref="517400347"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="759155340"/> + <string key="NSAntiCompressionPriority">{250, 750}</string> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="723960494"> <int key="NSCellFlags">67108864</int> @@ -334,10 +342,10 @@ <object class="NSButton" id="759409224"> <reference key="NSNextResponder" ref="757061322"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{21, 60}, {153, 18}}</string> + <string key="NSFrame">{{15, 57}, {153, 18}}</string> <reference key="NSSuperview" ref="757061322"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="485844511"/> + <reference key="NSNextKeyView" ref="780106098"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="601824583"> <int key="NSCellFlags">67108864</int> @@ -358,13 +366,13 @@ <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </array> - <string key="NSFrame">{{2, 2}, {189, 96}}</string> + <string key="NSFrame">{{2, 2}, {199, 83}}</string> <reference key="NSSuperview" ref="773092047"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="759409224"/> </object> </array> - <string key="NSFrame">{{256, 56}, {193, 113}}</string> + <string key="NSFrame">{{246, 69}, {203, 100}}</string> <reference key="NSSuperview" ref="335490069"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="757061322"/> @@ -394,91 +402,94 @@ <reference key="NSNextResponder" ref="759155340"/> <int key="NSvFlags">274</int> <array class="NSMutableArray" key="NSSubviews"> - <object class="NSButton" id="570869394"> + <object class="NSMatrix" id="754874250"> <reference key="NSNextResponder" ref="945237963"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{18, 58}, {199, 18}}</string> + <string key="NSFrame">{{17, 13}, {199, 60}}</string> <reference key="NSSuperview" ref="945237963"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="33989673"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="530057379"> - <int key="NSCellFlags">67108864</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">High Compatibility Mode</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="570869394"/> - <int key="NSButtonFlags">1211912448</int> - <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="179046743"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSSwitch</string> - </object> - <reference key="NSAlternateImage" ref="665587898"/> - <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="33989673"> - <reference key="NSNextResponder" ref="945237963"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{18, 38}, {199, 18}}</string> - <reference key="NSSuperview" ref="945237963"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="882835815"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="409625895"> - <int key="NSCellFlags">67108864</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">SPU IRQ Wait</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="33989673"/> - <int key="NSButtonFlags">1211912448</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="179046743"/> - <reference key="NSAlternateImage" ref="665587898"/> - <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="882835815"> - <reference key="NSNextResponder" ref="945237963"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{18, 16}, {199, 18}}</string> - <reference key="NSSuperview" ref="945237963"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="773092047"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="125730743"> + <int key="NSNumRows">3</int> + <int key="NSNumCols">1</int> + <array class="NSMutableArray" key="NSCells"> + <object class="NSButtonCell" id="530057379"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">High Compatibility Mode</string> + <reference key="NSSupport" ref="535632823"/> + <reference key="NSControlView" ref="754874250"/> + <int key="NSButtonFlags">1211912448</int> + <int key="NSButtonFlags2">2</int> + <object class="NSCustomResource" key="NSNormalImage" id="179046743"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSSwitch</string> + </object> + <reference key="NSAlternateImage" ref="665587898"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <object class="NSButtonCell" id="409625895"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">SPU IRQ Wait</string> + <reference key="NSSupport" ref="535632823"/> + <reference key="NSControlView" ref="754874250"/> + <int key="NSButtonFlags">1211912448</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="179046743"/> + <reference key="NSAlternateImage" ref="665587898"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <object class="NSButtonCell" id="125730743"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Mono Sound</string> + <reference key="NSSupport" ref="535632823"/> + <reference key="NSControlView" ref="754874250"/> + <int key="NSButtonFlags">1211912448</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="665587898"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </array> + <string key="NSCellSize">{199, 18}</string> + <string key="NSIntercellSpacing">{0, 3}</string> + <int key="NSMatrixFlags">-2080366592</int> + <nil key="NSCellClass"/> + <object class="NSButtonCell" key="NSProtoCell" id="795134582"> <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Mono Sound</string> + <string key="NSContents">High Compatibility Mode</string> <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="882835815"/> <int key="NSButtonFlags">1211912448</int> <int key="NSButtonFlags2">2</int> <reference key="NSAlternateImage" ref="665587898"/> <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> - <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <int key="NSSelectedRow">-1</int> + <int key="NSSelectedCol">-1</int> + <reference key="NSBackgroundColor" ref="498551882"/> + <reference key="NSCellBackgroundColor" ref="498551882"/> </object> </array> - <string key="NSFrame">{{2, 2}, {224, 96}}</string> + <string key="NSFrame">{{2, 2}, {223, 83}}</string> <reference key="NSSuperview" ref="759155340"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="570869394"/> + <reference key="NSNextKeyView"/> </object> </array> - <string key="NSFrame">{{17, 56}, {228, 113}}</string> + <string key="NSFrame">{{17, 69}, {227, 100}}</string> <reference key="NSSuperview" ref="335490069"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="945237963"/> @@ -500,23 +511,24 @@ <int key="NSTitlePosition">2</int> <bool key="NSTransparent">NO</bool> </object> - <object class="NSButton" id="422793261"> + <object class="NSButton" id="357594249"> <reference key="NSNextResponder" ref="335490069"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{330, 12}, {122, 32}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{393, 13}, {59, 32}}</string> <reference key="NSSuperview" ref="335490069"/> <reference key="NSWindow"/> <reference key="NSNextKeyView"/> + <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="28806191"> + <object class="NSButtonCell" key="NSCell" id="387624435"> <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">OK</string> <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="422793261"/> + <string key="NSCellIdentifier">_NS:9</string> + <reference key="NSControlView" ref="357594249"/> <int key="NSButtonFlags">-2038284288</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="535632823"/> + <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> <int key="NSPeriodicDelay">200</int> @@ -524,23 +536,24 @@ </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> - <object class="NSButton" id="1066134528"> + <object class="NSButton" id="129568570"> <reference key="NSNextResponder" ref="335490069"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{208, 12}, {122, 32}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{311, 13}, {82, 32}}</string> <reference key="NSSuperview" ref="335490069"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="422793261"/> + <reference key="NSNextKeyView" ref="357594249"/> + <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="1004748773"> + <object class="NSButtonCell" key="NSCell" id="1031291435"> <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Cancel</string> <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="1066134528"/> + <string key="NSCellIdentifier">_NS:9</string> + <reference key="NSControlView" ref="129568570"/> <int key="NSButtonFlags">-2038284288</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="535632823"/> + <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> <int key="NSPeriodicDelay">200</int> @@ -548,23 +561,24 @@ </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> - <object class="NSButton" id="485844511"> + <object class="NSButton" id="780106098"> <reference key="NSNextResponder" ref="335490069"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{14, 12}, {122, 32}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{14, 13}, {75, 32}}</string> <reference key="NSSuperview" ref="335490069"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="1066134528"/> + <reference key="NSNextKeyView" ref="129568570"/> + <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="974258099"> + <object class="NSButtonCell" key="NSCell" id="232731104"> <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Reset</string> <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="485844511"/> + <string key="NSCellIdentifier">_NS:9</string> + <reference key="NSControlView" ref="780106098"/> <int key="NSButtonFlags">-2038284288</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="535632823"/> + <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">200</int> @@ -595,30 +609,6 @@ <int key="connectionID">39</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">ok:</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="422793261"/> - </object> - <int key="connectionID">60</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">cancel:</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="1066134528"/> - </object> - <int key="connectionID">61</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">reset:</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="485844511"/> - </object> - <int key="connectionID">63</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">reverbValue</string> <reference key="source" ref="758282330"/> @@ -651,28 +641,52 @@ <int key="connectionID">66</int> </object> <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">reset:</string> + <reference key="source" ref="758282330"/> + <reference key="destination" ref="780106098"/> + </object> + <int key="connectionID">175</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">ok:</string> + <reference key="source" ref="758282330"/> + <reference key="destination" ref="357594249"/> + </object> + <int key="connectionID">176</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">cancel:</string> + <reference key="source" ref="758282330"/> + <reference key="destination" ref="129568570"/> + </object> + <int key="connectionID">177</int> + </object> + <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">hiCompBox</string> <reference key="source" ref="758282330"/> - <reference key="destination" ref="570869394"/> + <reference key="destination" ref="530057379"/> </object> - <int key="connectionID">54</int> + <int key="connectionID">203</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">irqWaitBox</string> <reference key="source" ref="758282330"/> - <reference key="destination" ref="33989673"/> + <reference key="destination" ref="409625895"/> </object> - <int key="connectionID">56</int> + <int key="connectionID">204</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">monoSoundBox</string> <reference key="source" ref="758282330"/> - <reference key="destination" ref="882835815"/> + <reference key="destination" ref="125730743"/> </object> - <int key="connectionID">57</int> + <int key="connectionID">205</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> @@ -699,14 +713,6 @@ <int key="connectionID">44</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="398137737"/> - <reference key="destination" ref="570869394"/> - </object> - <int key="connectionID">45</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">takeStringValueFrom:</string> <reference key="source" ref="184943800"/> @@ -725,38 +731,6 @@ <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">nextKeyView</string> - <reference key="source" ref="759409224"/> - <reference key="destination" ref="422793261"/> - </object> - <int key="connectionID">50</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="33989673"/> - <reference key="destination" ref="882835815"/> - </object> - <int key="connectionID">47</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="422793261"/> - <reference key="destination" ref="1066134528"/> - </object> - <int key="connectionID">51</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="1066134528"/> - <reference key="destination" ref="1507912"/> - </object> - <int key="connectionID">52</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> <reference key="source" ref="1011324224"/> <reference key="destination" ref="398137737"/> </object> @@ -804,12 +778,268 @@ <int key="objectID">5</int> <reference key="object" ref="335490069"/> <array class="NSMutableArray" key="children"> - <reference ref="988321145"/> <reference ref="773092047"/> + <object class="IBNSLayoutConstraint" id="686965984"> + <reference key="firstItem" ref="357594249"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="129568570"/> + <int key="secondAttribute">6</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">12</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="335490069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="949964607"> + <reference key="firstItem" ref="335490069"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="357594249"/> + <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="335490069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="329372734"> + <reference key="firstItem" ref="335490069"/> + <int key="firstAttribute">4</int> + <int key="relation">0</int> + <reference key="secondItem" ref="357594249"/> + <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="335490069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="5789354"> + <reference key="firstItem" ref="335490069"/> + <int key="firstAttribute">4</int> + <int key="relation">0</int> + <reference key="secondItem" ref="129568570"/> + <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="335490069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="562284763"> + <reference key="firstItem" ref="773092047"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="335490069"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">249</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="335490069"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="1010014513"> + <reference key="firstItem" ref="773092047"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="759155340"/> + <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="335490069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="708815831"> + <reference key="firstItem" ref="773092047"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="988321145"/> + <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="335490069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="558041630"> + <reference key="firstItem" ref="335490069"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="773092047"/> + <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="335490069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="750753059"> + <reference key="firstItem" ref="335490069"/> + <int key="firstAttribute">4</int> + <int key="relation">0</int> + <reference key="secondItem" ref="780106098"/> + <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="335490069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="171265789"> + <reference key="firstItem" ref="780106098"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="335490069"/> + <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="335490069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="33237787"> + <reference key="firstItem" ref="759155340"/> + <int key="firstAttribute">11</int> + <int key="relation">0</int> + <reference key="secondItem" ref="773092047"/> + <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="335490069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="263892534"> + <reference key="firstItem" ref="759155340"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="988321145"/> + <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="335490069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="275183491"> + <reference key="firstItem" ref="759155340"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="335490069"/> + <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="335490069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="505181088"> + <reference key="firstItem" ref="988321145"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="335490069"/> + <int key="secondAttribute">3</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="335490069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="498683704"> + <reference key="firstItem" ref="988321145"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="335490069"/> + <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="335490069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="744964704"> + <reference key="firstItem" ref="335490069"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="988321145"/> + <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="335490069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <reference ref="988321145"/> + <reference ref="357594249"/> + <reference ref="129568570"/> + <reference ref="780106098"/> <reference ref="759155340"/> - <reference ref="422793261"/> - <reference ref="1066134528"/> - <reference ref="485844511"/> </array> <reference key="parent" ref="980713848"/> </object> @@ -821,10 +1051,426 @@ <reference ref="1507912"/> <reference ref="197077555"/> <reference ref="398137737"/> + <object class="IBNSLayoutConstraint" id="2745058"> + <reference key="firstItem" ref="387662915"/> + <int key="firstAttribute">11</int> + <int key="relation">0</int> + <reference key="secondItem" ref="74783790"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="339074982"> + <reference key="firstItem" ref="387662915"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="261829518"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="444083121"> + <reference key="firstItem" ref="387662915"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="1011324224"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="393593304"> + <reference key="firstItem" ref="261829518"/> + <int key="firstAttribute">11</int> + <int key="relation">0</int> + <reference key="secondItem" ref="398137737"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="676445877"> + <reference key="firstItem" ref="261829518"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="1011324224"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="964665808"> + <reference key="firstItem" ref="261829518"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="398137737"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="140533858"> + <reference key="firstItem" ref="261829518"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="184943800"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="79155130"> + <reference key="firstItem" ref="184943800"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="121836166"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="623364289"> + <reference key="firstItem" ref="184943800"/> + <int key="firstAttribute">11</int> + <int key="relation">0</int> + <reference key="secondItem" ref="1507912"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="598544207"> + <reference key="firstItem" ref="184943800"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="1507912"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="702235891"> + <reference key="firstItem" ref="184943800"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="261829518"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="466154982"> + <reference key="firstItem" ref="988321145"/> + <int key="firstAttribute">4</int> + <int key="relation">0</int> + <reference key="secondItem" ref="1011324224"/> + <int key="secondAttribute">4</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="988321145"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="136783247"> + <reference key="firstItem" ref="1011324224"/> + <int key="firstAttribute">10</int> + <int key="relation">0</int> + <reference key="secondItem" ref="74783790"/> + <int key="secondAttribute">10</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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="731413808"> + <reference key="firstItem" ref="1011324224"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="398137737"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="942117436"> + <reference key="firstItem" ref="1011324224"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="398137737"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="648242307"> + <reference key="firstItem" ref="398137737"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="1507912"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="528161191"> + <reference key="firstItem" ref="398137737"/> + <int key="firstAttribute">11</int> + <int key="relation">0</int> + <reference key="secondItem" ref="197077555"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="681262160"> + <reference key="firstItem" ref="1507912"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="398137737"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="245275154"> + <reference key="firstItem" ref="1507912"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="988321145"/> + <int key="secondAttribute">3</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="988321145"/> + <int key="scoringType">9</int> + <float key="scoringTypeFloat">40</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="715982450"> + <reference key="firstItem" ref="1507912"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="988321145"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">128</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="988321145"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="257351407"> + <reference key="firstItem" ref="1507912"/> + <int key="firstAttribute">11</int> + <int key="relation">0</int> + <reference key="secondItem" ref="121836166"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="123359675"> + <reference key="firstItem" ref="74783790"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="988321145"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">16</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="988321145"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="126524274"> + <reference key="firstItem" ref="197077555"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="261829518"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="360356517"> + <reference key="firstItem" ref="121836166"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="197077555"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="340464515"> + <reference key="firstItem" ref="121836166"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="988321145"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">15</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="988321145"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="242350796"> + <reference key="firstItem" ref="121836166"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="197077555"/> + <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="988321145"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <reference ref="1011324224"/> <reference ref="184943800"/> <reference ref="261829518"/> <reference ref="74783790"/> - <reference ref="1011324224"/> <reference ref="387662915"/> </array> <reference key="parent" ref="335490069"/> @@ -833,6 +1479,38 @@ <int key="objectID">19</int> <reference key="object" ref="773092047"/> <array class="NSMutableArray" key="children"> + <object class="IBNSLayoutConstraint" id="1042446465"> + <reference key="firstItem" ref="759409224"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="773092047"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">16</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="773092047"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="521242941"> + <reference key="firstItem" ref="759409224"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="773092047"/> + <int key="secondAttribute">3</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">25</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="773092047"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> <reference ref="759409224"/> </array> <reference key="parent" ref="335490069"/> @@ -841,52 +1519,59 @@ <int key="objectID">24</int> <reference key="object" ref="759155340"/> <array class="NSMutableArray" key="children"> - <reference ref="570869394"/> - <reference ref="33989673"/> - <reference ref="882835815"/> - </array> - <reference key="parent" ref="335490069"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">37</int> - <reference key="object" ref="422793261"/> - <array class="NSMutableArray" key="children"> - <reference ref="28806191"/> - </array> - <reference key="parent" ref="335490069"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">38</int> - <reference key="object" ref="1066134528"/> - <array class="NSMutableArray" key="children"> - <reference ref="1004748773"/> - </array> - <reference key="parent" ref="335490069"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">62</int> - <reference key="object" ref="485844511"/> - <array class="NSMutableArray" key="children"> - <reference ref="974258099"/> + <object class="IBNSLayoutConstraint" id="1037484378"> + <reference key="firstItem" ref="759155340"/> + <int key="firstAttribute">4</int> + <int key="relation">0</int> + <reference key="secondItem" ref="754874250"/> + <int key="secondAttribute">4</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">11</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="759155340"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="307779622"> + <reference key="firstItem" ref="754874250"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="759155340"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">16</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="759155340"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="766517095"> + <reference key="firstItem" ref="754874250"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="759155340"/> + <int key="secondAttribute">3</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">25</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="759155340"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <reference ref="754874250"/> </array> <reference key="parent" ref="335490069"/> </object> <object class="IBObjectRecord"> - <int key="objectID">93</int> - <reference key="object" ref="28806191"/> - <reference key="parent" ref="422793261"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">94</int> - <reference key="object" ref="1004748773"/> - <reference key="parent" ref="1066134528"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">95</int> - <reference key="object" ref="974258099"/> - <reference key="parent" ref="485844511"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">-3</int> <reference key="object" ref="225882746"/> <reference key="parent" ref="0"/> @@ -897,6 +1582,38 @@ <reference key="object" ref="121836166"/> <array class="NSMutableArray" key="children"> <reference ref="429556832"/> + <object class="IBNSLayoutConstraint" id="514288272"> + <reference key="firstItem" ref="121836166"/> + <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">17</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="121836166"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> + <object class="IBNSLayoutConstraint" id="806674793"> + <reference key="firstItem" ref="121836166"/> + <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">90</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="121836166"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> </array> <reference key="parent" ref="988321145"/> </object> @@ -910,6 +1627,22 @@ <reference key="object" ref="1507912"/> <array class="NSMutableArray" key="children"> <reference ref="724216678"/> + <object class="IBNSLayoutConstraint" id="89688161"> + <reference key="firstItem" ref="1507912"/> + <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">140</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="1507912"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> </array> <reference key="parent" ref="988321145"/> </object> @@ -923,6 +1656,22 @@ <reference key="object" ref="197077555"/> <array class="NSMutableArray" key="children"> <reference ref="74472058"/> + <object class="IBNSLayoutConstraint" id="1005156286"> + <reference key="firstItem" ref="197077555"/> + <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">17</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="197077555"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> </array> <reference key="parent" ref="988321145"/> </object> @@ -949,6 +1698,22 @@ <reference key="object" ref="184943800"/> <array class="NSMutableArray" key="children"> <reference ref="909159478"/> + <object class="IBNSLayoutConstraint" id="1020662235"> + <reference key="firstItem" ref="184943800"/> + <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">127</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="184943800"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> </array> <reference key="parent" ref="988321145"/> </object> @@ -975,6 +1740,22 @@ <reference key="object" ref="74783790"/> <array class="NSMutableArray" key="children"> <reference ref="902474361"/> + <object class="IBNSLayoutConstraint" id="840440220"> + <reference key="firstItem" ref="74783790"/> + <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">90</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="74783790"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> </array> <reference key="parent" ref="988321145"/> </object> @@ -1001,6 +1782,22 @@ <reference key="object" ref="387662915"/> <array class="NSMutableArray" key="children"> <reference ref="723960494"/> + <object class="IBNSLayoutConstraint" id="617532850"> + <reference key="firstItem" ref="387662915"/> + <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">17</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="387662915"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> </array> <reference key="parent" ref="988321145"/> </object> @@ -1014,6 +1811,22 @@ <reference key="object" ref="759409224"/> <array class="NSMutableArray" key="children"> <reference ref="601824583"/> + <object class="IBNSLayoutConstraint" id="465689690"> + <reference key="firstItem" ref="759409224"/> + <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">149</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="759409224"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> </array> <reference key="parent" ref="773092047"/> </object> @@ -1023,43 +1836,349 @@ <reference key="parent" ref="759409224"/> </object> <object class="IBObjectRecord"> - <int key="objectID">25</int> - <reference key="object" ref="570869394"/> + <int key="objectID">107</int> + <reference key="object" ref="275183491"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">108</int> + <reference key="object" ref="558041630"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">109</int> + <reference key="object" ref="744964704"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">111</int> + <reference key="object" ref="498683704"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">112</int> + <reference key="object" ref="505181088"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">122</int> + <reference key="object" ref="89688161"/> + <reference key="parent" ref="1507912"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">127</int> + <reference key="object" ref="465689690"/> + <reference key="parent" ref="759409224"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">129</int> + <reference key="object" ref="1020662235"/> + <reference key="parent" ref="184943800"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">131</int> + <reference key="object" ref="942117436"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">133</int> + <reference key="object" ref="140533858"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">134</int> + <reference key="object" ref="964665808"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">136</int> + <reference key="object" ref="444083121"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">137</int> + <reference key="object" ref="257351407"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">140</int> + <reference key="object" ref="528161191"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">141</int> + <reference key="object" ref="715982450"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">145</int> + <reference key="object" ref="245275154"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">147</int> + <reference key="object" ref="339074982"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">148</int> + <reference key="object" ref="242350796"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">149</int> + <reference key="object" ref="340464515"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">150</int> + <reference key="object" ref="702235891"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">151</int> + <reference key="object" ref="598544207"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">152</int> + <reference key="object" ref="360356517"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">153</int> + <reference key="object" ref="681262160"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">154</int> + <reference key="object" ref="648242307"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">157</int> + <reference key="object" ref="806674793"/> + <reference key="parent" ref="121836166"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">162</int> + <reference key="object" ref="357594249"/> <array class="NSMutableArray" key="children"> - <reference ref="530057379"/> + <reference ref="387624435"/> </array> - <reference key="parent" ref="759155340"/> + <reference key="parent" ref="335490069"/> </object> <object class="IBObjectRecord"> - <int key="objectID">90</int> - <reference key="object" ref="530057379"/> - <reference key="parent" ref="570869394"/> + <int key="objectID">163</int> + <reference key="object" ref="387624435"/> + <reference key="parent" ref="357594249"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">164</int> + <reference key="object" ref="329372734"/> + <reference key="parent" ref="335490069"/> </object> <object class="IBObjectRecord"> - <int key="objectID">26</int> - <reference key="object" ref="33989673"/> + <int key="objectID">165</int> + <reference key="object" ref="949964607"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">166</int> + <reference key="object" ref="129568570"/> <array class="NSMutableArray" key="children"> - <reference ref="409625895"/> + <reference ref="1031291435"/> </array> - <reference key="parent" ref="759155340"/> + <reference key="parent" ref="335490069"/> </object> <object class="IBObjectRecord"> - <int key="objectID">91</int> - <reference key="object" ref="409625895"/> - <reference key="parent" ref="33989673"/> + <int key="objectID">167</int> + <reference key="object" ref="1031291435"/> + <reference key="parent" ref="129568570"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">169</int> + <reference key="object" ref="686965984"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">170</int> + <reference key="object" ref="5789354"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">171</int> + <reference key="object" ref="780106098"/> + <array class="NSMutableArray" key="children"> + <reference ref="232731104"/> + </array> + <reference key="parent" ref="335490069"/> </object> <object class="IBObjectRecord"> - <int key="objectID">33</int> - <reference key="object" ref="882835815"/> + <int key="objectID">172</int> + <reference key="object" ref="232731104"/> + <reference key="parent" ref="780106098"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">173</int> + <reference key="object" ref="171265789"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">174</int> + <reference key="object" ref="750753059"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">180</int> + <reference key="object" ref="731413808"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">181</int> + <reference key="object" ref="676445877"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">182</int> + <reference key="object" ref="840440220"/> + <reference key="parent" ref="74783790"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">183</int> + <reference key="object" ref="123359675"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">186</int> + <reference key="object" ref="623364289"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">188</int> + <reference key="object" ref="708815831"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">189</int> + <reference key="object" ref="263892534"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">191</int> + <reference key="object" ref="514288272"/> + <reference key="parent" ref="121836166"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">193</int> + <reference key="object" ref="79155130"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">194</int> + <reference key="object" ref="521242941"/> + <reference key="parent" ref="773092047"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">195</int> + <reference key="object" ref="1042446465"/> + <reference key="parent" ref="773092047"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">196</int> + <reference key="object" ref="754874250"/> <array class="NSMutableArray" key="children"> + <reference ref="795134582"/> <reference ref="125730743"/> + <reference ref="409625895"/> + <reference ref="530057379"/> </array> <reference key="parent" ref="759155340"/> </object> <object class="IBObjectRecord"> + <int key="objectID">197</int> + <reference key="object" ref="795134582"/> + <reference key="parent" ref="754874250"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">92</int> <reference key="object" ref="125730743"/> - <reference key="parent" ref="882835815"/> + <reference key="parent" ref="754874250"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">91</int> + <reference key="object" ref="409625895"/> + <reference key="parent" ref="754874250"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">90</int> + <reference key="object" ref="530057379"/> + <reference key="parent" ref="754874250"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">206</int> + <reference key="object" ref="766517095"/> + <reference key="parent" ref="759155340"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">207</int> + <reference key="object" ref="307779622"/> + <reference key="parent" ref="759155340"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">209</int> + <reference key="object" ref="1037484378"/> + <reference key="parent" ref="759155340"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">210</int> + <reference key="object" ref="33237787"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">213</int> + <reference key="object" ref="1010014513"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">214</int> + <reference key="object" ref="562284763"/> + <reference key="parent" ref="335490069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">222</int> + <reference key="object" ref="393593304"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">224</int> + <reference key="object" ref="617532850"/> + <reference key="parent" ref="387662915"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">225</int> + <reference key="object" ref="136783247"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">226</int> + <reference key="object" ref="126524274"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">227</int> + <reference key="object" ref="1005156286"/> + <reference key="parent" ref="197077555"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">228</int> + <reference key="object" ref="466154982"/> + <reference key="parent" ref="988321145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">229</int> + <reference key="object" ref="2745058"/> + <reference key="parent" ref="988321145"/> </object> </array> </object> @@ -1067,44 +2186,150 @@ <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="107.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="108.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="109.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array key="11.IBNSViewMetadataConstraints"> + <reference ref="806674793"/> + <reference ref="514288272"/> + </array> + <boolean value="NO" key="11.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="12.CustomClassName">NamedSlider</string> + <array key="12.IBNSViewMetadataConstraints"> + <reference ref="89688161"/> + </array> + <boolean value="NO" key="12.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="122.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="127.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="133.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="137.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="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="147.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array key="15.IBNSViewMetadataConstraints"> + <reference ref="1005156286"/> + </array> + <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="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="16.CustomClassName">NamedSlider</string> + <boolean value="NO" key="16.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="NO" key="162.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> + <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> + <boolean value="NO" key="166.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> + <string key="166.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="167.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array class="NSMutableArray" key="17.IBNSViewMetadataConstraints"> + <reference ref="1020662235"/> + </array> + <boolean value="NO" key="17.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="NO" key="171.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> + <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> + <boolean value="NO" key="18.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <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="186.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="188.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array class="NSMutableArray" key="19.IBNSViewMetadataConstraints"> + <reference ref="521242941"/> + <reference ref="1042446465"/> + </array> + <boolean value="NO" key="19.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="191.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> + <boolean value="NO" key="196.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> + <string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="197.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="213.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="214.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array key="22.IBNSViewMetadataConstraints"> + <reference ref="465689690"/> + </array> + <boolean value="NO" key="22.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="224.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="226.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="228.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="229.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array key="24.IBNSViewMetadataConstraints"> + <reference ref="766517095"/> + <reference ref="307779622"/> + <reference ref="1037484378"/> + </array> + <boolean value="NO" key="24.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary" key="25.IBAttributePlaceholdersKey"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="570869394"/> - <string key="toolTip">Should always be enabled. Only disable this option if the emulator doesn't support the SPUupdate/async plugin interface.</string> - </object> - </object> - <string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary" key="26.IBAttributePlaceholdersKey"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="33989673"/> - <string key="toolTip">When enabled the plugin will waits for CPU action which a few games requires (Metal Gears Solid + others)</string> - </object> - </object> - <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="38.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array class="NSMutableArray" key="5.IBNSViewMetadataConstraints"> + <reference ref="744964704"/> + <reference ref="498683704"/> + <reference ref="505181088"/> + <reference ref="275183491"/> + <reference ref="263892534"/> + <reference ref="33237787"/> + <reference ref="171265789"/> + <reference ref="750753059"/> + <reference ref="558041630"/> + <reference ref="708815831"/> + <reference ref="1010014513"/> + <reference ref="562284763"/> + <reference ref="5789354"/> + <reference ref="329372734"/> + <reference ref="949964607"/> + <reference ref="686965984"/> + </array> <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="62.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array class="NSMutableArray" key="69.IBNSViewMetadataConstraints"> + <reference ref="840440220"/> + </array> + <boolean value="NO" key="69.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="69.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="70.CustomClassName">NamedSlider</string> + <boolean value="NO" key="70.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="70.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array key="71.IBNSViewMetadataConstraints"> + <reference ref="617532850"/> + </array> + <boolean value="NO" key="71.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="71.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1116,23 +2341,57 @@ <string key="87.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="88.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="89.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array class="NSMutableArray" key="9.IBNSViewMetadataConstraints"> + <reference ref="242350796"/> + <reference ref="340464515"/> + <reference ref="360356517"/> + <reference ref="126524274"/> + <reference ref="123359675"/> + <reference ref="257351407"/> + <reference ref="715982450"/> + <reference ref="245275154"/> + <reference ref="681262160"/> + <reference ref="528161191"/> + <reference ref="648242307"/> + <reference ref="942117436"/> + <reference ref="731413808"/> + <reference ref="136783247"/> + <reference ref="466154982"/> + <reference ref="702235891"/> + <reference ref="598544207"/> + <reference ref="623364289"/> + <reference ref="79155130"/> + <reference ref="140533858"/> + <reference ref="964665808"/> + <reference ref="676445877"/> + <reference ref="393593304"/> + <reference ref="444083121"/> + <reference ref="339074982"/> + <reference ref="2745058"/> + </array> + <boolean value="NO" key="9.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="90.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="91.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="93.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="94.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="95.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">95</int> + <int key="maxID">232</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <array class="NSMutableArray" key="referencedPartialClassDescriptions"> <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">NamedSlider</string> <string key="superclassName">NSSlider</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -1163,10 +2422,10 @@ </object> </dictionary> <dictionary class="NSMutableDictionary" key="outlets"> - <string key="hiCompBox">NSControl</string> + <string key="hiCompBox">NSCell</string> <string key="interpolValue">NamedSlider</string> - <string key="irqWaitBox">NSControl</string> - <string key="monoSoundBox">NSControl</string> + <string key="irqWaitBox">NSCell</string> + <string key="monoSoundBox">NSCell</string> <string key="reverbValue">NamedSlider</string> <string key="volumeValue">NamedSlider</string> <string key="xaEnableBox">NSControl</string> @@ -1175,7 +2434,7 @@ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="IBToOneOutletInfo" key="hiCompBox"> <string key="name">hiCompBox</string> - <string key="candidateClassName">NSControl</string> + <string key="candidateClassName">NSCell</string> </object> <object class="IBToOneOutletInfo" key="interpolValue"> <string key="name">interpolValue</string> @@ -1183,11 +2442,11 @@ </object> <object class="IBToOneOutletInfo" key="irqWaitBox"> <string key="name">irqWaitBox</string> - <string key="candidateClassName">NSControl</string> + <string key="candidateClassName">NSCell</string> </object> <object class="IBToOneOutletInfo" key="monoSoundBox"> <string key="name">monoSoundBox</string> - <string key="candidateClassName">NSControl</string> + <string key="candidateClassName">NSCell</string> </object> <object class="IBToOneOutletInfo" key="reverbValue"> <string key="name">reverbValue</string> @@ -1217,7 +2476,7 @@ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <real value="1060" key="NS.object.0"/> + <real value="1070" key="NS.object.0"/> </object> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <int key="IBDocument.defaultPropertyAccessControl">3</int> @@ -1225,5 +2484,6 @@ <string key="NS.key.0">NSSwitch</string> <string key="NS.object.0">{15, 15}</string> </object> + <bool key="IBDocument.UseAutolayout">YES</bool> </data> </archive> diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m index 88d23d03..c323967d 100755 --- a/macosx/plugins/DFSound/macsrc/PluginController.m +++ b/macosx/plugins/DFSound/macsrc/PluginController.m @@ -44,6 +44,15 @@ extern char* PLUGLOC(char* toloc); static SPUPluginController *pluginController = nil; +static inline void RunOnMainThreadSync(dispatch_block_t block) +{ + if ([NSThread isMainThread]) { + block(); + } else { + dispatch_sync(dispatch_get_main_queue(), block); + } +} + void DoAbout() { // Get parent application instance @@ -81,18 +90,20 @@ void DoAbout() long DoConfiguration() { - NSWindow *window; - - if (pluginController == nil) { - pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuPluginMain"]; - } - window = [pluginController window]; - - /* load values */ - [pluginController loadValues]; - - [window center]; - [window makeKeyAndOrderFront:nil]; + RunOnMainThreadSync(^{ + NSWindow *window; + + if (pluginController == nil) { + pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuPluginMain"]; + } + window = [pluginController window]; + + /* load values */ + [pluginController loadValues]; + + [window center]; + [window makeKeyAndOrderFront:nil]; + }); return 0; } @@ -137,7 +148,7 @@ void ReadConfig(void) { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues]; + NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:self.keyValues]; [writeDic setObject:@((BOOL)[hiCompBox intValue]) forKey:@"High Compatibility Mode"]; [writeDic setObject:@((BOOL)[irqWaitBox intValue]) forKey:@"SPU IRQ Wait"]; [writeDic setObject:@((BOOL)[monoSoundBox intValue]) forKey:@"Mono Sound Output"]; @@ -172,8 +183,7 @@ void ReadConfig(void) ReadConfig(); /* load from preferences */ - RELEASEOBJ(keyValues); - keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy]; + self.keyValues = [NSMutableDictionary dictionaryWithDictionary:[defaults dictionaryForKey:PrefsKey]]; [hiCompBox setIntValue:[[keyValues objectForKey:@"High Compatibility Mode"] boolValue]]; [irqWaitBox setIntValue:[[keyValues objectForKey:@"SPU IRQ Wait"] boolValue]]; diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.h b/macosx/plugins/DFSound/macsrc/SPUPluginController.h index e6a61308..53b64aec 100644 --- a/macosx/plugins/DFSound/macsrc/SPUPluginController.h +++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.h @@ -8,13 +8,14 @@ #import <Cocoa/Cocoa.h> #import "NamedSlider.h" +#import "ARCBridge.h" @interface SPUPluginController : NSWindowController { - IBOutlet NSControl *hiCompBox; + IBOutlet NSCell *hiCompBox; IBOutlet NamedSlider *interpolValue; - IBOutlet NSControl *irqWaitBox; - IBOutlet NSControl *monoSoundBox; + IBOutlet NSCell *irqWaitBox; + IBOutlet NSCell *monoSoundBox; IBOutlet NamedSlider *reverbValue; IBOutlet NSControl *xaEnableBox; IBOutlet NSControl *xaSpeedBox; @@ -22,6 +23,7 @@ NSMutableDictionary *keyValues; } +@property (readwrite, arcretain) NSMutableDictionary *keyValues; - (IBAction)cancel:(id)sender; - (IBAction)ok:(id)sender; - (IBAction)reset:(id)sender; diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.m b/macosx/plugins/DFSound/macsrc/SPUPluginController.m index bb225b51..83598618 100644 --- a/macosx/plugins/DFSound/macsrc/SPUPluginController.m +++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.m @@ -8,9 +8,7 @@ #import "SPUPluginController.h" -@implementation SPUPluginController - -static Class GetSPUBaseClass() +static inline Class GetSPUBaseClass() { static Class spuBaseClass; if (!spuBaseClass) { @@ -19,7 +17,7 @@ static Class GetSPUBaseClass() return spuBaseClass; } -static inline void FuncNotAvailable(id sel, id sender, SEL theCmd) +static void FuncNotAvailable(id sel, id sender, SEL theCmd) { #ifdef DEBUG NSString *selString = NSStringFromSelector(theCmd); @@ -39,6 +37,9 @@ static inline void FuncNotAvailable(id sel, id sender, SEL theCmd) #define NotAvailableWarn(sender) FuncNotAvailable(self, sender, _cmd) +@implementation SPUPluginController +@synthesize keyValues; + - (IBAction)cancel:(id)sender { NotAvailableWarn(sender); @@ -59,4 +60,13 @@ static inline void FuncNotAvailable(id sel, id sender, SEL theCmd) NotAvailableWarn(nil); } +#if !__has_feature(objc_arc) +- (void)dealloc +{ + self.keyValues = nil; + + [super dealloc]; +} +#endif + @end |