Rewire Debugger.xib to properties rather than ivars.

Also remove dead statusField property.

diff --git a/English.lproj/Debugger.xib b/English.lproj/Debugger.xib
index c8b3cbc839291bfcae7231c6b549048657cc2dd6..1cf1cec2e993f321159f464b740b3273dc7fa74e 100644 (file)
--- a/English.lproj/Debugger.xib
+++ b/English.lproj/Debugger.xib
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
+        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="DebuggerController">
             <connections>
-                <outlet property="_attachedCheckbox" destination="591" id="595"/>
-                <outlet property="_inspector" destination="569" id="581"/>
-                <outlet property="_segmentControl" destination="mRx-aY-U5x" id="plt-DD-Uli"/>
-                <outlet property="_sourceViewer" destination="496" id="503"/>
-                <outlet property="_stackArrayController" destination="36" id="563"/>
-                <outlet property="_variablesOutlineView" destination="12" id="567"/>
-                <outlet property="_variablesTreeController" destination="59" id="566"/>
+                <outlet property="attachedCheckbox" destination="591" id="595"/>
+                <outlet property="inspector" destination="569" id="581"/>
+                <outlet property="segmentControl" destination="mRx-aY-U5x" id="plt-DD-Uli"/>
+                <outlet property="sourceViewer" destination="496" id="503"/>
+                <outlet property="stackArrayController" destination="36" id="563"/>
+                <outlet property="variablesOutlineView" destination="12" id="567"/>
+                <outlet property="variablesTreeController" destination="59" id="566"/>
                 <outlet property="tabView" destination="XU1-a6-Ws7" id="Zhr-ym-q15"/>
                 <outlet property="window" destination="7" id="26"/>
             </connections>
@@ -71,7 +72,7 @@
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <clipView key="contentView" id="oXX-ZU-YDL">
                                                                 <rect key="frame" x="1" y="0.0" width="298" height="480"/>
-                                                                <autoresizingMask key="autoresizingMask"/>
+                                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                 <subviews>
                                                                     <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" headerView="467" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="14" id="12">
                                                                         <rect key="frame" x="0.0" y="0.0" width="298" height="457"/>
@@ -189,7 +190,7 @@
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <clipView key="contentView" id="0J4-i7-RBa">
                                             <rect key="frame" x="1" y="0.0" width="558" height="233"/>
-                                            <autoresizingMask key="autoresizingMask"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="495" id="16">
                                                     <rect key="frame" x="0.0" y="0.0" width="558" height="210"/>
@@ -421,7 +422,7 @@
                 <string>variables</string>
             </declaredKeys>
             <connections>
-                <binding destination="-2" name="contentArray" keyPath="_model.stack" id="myv-aO-biI"/>
+                <binding destination="-2" name="contentArray" keyPath="model.stack" id="myv-aO-biI"/>
             </connections>
         </arrayController>
         <treeController objectClassName="VariableNode" editable="NO" childrenKeyPath="children" countKeyPath="childCount" leafKeyPath="isLeaf" id="59" userLabel="VariablesController">
@@ -449,7 +450,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="aGW-Gu-aWn">
                             <rect key="frame" x="0.0" y="0.0" width="402" height="402"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <textView editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES" quoteSubstitution="YES" dashSubstitution="YES" smartInsertDelete="YES" id="578">
                                     <rect key="frame" x="0.0" y="0.0" width="402" height="402"/>

diff --git a/Source/DebuggerController.h b/Source/DebuggerController.h
index 0a5a66b3951d12199f2430cfe5116350f5fa3bc6..55e5d20665e9d39112d67976ecd04e5537589c2a 100644 (file)
--- a/Source/DebuggerController.h
+++ b/Source/DebuggerController.h
@@ -35,7 +35,6 @@
 @property(retain) IBOutlet NSTreeController* variablesTreeController;
 @property(retain) IBOutlet NSOutlineView* variablesOutlineView;
 
-@property(retain) IBOutlet NSTextField* statusField;
 @property(retain) IBOutlet NSSegmentedControl* segmentControl;
 @property(retain) IBOutlet NSTabView* tabView;
 

diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m
index e6bffbe0691238021080c68d1d35020d15cbf383..cb8900425fd6b2901ff26f06526037c72db5089b 100644 (file)
--- a/Source/DebuggerController.m
+++ b/Source/DebuggerController.m
@@ -100,7 +100,6 @@
   [_variablesOutlineView release];
 
   [_segmentControl release];
-  [_statusField release];
   [_tabView release];
 
   [super dealloc];
@@ -170,8 +169,6 @@
       } else {
         [self debuggerDisconnected];
       }
-    } else if ([keyPath isEqualToString:@"status"]) {
-      self.statusField.textColor = self.model.lastError ? [NSColor redColor] : [NSColor textColor];
     }
   } else if (object == _segmentControl.cell) {
     [[NSUserDefaults standardUserDefaults] setValue:@(_segmentControl.selectedSegment)