From f41650b9b8d7da0a8a42135e47af91a0a58ad19e Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Tue, 30 Dec 2008 01:17:05 +0000 Subject: [PATCH] * Documentation/TODO: Update progress. * Modules/Debuggers/ProjectCenter/GNUmakefile: Add images to makefile. * Modules/Debuggers/ProjectCenter/PCDebugger.m: Add up and down methods to implement this behaviour. * Modules/Debuggers/ProjectCenter/Resources/down_button.png * Modules/Debuggers/ProjectCenter/Resources/up_button.png: Images for the up/down buttons. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@27459 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 25 ++++++-- Documentation/TODO | 2 +- Modules/Debuggers/ProjectCenter/GNUmakefile | 4 +- Modules/Debuggers/ProjectCenter/PCDebugger.m | 54 ++++++++++++++++-- .../ProjectCenter/Resources/down_button.png | Bin 0 -> 561 bytes .../ProjectCenter/Resources/up_button.png | Bin 0 -> 550 bytes 6 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 Modules/Debuggers/ProjectCenter/Resources/down_button.png create mode 100644 Modules/Debuggers/ProjectCenter/Resources/up_button.png diff --git a/ChangeLog b/ChangeLog index fdf18b5..1e36fe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,25 @@ +2008-12-29 20:23-EST Gregory John Casamento + + * Documentation/TODO: Update progress. + * Modules/Debuggers/ProjectCenter/GNUmakefile: Add images + to makefile. + * Modules/Debuggers/ProjectCenter/PCDebugger.m: Add up and down + methods to implement this behaviour. + * Modules/Debuggers/ProjectCenter/Resources/down_button.png + * Modules/Debuggers/ProjectCenter/Resources/up_button.png: + Images for the up/down buttons. + 2008-12-29 00:30-EST Gregory John Casamento - * Framework/PCProjectLauncher.m: Remove local variable for debugger from - method. Also add it to the launcher dealloc method. - * Headers/ProjectCenter/PCProjectLauncher.h: Add an ivar for the debugger. - * Modules/Debuggers/ProjectCenter/PCDebugger.m: Add dealloc to shut down + * Framework/PCProjectLauncher.m: Remove local variable for debugger + from method. Also add it to the launcher dealloc method. + * Headers/ProjectCenter/PCProjectLauncher.h: Add an ivar for the + debugger. + * Modules/Debuggers/ProjectCenter/PCDebugger.m: Add dealloc to shut + down the debugger window when it's dealloc. - * Modules/Debuggers/ProjectCenter/PCDebuggerView.m: Don't set status when - terminated, since it causes a crash. + * Modules/Debuggers/ProjectCenter/PCDebuggerView.m: Don't set status + when terminated, since it causes a crash. 2008-12-28 11:25-EST Gregory John Casamento diff --git a/Documentation/TODO b/Documentation/TODO index c572897..3f2a679 100644 --- a/Documentation/TODO +++ b/Documentation/TODO @@ -44,7 +44,7 @@ ProjectCenter 0.6 ----------------- - Create new Info panel [done!] -- Implement support for integrated debugging casamento/mottola +- Implement support for integrated debugging [90% done] - change project type from file to bundle casamento/mottola - Finish FileNameIcon (draggable, files can be dragged to it) stoyan - Review all situations when dialogs must be popped up stoyan diff --git a/Modules/Debuggers/ProjectCenter/GNUmakefile b/Modules/Debuggers/ProjectCenter/GNUmakefile index 661aad0..ff7b2d3 100644 --- a/Modules/Debuggers/ProjectCenter/GNUmakefile +++ b/Modules/Debuggers/ProjectCenter/GNUmakefile @@ -27,7 +27,9 @@ ProjectCenter_RESOURCE_FILES= \ Resources/restart_button.png \ Resources/next_button.png \ Resources/stepin_button.png \ - Resources/stepout_button.png + Resources/stepout_button.png \ + Resources/up_button.png \ + Resources/down_button.png # # Header files diff --git a/Modules/Debuggers/ProjectCenter/PCDebugger.m b/Modules/Debuggers/ProjectCenter/PCDebugger.m index ae07ac1..8322647 100644 --- a/Modules/Debuggers/ProjectCenter/PCDebugger.m +++ b/Modules/Debuggers/ProjectCenter/PCDebugger.m @@ -34,6 +34,8 @@ static NSImage *restartImage = nil; static NSImage *nextImage = nil; static NSImage *stepInImage = nil; static NSImage *stepOutImage = nil; +static NSImage *upImage = nil; +static NSImage *downImage = nil; @implementation PCDebugger + (void) initialize @@ -74,6 +76,16 @@ static NSImage *stepOutImage = nil; { stepOutImage = [[NSImage alloc] initWithContentsOfFile: path]; } + path = [bundle pathForImageResource: @"up_button"]; + if (path != nil) + { + upImage = [[NSImage alloc] initWithContentsOfFile: path]; + } + path = [bundle pathForImageResource: @"down_button"]; + if (path != nil) + { + downImage = [[NSImage alloc] initWithContentsOfFile: path]; + } } } @@ -198,6 +210,18 @@ static NSImage *stepOutImage = nil; [debuggerView putString: @"finish\n"]; } +- (void) up: (id) sender +{ + [self setStatus: @"Up to calling method."]; + [debuggerView putString: @"up\n"]; +} + +- (void) down: (id) sender +{ + [self setStatus: @"Down to called method."]; + [debuggerView putString: @"down\n"]; +} + // Status.. - (void) setStatus: (NSString *) status { @@ -247,7 +271,7 @@ willBeInsertedIntoToolbar: (BOOL)flag [toolbarItem setImage: restartImage]; [toolbarItem setTarget: self]; [toolbarItem setAction: @selector(restart:)]; - [toolbarItem setTag: 1]; + [toolbarItem setTag: 2]; } else if([itemIdentifier isEqual: @"NextItem"]) { @@ -255,7 +279,7 @@ willBeInsertedIntoToolbar: (BOOL)flag [toolbarItem setImage: nextImage]; [toolbarItem setTarget: self]; [toolbarItem setAction: @selector(next:)]; - [toolbarItem setTag: 2]; + [toolbarItem setTag: 3]; } else if([itemIdentifier isEqual: @"StepIntoItem"]) { @@ -263,7 +287,7 @@ willBeInsertedIntoToolbar: (BOOL)flag [toolbarItem setImage: stepInImage]; [toolbarItem setTarget: self]; [toolbarItem setAction: @selector(stepInto:)]; - [toolbarItem setTag: 3]; + [toolbarItem setTag: 4]; } else if([itemIdentifier isEqual: @"StepOutItem"]) { @@ -271,7 +295,23 @@ willBeInsertedIntoToolbar: (BOOL)flag [toolbarItem setImage: stepOutImage]; [toolbarItem setTarget: self]; [toolbarItem setAction: @selector(stepOut:)]; - [toolbarItem setTag: 4]; + [toolbarItem setTag: 5]; + } + else if([itemIdentifier isEqual: @"UpItem"]) + { + [toolbarItem setLabel: @"Up"]; + [toolbarItem setImage: upImage]; + [toolbarItem setTarget: self]; + [toolbarItem setAction: @selector(up:)]; + [toolbarItem setTag: 6]; + } + else if([itemIdentifier isEqual: @"DownItem"]) + { + [toolbarItem setLabel: @"Down"]; + [toolbarItem setImage: downImage]; + [toolbarItem setTarget: self]; + [toolbarItem setAction: @selector(down:)]; + [toolbarItem setTag: 7]; } return toolbarItem; @@ -285,6 +325,8 @@ willBeInsertedIntoToolbar: (BOOL)flag @"NextItem", @"StepIntoItem", @"StepOutItem", + @"UpItem", + @"DownItem", nil]; } @@ -296,6 +338,8 @@ willBeInsertedIntoToolbar: (BOOL)flag @"NextItem", @"StepIntoItem", @"StepOutItem", + @"UpItem", + @"DownItem", nil]; } @@ -307,6 +351,8 @@ willBeInsertedIntoToolbar: (BOOL)flag @"NextItem", @"StepIntoItem", @"StepOutItem", + @"UpItem", + @"DownItem", nil]; } @end diff --git a/Modules/Debuggers/ProjectCenter/Resources/down_button.png b/Modules/Debuggers/ProjectCenter/Resources/down_button.png new file mode 100644 index 0000000000000000000000000000000000000000..2882430da736c24e1a3c702036b0b8e197346d38 GIT binary patch literal 561 zcmV-10?z%3P)WFU8GbZ8({Xk{QrNlj4iWF>9@00EUrL_t(o!|j(bPQySD zMc+o`1QeVg1(Xz4iqNc}NaK<;J^)p6mZZu7XmGhr3XmI8pcIs(@ELppBbjD{B4^C5 z9Xk?&Dc9qfzkgjh{rGkE}AANm%{O1CILt#0CgDHf$#vGN&q&}6s$|Jr~gJ8#j6u4v6Xlm7D@O~ zL-jPZtNZ@QVD}4`9(e8WMqDdxZd`g`X2nC>mfP6;2*4_qr~?3zBu;x3(=P@l zEisW->A^|>dmx5ZS~sq_)q(Nve3+c#Y4&elr7fAj@$oE800000NkvXXu0mjfXSCx| literal 0 HcmV?d00001 diff --git a/Modules/Debuggers/ProjectCenter/Resources/up_button.png b/Modules/Debuggers/ProjectCenter/Resources/up_button.png new file mode 100644 index 0000000000000000000000000000000000000000..7261c99f6a1017b1639128c0fcc7f69d23b1f336 GIT binary patch literal 550 zcmV+>0@?kEP)WFU8GbZ8({Xk{QrNlj4iWF>9@00D|gL_t(o!|j(ZQo}$L zhrjK>2_iT_1xQ4vqL>{JHIdZx04REvRB-?dk!vboVn8qzNDw(gPEZldmPyl>|C`J( z@Z@H*@7v$*zWpuy^-xVZr;&dR%z+6o20Z&I0b*baY?L-HP65)$zXR@p^P1y+0c)kr zLnnYV@-Kk^n6*^+4Ol5{J{kk0k$($30;e69c?T?&Heqc5oBYY~ep^ToszCO42Q!zH znC6#bBy