diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 326157b..6ad015d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3,3 +3,4 @@ MacGDBp CONTRIBUTORS
Ciarán Walsh
Nicola Ferruzzi
+Matt Ball (HUD Icon frame)
diff --git a/English.lproj/Debugger.xib b/English.lproj/Debugger.xib
index f39be13..c096631 100644
--- a/English.lproj/Debugger.xib
+++ b/English.lproj/Debugger.xib
@@ -2,12 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9G55</string>
+ <string key="IBDocument.SystemVersion">9J61</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
- <string key="IBDocument.AppKitVersion">949.43</string>
+ <string key="IBDocument.AppKitVersion">949.46</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="7"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -56,6 +57,7 @@
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>4F493FF4-D55D-4881-B16D-54ED9DC66FF7</string>
+ <string>87BEA2D0-EF8E-4DF2-9827-B2AC06858DC6</string>
<string>91C3B0BD-0D34-4A26-A0EA-CC2A093F5916</string>
<string>9FD4795A-41D6-49D4-94CE-99E9DF733A09</string>
<string>DD23489D-A21C-474A-84A1-392673464E24</string>
@@ -89,6 +91,28 @@
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
+ <object class="NSToolbarItem" id="909415165">
+ <object class="NSMutableString" key="NSToolbarItemIdentifier">
+ <characters key="NS.bytes">87BEA2D0-EF8E-4DF2-9827-B2AC06858DC6</characters>
+ </object>
+ <string key="NSToolbarItemLabel">Variable Inspector</string>
+ <string key="NSToolbarItemPaletteLabel">Variable Inspector</string>
+ <string key="NSToolbarItemToolTip"/>
+ <nil key="NSToolbarItemView"/>
+ <object class="NSCustomResource" key="NSToolbarItemImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">HUDIcon.png</string>
+ </object>
+ <nil key="NSToolbarItemTarget"/>
+ <nil key="NSToolbarItemAction"/>
+ <string key="NSToolbarItemMinSize">{0, 0}</string>
+ <string key="NSToolbarItemMaxSize">{0, 0}</string>
+ <bool key="NSToolbarItemEnabled">YES</bool>
+ <bool key="NSToolbarItemAutovalidates">YES</bool>
+ <int key="NSToolbarItemTag">-1</int>
+ <bool key="NSToolbarIsUserRemovable">YES</bool>
+ <int key="NSToolbarItemVisibilityPriority">0</int>
+ </object>
<object class="NSToolbarItem" id="966497091">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">91C3B0BD-0D34-4A26-A0EA-CC2A093F5916</characters>
@@ -380,6 +404,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
<reference ref="822794044"/>
<reference ref="578309120"/>
<reference ref="524686954"/>
+ <reference ref="909415165"/>
<reference ref="619392803"/>
<reference ref="1015206233"/>
<reference ref="499700426"/>
@@ -392,6 +417,9 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
<reference ref="822794044"/>
<reference ref="619392803"/>
<reference ref="578309120"/>
+ <reference ref="1015206233"/>
+ <reference ref="1015206233"/>
+ <reference ref="909415165"/>
<reference ref="499700426"/>
<reference ref="524686954"/>
</object>
@@ -402,7 +430,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="976098315">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -918,6 +946,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
</object>
</object>
<string key="NSFrameSize">{769, 501}</string>
+ <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 169}</string>
@@ -1179,13 +1208,14 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
<nil key="NSDefaultParagraphStyle"/>
</object>
<int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{666, 1e+07}</string>
+ <string key="NSMaxSize">{804, 1e+07}</string>
<string key="NSMinize">{223, 0}</string>
<nil key="NSDelegate"/>
</object>
</object>
<string key="NSFrameSize">{402, 402}</string>
<reference key="NSSuperview" ref="943668178"/>
+ <reference key="NSNextKeyView" ref="294150047"/>
<reference key="NSDocView" ref="294150047"/>
<reference key="NSBGColor" ref="866192031"/>
<object class="NSCursor" key="NSCursor">
@@ -1218,6 +1248,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
</object>
<string key="NSFrame">{{-1, -1}, {402, 402}}</string>
<reference key="NSSuperview" ref="451591711"/>
+ <reference key="NSNextKeyView" ref="138455094"/>
<int key="NSsFlags">560</int>
<reference key="NSVScroller" ref="896820060"/>
<reference key="NSHScroller" ref="498580399"/>
@@ -1231,10 +1262,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
<string key="NSFrameAutosaveName">InspectorWindow</string>
</object>
<object class="NSUserDefaultsController" id="463528398">
- <object class="NSMutableArray" key="NSDeclaredKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>InspectorWindowVisible</string>
- </object>
<bool key="NSSharedInstance">YES</bool>
</object>
</object>
@@ -1589,6 +1616,14 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
</object>
<int key="connectionID">583</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">showInspectorWindow:</string>
+ <reference key="source" ref="320275587"/>
+ <reference key="destination" ref="909415165"/>
+ </object>
+ <int key="connectionID">587</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1695,6 +1730,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
<reference ref="524686954"/>
<reference ref="822794044"/>
<reference ref="121644564"/>
+ <reference ref="909415165"/>
</object>
<reference key="parent" ref="797274304"/>
</object>
@@ -1993,6 +2029,11 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
<reference key="object" ref="463528398"/>
<reference key="parent" ref="931987460"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">584</int>
+ <reference key="object" ref="909415165"/>
+ <reference key="parent" ref="1070952276"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2079,6 +2120,8 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
<string>576.IBPluginDependency</string>
<string>577.IBPluginDependency</string>
<string>578.IBPluginDependency</string>
+ <string>582.IBPluginDependency</string>
+ <string>584.IBPluginDependency</string>
<string>59.IBPluginDependency</string>
<string>59.ImportedFromIB2</string>
<string>7.IBEditorWindowLastContentRect</string>
@@ -2156,7 +2199,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{401, 738}, {617, 0}}</string>
+ <string>{{445, 738}, {617, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{418, 770}, {617, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2180,6 +2223,8 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<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="9"/>
<string>{{369, 237}, {769, 501}}</string>
<reference ref="8"/>
@@ -2218,12 +2263,52 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">583</int>
+ <int key="maxID">587</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
+ <string key="className">AppDelegate</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>openHelpPage:</string>
+ <string>showBreakpointWindow:</string>
+ <string>showDebuggerWindow:</string>
+ <string>showInspectorWindow:</string>
+ <string>showPreferences:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>breakpoint</string>
+ <string>debugger</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>BreakpointController</string>
+ <string>DebuggerController</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/AppDelegate.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">BSSourceView</string>
<string key="superclassName">NSView</string>
<object class="NSMutableDictionary" key="outlets">
@@ -2252,6 +2337,40 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">BreakpointController</string>
+ <string key="superclassName">NSWindowController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>addBreakpoint:</string>
+ <string>removeBreakpoint:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>arrayController</string>
+ <string>sourceView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSArrayController</string>
+ <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">DebuggerController</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="actions">
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index a5d429c..46d9e7a 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9G55</string>
+ <string key="IBDocument.SystemVersion">9J61</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
- <string key="IBDocument.AppKitVersion">949.43</string>
+ <string key="IBDocument.AppKitVersion">949.46</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1028,10 +1028,10 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showInspectorWindow:</string>
- <reference key="source" ref="734458411"/>
+ <reference key="source" ref="614736281"/>
<reference key="destination" ref="172306033"/>
</object>
- <int key="connectionID">304</int>
+ <int key="connectionID">305</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -1893,7 +1893,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">304</int>
+ <int key="maxID">305</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2009,6 +2009,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>reconnect:</string>
<string>run:</string>
+ <string>showInspectorWindow:</string>
<string>stepIn:</string>
<string>stepOut:</string>
<string>stepOver:</string>
@@ -2020,6 +2021,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
diff --git a/Icons/HUDIcon.png b/Icons/HUDIcon.png
new file mode 100644
index 0000000..5469c53
Binary files /dev/null and b/Icons/HUDIcon.png differ
diff --git a/MacGDBp.xcodeproj/project.pbxproj b/MacGDBp.xcodeproj/project.pbxproj
index f8c8e2a..2345e97 100644
--- a/MacGDBp.xcodeproj/project.pbxproj
+++ b/MacGDBp.xcodeproj/project.pbxproj
@@ -13,6 +13,7 @@
1E02C3D50C60EC2C006F1752 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C3D40C60EC2C006F1752 /* AppDelegate.m */; };
1E02C5710C610158006F1752 /* GDBpConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5700C610158006F1752 /* GDBpConnection.m */; };
1E02C5F60C610724006F1752 /* DebuggerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5F50C610724006F1752 /* DebuggerController.m */; };
+ 1E0AFBB90FC2518700C67031 /* HUDIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E0AFBB80FC2518700C67031 /* HUDIcon.png */; };
1E1E53030DF9B89800D334F9 /* Breakpoints.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1E1E53010DF9B89800D334F9 /* Breakpoints.xib */; };
1E35FC760C6579CA0030F527 /* NSXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E35FC750C6579CA0030F527 /* NSXMLElementAdditions.m */; };
1E35FEA10C6599040030F527 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E35FEA00C6599040030F527 /* base64.c */; };
@@ -69,6 +70,7 @@
1E02C5700C610158006F1752 /* GDBpConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GDBpConnection.m; path = Source/GDBpConnection.m; sourceTree = "<group>"; };
1E02C5F40C610724006F1752 /* DebuggerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerController.h; path = Source/DebuggerController.h; sourceTree = "<group>"; };
1E02C5F50C610724006F1752 /* DebuggerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerController.m; path = Source/DebuggerController.m; sourceTree = "<group>"; };
+ 1E0AFBB80FC2518700C67031 /* HUDIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HUDIcon.png; path = Icons/HUDIcon.png; sourceTree = "<group>"; };
1E1E53020DF9B89800D334F9 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Breakpoints.xib; sourceTree = "<group>"; };
1E35FC750C6579CA0030F527 /* NSXMLElementAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSXMLElementAdditions.m; path = Source/NSXMLElementAdditions.m; sourceTree = "<group>"; };
1E35FE9F0C6599040030F527 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = Source/base64.h; sourceTree = "<group>"; };
@@ -172,6 +174,7 @@
1E027F0D0D36F24200885DEE /* Toolbar Icons */ = {
isa = PBXGroup;
children = (
+ 1E0AFBB80FC2518700C67031 /* HUDIcon.png */,
1E027F380D36F60800885DEE /* Reconnect.png */,
1E027F080D36F23F00885DEE /* Run.png */,
1E027F090D36F23F00885DEE /* StepOver.png */,
@@ -361,6 +364,7 @@
1EEE875D0D9DE4B4009CBA7C /* MacGDBp.icns in Resources */,
1E1E53030DF9B89800D334F9 /* Breakpoints.xib in Resources */,
1E9582620E252474001A3D89 /* Preferences.xib in Resources */,
+ 1E0AFBB90FC2518700C67031 /* HUDIcon.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/Source/AppDelegate.h b/Source/AppDelegate.h
index 1763721..6298b91 100644
--- a/Source/AppDelegate.h
+++ b/Source/AppDelegate.h
@@ -30,7 +30,6 @@
@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 f79b18c..7082161 100644
--- a/Source/AppDelegate.m
+++ b/Source/AppDelegate.m
@@ -65,17 +65,6 @@
}
/**
- * 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
diff --git a/Source/DebuggerController.h b/Source/DebuggerController.h
index 50b032e..7000392 100644
--- a/Source/DebuggerController.h
+++ b/Source/DebuggerController.h
@@ -44,6 +44,8 @@
@property(readonly) BSSourceView* sourceViewer;
@property(readonly) NSWindow* inspector;
+- (IBAction)showInspectorWindow:(id)sender;
+
- (void)resetDisplays;
- (void)setError:(NSString*)anError;
diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m
index 4d7f7ca..80aed82 100644
--- a/Source/DebuggerController.m
+++ b/Source/DebuggerController.m
@@ -108,6 +108,17 @@
}
/**
+ * Shows the inspector window
+ */
+- (IBAction)showInspectorWindow:(id)sender
+{
+ if (![inspector isVisible])
+ [inspector makeKeyAndOrderFront:sender];
+ else
+ [inspector orderOut:sender];
+}
+
+/**
* Resets all the displays to be empty
*/
- (void)resetDisplays
