https://src.bluestatic.org / macgdbp.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5c92c60)
Move the Eval window into a tabbed section.
authorRobert Sesek <rsesek@bluestatic.org>
Fri, 5 Aug 2016 01:53:12 +0000 (21:53 -0400)
committerRobert Sesek <rsesek@bluestatic.org>
Fri, 5 Aug 2016 01:53:12 +0000 (21:53 -0400)
English.lproj/Debugger.xib patch | blob | history
English.lproj/Eval.xib patch | blob | history
Icons/Eval.png [deleted file] patch | blob | history
MacGDBp.xcodeproj/project.pbxproj patch | blob | history
Source/DebuggerController.m patch | blob | history
Source/EvalController.h patch | blob | history
Source/EvalController.m patch | blob | history

diff --git a/English.lproj/Debugger.xib b/English.lproj/Debugger.xib
index 770b26744d4c0b0899d0d01fe84c38e3c7244a23..4368e5649874c7ce86947693a98287ce38b96f5a 100644 (file)
--- a/English.lproj/Debugger.xib
+++ b/English.lproj/Debugger.xib
@@ -69,7 +69,7 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <subviews>
                                     <segmentedControl verticalHuggingPriority="750" id="mRx-aY-U5x">
-                                        <rect key="frame" x="-9" y="459" width="218" height="25"/>
+                                        <rect key="frame" x="-50" y="459" width="304" height="25"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                         <segmentedCell key="cell" borderStyle="border" alignment="left" style="texturedRounded" trackingMode="selectOne" id="Qgr-HU-m0Y">
                                             <font key="font" metaFont="system"/>
@@ -77,15 +77,16 @@
                                                 <segment enabled="NO">
                                                     <nil key="label"/>
                                                 </segment>
-                                                <segment label="Variables" width="92" selected="YES" tag="1"/>
-                                                <segment label="Breakpoints" width="93" tag="2"/>
+                                                <segment label="Variables" width="90" selected="YES" tag="1"/>
+                                                <segment label="Breakpoints" width="90" tag="2"/>
+                                                <segment label="Eval" width="90" tag="3"/>
                                                 <segment enabled="NO">
                                                     <nil key="label"/>
                                                 </segment>
                                             </segments>
                                         </segmentedCell>
                                     </segmentedControl>
-                                    <tabView type="noTabsNoBorder" id="XU1-a6-Ws7">
+                                    <tabView type="noTabsNoBorder" initialItem="jVS-VL-LBw" id="XU1-a6-Ws7">
                                         <rect key="frame" x="0.0" y="0.0" width="211" height="461"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -182,7 +183,7 @@
                                                                 <rect key="frame" x="1" y="11" width="53" height="16"/>
                                                                 <autoresizingMask key="autoresizingMask"/>
                                                             </scroller>
-                                                            <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="465">
+                                                            <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="465">
                                                                 <rect key="frame" x="38" y="23" width="16" height="4"/>
                                                                 <autoresizingMask key="autoresizingMask"/>
                                                             </scroller>
@@ -196,7 +197,13 @@
                                             </tabViewItem>
                                             <tabViewItem label="Breakpoints" identifier="2" id="2a4-vf-O1X">
                                                 <view key="view" id="9f1-p9-w6d">
-                                                    <rect key="frame" x="0.0" y="0.0" width="211" height="463"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="211" height="461"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </view>
+                                            </tabViewItem>
+                                            <tabViewItem label="Eval" identifier="" id="ncK-g5-aVZ">
+                                                <view key="view" id="uDl-xl-zMF">
+                                                    <rect key="frame" x="0.0" y="0.0" width="211" height="461"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 </view>
                                             </tabViewItem>
@@ -373,23 +380,18 @@
                             <action selector="showInspectorWindow:" target="-1" id="587"/>
                         </connections>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="05157554-5CF3-45B4-9306-239A1F7E8130" label="Evaluate Script" paletteLabel="Evaluate Script" tag="-1" image="Eval" id="600">
-                        <connections>
-                            <action selector="showEvalWindow:" target="-2" id="602"/>
-                        </connections>
-                    </toolbarItem>
                     <toolbarItem implicitItemIdentifier="NSToolbarSeparatorItem" id="474"/>
                     <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="476"/>
                     <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="477"/>
                     <toolbarItem implicitItemIdentifier="NSToolbarCustomizeToolbarItem" id="478"/>
-                    <toolbarItem implicitItemIdentifier="0DD9463E-4676-43E6-B885-7A9CB1137956" label="Attached" paletteLabel="" image="123B7784-9F5B-43C3-9BF1-67AA3027FBC7" id="593">
+                    <toolbarItem implicitItemIdentifier="0DD9463E-4676-43E6-B885-7A9CB1137956" label="Attached" paletteLabel="" image="5C5E81E6-5645-44D5-9588-4457F99FF803" id="593">
                         <nil key="toolTip"/>
                         <size key="minSize" width="63" height="18"/>
                         <size key="maxSize" width="107" height="18"/>
                         <button key="view" id="591">
                             <rect key="frame" x="0.0" y="14" width="83" height="18"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <buttonCell key="cell" type="bevel" title="Attached" bezelStyle="regularSquare" image="123B7784-9F5B-43C3-9BF1-67AA3027FBC7" imagePosition="left" alignment="left" state="on" inset="2" id="592">
+                            <buttonCell key="cell" type="bevel" title="Attached" bezelStyle="regularSquare" image="5C5E81E6-5645-44D5-9588-4457F99FF803" imagePosition="left" alignment="left" state="on" inset="2" id="592">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                 <font key="font" metaFont="system"/>
                                 <connections>
@@ -412,7 +414,6 @@
                     <toolbarItem reference="597"/>
                     <toolbarItem reference="476"/>
                     <toolbarItem reference="476"/>
-                    <toolbarItem reference="600"/>
                     <toolbarItem reference="584"/>
                     <toolbarItem reference="477"/>
                     <toolbarItem reference="593"/>
@@ -608,7 +609,7 @@
         <userDefaultsController representsSharedInstance="YES" id="582"/>
     </objects>
     <resources>
-        <image name="123B7784-9F5B-43C3-9BF1-67AA3027FBC7" width="18" height="18">
+        <image name="5C5E81E6-5645-44D5-9588-4457F99FF803" width="18" height="18">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGW1xYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK8QFwcI
 ERYbHCc0NTY3ODk6O0JDRElMT1VYVSRudWxs1AkKCwwNDg8QViRjbGFzc1xOU0ltYWdlRmxhZ3NWTlNS
@@ -627,7 +628,6 @@ AUMBSAFOAVQBWwFjAWoBcwF4AYMBjAGiAaYBswG8AcUB4QHmAfkB/QIQAhsCIAIoAisCMAI/AkMCSgJS
 Al8CZAJmAmgCbQJ1AngCfQKFAogCmgKdAqIAAAAAAAACAQAAAAAAAABfAAAAAAAAAAAAAAAAAAACpA
 </mutableData>
         </image>
-        <image name="Eval" width="256" height="256"/>
         <image name="HUDIcon" width="32" height="32"/>
         <image name="Run" width="256" height="256"/>
         <image name="StepIn" width="256" height="256"/>
diff --git a/English.lproj/Eval.xib b/English.lproj/Eval.xib
index 83ba75f6be5e99ec5a66569658267bd89f9b7aec..212df7ecc1ebc0dd9f8598316d72a554a7e8c921 100644 (file)
--- a/English.lproj/Eval.xib
+++ b/English.lproj/Eval.xib
@@ -1,1029 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-       <data>
-               <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">10K549</string>
-               <string key="IBDocument.InterfaceBuilderVersion">804</string>
-               <string key="IBDocument.AppKitVersion">1038.36</string>
-               <string key="IBDocument.HIToolboxVersion">461.00</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       <string key="NS.object.0">804</string>
-               </object>
-               <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="2"/>
-               </object>
-               <object class="NSArray" key="IBDocument.PluginDependencies">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-               </object>
-               <object class="NSMutableDictionary" key="IBDocument.Metadata">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <object class="NSArray" key="dict.sortedKeys" id="0">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                       </object>
-                       <object class="NSMutableArray" key="dict.values">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                       </object>
-               </object>
-               <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <object class="NSCustomObject" id="1001">
-                               <string key="NSClassName">EvalController</string>
-                       </object>
-                       <object class="NSCustomObject" id="1003">
-                               <string key="NSClassName">FirstResponder</string>
-                       </object>
-                       <object class="NSCustomObject" id="1004">
-                               <string key="NSClassName">NSApplication</string>
-                       </object>
-                       <object class="NSWindowTemplate" id="1005">
-                               <int key="NSWindowStyleMask">15</int>
-                               <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{196, 240}, {480, 270}}</string>
-                               <int key="NSWTFlags">544735232</int>
-                               <string key="NSWindowTitle">Window</string>
-                               <string key="NSWindowClass">NSWindow</string>
-                               <nil key="NSViewClass"/>
-                               <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-                               <object class="NSView" key="NSWindowView" id="1006">
-                                       <reference key="NSNextResponder"/>
-                                       <int key="NSvFlags">256</int>
-                                       <object class="NSMutableArray" key="NSSubviews">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSTextField" id="585564135">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">266</int>
-                                                       <string key="NSFrame">{{20, 178}, {440, 65}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="84213117">
-                                                               <int key="NSCellFlags">-1805517311</int>
-                                                               <int key="NSCellFlags2">272629760</int>
-                                                               <string key="NSContents"/>
-                                                               <object class="NSFont" key="NSSupport" id="567817565">
-                                                                       <string key="NSName">Menlo-Regular</string>
-                                                                       <double key="NSSize">13</double>
-                                                                       <int key="NSfFlags">16</int>
-                                                               </object>
-                                                               <reference key="NSControlView" ref="585564135"/>
-                                                               <bool key="NSDrawsBackground">YES</bool>
-                                                               <object class="NSColor" key="NSBackgroundColor" id="815552025">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">textBackgroundColor</string>
-                                                                       <object class="NSColor" key="NSColor">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MQA</bytes>
-                                                                       </object>
-                                                               </object>
-                                                               <object class="NSColor" key="NSTextColor" id="791169219">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">textColor</string>
-                                                                       <object class="NSColor" key="NSColor" id="1034870718">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MAA</bytes>
-                                                                       </object>
-                                                               </object>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="732850600">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{19, 246}, {100, 14}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="544574022">
-                                                               <int key="NSCellFlags">68288064</int>
-                                                               <int key="NSCellFlags2">272761856</int>
-                                                               <string key="NSContents">Script to Evaluate:</string>
-                                                               <object class="NSFont" key="NSSupport" id="26">
-                                                                       <string key="NSName">LucidaGrande</string>
-                                                                       <double key="NSSize">11</double>
-                                                                       <int key="NSfFlags">3100</int>
-                                                               </object>
-                                                               <reference key="NSControlView" ref="732850600"/>
-                                                               <object class="NSColor" key="NSBackgroundColor" id="335792931">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">controlColor</string>
-                                                                       <object class="NSColor" key="NSColor">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-                                                                       </object>
-                                                               </object>
-                                                               <object class="NSColor" key="NSTextColor" id="545119019">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">controlTextColor</string>
-                                                                       <reference key="NSColor" ref="1034870718"/>
-                                                               </object>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="92516705">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{17, 146}, {100, 14}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="404230986">
-                                                               <int key="NSCellFlags">68288064</int>
-                                                               <int key="NSCellFlags2">272761856</int>
-                                                               <string key="NSContents">Result:</string>
-                                                               <reference key="NSSupport" ref="26"/>
-                                                               <reference key="NSControlView" ref="92516705"/>
-                                                               <reference key="NSBackgroundColor" ref="335792931"/>
-                                                               <reference key="NSTextColor" ref="545119019"/>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="1253298">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">274</int>
-                                                       <string key="NSFrame">{{20, 43}, {440, 95}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="500870399">
-                                                               <int key="NSCellFlags">-1804468671</int>
-                                                               <int key="NSCellFlags2">272630784</int>
-                                                               <string key="NSContents"/>
-                                                               <reference key="NSSupport" ref="567817565"/>
-                                                               <reference key="NSControlView" ref="1253298"/>
-                                                               <bool key="NSDrawsBackground">YES</bool>
-                                                               <reference key="NSBackgroundColor" ref="815552025"/>
-                                                               <reference key="NSTextColor" ref="791169219"/>
-                                                       </object>
-                                               </object>
-                                               <object class="NSButton" id="259944115">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">289</int>
-                                                       <string key="NSFrame">{{370, 7}, {96, 32}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSButtonCell" key="NSCell" id="271035364">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">134217728</int>
-                                                               <string key="NSContents">Evaluate</string>
-                                                               <object class="NSFont" key="NSSupport" id="333028838">
-                                                                       <string key="NSName">LucidaGrande</string>
-                                                                       <double key="NSSize">13</double>
-                                                                       <int key="NSfFlags">1044</int>
-                                                               </object>
-                                                               <reference key="NSControlView" ref="259944115"/>
-                                                               <int key="NSButtonFlags">-2038284033</int>
-                                                               <int key="NSButtonFlags2">129</int>
-                                                               <string key="NSAlternateContents"/>
-                                                               <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-                                                               <int key="NSPeriodicDelay">200</int>
-                                                               <int key="NSPeriodicInterval">25</int>
-                                                       </object>
-                                               </object>
-                                               <object class="NSButton" id="325963966">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">289</int>
-                                                       <string key="NSFrame">{{274, 7}, {96, 32}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSButtonCell" key="NSCell" id="484259161">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">134217728</int>
-                                                               <string key="NSContents">Close</string>
-                                                               <reference key="NSSupport" ref="333028838"/>
-                                                               <reference key="NSControlView" ref="325963966"/>
-                                                               <int key="NSButtonFlags">-2038284033</int>
-                                                               <int key="NSButtonFlags2">129</int>
-                                                               <string key="NSAlternateContents"/>
-                                                               <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
-                                                               <int key="NSPeriodicDelay">200</int>
-                                                               <int key="NSPeriodicInterval">25</int>
-                                                       </object>
-                                               </object>
-                                       </object>
-                                       <string key="NSFrameSize">{480, 270}</string>
-                                       <reference key="NSSuperview"/>
-                               </object>
-                               <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-                               <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
-                               <string key="NSFrameAutosaveName">EvalWindow</string>
-                       </object>
-               </object>
-               <object class="IBObjectContainer" key="IBDocument.Objects">
-                       <object class="NSMutableArray" key="connectionRecords">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">dataField</string>
-                                               <reference key="source" ref="1001"/>
-                                               <reference key="destination" ref="585564135"/>
-                                       </object>
-                                       <int key="connectionID">15</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">resultField</string>
-                                               <reference key="source" ref="1001"/>
-                                               <reference key="destination" ref="1253298"/>
-                                       </object>
-                                       <int key="connectionID">16</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">window</string>
-                                               <reference key="source" ref="1001"/>
-                                               <reference key="destination" ref="1005"/>
-                                       </object>
-                                       <int key="connectionID">17</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">closeWindow:</string>
-                                               <reference key="source" ref="1001"/>
-                                               <reference key="destination" ref="325963966"/>
-                                       </object>
-                                       <int key="connectionID">18</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">evaluateScript:</string>
-                                               <reference key="source" ref="1001"/>
-                                               <reference key="destination" ref="259944115"/>
-                                       </object>
-                                       <int key="connectionID">19</int>
-                               </object>
-                       </object>
-                       <object class="IBMutableOrderedSet" key="objectRecords">
-                               <object class="NSArray" key="orderedObjects">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
-                                               <reference key="object" ref="0"/>
-                                               <reference key="children" ref="1000"/>
-                                               <nil key="parent"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
-                                               <reference key="object" ref="1001"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">File's Owner</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
-                                               <reference key="object" ref="1003"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">First Responder</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-3</int>
-                                               <reference key="object" ref="1004"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">Application</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
-                                               <reference key="object" ref="1005"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1006"/>
-                                               </object>
-                                               <reference key="parent" ref="0"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">2</int>
-                                               <reference key="object" ref="1006"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="732850600"/>
-                                                       <reference ref="585564135"/>
-                                                       <reference ref="92516705"/>
-                                                       <reference ref="1253298"/>
-                                                       <reference ref="259944115"/>
-                                                       <reference ref="325963966"/>
-                                               </object>
-                                               <reference key="parent" ref="1005"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">3</int>
-                                               <reference key="object" ref="585564135"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="84213117"/>
-                                               </object>
-                                               <reference key="parent" ref="1006"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
-                                               <reference key="object" ref="84213117"/>
-                                               <reference key="parent" ref="585564135"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
-                                               <reference key="object" ref="732850600"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="544574022"/>
-                                               </object>
-                                               <reference key="parent" ref="1006"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
-                                               <reference key="object" ref="544574022"/>
-                                               <reference key="parent" ref="732850600"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
-                                               <reference key="object" ref="92516705"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="404230986"/>
-                                               </object>
-                                               <reference key="parent" ref="1006"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
-                                               <reference key="object" ref="404230986"/>
-                                               <reference key="parent" ref="92516705"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">9</int>
-                                               <reference key="object" ref="1253298"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="500870399"/>
-                                               </object>
-                                               <reference key="parent" ref="1006"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">10</int>
-                                               <reference key="object" ref="500870399"/>
-                                               <reference key="parent" ref="1253298"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">11</int>
-                                               <reference key="object" ref="259944115"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="271035364"/>
-                                               </object>
-                                               <reference key="parent" ref="1006"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
-                                               <reference key="object" ref="271035364"/>
-                                               <reference key="parent" ref="259944115"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">13</int>
-                                               <reference key="object" ref="325963966"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="484259161"/>
-                                               </object>
-                                               <reference key="parent" ref="1006"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">14</int>
-                                               <reference key="object" ref="484259161"/>
-                                               <reference key="parent" ref="325963966"/>
-                                       </object>
-                               </object>
-                       </object>
-                       <object class="NSMutableDictionary" key="flattenedProperties">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="NSArray" key="dict.sortedKeys">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <string>1.IBEditorWindowLastContentRect</string>
-                                       <string>1.IBPluginDependency</string>
-                                       <string>1.IBWindowTemplateEditedContentRect</string>
-                                       <string>1.NSWindowTemplate.visibleAtLaunch</string>
-                                       <string>1.WindowOrigin</string>
-                                       <string>1.editorWindowContentRectSynchronizationRect</string>
-                                       <string>10.IBPluginDependency</string>
-                                       <string>11.IBPluginDependency</string>
-                                       <string>11.IBViewBoundsToFrameTransform</string>
-                                       <string>12.IBPluginDependency</string>
-                                       <string>13.IBPluginDependency</string>
-                                       <string>13.IBViewBoundsToFrameTransform</string>
-                                       <string>14.IBPluginDependency</string>
-                                       <string>2.IBPluginDependency</string>
-                                       <string>3.IBPluginDependency</string>
-                                       <string>3.IBViewBoundsToFrameTransform</string>
-                                       <string>4.IBPluginDependency</string>
-                                       <string>5.IBPluginDependency</string>
-                                       <string>5.IBViewBoundsToFrameTransform</string>
-                                       <string>6.IBPluginDependency</string>
-                                       <string>7.IBPluginDependency</string>
-                                       <string>7.IBViewBoundsToFrameTransform</string>
-                                       <string>8.IBPluginDependency</string>
-                                       <string>9.IBPluginDependency</string>
-                                       <string>9.IBViewBoundsToFrameTransform</string>
-                               </object>
-                               <object class="NSMutableArray" key="dict.values">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <string>{{322, 586}, {480, 270}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{322, 586}, {480, 270}}</string>
-                                       <boolean value="NO"/>
-                                       <string>{196, 240}</string>
-                                       <string>{{202, 428}, {480, 270}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <object class="NSAffineTransform">
-                                               <bytes key="NSTransformStruct">P4AAAL+AAABDuQAAwhQAAA</bytes>
-                                       </object>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <object class="NSAffineTransform">
-                                               <bytes key="NSTransformStruct">P4AAAL+AAABDuQAAwhQAAA</bytes>
-                                       </object>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <object class="NSAffineTransform">
-                                               <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw3EAAA</bytes>
-                                       </object>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <object class="NSAffineTransform">
-                                               <bytes key="NSTransformStruct">P4AAAL+AAABBmAAAw4EAAA</bytes>
-                                       </object>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <object class="NSAffineTransform">
-                                               <bytes key="NSTransformStruct">P4AAAL+AAABBmAAAw4EAAA</bytes>
-                                       </object>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <object class="NSAffineTransform">
-                                               <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw3EAAA</bytes>
-                                       </object>
-                               </object>
-                       </object>
-                       <object class="NSMutableDictionary" key="unlocalizedProperties">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <reference key="dict.sortedKeys" ref="0"/>
-                               <object class="NSMutableArray" key="dict.values">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                               </object>
-                       </object>
-                       <nil key="activeLocalization"/>
-                       <object class="NSMutableDictionary" key="localizations">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <reference key="dict.sortedKeys" ref="0"/>
-                               <object class="NSMutableArray" key="dict.values">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                               </object>
-                       </object>
-                       <nil key="sourceID"/>
-                       <int key="maxID">20</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">EvalController</string>
-                                       <string key="superclassName">NSWindowController</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>closeWindow:</string>
-                                                       <string>evaluateScript:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>closeWindow:</string>
-                                                       <string>evaluateScript:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">closeWindow:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">evaluateScript:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="outlets">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>dataField</string>
-                                                       <string>resultField</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>dataField</string>
-                                                       <string>resultField</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">dataField</string>
-                                                               <string key="candidateClassName">NSTextField</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">resultField</string>
-                                                               <string key="candidateClassName">NSTextField</string>
-                                                       </object>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">Source/EvalController.h</string>
-                                       </object>
-                               </object>
-                       </object>
-                       <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSActionCell</string>
-                                       <string key="superclassName">NSCell</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSApplication</string>
-                                       <string key="superclassName">NSResponder</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="681157329">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSApplication</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="133745062">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSApplication</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="737077093">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSApplication</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSApplication</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSApplication</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSButton</string>
-                                       <string key="superclassName">NSControl</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSButtonCell</string>
-                                       <string key="superclassName">NSActionCell</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSCell</string>
-                                       <string key="superclassName">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSControl</string>
-                                       <string key="superclassName">NSView</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="867792768">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSFormatter</string>
-                                       <string key="superclassName">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSMenu</string>
-                                       <string key="superclassName">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="983546826">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <reference key="sourceIdentifier" ref="681157329"/>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <reference key="sourceIdentifier" ref="133745062"/>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <reference key="sourceIdentifier" ref="737077093"/>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <reference key="sourceIdentifier" ref="867792768"/>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <reference key="sourceIdentifier" ref="983546826"/>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="919297429">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSView.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">Sparkle.framework/Headers/SUUpdater.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSResponder</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSResponder</string>
-                                       <string key="superclassName">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSTextField</string>
-                                       <string key="superclassName">NSControl</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSTextFieldCell</string>
-                                       <string key="superclassName">NSActionCell</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSView</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSView</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSView</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSView</string>
-                                       <string key="superclassName">NSResponder</string>
-                                       <reference key="sourceIdentifier" ref="919297429"/>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSWindow</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSWindow</string>
-                                       <string key="superclassName">NSResponder</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSWindow</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSWindowController</string>
-                                       <string key="superclassName">NSResponder</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">showWindow:</string>
-                                               <string key="NS.object.0">id</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">showWindow:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">showWindow:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBFrameworkSource</string>
-                                               <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
-                                       </object>
-                               </object>
-                       </object>
-               </object>
-               <int key="IBDocument.localizationMode">0</int>
-               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-                       <integer value="1050" key="NS.object.0"/>
-               </object>
-               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-                       <integer value="3000" key="NS.object.0"/>
-               </object>
-               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-               <string key="IBDocument.LastKnownRelativeProjectPath">../MacGDBp.xcodeproj</string>
-               <int key="IBDocument.defaultPropertyAccessControl">3</int>
-       </data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="EvalController">
+            <connections>
+                <outlet property="dataField" destination="Vbq-T6-nq6" id="18y-9a-sBw"/>
+                <outlet property="resultField" destination="QKP-GR-0Lw" id="Yd8-3d-oNa"/>
+                <outlet property="view" destination="pgF-sO-Ir5" id="ZEj-UG-amG"/>
+            </connections>
+        </customObject>
+        <view id="pgF-sO-Ir5">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <subviews>
+                <textField verticalHuggingPriority="750" id="Vbq-T6-nq6">
+                    <rect key="frame" x="20" y="178" width="440" height="65"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                    <textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="QIx-p6-u8e">
+                        <font key="font" size="13" name="Menlo-Regular"/>
+                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <textField verticalHuggingPriority="750" id="ZKL-CJ-8ib">
+                    <rect key="frame" x="19" y="246" width="100" height="14"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Script to Evaluate:" id="nX4-if-rtS">
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <textField verticalHuggingPriority="750" id="rDx-6t-Uff">
+                    <rect key="frame" x="17" y="146" width="100" height="14"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Result:" id="jie-L1-VJh">
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <textField verticalHuggingPriority="750" id="QKP-GR-0Lw">
+                    <rect key="frame" x="20" y="43" width="440" height="95"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="Xyb-tl-MWX">
+                        <font key="font" size="13" name="Menlo-Regular"/>
+                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <button verticalHuggingPriority="750" id="Ctw-Nn-pLv">
+                    <rect key="frame" x="370" y="7" width="96" height="32"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                    <buttonCell key="cell" type="push" title="Evaluate" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="HmR-fA-L6m">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                        <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                    </buttonCell>
+                    <connections>
+                        <action selector="evaluateScript:" target="-2" id="ylX-wS-HCd"/>
+                    </connections>
+                </button>
+                <button verticalHuggingPriority="750" id="yxM-H4-d1E">
+                    <rect key="frame" x="274" y="7" width="96" height="32"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                    <buttonCell key="cell" type="push" title="Close" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iFP-7O-ger">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                        <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                    </buttonCell>
+                </button>
+            </subviews>
+        </view>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+    </objects>
+</document>
diff --git a/Icons/Eval.png b/Icons/Eval.png
deleted file mode 100644 (file)
index ac99858..0000000
Binary files a/Icons/Eval.png and /dev/null differ
diff --git a/MacGDBp.xcodeproj/project.pbxproj b/MacGDBp.xcodeproj/project.pbxproj
index 075aefeb9e3c92f60961619fec22ff7897aaaae4..afcf00d69ec2ab376590cc4b14be4734e4ccd834 100644 (file)
--- a/MacGDBp.xcodeproj/project.pbxproj
+++ b/MacGDBp.xcodeproj/project.pbxproj
@@ -16,7 +16,6 @@
                1E108E40136CC8B9002E34E0 /* EvalController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E108E3F136CC8B9002E34E0 /* EvalController.m */; };
                1E108E43136CC9A0002E34E0 /* Eval.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1E108E41136CC9A0002E34E0 /* Eval.xib */; };
                1E109019136DD92D002E34E0 /* StripLineBreaksValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E109018136DD92D002E34E0 /* StripLineBreaksValueTransformer.m */; };
-               1E110F8D1393F370007B6D63 /* Eval.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E110F8C1393F370007B6D63 /* Eval.png */; };
                1E11814A1319805E003BFEF1 /* BSSourceViewTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E1181491319805E003BFEF1 /* BSSourceViewTextView.m */; };
                1E1E53030DF9B89800D334F9 /* Breakpoints.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1E1E53010DF9B89800D334F9 /* Breakpoints.xib */; };
                1E2F0A6912D5371C00EBF675 /* Stop.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E2F0A6812D5371B00EBF675 /* Stop.png */; };
@@ -95,7 +94,6 @@
                1E108E42136CC9A0002E34E0 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Eval.xib; sourceTree = "<group>"; };
                1E109017136DD92D002E34E0 /* StripLineBreaksValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StripLineBreaksValueTransformer.h; path = Source/StripLineBreaksValueTransformer.h; sourceTree = "<group>"; };
                1E109018136DD92D002E34E0 /* StripLineBreaksValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StripLineBreaksValueTransformer.m; path = Source/StripLineBreaksValueTransformer.m; sourceTree = "<group>"; };
-               1E110F8C1393F370007B6D63 /* Eval.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Eval.png; path = Icons/Eval.png; sourceTree = "<group>"; };
                1E1181481319805E003BFEF1 /* BSSourceViewTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BSSourceViewTextView.h; path = Source/BSSourceViewTextView.h; sourceTree = "<group>"; };
                1E1181491319805E003BFEF1 /* BSSourceViewTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BSSourceViewTextView.m; path = Source/BSSourceViewTextView.m; sourceTree = "<group>"; };
                1E1E53020DF9B89800D334F9 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Breakpoints.xib; sourceTree = "<group>"; };
@@ -224,7 +222,6 @@
                                1E027F090D36F23F00885DEE /* StepOver.png */,
                                1EEBFC360D358F1B008F835B /* StepOut.png */,
                                1EEBFC2A0D358EBD008F835B /* StepIn.png */,
-                               1E110F8C1393F370007B6D63 /* Eval.png */,
                        );
                        name = "Toolbar Icons";
                        sourceTree = "<group>";
@@ -472,7 +469,6 @@
                                1E6B594C11610993001189D2 /* Log.xib in Resources */,
                                1E2F0A6912D5371C00EBF675 /* Stop.png in Resources */,
                                1E108E43136CC9A0002E34E0 /* Eval.xib in Resources */,
-                               1E110F8D1393F370007B6D63 /* Eval.png in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m
index 3a4231016aeff6569fcb32ee77aef957f25a8291..e09833d246dbeac2f4a4dcaca85d2c983e484627 100644 (file)
--- a/Source/DebuggerController.m
+++ b/Source/DebuggerController.m
@@ -34,6 +34,7 @@
 
 @implementation DebuggerController {
   BreakpointController* _breakpointsController;
+  EvalController* _evalController;
 }
 
 @synthesize connection, sourceViewer, inspector;
@@ -75,6 +76,7 @@
   [connection release];
   [_model release];
   [_breakpointsController release];
+  [_evalController release];
   [expandedVariables release];
   [super dealloc];
 }
@@ -98,9 +100,13 @@
                             context:nil];
   self.connection.autoAttach = [attachedCheckbox_ state] == NSOnState;
 
+  // Load view controllers into the tab views.
   _breakpointsController = [[BreakpointController alloc] init];
   [[self.tabView tabViewItemAtIndex:1] setView:_breakpointsController.view];
 
+  _evalController = [[EvalController alloc] initWithBackEnd:connection];
+  [[self.tabView tabViewItemAtIndex:2] setView:_evalController.view];
+
   // When the segment control's selection changes, update the tab view.
   [[_segmentControl cell] addObserver:self
                            forKeyPath:@"selectedSegment"
@@ -176,9 +182,7 @@
  */
 - (IBAction)showEvalWindow:(id)sender
 {
-  // The |controller| will release itself on close.
-  EvalController* controller = [[EvalController alloc] initWithBackEnd:connection];
-  [controller runModalForWindow:[self window]];
+  [self.segmentControl setSelectedSegment:3];
 }
 
 /**
diff --git a/Source/EvalController.h b/Source/EvalController.h
index 542aa94d4e0ee53b98b7ff8457a3fd3abeb0b291..da4aaf94114dcb9ef0e1d6db1943e1821906992b 100644 (file)
--- a/Source/EvalController.h
+++ b/Source/EvalController.h
@@ -18,23 +18,13 @@
 
 @class DebuggerBackEnd;
 
-@interface EvalController : NSWindowController {
- @private
-  DebuggerBackEnd* backEnd_;
-
-  // Outlets.
-  NSTextField* dataField_;
-  NSTextField* resultField_;
-}
+@interface EvalController : NSViewController
 
 @property(nonatomic, retain) IBOutlet NSTextField* dataField;
 @property(nonatomic, retain) IBOutlet NSTextField* resultField;
 
 - (id)initWithBackEnd:(DebuggerBackEnd*)backEnd;
 
-- (void)runModalForWindow:(NSWindow*)parent;
-
 - (IBAction)evaluateScript:(id)sender;
-- (IBAction)closeWindow:(id)sender;
 
 @end
diff --git a/Source/EvalController.m b/Source/EvalController.m
index 9c6868717a4d2d900d060e60732cc2694997b341..3c2e7dd1393aa26f7d26f10222842a0f54511042 100644 (file)
--- a/Source/EvalController.m
+++ b/Source/EvalController.m
@@ -18,54 +18,28 @@
 
 #import "DebuggerBackEnd.h"
 
-@implementation EvalController
-
-@synthesize dataField = dataField_;
-@synthesize resultField = resultField_;
+@implementation EvalController {
+  DebuggerBackEnd* _backEnd;
+}
 
-- (id)initWithBackEnd:(DebuggerBackEnd*)backEnd
-{
-  if (self = [super initWithWindowNibName:@"Eval"]) {
-    backEnd_ = backEnd;
+- (id)initWithBackEnd:(DebuggerBackEnd*)backEnd {
+  if (self = [super initWithNibName:@"Eval" bundle:nil]) {
+    _backEnd = backEnd;
   }
   return self;
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
   self.dataField = nil;
   self.resultField = nil;
   [super dealloc];
 }
 
-- (void)runModalForWindow:(NSWindow*)parent
-{
-  [NSApp beginSheet:[self window]
-     modalForWindow:parent
-      modalDelegate:self
-     didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
-        contextInfo:nil];
-}
-
-- (void)sheetDidEnd:(NSWindow*)sheet
-         returnCode:(NSInteger)returnCode
-        contextInfo:(void*)contextInfo
-{
-  [self autorelease];
-}
-
-- (IBAction)evaluateScript:(id)sender
-{
+- (IBAction)evaluateScript:(id)sender {
   NSString* code = [self.dataField stringValue];
-  [backEnd_ evalScript:code callback:^(NSString* result) {
+  [_backEnd evalScript:code callback:^(NSString* result) {
     [self.resultField setStringValue:result];
   }];
 }
 
-- (IBAction)closeWindow:(id)sender
-{
-  [self close];
-  [NSApp endSheet:[self window]];
-}
-
 @end
A Cocoa/Mac OS X debugging client for PHP using the Xdebug GDBp protocol.