Add an item to the Window menu to allow the inspector to be shown/hidden

* Source/AppDelegate.m+h:
(showInspectorWindow:): New method
(showBreakpointWindow:): Make this toggle window visibility rather than just always bring to front
* Source/DebuggerController.m+h: Create ivar for the inspector and synth the property
* English.lproj/Debugger.xib: Hook up the outlet
* English.lproj/MainMenu.xib: Add menu item

diff --git a/English.lproj/Debugger.xib b/English.lproj/Debugger.xib
index c76f64e6a3dd1472a3f2a693e610e6c71e949ce1..16f3434c49bf909c13c13fb64973813a368dc7e4 100644 (file)
--- a/English.lproj/Debugger.xib
+++ b/English.lproj/Debugger.xib
@@ -8,7 +8,6 @@
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="578"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -626,6 +625,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                                                                        </object>
                                                                                                        <string key="NSFrame">{{1, 17}, {377, 205}}</string>
                                                                                                        <reference key="NSSuperview" ref="307722252"/>
+                                                                                                       <reference key="NSNextKeyView" ref="395283679"/>
                                                                                                        <reference key="NSDocView" ref="395283679"/>
                                                                                                        <reference key="NSBGColor" ref="61205991"/>
                                                                                                        <int key="NScvFlags">4</int>
@@ -658,6 +658,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                                                                        </object>
                                                                                                        <string key="NSFrame">{{1, 0}, {377, 17}}</string>
                                                                                                        <reference key="NSSuperview" ref="307722252"/>
+                                                                                                       <reference key="NSNextKeyView" ref="883999035"/>
                                                                                                        <reference key="NSDocView" ref="883999035"/>
                                                                                                        <reference key="NSBGColor" ref="61205991"/>
                                                                                                        <int key="NScvFlags">4</int>
@@ -666,6 +667,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                                                        </object>
                                                                                        <string key="NSFrameSize">{379, 223}</string>
                                                                                        <reference key="NSSuperview" ref="1019729176"/>
+                                                                                       <reference key="NSNextKeyView" ref="451366414"/>
                                                                                        <int key="NSsFlags">562</int>
                                                                                        <reference key="NSVScroller" ref="565466854"/>
                                                                                        <reference key="NSHScroller" ref="429650014"/>
@@ -847,6 +849,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                                                                        </object>
                                                                                                        <string key="NSFrame">{{1, 17}, {382, 205}}</string>
                                                                                                        <reference key="NSSuperview" ref="312219739"/>
+                                                                                                       <reference key="NSNextKeyView" ref="439139003"/>
                                                                                                        <reference key="NSDocView" ref="439139003"/>
                                                                                                        <reference key="NSBGColor" ref="61205991"/>
                                                                                                        <int key="NScvFlags">4</int>
@@ -879,6 +882,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                                                                        </object>
                                                                                                        <string key="NSFrame">{{1, 0}, {382, 17}}</string>
                                                                                                        <reference key="NSSuperview" ref="312219739"/>
+                                                                                                       <reference key="NSNextKeyView" ref="931253588"/>
                                                                                                        <reference key="NSDocView" ref="931253588"/>
                                                                                                        <reference key="NSBGColor" ref="61205991"/>
                                                                                                        <int key="NScvFlags">4</int>
@@ -887,6 +891,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                                                        </object>
                                                                                        <string key="NSFrame">{{388, 0}, {384, 223}}</string>
                                                                                        <reference key="NSSuperview" ref="1019729176"/>
+                                                                                       <reference key="NSNextKeyView" ref="1065166281"/>
                                                                                        <int key="NSsFlags">562</int>
                                                                                        <reference key="NSVScroller" ref="488231138"/>
                                                                                        <reference key="NSHScroller" ref="483047411"/>
@@ -964,8 +969,9 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                <string key="NSWindowTitle">Inspector</string>
                                <string key="NSWindowClass">NSPanel</string>
                                <nil key="NSViewClass"/>
+                               <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
                                <object class="NSView" key="NSWindowView" id="451591711">
-                                       <reference key="NSNextResponder"/>
+                                       <nil key="NSNextResponder"/>
                                        <int key="NSvFlags">256</int>
                                        <object class="NSMutableArray" key="NSSubviews">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -1173,8 +1179,8 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                                                                <nil key="NSDefaultParagraphStyle"/>
                                                                                        </object>
                                                                                        <int key="NSTVFlags">6</int>
-                                                                                       <string key="NSMaxSize">{463, 1e+07}</string>
-                                                                                       <string key="NSMinize">{223, 40}</string>
+                                                                                       <string key="NSMaxSize">{666, 1e+07}</string>
+                                                                                       <string key="NSMinize">{223, 0}</string>
                                                                                        <nil key="NSDelegate"/>
                                                                                </object>
                                                                        </object>
@@ -1219,7 +1225,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                </object>
                                        </object>
                                        <string key="NSFrameSize">{331, 423}</string>
-                                       <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
                                <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -1553,6 +1558,14 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                        </object>
                                        <int key="connectionID">580</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">inspector</string>
+                                               <reference key="source" ref="78922448"/>
+                                               <reference key="destination" ref="1072871805"/>
+                                       </object>
+                                       <int key="connectionID">581</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -1592,7 +1605,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                        <reference ref="1070952276"/>
                                                </object>
                                                <reference key="parent" ref="931987460"/>
-                                               <string key="objectName">Window</string>
+                                               <string key="objectName">Debugger</string>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">8</int>
@@ -2031,7 +2044,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                        <string>502.CustomClassName</string>
                                        <string>502.IBPluginDependency</string>
                                        <string>569.IBEditorWindowLastContentRect</string>
-                                       <string>569.IBPluginDependency</string>
                                        <string>569.IBWindowTemplateEditedContentRect</string>
                                        <string>569.NSWindowTemplate.visibleAtLaunch</string>
                                        <string>570.IBPluginDependency</string>
@@ -2132,7 +2144,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                        <string>BSSplitView</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{478, 327}, {331, 423}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{478, 327}, {331, 423}}</string>
                                        <boolean value="YES"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2179,7 +2190,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">580</int>
+                       <int key="maxID">581</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2239,6 +2250,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                <object class="NSMutableArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>errormsg</string>
+                                                       <string>inspector</string>
                                                        <string>sourceViewer</string>
                                                        <string>stackArrayController</string>
                                                        <string>statusmsg</string>
@@ -2248,6 +2260,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>NSTextField</string>
+                                                       <string>NSWindow</string>
                                                        <string>BSSourceView</string>
                                                        <string>NSArrayController</string>
                                                        <string>NSTextField</string>

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 7b2973d8eee59758d13e963bceae7daab6df3d60..a5d429c34f959c5527e7294c981a0fc90fb356e6 100644 (file)
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
        <data>
                <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">9F33</string>
-               <string key="IBDocument.InterfaceBuilderVersion">672</string>
-               <string key="IBDocument.AppKitVersion">949.34</string>
-               <string key="IBDocument.HIToolboxVersion">352.00</string>
+               <string key="IBDocument.SystemVersion">9G55</string>
+               <string key="IBDocument.InterfaceBuilderVersion">677</string>
+               <string key="IBDocument.AppKitVersion">949.43</string>
+               <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
+                       <integer value="303"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                </object>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <bool key="EncodedWithXMLCoder">YES</bool>
+                       <object class="NSArray" key="dict.sortedKeys">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                       </object>
+                       <object class="NSMutableArray" key="dict.values">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                       </object>
+               </object>
                <object class="NSMutableArray" key="IBDocument.RootObjects" id="110598985">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                        <object class="NSCustomObject" id="158703408">
@@ -633,6 +643,15 @@
                                                                        <reference key="NSOnImage" ref="501814074"/>
                                                                        <reference key="NSMixedImage" ref="682415215"/>
                                                                </object>
+                                                               <object class="NSMenuItem" id="172306033">
+                                                                       <reference key="NSMenu" ref="149857684"/>
+                                                                       <string key="NSTitle">Inspector</string>
+                                                                       <string key="NSKeyEquiv">I</string>
+                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="501814074"/>
+                                                                       <reference key="NSMixedImage" ref="682415215"/>
+                                                               </object>
                                                                <object class="NSMenuItem" id="827693060">
                                                                        <reference key="NSMenu" ref="149857684"/>
                                                                        <string key="NSTitle">Breakpoints</string>
@@ -1006,6 +1025,14 @@
                                        </object>
                                        <int key="connectionID">302</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">showInspectorWindow:</string>
+                                               <reference key="source" ref="734458411"/>
+                                               <reference key="destination" ref="172306033"/>
+                                       </object>
+                                       <int key="connectionID">304</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -1066,6 +1093,7 @@
                                                        <reference ref="82859880"/>
                                                        <reference ref="163106127"/>
                                                        <reference ref="827693060"/>
+                                                       <reference ref="172306033"/>
                                                </object>
                                                <reference key="parent" ref="265418751"/>
                                        </object>
@@ -1555,6 +1583,11 @@
                                                <reference key="object" ref="1023629900"/>
                                                <reference key="parent" ref="155987990"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">303</int>
+                                               <reference key="object" ref="172306033"/>
+                                               <reference key="parent" ref="149857684"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
@@ -1563,6 +1596,7 @@
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                        <string>-1.IBPluginDependency</string>
                                        <string>-2.IBPluginDependency</string>
+                                       <string>-3.IBPluginDependency</string>
                                        <string>103.IBPluginDependency</string>
                                        <string>103.ImportedFromIB2</string>
                                        <string>106.IBEditorWindowLastContentRect</string>
@@ -1685,6 +1719,7 @@
                                        <string>294.IBPluginDependency</string>
                                        <string>295.IBPluginDependency</string>
                                        <string>296.IBPluginDependency</string>
+                                       <string>303.IBPluginDependency</string>
                                        <string>5.IBPluginDependency</string>
                                        <string>5.ImportedFromIB2</string>
                                        <string>56.IBPluginDependency</string>
@@ -1702,6 +1737,7 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1" id="5"/>
                                        <string>{{756, 778}, {174, 23}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1787,7 +1823,7 @@
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
-                                       <string>{{821, 613}, {211, 123}}</string>
+                                       <string>{{821, 593}, {211, 143}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1824,6 +1860,7 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
@@ -1856,7 +1893,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">302</int>
+                       <int key="maxID">304</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1871,6 +1908,7 @@
                                                        <string>openHelpPage:</string>
                                                        <string>showBreakpointWindow:</string>
                                                        <string>showDebuggerWindow:</string>
+                                                       <string>showInspectorWindow:</string>
                                                        <string>showPreferences:</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
@@ -1879,6 +1917,7 @@
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
+                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">
@@ -1948,6 +1987,14 @@
                                                        <string>BSSourceView</string>
                                                </object>
                                        </object>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">Source/BreakpointController.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">BreakpointController</string>
+                                       <string key="superclassName">NSWindowController</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBUserSource</string>
                                                <string key="minorKey"/>
@@ -1980,30 +2027,51 @@
                                                <object class="NSMutableArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>errormsg</string>
+                                                       <string>inspector</string>
+                                                       <string>sourceViewer</string>
+                                                       <string>stackArrayController</string>
+                                                       <string>statusmsg</string>
+                                                       <string>variablesOutlineView</string>
+                                                       <string>variablesTreeController</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>NSTextField</string>
+                                                       <string>NSWindow</string>
+                                                       <string>BSSourceView</string>
+                                                       <string>NSArrayController</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSOutlineView</string>
+                                                       <string>NSTreeController</string>
+                                               </object>
+                                       </object>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">Source/DebuggerController.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">DebuggerController</string>
+                                       <string key="superclassName">NSWindowController</string>
+                                       <object class="NSMutableDictionary" key="outlets">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSMutableArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>reconnectButton</string>
                                                        <string>runButton</string>
-                                                       <string>sourceViewer</string>
                                                        <string>stackController2</string>
-                                                       <string>statusmsg</string>
                                                        <string>stepInButton</string>
                                                        <string>stepOutButton</string>
                                                        <string>stepOverButton</string>
-                                                       <string>variablesOutlineView</string>
-                                                       <string>variablesTreeController</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>NSTextField</string>
                                                        <string>NSToolbarItem</string>
                                                        <string>NSToolbarItem</string>
-                                                       <string>BSSourceView</string>
                                                        <string>NSArrayController</string>
-                                                       <string>NSTextField</string>
                                                        <string>NSToolbarItem</string>
                                                        <string>NSToolbarItem</string>
                                                        <string>NSToolbarItem</string>
-                                                       <string>NSOutlineView</string>
-                                                       <string>NSTreeController</string>
                                                </object>
                                        </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2040,41 +2108,6 @@
                                                <string key="minorKey">../Sparkle.framework/Versions/A/Headers/SUAppcast.h</string>
                                        </object>
                                </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBDocumentRelativeSource</string>
-                                               <string key="minorKey">../Sparkle.framework/Versions/A/Headers/SUAutomaticUpdateAlert.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBDocumentRelativeSource</string>
-                                               <string key="minorKey">../Sparkle.framework/Versions/A/Headers/SUInstaller.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBDocumentRelativeSource</string>
-                                               <string key="minorKey">../Sparkle.framework/Versions/A/Headers/SUUnarchiver.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBDocumentRelativeSource</string>
-                                               <string key="minorKey">../Sparkle.framework/Versions/A/Headers/SUUpdateAlert.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBDocumentRelativeSource</string>
-                                               <string key="minorKey">../Sparkle.framework/Versions/A/Headers/SUUpdatePermissionPrompt.h</string>
-                                       </object>
-                               </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NSObject</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier" id="644302217">

diff --git a/Source/AppDelegate.h b/Source/AppDelegate.h
index 1aa92ef824999072e3e6b7e3851e81b530a3e53c..0f43d76530a8540c02b4ff340704631e1baf256a 100644 (file)
--- a/Source/AppDelegate.h
+++ b/Source/AppDelegate.h
@@ -30,6 +30,7 @@
 @property(readonly) BreakpointController *breakpoint;
 
 - (IBAction)showDebuggerWindow:(id)sender;
+- (IBAction)showInspectorWindow:(id)sender;
 - (IBAction)showBreakpointWindow:(id)sender;
 - (IBAction)showPreferences:(id)sender;
 

diff --git a/Source/AppDelegate.m b/Source/AppDelegate.m
index 709c723b10877055088a8283a1412494eab8b5fb..c6dbe084ff203ae9dfe847ccef122c4ceb8b63c6 100644 (file)
--- a/Source/AppDelegate.m
+++ b/Source/AppDelegate.m
@@ -62,12 +62,26 @@
        [[debugger window] makeKeyAndOrderFront:self];
 }
 
+/**
+ * Shows the inspector window
+ */
+- (IBAction)showInspectorWindow:(id)sender
+{
+       if (![debugger.inspector isVisible])
+               [debugger.inspector makeKeyAndOrderFront:sender];
+       else
+               [debugger.inspector orderOut:sender];
+}
+
 /**
  * Shows the breakpoints window
  */
 - (IBAction)showBreakpointWindow:(id)sender
 {
-       [[breakpoint window] makeKeyAndOrderFront:self];
+       if (![[breakpoint window] isVisible])
+               [[breakpoint window] makeKeyAndOrderFront:sender];
+       else
+               [[breakpoint window] orderOut:sender];
 }
 
 /**

diff --git a/Source/DebuggerController.h b/Source/DebuggerController.h
index ab5b124a0ce3cea87e786d67e000309babcd807d..9f7c14951752f97e1e0abc6d7c8ab35381c8b2cd 100644 (file)
--- a/Source/DebuggerController.h
+++ b/Source/DebuggerController.h
@@ -31,6 +31,8 @@
        IBOutlet NSOutlineView *variablesOutlineView;
        NSMutableSet *expandedVariables;
        
+       IBOutlet NSWindow *inspector;
+       
        IBOutlet NSTextField *statusmsg;
        IBOutlet NSTextField *errormsg;
        
@@ -39,6 +41,7 @@
 
 @property(readonly) GDBpConnection *connection;
 @property(readonly) BSSourceView *sourceViewer;
+@property(readonly) NSWindow *inspector;
 
 - (void)resetDisplays;
 

diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m
index 3af8421b7f31cba1e3578e6c0dec58eb4789f3ca..ae5af5ba8c9ac2ff2d9f3ffd711ece6c7b086737 100644 (file)
--- a/Source/DebuggerController.m
+++ b/Source/DebuggerController.m
@@ -28,7 +28,7 @@
 
 @implementation DebuggerController
 
-@synthesize connection, sourceViewer;
+@synthesize connection, sourceViewer, inspector;
 
 /**
  * Initializes the window controller and sets the connection using preference