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

rsesek · Aug 4, 2016 · 6f9b4c7 · 6f9b4c7
1 parent ed4a877
commit 6f9b4c7
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 153 deletions.
diff --git a/English.lproj/Breakpoints.xib b/English.lproj/Breakpoints.xib
diff --git 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
@@ -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
@@ -35,7 +35,6 @@ + (void)load
   @autoreleasepool {
     NSDictionary* defaults = @{
       kPrefPort                     : @9000,
-      kPrefBreakpointsWindowVisible : @YES,
       kPrefInspectorWindowVisible   : @YES,
       kPrefPathReplacements         : [NSMutableArray array],
       kPrefBreakOnFirstLine         : @YES,
@@ -83,10 +82,8 @@ - (IBAction)showDebuggerWindow:(id)sender
  */
 - (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
@@ -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
@@ -28,11 +28,9 @@ @implementation BreakpointController
  */
 - (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
@@ -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)updateSourceViewer;
 - (void)expandVariables;
 @end
 
-@implementation DebuggerController
+@implementation DebuggerController {
+  BreakpointController* _breakpointsController;
+}
 
 @synthesize connection, sourceViewer, inspector;
 
@@ -71,6 +74,7 @@ - (void)dealloc
 {
   [connection release];
   [_model release];
+  [_breakpointsController release];
   [expandedVariables release];
   [super dealloc];
 }
@@ -98,6 +102,9 @@ - (void)awakeFromNib
                               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
@@ -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
@@ -18,8 +18,6 @@
 
 NSString* const kPrefPort = @"Port";
 
-NSString* const kPrefBreakpointsWindowVisible = @"BreakpointsWindowVisible";
-
 NSString* const kPrefInspectorWindowVisible = @"InspectorWindowVisible";
 
 NSString* const kPrefPathReplacements = @"PathReplacements";