From dbb7ffd6be950391e9f398d02f88dd46c27bf656 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 17 May 2020 12:48:01 -0400
Subject: [PATCH] Move the Evaluate menu item from Debugger to Window.

Also re-organizes the Window menu items.
---
 CHANGES               |  1 +
 en.lproj/MainMenu.xib | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 10918f9..286f7f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ MacGDBp                                                               CHANGE LOG
 2.0.3
 #####################
 - Fix: #265  Variables holding scalars would not display a value.
+- Change: Reorganized the Window main menu.
 
 2.0.2
 #####################
diff --git a/en.lproj/MainMenu.xib b/en.lproj/MainMenu.xib
index 9aa41d3..bbf12b3 100644
--- a/en.lproj/MainMenu.xib
+++ b/en.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="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -241,11 +241,6 @@
                                     <action selector="stop:" target="287" id="312"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Evaluate" keyEquivalent="E" id="316">
-                                <connections>
-                                    <action selector="showEvalWindow:" target="287" id="317"/>
-                                </connections>
-                            </menuItem>
                             <menuItem title="Attached" keyEquivalent="A" id="313">
                                 <connections>
                                     <binding destination="287" name="value" keyPath="connection.autoAttach" id="314"/>
@@ -273,14 +268,20 @@
                                     <action selector="showDebuggerWindow:" target="225" id="266"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Inspector" keyEquivalent="I" id="303">
+                            <menuItem title="Breakpoints" keyEquivalent="B" id="268">
                                 <connections>
-                                    <action selector="showInspectorWindow:" target="287" id="305"/>
+                                    <action selector="showBreakpointWindow:" target="225" id="269"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Breakpoints" keyEquivalent="B" id="268">
+                            <menuItem title="Evaluate" keyEquivalent="E" id="316">
                                 <connections>
-                                    <action selector="showBreakpointWindow:" target="225" id="269"/>
+                                    <action selector="showEvalWindow:" target="287" id="317"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="y56-BA-NYU"/>
+                            <menuItem title="Inspector" keyEquivalent="I" id="303">
+                                <connections>
+                                    <action selector="showInspectorWindow:" target="287" id="305"/>
                                 </connections>
                             </menuItem>
                             <menuItem title="Connection Log" id="308">
@@ -312,6 +313,7 @@
                     </menu>
                 </menuItem>
             </items>
+            <point key="canvasLocation" x="139" y="154"/>
         </menu>
         <customObject id="225" userLabel="AppDelegate" customClass="AppDelegate">
             <connections>
-- 
2.22.5