From f0984f261dd3f22c8ec6129b7163b054b757384f Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 4 Dec 2016 18:51:46 -0500
Subject: [PATCH] Make the add breakpoint button a pull-down menu.

---
 English.lproj/Breakpoints.xib | 37 ++++++++++++++++++++++++-----------
 Source/BreakpointController.h |  1 +
 Source/BreakpointController.m | 14 +++++++++++--
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/English.lproj/Breakpoints.xib b/English.lproj/Breakpoints.xib
index 832ff6a..d92bd0e 100644
--- a/English.lproj/Breakpoints.xib
+++ b/English.lproj/Breakpoints.xib
@@ -8,6 +8,7 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="BreakpointController">
             <connections>
+                <outlet property="addBreakpointButton" destination="Rhe-Th-Bhr" id="xGD-6H-O84"/>
                 <outlet property="arrayController" destination="28" id="35"/>
                 <outlet property="view" destination="uUK-Ll-YSm" id="ujh-9q-BWz"/>
             </connections>
@@ -29,17 +30,6 @@
                         <action selector="removeBreakpoint:" target="-2" id="65m-Li-WgP"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" misplaced="YES" id="lru-8s-P8q">
-                    <rect key="frame" x="0.0" y="-1" 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 focusRingType="none" misplaced="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="QUj-nl-H1n">
                     <rect key="frame" x="0.0" y="20" width="574" height="464"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -106,6 +96,31 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
+                <popUpButton verticalHuggingPriority="750" misplaced="YES" id="Rhe-Th-Bhr">
+                    <rect key="frame" x="0.0" y="-1" width="24" height="23"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <popUpButtonCell key="cell" type="smallSquare" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" arrowPosition="noArrow" preferredEdge="maxX" altersStateOfSelectedItem="NO" selectedItem="CvR-xk-b9b" id="Dwf-ep-VTS">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="menu"/>
+                        <menu key="menu" id="Rib-S1-dUw">
+                            <items>
+                                <menuItem image="NSAddTemplate" id="CvR-xk-b9b">
+                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                    <connections>
+                                        <action selector="addBreakpoint:" target="-2" id="HVH-4f-zD3"/>
+                                    </connections>
+                                </menuItem>
+                                <menuItem title="File breakpoint" id="K7S-yj-EhU">
+                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                    <connections>
+                                        <action selector="addBreakpoint:" target="-2" id="7gF-se-38S"/>
+                                    </connections>
+                                </menuItem>
+                                <menuItem title="Symbolic breakpoint" id="bYU-4e-GiO"/>
+                            </items>
+                        </menu>
+                    </popUpButtonCell>
+                </popUpButton>
             </subviews>
         </view>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
diff --git a/Source/BreakpointController.h b/Source/BreakpointController.h
index f4ccc8b..54714df 100644
--- a/Source/BreakpointController.h
+++ b/Source/BreakpointController.h
@@ -21,6 +21,7 @@
 
 @interface BreakpointController : NSViewController<BSSourceViewDelegate>
 
+@property(nonatomic, assign) IBOutlet NSPopUpButton* addBreakpointButton;
 @property(nonatomic, assign) IBOutlet NSArrayController* arrayController;
 
 - (instancetype)initWithBreakpointManager:(BreakpointManager*)breakpointManager
diff --git a/Source/BreakpointController.m b/Source/BreakpointController.m
index 941ab88..8cc1cf4 100644
--- a/Source/BreakpointController.m
+++ b/Source/BreakpointController.m
@@ -23,6 +23,7 @@
   BreakpointManager* _manager;
 
   BSSourceView* _sourceView;
+
   NSArrayController* _arrayController;
 }
 
@@ -39,6 +40,12 @@
   return self;
 }
 
+- (void)awakeFromNib
+{
+  [[self.addBreakpointButton cell] setUsesItemFromMenu:NO];
+  [self.addBreakpointButton.cell setMenuItem:[self.addBreakpointButton.menu itemAtIndex:0]];
+}
+
 /**
  * Adds a breakpoint by calling up a file chooser and selecting a file for
  * breaking in
@@ -81,12 +88,15 @@
 - (void)tableViewSelectionDidChange:(NSNotification*)notif
 {
   NSArray* selection = [_arrayController selectedObjects];
-  if ([selection count] < 1)
-  {
+  if ([selection count] < 1) {
     return;
   }
   
   Breakpoint* bp = [selection objectAtIndex:0];
+  if (bp.type != kBreakpointTypeFile) {
+    return;
+  }
+
   [_sourceView setFile:[bp file]];
   [_sourceView scrollToLine:[bp line]];
   [_sourceView setMarkers:[_manager breakpointsForFile:bp.file]];
-- 
2.43.5