From cf1b68f0e72bd12a640c0db059de4988c66e964c Mon Sep 17 00:00:00 2001 From: Sergii Stoian Date: Tue, 7 Jun 2005 20:39:06 +0000 Subject: [PATCH] Fixed bug #11779 git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@21293 72102866-910b-0410-8b05-ffd578937521 --- .cvsignore | 9 +++++++++ Documentation/ChangeLog | 6 ++++++ Library/PCProjectEditor.m | 5 +++-- Library/PCProjectWindow.h | 1 + Library/PCProjectWindow.m | 13 +++++++++++++ Resources/Info-gnustep.plist | 2 +- 6 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..d6fc589 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,9 @@ +.gwdir +*.swp +*~ +*.app +*.bundle +*.framework +*obj +derived_src +ProjectCenter diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog index 55d49fe..28ff119 100644 --- a/Documentation/ChangeLog +++ b/Documentation/ChangeLog @@ -1,3 +1,9 @@ +2005-06-07 Serg Stoyan + + * Library/PCProjectEditor.m: + (orderFrontEditorForFile:): Always show editor subview + (Fixed bug#11779). + 2005-02-12 Pascal Hoftsee Committed by Gregory Jonh Casamento diff --git a/Library/PCProjectEditor.m b/Library/PCProjectEditor.m index 23ab4a6..5d9eaad 100644 --- a/Library/PCProjectEditor.m +++ b/Library/PCProjectEditor.m @@ -255,8 +255,8 @@ NSString *PCEditorDidResignActiveNotification = editor = [[PCEditor alloc] initWithPath:path categoryPath:categoryPath projectEditor:self]; - [componentView setContentView:[editor componentView]]; - [[project projectWindow] makeFirstResponder:[editor editorView]]; +// [componentView setContentView:[editor componentView]]; +// [[project projectWindow] makeFirstResponder:[editor editorView]]; [editorsDict setObject:editor forKey:path]; RELEASE(editor); @@ -280,6 +280,7 @@ NSString *PCEditorDidResignActiveNotification = else { [componentView setContentView:[editor componentView]]; + [[project projectWindow] setCustomContentView:componentView]; [[project projectWindow] makeFirstResponder:[editor editorView]]; } } diff --git a/Library/PCProjectWindow.h b/Library/PCProjectWindow.h index 41a8656..b8d3b33 100644 --- a/Library/PCProjectWindow.h +++ b/Library/PCProjectWindow.h @@ -42,6 +42,7 @@ NSBox *toolbarView; PCButton *buildButton; PCButton *launchButton; + PCButton *editorButton; PCButton *loadedFilesButton; PCButton *findButton; PCButton *inspectorButton; diff --git a/Library/PCProjectWindow.m b/Library/PCProjectWindow.m index 7c05196..d63b507 100644 --- a/Library/PCProjectWindow.m +++ b/Library/PCProjectWindow.m @@ -131,6 +131,18 @@ { [launchButton setEnabled:NO]; } + +/* editorButton = [[PCButton alloc] initWithFrame:NSMakeRect(88,5,43,43)]; + [editorButton setRefusesFirstResponder:YES]; + [editorButton setToolTip:@"Editor"]; + [editorButton setTitle:@"Editor"]; + [editorButton setImage:IMAGE(@"Stop")]; + [editorButton setTarget:self]; + [editorButton setAction:@selector(showProjectEditor:)]; + [editorButton setAutoresizingMask:(NSViewMaxXMargin | NSViewMinYMargin)]; + [editorButton setButtonType:NSMomentaryPushButton]; + [toolbarView addSubview:editorButton]; + RELEASE (editorButton);*/ loadedFilesButton = [[PCButton alloc] initWithFrame:NSMakeRect(88,5,43,43)]; [loadedFilesButton setRefusesFirstResponder:YES]; @@ -901,6 +913,7 @@ - (BOOL)makeFirstResponder:(NSResponder *)aResponder { firstResponder = aResponder; + [projectWindow makeFirstResponder:firstResponder]; return YES; diff --git a/Resources/Info-gnustep.plist b/Resources/Info-gnustep.plist index fb494dc..381347e 100644 --- a/Resources/Info-gnustep.plist +++ b/Resources/Info-gnustep.plist @@ -3,7 +3,7 @@ ApplicationName = "ProjectCenter"; ApplicationDescription = "GNUstep Integrated Development Environment"; ApplicationIcon = "ProjectCenter.tiff"; - ApplicationRelease = "0.4.1"; + ApplicationRelease = "0.4.3"; FullVersionID = "HEAD"; Authors = ( "Philippe C.D. Robert",