From ed4a87756e57e803abb177cd3791de2e2b9a96db Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Thu, 4 Aug 2016 00:52:31 -0400
Subject: [PATCH] Add a tab view and segmented control for selection, for
 Variables and Breakpoints.

---
 English.lproj/Debugger.xib  | 294 +++++++++++++++++++-----------------
 Source/DebuggerController.h |   5 +-
 Source/DebuggerController.m |  26 ++++
 3 files changed, 188 insertions(+), 137 deletions(-)

diff --git a/English.lproj/Debugger.xib b/English.lproj/Debugger.xib
index 7236e23..9f8fd2d 100644
--- a/English.lproj/Debugger.xib
+++ b/English.lproj/Debugger.xib
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<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="9060"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="DebuggerController">
             <connections>
+                <outlet property="_segmentControl" destination="mRx-aY-U5x" id="plt-DD-Uli"/>
                 <outlet property="attachedCheckbox_" destination="591" id="595"/>
                 <outlet property="inspector" destination="569" id="581"/>
                 <outlet property="sourceViewer" destination="496" id="503"/>
                 <outlet property="stackArrayController" destination="36" id="563"/>
                 <outlet property="statusmsg" destination="27" id="446"/>
+                <outlet property="tabView" destination="XU1-a6-Ws7" id="Zhr-ym-q15"/>
                 <outlet property="variablesOutlineView" destination="12" id="567"/>
                 <outlet property="variablesTreeController" destination="59" id="566"/>
                 <outlet property="window" destination="7" id="26"/>
@@ -32,7 +34,6 @@
                     <textField hidden="YES" verticalHuggingPriority="750" id="22">
                         <rect key="frame" x="447" y="3" width="632" height="14"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                        <animations/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="&lt;error&gt;" id="453">
                             <font key="font" metaFont="smallSystem"/>
                             <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -50,7 +51,6 @@
                     <textField verticalHuggingPriority="750" id="27">
                         <rect key="frame" x="3" y="0.0" width="196" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <animations/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="&lt;status&gt;" id="455">
                             <font key="font" metaFont="smallSystem"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -64,128 +64,165 @@
                         <rect key="frame" x="-1" y="19" width="772" height="483"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="11">
-                                <rect key="frame" x="0.0" y="0.0" width="339" height="483"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <clipView key="contentView" id="oXX-ZU-YDL">
-                                    <rect key="frame" x="1" y="0.0" width="337" height="482"/>
-                                    <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="337" height="459"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <animations/>
-                                            <size key="intercellSpacing" width="3" height="2"/>
-                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
-                                            <tableColumns>
-                                                <tableColumn editable="NO" width="97" minWidth="16" maxWidth="1000" id="14">
-                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Variable">
-                                                        <font key="font" metaFont="smallSystem"/>
-                                                        <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
-                                                    </tableHeaderCell>
-                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="457">
-                                                        <font key="font" metaFont="smallSystem"/>
-                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                                    <connections>
-                                                        <binding destination="59" name="value" keyPath="arrangedObjects.name" id="588">
-                                                            <dictionary key="options">
-                                                                <bool key="NSConditionallySetsEditable" value="YES"/>
-                                                            </dictionary>
-                                                        </binding>
-                                                    </connections>
-                                                </tableColumn>
-                                                <tableColumn editable="NO" width="126" minWidth="8" maxWidth="1000" id="13">
-                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Value">
-                                                        <font key="font" metaFont="smallSystem"/>
-                                                        <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
-                                                    </tableHeaderCell>
-                                                    <textFieldCell key="dataCell" lineBreakMode="charWrapping" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="456">
-                                                        <font key="font" metaFont="smallSystem"/>
-                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                                    <connections>
-                                                        <binding destination="59" name="value" keyPath="arrangedObjects.value" id="603">
-                                                            <dictionary key="options">
-                                                                <bool key="NSConditionallySetsEditable" value="YES"/>
-                                                                <string key="NSValueTransformerName">StripLineBreaksValueTransformer</string>
-                                                            </dictionary>
-                                                        </binding>
-                                                    </connections>
-                                                </tableColumn>
-                                                <tableColumn editable="NO" width="104.7544" minWidth="29.754390000000001" maxWidth="1000" id="81">
-                                                    <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Type">
-                                                        <font key="font" metaFont="smallSystem"/>
-                                                        <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                                    </tableHeaderCell>
-                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="458">
-                                                        <font key="font" metaFont="smallSystem"/>
-                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                                    <connections>
-                                                        <binding destination="59" name="value" keyPath="arrangedObjects.displayType" id="590">
-                                                            <dictionary key="options">
-                                                                <bool key="NSConditionallySetsEditable" value="YES"/>
-                                                            </dictionary>
-                                                        </binding>
-                                                    </connections>
-                                                </tableColumn>
-                                            </tableColumns>
-                                            <connections>
-                                                <outlet property="delegate" destination="-2" id="84"/>
-                                            </connections>
-                                        </outlineView>
-                                    </subviews>
-                                    <animations/>
-                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </clipView>
-                                <animations/>
-                                <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="0.0053050397877984082" horizontal="YES" id="466">
-                                    <rect key="frame" x="1" y="207" width="377" height="15"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <animations/>
-                                </scroller>
-                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="465">
-                                    <rect key="frame" x="84" y="17" width="15" height="67"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <animations/>
-                                </scroller>
-                                <tableHeaderView key="headerView" id="467">
-                                    <rect key="frame" x="0.0" y="0.0" width="337" height="23"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <animations/>
-                                </tableHeaderView>
-                            </scrollView>
+                            <customView id="eQ1-kt-gEm">
+                                <rect key="frame" x="0.0" y="0.0" width="211" height="483"/>
+                                <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"/>
+                                        <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"/>
+                                            <segments>
+                                                <segment enabled="NO">
+                                                    <nil key="label"/>
+                                                </segment>
+                                                <segment label="Variables" width="92" selected="YES" tag="1"/>
+                                                <segment label="Breakpoints" width="93" tag="2"/>
+                                                <segment enabled="NO">
+                                                    <nil key="label"/>
+                                                </segment>
+                                            </segments>
+                                        </segmentedCell>
+                                    </segmentedControl>
+                                    <tabView type="noTabsNoBorder" 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"/>
+                                        <tabViewItems>
+                                            <tabViewItem label="Variables" identifier="1" id="jVS-VL-LBw">
+                                                <view key="view" id="cqt-pj-ASk">
+                                                    <rect key="frame" x="0.0" y="0.0" width="211" height="461"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <subviews>
+                                                        <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="11">
+                                                            <rect key="frame" x="0.0" y="0.0" width="300" height="462"/>
+                                                            <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="461"/>
+                                                                <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="438"/>
+                                                                        <autoresizingMask key="autoresizingMask"/>
+                                                                        <size key="intercellSpacing" width="3" height="2"/>
+                                                                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                        <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                                                        <tableColumns>
+                                                                            <tableColumn editable="NO" width="76" minWidth="16" maxWidth="1000" id="14">
+                                                                                <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Variable">
+                                                                                    <font key="font" metaFont="smallSystem"/>
+                                                                                    <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                                                    <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
+                                                                                </tableHeaderCell>
+                                                                                <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="457">
+                                                                                    <font key="font" metaFont="smallSystem"/>
+                                                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                                </textFieldCell>
+                                                                                <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                                                <connections>
+                                                                                    <binding destination="59" name="value" keyPath="arrangedObjects.name" id="588">
+                                                                                        <dictionary key="options">
+                                                                                            <bool key="NSConditionallySetsEditable" value="YES"/>
+                                                                                        </dictionary>
+                                                                                    </binding>
+                                                                                </connections>
+                                                                            </tableColumn>
+                                                                            <tableColumn editable="NO" width="97" minWidth="8" maxWidth="1000" id="13">
+                                                                                <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Value">
+                                                                                    <font key="font" metaFont="smallSystem"/>
+                                                                                    <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                                                    <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
+                                                                                </tableHeaderCell>
+                                                                                <textFieldCell key="dataCell" lineBreakMode="charWrapping" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="456">
+                                                                                    <font key="font" metaFont="smallSystem"/>
+                                                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                                </textFieldCell>
+                                                                                <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                                                <connections>
+                                                                                    <binding destination="59" name="value" keyPath="arrangedObjects.value" id="603">
+                                                                                        <dictionary key="options">
+                                                                                            <bool key="NSConditionallySetsEditable" value="YES"/>
+                                                                                            <string key="NSValueTransformerName">StripLineBreaksValueTransformer</string>
+                                                                                        </dictionary>
+                                                                                    </binding>
+                                                                                </connections>
+                                                                            </tableColumn>
+                                                                            <tableColumn editable="NO" width="115.75439" minWidth="29.754390000000001" maxWidth="1000" id="81">
+                                                                                <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Type">
+                                                                                    <font key="font" metaFont="smallSystem"/>
+                                                                                    <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                                                    <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                                                                </tableHeaderCell>
+                                                                                <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="458">
+                                                                                    <font key="font" metaFont="smallSystem"/>
+                                                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                                </textFieldCell>
+                                                                                <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                                                <connections>
+                                                                                    <binding destination="59" name="value" keyPath="arrangedObjects.displayType" id="590">
+                                                                                        <dictionary key="options">
+                                                                                            <bool key="NSConditionallySetsEditable" value="YES"/>
+                                                                                        </dictionary>
+                                                                                    </binding>
+                                                                                </connections>
+                                                                            </tableColumn>
+                                                                        </tableColumns>
+                                                                        <connections>
+                                                                            <outlet property="delegate" destination="-2" id="84"/>
+                                                                        </connections>
+                                                                    </outlineView>
+                                                                </subviews>
+                                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                            </clipView>
+                                                            <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="466">
+                                                                <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">
+                                                                <rect key="frame" x="38" y="23" width="16" height="4"/>
+                                                                <autoresizingMask key="autoresizingMask"/>
+                                                            </scroller>
+                                                            <tableHeaderView key="headerView" id="467">
+                                                                <rect key="frame" x="0.0" y="0.0" width="298" height="23"/>
+                                                                <autoresizingMask key="autoresizingMask"/>
+                                                            </tableHeaderView>
+                                                        </scrollView>
+                                                    </subviews>
+                                                </view>
+                                            </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"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </view>
+                                            </tabViewItem>
+                                        </tabViewItems>
+                                    </tabView>
+                                </subviews>
+                            </customView>
                             <splitView dividerStyle="thin" id="46">
-                                <rect key="frame" x="340" y="0.0" width="432" height="483"/>
+                                <rect key="frame" x="212" y="0.0" width="560" height="483"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
                                     <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="15">
-                                        <rect key="frame" x="0.0" y="0.0" width="432" height="225"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="560" height="225"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <clipView key="contentView" id="0J4-i7-RBa">
-                                            <rect key="frame" x="1" y="0.0" width="430" height="224"/>
+                                            <rect key="frame" x="1" y="0.0" width="558" height="224"/>
                                             <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="430" height="201"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="558" height="19"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                    <animations/>
                                                     <size key="intercellSpacing" width="3" height="2"/>
                                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                     <tableColumns>
-                                                        <tableColumn identifier="index" editable="NO" width="22" minWidth="10" maxWidth="30" id="17">
+                                                        <tableColumn identifier="index" editable="NO" width="29" minWidth="10" maxWidth="30" id="17">
                                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="#">
                                                                 <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -206,7 +243,7 @@
                                                                 </binding>
                                                             </connections>
                                                         </tableColumn>
-                                                        <tableColumn identifier="filename" editable="NO" width="91" minWidth="8" maxWidth="1000" id="18">
+                                                        <tableColumn identifier="filename" editable="NO" width="131" minWidth="8" maxWidth="1000" id="18">
                                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="File">
                                                                 <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -223,7 +260,7 @@
                                                                 <binding destination="36" name="value" keyPath="arrangedObjects.filename" id="44"/>
                                                             </connections>
                                                         </tableColumn>
-                                                        <tableColumn identifier="lineNumber" editable="NO" width="109" minWidth="26" maxWidth="1000" id="42">
+                                                        <tableColumn identifier="lineNumber" editable="NO" width="150" minWidth="26" maxWidth="1000" id="42">
                                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Line">
                                                                 <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -244,7 +281,7 @@
                                                                 </binding>
                                                             </connections>
                                                         </tableColumn>
-                                                        <tableColumn identifier="function" editable="NO" width="196" minWidth="50.0625" maxWidth="1000" id="48">
+                                                        <tableColumn identifier="function" editable="NO" width="236" minWidth="50.0625" maxWidth="1000" id="48">
                                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Function">
                                                                 <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -271,47 +308,38 @@
                                                     </connections>
                                                 </tableView>
                                             </subviews>
-                                            <animations/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </clipView>
-                                        <animations/>
                                         <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="469">
                                             <rect key="frame" x="1" y="207" width="382" height="15"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <animations/>
                                         </scroller>
                                         <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="468">
                                             <rect key="frame" x="368" y="17" width="15" height="190"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <animations/>
                                         </scroller>
                                         <tableHeaderView key="headerView" id="495">
-                                            <rect key="frame" x="0.0" y="0.0" width="430" height="23"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="558" height="23"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <animations/>
                                         </tableHeaderView>
                                     </scrollView>
                                     <customView id="496" customClass="BSSourceView">
-                                        <rect key="frame" x="0.0" y="226" width="432" height="257"/>
+                                        <rect key="frame" x="0.0" y="226" width="560" height="257"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <animations/>
                                     </customView>
                                 </subviews>
-                                <animations/>
                                 <holdingPriorities>
                                     <real value="250"/>
                                     <real value="250"/>
                                 </holdingPriorities>
                             </splitView>
                         </subviews>
-                        <animations/>
                         <holdingPriorities>
                             <real value="250"/>
                             <real value="250"/>
                         </holdingPriorities>
                     </splitView>
                 </subviews>
-                <animations/>
             </view>
             <toolbar key="toolbar" implicitIdentifier="2E704228-00D1-43C3-B458-9839CEF5A7D0" displayMode="iconOnly" sizeMode="regular" id="471">
                 <allowedToolbarItems>
@@ -354,15 +382,14 @@
                     <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="415019FA-217B-4DF0-B762-927263FE8B3A" id="593">
+                    <toolbarItem implicitItemIdentifier="0DD9463E-4676-43E6-B885-7A9CB1137956" label="Attached" paletteLabel="" image="123B7784-9F5B-43C3-9BF1-67AA3027FBC7" 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"/>
-                            <animations/>
-                            <buttonCell key="cell" type="bevel" title="Attached" bezelStyle="regularSquare" image="415019FA-217B-4DF0-B762-927263FE8B3A" imagePosition="left" alignment="left" state="on" inset="2" id="592">
+                            <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">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                 <font key="font" metaFont="system"/>
                                 <connections>
@@ -394,6 +421,7 @@
             <connections>
                 <outlet property="delegate" destination="-2" id="92"/>
             </connections>
+            <point key="canvasLocation" x="660.5" y="645.5"/>
         </window>
         <arrayController objectClassName="StackFrame" automaticallyPreparesContent="YES" preservesSelection="NO" automaticallyRearrangesObjects="YES" id="36" userLabel="StackController">
             <declaredKeys>
@@ -438,7 +466,6 @@
                                 <textView editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" findStyle="panel" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" quoteSubstitution="YES" dashSubstitution="YES" smartInsertDelete="YES" id="578">
                                     <rect key="frame" x="0.0" y="0.0" width="402" height="402"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <animations/>
                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <size key="minSize" width="402" height="402"/>
@@ -560,23 +587,18 @@
                                     </connections>
                                 </textView>
                             </subviews>
-                            <animations/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         </clipView>
-                        <animations/>
                         <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="0.86706950000000005" horizontal="YES" id="577">
                             <rect key="frame" x="-100" y="-100" width="87" height="18"/>
                             <autoresizingMask key="autoresizingMask"/>
-                            <animations/>
                         </scroller>
                         <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="0.23333329999999999" horizontal="NO" id="576">
                             <rect key="frame" x="317" y="1" width="15" height="408"/>
                             <autoresizingMask key="autoresizingMask"/>
-                            <animations/>
                         </scroller>
                     </scrollView>
                 </subviews>
-                <animations/>
             </view>
             <connections>
                 <binding destination="59" name="title" keyPath="selection.fullName" id="589"/>
@@ -586,7 +608,7 @@
         <userDefaultsController representsSharedInstance="YES" id="582"/>
     </objects>
     <resources>
-        <image name="415019FA-217B-4DF0-B762-927263FE8B3A" width="18" height="18">
+        <image name="123B7784-9F5B-43C3-9BF1-67AA3027FBC7" width="18" height="18">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGW1xYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK8QFwcI
 ERYbHCc0NTY3ODk6O0JDRElMT1VYVSRudWxs1AkKCwwNDg8QViRjbGFzc1xOU0ltYWdlRmxhZ3NWTlNS
diff --git a/Source/DebuggerController.h b/Source/DebuggerController.h
index b7cf03a..ce3e45b 100644
--- a/Source/DebuggerController.h
+++ b/Source/DebuggerController.h
@@ -31,7 +31,7 @@
   IBOutlet NSButton* attachedCheckbox_;
 
   IBOutlet NSArrayController* stackArrayController;
-  
+
   IBOutlet NSTreeController* variablesTreeController;
   IBOutlet NSOutlineView* variablesOutlineView;
   NSMutableSet* expandedVariables;
@@ -49,6 +49,9 @@
 @property(readonly) BSSourceView* sourceViewer;
 @property(readonly) NSWindow* inspector;
 
+@property(retain) IBOutlet NSSegmentedControl* segmentControl;
+@property(retain) IBOutlet NSTabView* tabView;
+
 - (IBAction)showInspectorWindow:(id)sender;
 - (IBAction)showEvalWindow:(id)sender;
 
diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m
index d8ccba4..d057f85 100644
--- a/Source/DebuggerController.m
+++ b/Source/DebuggerController.m
@@ -92,7 +92,14 @@
                          forKeyPath:@"selection.source"
                             options:NSKeyValueObservingOptionNew
                             context:nil];
+  [[_segmentControl cell] addObserver:self
+                           forKeyPath:@"selectedSegment"
+                              options:NSKeyValueObservingOptionNew
+                              context:nil];
   self.connection.autoAttach = [attachedCheckbox_ state] == NSOnState;
+
+  [self updateSegmentControl];
+
 }
 
 /**
@@ -112,6 +119,8 @@
       [self debuggerConnected];
     else
       [self debuggerDisconnected];
+  } else if (object == self.segmentControl.cell) {
+    [self.tabView selectTabViewItemAtIndex:self.segmentControl.selectedSegment - 1];
   } else {
     [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
   }
@@ -354,6 +363,23 @@
   }
 }
 
+/**
+ * Sets the widths of the segmented control.
+ */
+- (void)updateSegmentControl {
+  NSRect containerFrame = [[_segmentControl superview] frame];
+  CGFloat containerWidth = NSWidth(containerFrame);
+  CGFloat segmentSizes = 0;
+  for (NSInteger i = 1; i < [_segmentControl segmentCount] - 1; ++i) {
+    segmentSizes += [_segmentControl widthForSegment:i];
+  }
+  CGFloat spacerWidth = (containerWidth - segmentSizes) / 2;
+  [_segmentControl setWidth:spacerWidth forSegment:0];
+  [_segmentControl setWidth:spacerWidth forSegment:[_segmentControl segmentCount] - 1];
+
+  [_segmentControl setFrame:NSMakeRect(-1, NSHeight(containerFrame) - 27, containerWidth + 2, 30)];
+}
+
 #pragma mark BSSourceView Delegate
 
 /**
-- 
2.22.5