Move Breakpoints from a window to a view in the main debugger.

diff --git a/English.lproj/Breakpoints.xib b/English.lproj/Breakpoints.xib
index 61d20b016f0385667f6ffdc210c390af302d7fea..6bcfb2ff484c94082de859b2f7ab197152a8a0fd 100644 (file)
--- a/English.lproj/Breakpoints.xib
+++ b/English.lproj/Breakpoints.xib
@@ -1,147 +1,138 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" 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="10116"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="BreakpointController">
             <connections>
                 <outlet property="arrayController" destination="28" id="35"/>
-                <outlet property="sourceView" destination="4" id="40"/>
-                <outlet property="window" destination="1" id="25"/>
+                <outlet property="sourceView" destination="hds-fn-ZMp" id="xJW-ll-wla"/>
+                <outlet property="view" destination="uUK-Ll-YSm" id="ujh-9q-BWz"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Breakpoints" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" visibleAtLaunch="NO" frameAutosaveName="BreakpointsWindow" animationBehavior="default" id="1">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="25" width="574" height="484"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
-            <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="574" height="484"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <splitView dividerStyle="thin" id="3">
-                        <rect key="frame" x="0.0" y="0.0" width="574" height="484"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <customView id="4" customClass="BSSourceView">
-                                <rect key="frame" x="0.0" y="0.0" width="574" height="221"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <connections>
-                                    <outlet property="delegate" destination="-2" id="41"/>
-                                </connections>
-                            </customView>
-                            <customView id="5">
-                                <rect key="frame" x="0.0" y="222" width="574" height="262"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <subviews>
-                                    <button verticalHuggingPriority="750" id="23">
-                                        <rect key="frame" x="23" y="-2" width="26" height="23"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="24">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                            <string key="keyEquivalent">\7f</string>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="removeBreakpoint:" target="-2" id="27"/>
-                                        </connections>
-                                    </button>
-                                    <button verticalHuggingPriority="750" id="19">
-                                        <rect key="frame" x="0.0" y="-2" width="24" height="23"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="20">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="addBreakpoint:" target="-2" id="26"/>
-                                        </connections>
-                                    </button>
-                                    <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="10">
-                                        <rect key="frame" x="0.0" y="19" width="574" height="243"/>
+        <view id="uUK-Ll-YSm">
+            <rect key="frame" x="0.0" y="0.0" width="574" height="484"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <subviews>
+                <splitView dividerStyle="thin" id="dSm-S9-gg1">
+                    <rect key="frame" x="0.0" y="0.0" width="574" height="484"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <subviews>
+                        <customView id="hds-fn-ZMp" customClass="BSSourceView">
+                            <rect key="frame" x="0.0" y="0.0" width="574" height="221"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <connections>
+                                <outlet property="delegate" destination="-2" id="yPG-gl-ySf"/>
+                            </connections>
+                        </customView>
+                        <customView id="siI-sb-Ohb">
+                            <rect key="frame" x="0.0" y="222" width="574" height="262"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                            <subviews>
+                                <button verticalHuggingPriority="750" id="NEA-NE-e2L">
+                                    <rect key="frame" x="23" y="-2" width="26" height="23"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="RTj-JH-bdO">
+                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                        <font key="font" metaFont="system"/>
+                                        <string key="keyEquivalent">\7f</string>
+                                    </buttonCell>
+                                    <connections>
+                                        <action selector="removeBreakpoint:" target="-2" id="65m-Li-WgP"/>
+                                    </connections>
+                                </button>
+                                <button verticalHuggingPriority="750" id="lru-8s-P8q">
+                                    <rect key="frame" x="0.0" y="-2" width="24" height="23"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7HD-4r-sdn">
+                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                        <font key="font" metaFont="system"/>
+                                    </buttonCell>
+                                    <connections>
+                                        <action selector="addBreakpoint:" target="-2" id="qiy-D7-vZp"/>
+                                    </connections>
+                                </button>
+                                <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="QUj-nl-H1n">
+                                    <rect key="frame" x="0.0" y="19" width="574" height="243"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <clipView key="contentView" id="vnD-I2-3RC">
+                                        <rect key="frame" x="1" y="23" width="572" height="219"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <clipView key="contentView" id="5Ab-Im-ASW">
-                                            <rect key="frame" x="1" y="0.0" width="572" height="242"/>
-                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                            <subviews>
-                                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnSelection="YES" autosaveColumns="NO" headerView="14" id="13">
-                                                    <rect key="frame" x="0.0" y="0.0" width="572" height="219"/>
-                                                    <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 width="425" minWidth="40" maxWidth="1000" id="15">
-                                                            <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"/>
-                                                                <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="18">
-                                                                <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="28" name="value" keyPath="arrangedObjects.file" id="37"/>
-                                                            </connections>
-                                                        </tableColumn>
-                                                        <tableColumn width="141" minWidth="40" maxWidth="1000" id="16">
-                                                            <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"/>
-                                                                <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="17">
-                                                                <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="28" name="value" keyPath="arrangedObjects.line" id="39"/>
-                                                            </connections>
-                                                        </tableColumn>
-                                                    </tableColumns>
-                                                    <connections>
-                                                        <outlet property="delegate" destination="-2" id="42"/>
-                                                    </connections>
-                                                </tableView>
-                                            </subviews>
-                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </clipView>
-                                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="12">
-                                            <rect key="frame" x="1" y="223" width="557" height="15"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                        </scroller>
-                                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="11">
-                                            <rect key="frame" x="558" y="17" width="15" height="206"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                        </scroller>
-                                        <tableHeaderView key="headerView" id="14">
-                                            <rect key="frame" x="0.0" y="0.0" width="572" height="23"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                        </tableHeaderView>
-                                    </scrollView>
-                                </subviews>
-                            </customView>
-                        </subviews>
-                        <holdingPriorities>
-                            <real value="250"/>
-                            <real value="250"/>
-                        </holdingPriorities>
-                    </splitView>
-                </subviews>
-            </view>
-            <connections>
-                <binding destination="43" name="visible" keyPath="values.BreakpointsWindowVisible" id="49"/>
-            </connections>
-        </window>
+                                        <subviews>
+                                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnSelection="YES" autosaveColumns="NO" headerView="XI3-4j-eHA" id="d8X-q7-NYd">
+                                                <rect key="frame" x="0.0" y="0.0" width="572" height="19"/>
+                                                <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 width="425" minWidth="40" maxWidth="1000" id="RCP-bP-B4d">
+                                                        <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"/>
+                                                            <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="IV1-Sj-2od">
+                                                            <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="28" name="value" keyPath="arrangedObjects.file" id="8aj-3i-nGj"/>
+                                                        </connections>
+                                                    </tableColumn>
+                                                    <tableColumn width="141" minWidth="40" maxWidth="1000" id="MvD-nE-8qa">
+                                                        <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"/>
+                                                            <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="kPe-Mi-bAY">
+                                                            <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="28" name="value" keyPath="arrangedObjects.line" id="keh-Aa-ayp"/>
+                                                        </connections>
+                                                    </tableColumn>
+                                                </tableColumns>
+                                                <connections>
+                                                    <outlet property="delegate" destination="-2" id="Tc8-nD-s4R"/>
+                                                </connections>
+                                            </tableView>
+                                        </subviews>
+                                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </clipView>
+                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="Abm-OM-c9d">
+                                        <rect key="frame" x="1" y="223" width="557" height="15"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                    </scroller>
+                                    <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="NaV-vD-Og8">
+                                        <rect key="frame" x="558" y="17" width="15" height="206"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                    </scroller>
+                                    <tableHeaderView key="headerView" id="XI3-4j-eHA">
+                                        <rect key="frame" x="0.0" y="0.0" width="572" height="23"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                    </tableHeaderView>
+                                </scrollView>
+                            </subviews>
+                        </customView>
+                    </subviews>
+                    <holdingPriorities>
+                        <real value="250"/>
+                        <real value="250"/>
+                    </holdingPriorities>
+                </splitView>
+            </subviews>
+        </view>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <arrayController objectClassName="Breakpoint" automaticallyPreparesContent="YES" automaticallyRearrangesObjects="YES" id="28">
             <declaredKeys>
                 <string>file</string>

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 2b8726607fb9b5f393ffc64d8466ad1281f90e9f..9aa41d378ce2dd9e7dbafb941ccffb8d25cc55a2 100644 (file)
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?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="NSApplication">
@@ -11,7 +11,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
                 <menuItem title="MacGDBp" id="56">
@@ -315,12 +315,10 @@
         </menu>
         <customObject id="225" userLabel="AppDelegate" customClass="AppDelegate">
             <connections>
-                <outlet property="breakpoint" destination="286" id="301"/>
                 <outlet property="debugger" destination="287" id="302"/>
                 <outlet property="loggingController_" destination="306" id="307"/>
             </connections>
         </customObject>
-        <customObject id="286" customClass="BreakpointController"/>
         <customObject id="287" customClass="DebuggerController"/>
         <customObject id="306" customClass="LoggingController"/>
         <customObject id="288" customClass="SUUpdater"/>

diff --git a/Source/AppDelegate.h b/Source/AppDelegate.h
index dfcb9d53671e345167a3d0b05dd5e0c1a3b683d4..1350a984062290f232df2c24980652f9ab529af3 100644 (file)
--- a/Source/AppDelegate.h
+++ b/Source/AppDelegate.h
@@ -24,7 +24,6 @@
 @interface AppDelegate : NSObject
 {
   IBOutlet DebuggerController* debugger;
-  IBOutlet BreakpointController* breakpoint;
   IBOutlet LoggingController* loggingController_;
   PreferencesController* prefs;
 }

diff --git a/Source/AppDelegate.m b/Source/AppDelegate.m
index 7e398385c3bdbb7aa4c1e256df03d9723d8c155c..9030732364d6cd879b5de186f75e9a9b08de1a5e 100644 (file)
--- a/Source/AppDelegate.m
+++ b/Source/AppDelegate.m
@@ -35,7 +35,6 @@
   @autoreleasepool {
     NSDictionary* defaults = @{
       kPrefPort                     : @9000,
-      kPrefBreakpointsWindowVisible : @YES,
       kPrefInspectorWindowVisible   : @YES,
       kPrefPathReplacements         : [NSMutableArray array],
       kPrefBreakOnFirstLine         : @YES,
@@ -83,10 +82,8 @@
  */
 - (IBAction)showBreakpointWindow:(id)sender
 {
-  if (![[breakpoint window] isVisible] || ![[breakpoint window] isKeyWindow])
-    [[breakpoint window] makeKeyAndOrderFront:sender];
-  else
-    [[breakpoint window] orderOut:sender];
+  [[debugger window] makeKeyAndOrderFront:sender];
+  [debugger.segmentControl setSelectedSegment:2];
 }
 
 /**

diff --git a/Source/BreakpointController.h b/Source/BreakpointController.h
index 70552d94bdc1d58546269a9c743b54da3764fbc8..c5c4069e15af9a47480be45ac22a41f3de82ceee 100644 (file)
--- a/Source/BreakpointController.h
+++ b/Source/BreakpointController.h
@@ -19,7 +19,7 @@
 #import "BreakpointManager.h"
 #import "BSSourceView.h"
 
-@interface BreakpointController : NSWindowController<BSSourceViewDelegate>
+@interface BreakpointController : NSViewController<BSSourceViewDelegate>
 {
   BreakpointManager* manager;
   

diff --git a/Source/BreakpointController.m b/Source/BreakpointController.m
index 34a52a1c4243d21655de2990c284c8ce1c166ed2..f6b90283cfa414466b17466b73c301602a630a2b 100644 (file)
--- a/Source/BreakpointController.m
+++ b/Source/BreakpointController.m
@@ -28,11 +28,9 @@
  */
 - (id)init
 {
-  if (self = [super initWithWindowNibName:@"Breakpoints"])
+  if (self = [super initWithNibName:@"Breakpoints" bundle:nil])
   {
     manager = [BreakpointManager sharedManager];
-    if ([[NSUserDefaults standardUserDefaults] boolForKey:kPrefBreakpointsWindowVisible])
-      [[self window] orderBack:nil];
   }
   return self;
 }

diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m
index d057f850dbdf86cf0fb4712c1438c194147f6b41..896980f4f2d0262e6d49069c4bbedcea7ac2315b 100644 (file)
--- a/Source/DebuggerController.m
+++ b/Source/DebuggerController.m
@@ -18,6 +18,7 @@
 
 #import "AppDelegate.h"
 #import "BSSourceView.h"
+#import "BreakpointController.h"
 #import "BreakpointManager.h"
 #import "DebuggerBackEnd.h"
 #import "DebuggerModel.h"
@@ -31,7 +32,9 @@
 - (void)expandVariables;
 @end
 
-@implementation DebuggerController
+@implementation DebuggerController {
+  BreakpointController* _breakpointsController;
+}
 
 @synthesize connection, sourceViewer, inspector;
 
@@ -71,6 +74,7 @@
 {
   [connection release];
   [_model release];
+  [_breakpointsController release];
   [expandedVariables release];
   [super dealloc];
 }
@@ -98,6 +102,9 @@
                               context:nil];
   self.connection.autoAttach = [attachedCheckbox_ state] == NSOnState;
 
+  _breakpointsController = [[BreakpointController alloc] init];
+  [[self.tabView tabViewItemAtIndex:1] setView:_breakpointsController.view];
+
   [self updateSegmentControl];
 
 }

diff --git a/Source/PreferenceNames.h b/Source/PreferenceNames.h
index 0a1b5ef3257be0c4de16d81facd45abc0b98e5a8..3a38ac13c175745c061eb5e3c38dfc2d124b9993 100644 (file)
--- a/Source/PreferenceNames.h
+++ b/Source/PreferenceNames.h
@@ -19,9 +19,6 @@
 // NSNumber integer for the port to listen on.
 extern NSString* const kPrefPort;
 
-// NSNumber bool for whether the breakpoints window is visible.
-extern NSString* const kPrefBreakpointsWindowVisible;
-
 // NSNumber bool for whether the inspector window is visible.
 extern NSString* const kPrefInspectorWindowVisible;
 

diff --git a/Source/PreferenceNames.m b/Source/PreferenceNames.m
index 1c398ef9774308d98836fb6fddb0d3b6b653711f..787b6489f17da6679229dd07f79c03cfe3897db0 100644 (file)
--- a/Source/PreferenceNames.m
+++ b/Source/PreferenceNames.m
@@ -18,8 +18,6 @@
 
 NSString* const kPrefPort = @"Port";
 
-NSString* const kPrefBreakpointsWindowVisible = @"BreakpointsWindowVisible";
-
 NSString* const kPrefInspectorWindowVisible = @"InspectorWindowVisible";
 
 NSString* const kPrefPathReplacements = @"PathReplacements";