From 31d7f23be81c33ae155ee278fafc81d4d561b44f Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 18 May 2009 23:14:54 -0400 Subject: [PATCH] Add a toolbar icon for the HUD window, which required making DebuggerController the action handler. * Icons/HUDIcon.png: New icon * CONTRIBUTORS: Add credits for icon * MacGDBp.xcodeproj/project.pbxproj: Project updates for icon * Source/AppDelegate.h+m: (showInspectorWindow:): Moved to... * Source/DebuggerController.h+m: (showInspectorWindow:): new from ^ * English.lproj/Debugger.xib: Add toolbar item * English.lproj/MainMenu.xib: Change Window-->Inspector's target --- CONTRIBUTORS | 1 + English.lproj/Debugger.xib | 139 +++++++++++++++++++++++++++--- English.lproj/MainMenu.xib | 12 +-- Icons/HUDIcon.png | Bin 0 -> 842 bytes MacGDBp.xcodeproj/project.pbxproj | 4 + Source/AppDelegate.h | 1 - Source/AppDelegate.m | 11 --- Source/DebuggerController.h | 2 + Source/DebuggerController.m | 11 +++ 9 files changed, 154 insertions(+), 27 deletions(-) create mode 100644 Icons/HUDIcon.png 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 @@ 1050 - 9G55 + 9J61 677 - 949.43 + 949.46 353.00 YES + YES @@ -56,6 +57,7 @@ YES 4F493FF4-D55D-4881-B16D-54ED9DC66FF7 + 87BEA2D0-EF8E-4DF2-9827-B2AC06858DC6 91C3B0BD-0D34-4A26-A0EA-CC2A093F5916 9FD4795A-41D6-49D4-94CE-99E9DF733A09 DD23489D-A21C-474A-84A1-392673464E24 @@ -89,6 +91,28 @@ YES 0 + + + 87BEA2D0-EF8E-4DF2-9827-B2AC06858DC6 + + Variable Inspector + Variable Inspector + + + + NSImage + HUDIcon.png + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + 91C3B0BD-0D34-4A26-A0EA-CC2A093F5916 @@ -380,6 +404,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ + @@ -392,6 +417,9 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ + + + @@ -402,7 +430,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ {3.40282e+38, 3.40282e+38} {213, 107} - + 256 YES @@ -918,6 +946,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ {769, 501} + {{0, 0}, {1440, 878}} {213, 169} @@ -1179,13 +1208,14 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ 6 - {666, 1e+07} + {804, 1e+07} {223, 0} {402, 402} + @@ -1218,6 +1248,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ {{-1, -1}, {402, 402}} + 560 @@ -1231,10 +1262,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ InspectorWindow - - YES - InspectorWindowVisible - YES @@ -1589,6 +1616,14 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ 583 + + + showInspectorWindow: + + + + 587 + @@ -1695,6 +1730,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ + @@ -1993,6 +2029,11 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ + + 584 + + + @@ -2079,6 +2120,8 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ 576.IBPluginDependency 577.IBPluginDependency 578.IBPluginDependency + 582.IBPluginDependency + 584.IBPluginDependency 59.IBPluginDependency 59.ImportedFromIB2 7.IBEditorWindowLastContentRect @@ -2156,7 +2199,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ com.apple.InterfaceBuilder.CocoaPlugin - {{401, 738}, {617, 0}} + {{445, 738}, {617, 0}} com.apple.InterfaceBuilder.CocoaPlugin {{418, 770}, {617, 0}} com.apple.InterfaceBuilder.CocoaPlugin @@ -2180,6 +2223,8 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{369, 237}, {769, 501}} @@ -2218,11 +2263,51 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ - 583 + 587 YES + + AppDelegate + NSObject + + YES + + YES + openHelpPage: + showBreakpointWindow: + showDebuggerWindow: + showInspectorWindow: + showPreferences: + + + YES + id + id + id + id + id + + + + YES + + YES + breakpoint + debugger + + + YES + BreakpointController + DebuggerController + + + + IBProjectSource + Source/AppDelegate.h + + BSSourceView NSView @@ -2251,6 +2336,40 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ + + BreakpointController + NSWindowController + + YES + + YES + addBreakpoint: + removeBreakpoint: + + + YES + id + id + + + + YES + + YES + arrayController + sourceView + + + YES + NSArrayController + BSSourceView + + + + IBProjectSource + Source/BreakpointController.h + + DebuggerController NSWindowController 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 @@ 1050 - 9G55 + 9J61 677 - 949.43 + 949.46 353.00 YES @@ -1028,10 +1028,10 @@ showInspectorWindow: - + - 304 + 305 @@ -1893,7 +1893,7 @@ - 304 + 305 @@ -2009,6 +2009,7 @@ YES reconnect: run: + showInspectorWindow: stepIn: stepOut: stepOver: @@ -2020,6 +2021,7 @@ id id id + id diff --git a/Icons/HUDIcon.png b/Icons/HUDIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..5469c537942a84029c9e7ec7c8b91073513e0a8c GIT binary patch literal 842 zcmV-Q1GW5#P)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;&`Cr=RCwCNmpy0`VHn4MZ_)~-2QGm`aL`;_n^v7tx)iAjE>^`wCkNZ2xKt2Y zniMJuX@`QSTczzHVsQ~;S_&dMS)1#ih`H+EkSkflEB#9HI`k3}^Idz*1IHcr_5Z*B z=j(lhl#)i8g9cl}2{Zu+A@c7Dn=x}fms0K$u*})reP+PnbPNe0+_oS~X=Kuw`-_VU zkAZYf0n1t(PUpz!QzuGKFM1(^8+1kfr3E`Zh5Ra?-#UN06#E3gj8{2**T zz}Rap2*Rwb8A-l=`9?CCv;}o*bB8q}Sw0O9q9#dXr8;mR3@Rv40|CFk-97?js((Kb zo-BD^Q4~f)W1Q_dU!@jgD#bu)1yt3?XlRUu=sN&j&AmodeT50`_RtyVA`s}TR*Z^E zaU~Zhio!&Ak`Eu>6ATU0d+{>C(V?REbUn_^{u>xZ;y(zKP(W3ED2hUKK7zlk9c^V9 z(=-d->F>LRPdx!ZbUwn{=$l$Ypt=imJx;<%Fwl3qNcOBn=OawdPN66YZnwKG1*#G- zO_RaFJH++xbOyTU40II*ny$yuv{;cc`{DwCgpnXT{t%D*2s5L3^wC~A zV*Oc=Uju@nVP4L?;8O3Ey|(1~2q=n@J7*>KcswMkM0*7W&V zMOi>?Wx1sEnikt17i47lW-vYTY`^w}mAYYrw&hv;bSm`|IOcNMw=YfYV#rbib~ZLQ zBFnL*3r=VAQ6WJhK)~)bc^B4BRshl(BdllA8Y_f_k~<4XrM7=V z0erx5;BYM&Qt#q{-@p$b4wzEP0s>B;#X1hzFd<1`8`!Xp^uGieGMb4-kLP~}0QvAh U&qTr7!T