From a2e7803ca42c365e32957573edb4d4f453761986 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Fri, 4 Jan 2008 12:04:45 -0800 Subject: [PATCH] Refactoring _status --- English.lproj/Debugger.nib/classes.nib | 4 ++-- English.lproj/Debugger.nib/keyedobjects.nib | Bin 17621 -> 17627 bytes Source/DebuggerWindowController.h | 4 ++-- Source/DebuggerWindowController.m | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/English.lproj/Debugger.nib/classes.nib b/English.lproj/Debugger.nib/classes.nib index a5ab17e..d9790a3 100644 --- a/English.lproj/Debugger.nib/classes.nib +++ b/English.lproj/Debugger.nib/classes.nib @@ -34,8 +34,6 @@ NSTextView _sourceViewerScroller NSScrollView - _status - NSTextField _stepInButton NSButton _stepOutButton @@ -48,6 +46,8 @@ NSOutlineView stackController NSArrayController + status + NSTextField SUPERCLASS NSWindowController diff --git a/English.lproj/Debugger.nib/keyedobjects.nib b/English.lproj/Debugger.nib/keyedobjects.nib index 2f96d4ddbac02d38a070dcec50177e14bf581a8d..967f03b233457c586d44ee25aa8c8e9793e36519 100644 GIT binary patch delta 3799 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 delta 3771 zcmbVOX>=4-7VhfYA_f)RbAaxuamIIA`uWoNFXeM5RwKn$s~}4Bru_? z927yep=J<8L=ZWMj3WjG88QfpItnhhAjlxwU<70p*+BfJHhVGA_FC-4P)347ry_!_>2eefN84+r509EBgD1%8Gza1nli zt8fi&(>9u>+tG-QqNC|JI)zT9)6Dhuh&UgeNoUc0=)QD6dJsLBev}?U=bF3i3LKApj! zUbLA8P%_KgR8E;FsRl`L6-$dfjkB_bL7gttP_={_@_u726OeltuSD?i7 zvus2iF)k&>nMCzRvr3M76S(pzCU?D7m z#rn_s8U3t&PCu_-Fg0hNF3a>^S`&T&8dgJttw-y(7h%O3SOG7=N^_}mWPpI}d#5s? z_gBWMLOrYxR-u=EHIGz0yA6SLJ00E(-g@=xqb;1nYHRM(=xJ*p7~dfn`w@&c^GPX+ zYHF+7T=aykM8UOlP7(e=im;s&;XRlIJ4gZEhYw&Ed`M0on`Qi9DJj5iMM>p< z#jAr`!FZVl6=&{X6FoE#gCUkdJZZDa+Nxr|m8HLGpT!wEln%3aLx zO+q%(ZyQt+DUQC>pb`sFvKb}Cn-k93lDE>s=*R74^oV=DJO-ucjRxg5H@F^2tER`0 zlorqh_fpcVSnnE?dNB5$O2n~eN)IH+hevFwpx3cy(wgVNP(>`WFeUc)%Ldt4;n}h3^6F5-itI+C%sN* zNuR9K-z6kks_)Pv^c*r-8ucamCNk+V^=2|a96B|}ye4M{(n*|jtG$SS>pjDIs45cS zF?$*L>}yHwL#?x&oQQ;I+RF$#>&Qdek+`?sIl-rn1c)G^Hjs=gX+!Y5j+{0GH5>1O zel-X>6$1Y=YBH|>Z`}3=kk7fB#4dv}y~=Z3%!oUTt?pl0QBze}Uhc0NpIdAl92PxX z%BcJxyUcT*1oNm8+pF{Awbf5JT50NFbIBZY5ZaP<>YPgkR%x*#&tG3-U0BmA+rbs& zPAxC3x#P@y&zs;Lcc1?UVtEQtOkUBXa=)X0WqIxID;#W2X}O+1umv6{6S&y^bm>uk~{UmUCydV_020~bQ;Ara> zND1=fh<-V^KnMYAoTcjxWL0P-PFKB!>=M?p5!^F;!F__P7xG;~k?q3b6j?j;{bc>P z!>wET!3X$tSU*Wt75xg?Q3%(LSyMKW>@sbnJ49$ln$PT~`Rwfq%$b^Mw}+V1F<)D1TA`ePI=`pukUpJ8p<)Q&72DL{L8jL!l zc%-5+$cv&;GFpsM(QxEOVMs=Cs3Xclb?7yehLTVO8jnV!u_y{56pMJ&9cd^WMc&yD z+HGsPgqyEd4w6nJjx7ZCNLA3 zNlXbdnQ36=G4q*)%wlE>_p z!ZX4=VS%t**dpu{b_=J3Gr~FHqVTJ5MYt{|if%DW>?4jAYsGqThS(_T;*;W2;u>+A zxL-Ud9ukj;$Hf!kPp&YR!_~{x$JNg@z%|e{*frEu?wajdw3+#!S#k~qw7o8 zNhwrnFLjhUNzu}( zq-%0VnUh6Xk`-B%v79B3lc&o8`ANB1-Y)Nu-)fxqTihqzr`>1V=iC?Fm)w`#SKZg$ zH{G`tN(oVDB~%GlIw%q5ihl6{QIVB$rBbO!J~Kvd-6S%o|&Gxo|T?0 zp3gijo=aYvH^KXmca*o-JKej&yV<+P`-AtI8mp$N4z)`_H>+FK zW_7!|Q~f~wNd2e!srs4vh5D8Hjk-@gp#DoetR7QOs4ePA^|X3MJ+EF=FR545YwAt) zwnk|o8m)zD;aUeRLhGbOX)#)y7Oy2~DO$SLMeC+zXspI-q9$o>&7-Lr);eTr*;;=s zN87ILG@JXo0-?A)j=%`V;LbP^r{Hwl6=z@;3s}MmRDxQ`~rRvzl2}L vtMMAV7O%tW@do^cIpyK3xU={?zJRaeTllsw%-6x!(HG}SGXMT?I>r45$$+2E diff --git a/Source/DebuggerWindowController.h b/Source/DebuggerWindowController.h index cc2f20c..2a0e152 100644 --- a/Source/DebuggerWindowController.h +++ b/Source/DebuggerWindowController.h @@ -29,7 +29,7 @@ IBOutlet NSOutlineView *registerView; NSMutableArray *expandedRegisters; - IBOutlet NSTextField *_status; + IBOutlet NSTextField *status; IBOutlet NSTextField *_error; IBOutlet NSTextView *_sourceViewer; @@ -44,7 +44,7 @@ - (id)initWithConnection:(DebuggerConnection *)cnx; -- (void)setStatus:(NSString *)status; +- (void)setStatus:(NSString *)aStatus; - (void)setError:(NSString *)error; - (void)setStack:(NSArray *)node; - (void)setRegister:(NSXMLDocument *)reg; diff --git a/Source/DebuggerWindowController.m b/Source/DebuggerWindowController.m index 0f1460d..b63d182 100644 --- a/Source/DebuggerWindowController.m +++ b/Source/DebuggerWindowController.m @@ -75,10 +75,10 @@ /** * Sets the status and clears any error message */ -- (void)setStatus:(NSString *)status +- (void)setStatus:(NSString *)aStatus { [_error setHidden:YES]; - [_status setStringValue:status]; + [status setStringValue:aStatus]; [[self window] setTitle:[NSString stringWithFormat:@"GDBp @ %@:%d/%@", [connection remoteHost], [connection port], [connection session]]]; [_stepInButton setEnabled:NO]; @@ -89,7 +89,7 @@ if ([connection isConnected]) { - if ([status isEqualToString:@"Starting"]) + if ([aStatus isEqualToString:@"Starting"]) { [_stepInButton setEnabled:YES]; [_runButton setEnabled:YES]; -- 2.43.5