diff --git a/English.lproj/Preferences.gorm/objects.gorm b/English.lproj/Preferences.gorm/objects.gorm index b9d4e12..c2acdc9 100644 Binary files a/English.lproj/Preferences.gorm/objects.gorm and b/English.lproj/Preferences.gorm/objects.gorm differ diff --git a/Framework/English.lproj/BuilderPanel.gorm/data.info b/Framework/English.lproj/BuilderPanel.gorm/data.info index 152bdec..da98e43 100644 Binary files a/Framework/English.lproj/BuilderPanel.gorm/data.info and b/Framework/English.lproj/BuilderPanel.gorm/data.info differ diff --git a/Framework/English.lproj/BuilderPanel.gorm/objects.gorm b/Framework/English.lproj/BuilderPanel.gorm/objects.gorm index b81c7ec..c603d98 100644 Binary files a/Framework/English.lproj/BuilderPanel.gorm/objects.gorm and b/Framework/English.lproj/BuilderPanel.gorm/objects.gorm differ diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m index 1949f39..25745ef 100644 --- a/Framework/PCProjectBuilder.m +++ b/Framework/PCProjectBuilder.m @@ -97,6 +97,8 @@ NSLog (@"PCProjectBuilder: dealloc"); #endif + [[NSNotificationCenter defaultCenter] removeObserver:self]; + RELEASE(buildStatusTarget); RELEASE(buildTarget); RELEASE(buildArgs); @@ -131,6 +133,9 @@ [componentView retain]; [componentView removeFromSuperview]; + NSLog(@"ProjectBuilder awakeFromNib: componentView RC:%i", + [componentView retainCount]); + /* * 4 build Buttons */ diff --git a/Framework/PCProjectBuilderPanel.m b/Framework/PCProjectBuilderPanel.m index 8735ce7..8927e0b 100644 --- a/Framework/PCProjectBuilderPanel.m +++ b/Framework/PCProjectBuilderPanel.m @@ -29,6 +29,8 @@ #import +#import "Modules/Preferences/Misc/PCMiscPrefs.h" + @implementation PCProjectBuilderPanel - (void)awakeFromNib @@ -92,7 +94,6 @@ if (!([contentBox contentView] == builderView)) { [contentBox setContentView:builderView]; - [contentBox display]; } /* NSLog(self, @"orderFront: %@ -> %@", @@ -114,8 +115,15 @@ - (void)activeProjectDidChange:(NSNotification *)aNotif { - PCProject *rootProject = [projectManager rootActiveProject]; + PCProject *rootProject; + id prefs = [projectManager prefController]; + if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"NO"]) + { + return; + } + + rootProject = [projectManager rootActiveProject]; if (rootProject == currentProject) { return; @@ -144,5 +152,12 @@ return [panel isVisible]; } +// --- Panel delgate +- (BOOL)windowShouldClose:(id)sender +{ + [contentBox setContentView:emptyBox]; + return YES; +} + @end diff --git a/Framework/PCProjectLauncherPanel.m b/Framework/PCProjectLauncherPanel.m index 3827260..a1099da 100644 --- a/Framework/PCProjectLauncherPanel.m +++ b/Framework/PCProjectLauncherPanel.m @@ -29,6 +29,8 @@ #import +#import "Modules/Preferences/Misc/PCMiscPrefs.h" + @implementation PCProjectLauncherPanel - (id)initWithProjectManager:(PCProjectManager *)aManager @@ -123,8 +125,15 @@ - (void)activeProjectDidChange:(NSNotification *)aNotif { - PCProject *rootProject = [projectManager rootActiveProject]; + PCProject *rootProject; + id prefs = [projectManager prefController]; + if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"NO"]) + { + return; + } + + rootProject = [projectManager rootActiveProject]; if (rootProject == currentProject) { return; diff --git a/Framework/PCProjectLoadedFiles.m b/Framework/PCProjectLoadedFiles.m index d8ecfe0..6bd03a7 100644 --- a/Framework/PCProjectLoadedFiles.m +++ b/Framework/PCProjectLoadedFiles.m @@ -33,7 +33,7 @@ #import #import -#import "Modules/Preferences/Interface/PCInterfacePrefs.h" +#import "Modules/Preferences/Misc/PCMiscPrefs.h" @implementation PCProjectLoadedFiles @@ -80,7 +80,7 @@ [filesScroll setDocumentView:filesList]; [filesScroll setHasHorizontalScroller:NO]; [filesScroll setHasVerticalScroller:YES]; - if ([[prefs objectForKey:SeparateLoadedFiles] isEqualToString:@"NO"]) + if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"NO"]) { [filesScroll setBorderType:NSBezelBorder]; } diff --git a/Framework/PCProjectLoadedFilesPanel.m b/Framework/PCProjectLoadedFilesPanel.m index dfa167b..62165e9 100644 --- a/Framework/PCProjectLoadedFilesPanel.m +++ b/Framework/PCProjectLoadedFilesPanel.m @@ -29,6 +29,8 @@ #import +#import "Modules/Preferences/Misc/PCMiscPrefs.h" + @implementation PCProjectLoadedFilesPanel - (id)initWithProjectManager:(PCProjectManager *)aManager @@ -123,8 +125,15 @@ - (void)activeProjectDidChange:(NSNotification *)aNotif { - PCProject *rootProject = [projectManager rootActiveProject]; + PCProject *rootProject; + id prefs = [projectManager prefController]; + if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"NO"]) + { + return; + } + + rootProject = [projectManager rootActiveProject]; if (rootProject == currentProject) { return; diff --git a/Framework/PCProjectManager.m b/Framework/PCProjectManager.m index a02825a..57c91f7 100644 --- a/Framework/PCProjectManager.m +++ b/Framework/PCProjectManager.m @@ -45,7 +45,7 @@ #import "Protocols/CodeEditor.h" #import "Modules/Preferences/Saving/PCSavingPrefs.h" -#import "Modules/Preferences/Interface/PCInterfacePrefs.h" +#import "Modules/Preferences/Misc/PCMiscPrefs.h" NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; @@ -301,7 +301,7 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; - (NSPanel *)loadedFilesPanel { if (!loadedFilesPanel - && [[prefController objectForKey:SeparateLoadedFiles] isEqualToString:@"YES"]) + && [[prefController objectForKey:UseTearOffWindows] isEqualToString:@"YES"]) { loadedFilesPanel = [[PCProjectLoadedFilesPanel alloc] initWithProjectManager:self]; @@ -312,7 +312,7 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; - (void)showProjectLoadedFiles:(id)sender { - if ([[prefController objectForKey:SeparateLoadedFiles] isEqualToString:@"YES"]) + if ([[prefController objectForKey:UseTearOffWindows] isEqualToString:@"YES"]) { [[self loadedFilesPanel] orderFront:nil]; } @@ -321,7 +321,7 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; - (NSPanel *)buildPanel { if (!buildPanel - && [[prefController objectForKey:SeparateBuilder] isEqualToString:@"YES"]) + && [[prefController objectForKey:UseTearOffWindows] isEqualToString:@"YES"]) { buildPanel = [[PCProjectBuilderPanel alloc] initWithProjectManager:self]; } @@ -332,7 +332,7 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; - (NSPanel *)launchPanel { if (!launchPanel - && [[prefController objectForKey:SeparateLauncher] isEqualToString:@"YES"]) + && [[prefController objectForKey:UseTearOffWindows] isEqualToString:@"YES"]) { launchPanel = [[PCProjectLauncherPanel alloc] initWithProjectManager:self]; } diff --git a/Framework/PCProjectWindow.m b/Framework/PCProjectWindow.m index aaf4f2b..130d62f 100644 --- a/Framework/PCProjectWindow.m +++ b/Framework/PCProjectWindow.m @@ -44,6 +44,8 @@ #import "Modules/Preferences/Misc/PCMiscPrefs.h" #import "Modules/Preferences/Interface/PCInterfacePrefs.h" +#import + @implementation PCProjectWindow // ============================================================================ @@ -68,6 +70,7 @@ - (void)awakeFromNib { + id prefs = [[project projectManager] prefController]; NSRect rect; [buildButton setToolTip:@"Project Builder"]; @@ -82,7 +85,7 @@ [loadedFilesButton setToolTip:@"Loaded Files"]; [loadedFilesButton setImage:IMAGE(@"Files")]; - if ([self hasLoadedFilesView]) + if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"NO"]) { [loadedFilesButton setEnabled:NO]; } @@ -131,7 +134,7 @@ /* * LoadedFiles */ - if ([self hasLoadedFilesView]) + if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"NO"]) { [self showProjectLoadedFiles:self]; } @@ -143,10 +146,7 @@ * Custom view * View where non-separated Builder, Launcher, Editor goes. */ -// if ([self hasCustomView]) -// { - [self _createCustomView]; -// } + [self _createCustomView]; } - (id)initWithProject:(PCProject *)owner @@ -277,40 +277,6 @@ // Custom view is always shown because editor always opened on // one click in Browser. External editor will be opened only on // double click. -- (BOOL)hasCustomView -{ - id prefs = [[project projectManager] prefController]; - - _hasCustomView = NO; - - if (![[prefs objectForKey:SeparateEditor] isEqualToString:@"YES"] - && [[prefs objectForKey:Editor] isEqualToString:@"ProjectCenter"]) - { - _hasCustomView = YES; - } - if (![[prefs objectForKey:SeparateBuilder] isEqualToString:@"YES"]) - { - _hasCustomView = YES; - } - if (![[prefs objectForKey:SeparateLauncher] isEqualToString:@"YES"]) - { - _hasCustomView = YES; - } - - return _hasCustomView; -} - -- (BOOL)hasLoadedFilesView -{ - id prefs = [[project projectManager] prefController]; - NSString *val; - - val = [prefs objectForKey:SeparateLoadedFiles]; - _hasLoadedFilesView = ([val isEqualToString:@"YES"]) ? NO : YES; - - return _hasLoadedFilesView; -} - - (NSView *)customContentView { return [customView contentView]; @@ -341,18 +307,27 @@ id prefs = [[project projectManager] prefController]; NSView *view = [[project projectBuilder] componentView]; NSPanel *buildPanel = [[project projectManager] buildPanel]; + PCProject *rootActiveProject; + + rootActiveProject = [[project projectManager] rootActiveProject]; + NSLog(@"ProjectWindow showProjectBuild: componentView RC:%i", + [view retainCount]); + if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"YES"]) { if ([customView contentView] == view) { [self showProjectEditor:self]; } - [buildPanel orderFront:nil]; + if (rootActiveProject == project) + { + [buildPanel orderFront:nil]; + } } else { - if ([buildPanel isVisible]) + if ((rootActiveProject == project) && [buildPanel isVisible]) { [buildPanel close]; } @@ -391,29 +366,35 @@ { id prefs = [[project projectManager] prefController]; NSPanel *panel = [[project projectManager] loadedFilesPanel]; + PCProject *rootActiveProject; NSScrollView *componentView; + rootActiveProject = [[project projectManager] rootActiveProject]; componentView = (NSScrollView *)[[project projectLoadedFiles] componentView]; // PCLogInfo(self, @"showProjectLoadedFiles"); -// if ([self hasLoadedFilesView]) if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"YES"]) { [componentView setBorderType:NSNoBorder]; - [panel orderFront:nil]; + [componentView removeFromSuperview]; + if (rootActiveProject == project) + { + [panel orderFront:nil]; + } [v_split adjustSubviews]; } else { - if (panel && [panel isVisible]) + if ((rootActiveProject == project) && panel && [panel isVisible]) { [panel close]; } [componentView setBorderType:NSBezelBorder]; - [componentView setFrame:NSMakeRect(0,0,128,130)]; - [v_split addSubview:[[project projectLoadedFiles] componentView]]; + // Preserve width of view in panel +// [componentView setFrame:NSMakeRect(0,0,128,130)]; + [v_split addSubview:componentView]; [v_split adjustSubviews]; } } @@ -570,18 +551,9 @@ PCLogStatus(self, @"Preferences did change"); -// See comment to _createCustomView -/* //--- Add Custom view - if ([self hasCustomView] && customView == nil) +/* if ([[project projectManager] rootActiveProject] != project) { - [self _createCustomView]; - } - //--- Remove Custom view - if (![self hasCustomView] && customView != nil) - { - [customView removeFromSuperview]; - [h_split adjustSubviews]; - customView = nil; + return; }*/ if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"YES"]) @@ -625,61 +597,6 @@ } [loadedFilesButton setEnabled:NO]; } -/* - // Project Builder - if ([[prefs objectForKey:@"SeparateBuilder"] isEqualToString:@"YES"]) - { - // Project Build is sepearate and visible in project window - if ([[[project projectBuilder] componentView] window] == projectWindow) - { - [self showProjectBuild:self]; - } - } - else - { - NSPanel *buildPanel = [[project projectManager] buildPanel]; - - if ([buildPanel isVisible] == YES) - { - [self showProjectBuild:self]; - } - } - - // Project Launcher - if ([[prefs objectForKey:@"SeparateLauncher"] isEqualToString:@"YES"]) - { - if ([[[project projectLauncher] componentView] window] == projectWindow) - { - [self showProjectLaunch:self]; - } - } - else - { - NSPanel *launchPanel = [[project projectManager] launchPanel]; - - if ([launchPanel isVisible] == YES) - { - [self showProjectLaunch:self]; - } - } - - // Loaded Files view - if ([self hasLoadedFilesView]) - { - if ([[v_split subviews] count] == 1) - { - [self showProjectLoadedFiles:self]; - } - [loadedFilesButton setEnabled:NO]; - } - else - { - if ([[v_split subviews] count] == 2) - { - [self showProjectLoadedFiles:self]; - } - [loadedFilesButton setEnabled:YES]; - }*/ } - (void)browserDidSetPath:(NSNotification *)aNotif @@ -852,9 +769,16 @@ NSDictionary *projectDict = nil; NSDictionary *windowsDict = nil; NSString *browserString = nil; - NSRect browserRect; + NSRect browserRect = NSMakeRect(0,0,0,0); NSRect boxRect; +// NSLog(@"resizeVerticalSubiewsWithOldSize entered split view width: %f, height %f", splitSize.width, splitSize.height); + + boxRect = [v_split frame]; + boxRect.size.width = floorf(boxRect.size.width); + boxRect.size.height = floorf(boxRect.size.height); + [v_split setFrame:boxRect]; + if (splitSize.width == oldSize.width && splitSize.height == oldSize.height) { return; @@ -870,43 +794,59 @@ if (windowsDict != nil) { browserString = [windowsDict objectForKey:@"ProjectBrowser"]; + NSLog(@"Browser size '%@'", browserString); if (browserString != nil && ![browserString isEqualToString:@""]) { browserRect = NSRectFromString(browserString); } } - else + // Unable to restore browser frame + if (browserRect.size.width == 0 && browserRect.size.height == 0) { - browserRect = NSMakeRect(0, 0, splitSize.width, splitSize.height); + browserRect = NSMakeRect(0, 0, + floorf(splitSize.width), + floorf(splitSize.height)); } + [browserView setFrame:browserRect]; } // Use saved frame of ProjectBrowser only first time. Every time window is // resized use new size of subviews. - if (_splitViewsRestored) +/* if (_splitViewsRestored) { browserRect = [[[project projectBrowser] view] frame]; browserRect.size.height = splitSize.height; - if (![self hasLoadedFilesView]) + if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"YES"]) { browserRect.size.width = splitSize.width; } } // Browser -// NSLog(@"browser %@", NSStringFromRect(browserRect)); - [browserView setFrame:browserRect]; + NSLog(@"%@ browser %@", + [project projectName], NSStringFromRect(browserRect)); + [browserView setFrame:browserRect];*/ // Loaded Files - if ([self hasLoadedFilesView]) +/* if ([[prefs objectForKey:UseTearOffWindows] isEqualToString:@"NO"]) { boxRect.origin.x = browserRect.size.width + [v_split dividerThickness]; boxRect.origin.y = 0; boxRect.size.width = [v_split frame].size.width - boxRect.origin.x; boxRect.size.height = [v_split frame].size.height; -// NSLog(@"loadedFiles %@", NSStringFromRect(boxRect)); + + if (boxRect.size.width < 60) + { + boxRect.size.width = 60; + boxRect.origin.x = [v_split frame].size.width - boxRect.size.width; + } + + NSLog(@"%@ loadedFiles %@", + [project projectName], NSStringFromRect(boxRect)); [[[project projectLoadedFiles] componentView] setFrame:boxRect]; - } + }*/ + + [v_split adjustSubviews]; _splitViewsRestored = YES; } @@ -919,6 +859,8 @@ NSRect vSplitRect; NSRect boxRect; + NSLog(@"resizeHorizontalSubiewsWithOldSize entered split view width: %f, height %f", splitSize.width, splitSize.height); + if (splitSize.width == oldSize.width && splitSize.height == oldSize.height) { return; diff --git a/Framework/PCSplitView.m b/Framework/PCSplitView.m index 4637492..6880617 100644 --- a/Framework/PCSplitView.m +++ b/Framework/PCSplitView.m @@ -23,18 +23,550 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ +#import + #import +static NSNotificationCenter *nc = nil; + @implementation PCSplitView -- (float) dividerThickness +- (float)dividerThickness { return 8.0f; } -- (void)drawDividerInRect: (NSRect)aRect +- (void)drawDividerInRect:(NSRect)aRect { - [super drawDividerInRect: aRect]; + [super drawDividerInRect:aRect]; +} + +/*- (void)mouseDown:(NSEvent*)theEvent +{ + [super mouseDown:theEvent]; + [self adjustSubviews]; +}*/ + +- (void)mouseDown:(NSEvent*)theEvent +{ + NSApplication *app = [NSApplication sharedApplication]; + static NSRect oldRect; //only one can be dragged at a time + static BOOL lit = NO; + NSPoint p, op; + NSEvent *e; + NSRect r, r1, bigRect, vis; + id v = nil, prev = nil; + float minCoord, maxCoord; + NSArray *subs = [self subviews]; + int offset = 0, i, count = [subs count]; + float divVertical, divHorizontal; + NSDate *farAway = [NSDate distantFuture]; + NSDate *longTimeAgo = [NSDate distantPast]; + unsigned int eventMask = NSLeftMouseUpMask | NSLeftMouseDraggedMask; + /* YES if delegate implements splitView:constrainSplitPosition:ofSubviewAt:*/ + BOOL delegateConstrains = NO; + SEL constrainSel = @selector(splitView:constrainSplitPosition:ofSubviewAt:); + typedef float (*floatIMP)(id, SEL, id, float, int); + floatIMP constrainImp = NULL; + + /* if there are less the two subviews, there is nothing to do */ + if (count < 2) + { + return; + } + + /* Silence compiler warnings. */ + r1 = NSZeroRect; + bigRect = NSZeroRect; + + vis = [self visibleRect]; + + /* find out which divider it is */ + p = [theEvent locationInWindow]; + p = [self convertPoint: p fromView: nil]; + for (i = 0; i < count; i++) + { + v = [subs objectAtIndex: i]; + r = [v frame]; + /* if the click is inside of a subview, return. this should + happen only if a subview has leaked a mouse down to next + responder + */ + if (NSPointInRect(p, r)) + { + NSDebugLLog(@"NSSplitView", + @"NSSplitView got mouseDown in subview area"); + return; + } + if (_isVertical == NO) + { + if (NSMinY(r) >= p.y) + { + offset = i - 1; + + /* get the enclosing rect for the two views */ + if (prev != nil) + { + r = [prev frame]; + } + else + { + /* + * This happens if user pressed exactly on the + * top of the top subview + */ + return; + } + if (v != nil) + { + r1 = [v frame]; + } + bigRect = r; + bigRect = NSUnionRect(r1 , bigRect); + break; + } + prev = v; + } + else + { + if (NSMinX(r) >= p.x) + { + offset = i - 1; + + /* get the enclosing rect for the two views */ + if (prev != nil) + { + r = [prev frame]; + } + else + { + /* + * This happens if user pressed exactly on the + * left of the left subview + */ + return; + } + if (v != nil) + { + r1 = [v frame]; + } + bigRect = r; + bigRect = NSUnionRect(r1 , bigRect); + break; + } + prev = v; + } + } + + /* Check if the delegate wants to constrain the spliview divider to + certain positions */ + if (_delegate + && [_delegate respondsToSelector: + @selector(splitView:constrainSplitPosition:ofSubviewAt:)]) + { + delegateConstrains = YES; + } + + if (_isVertical == NO) + { + divVertical = _dividerWidth; + divHorizontal = NSWidth(_frame); + /* set the default limits on the dragging */ + minCoord = NSMinY(bigRect) + divVertical; + maxCoord = NSHeight(bigRect) + NSMinY(bigRect) - divVertical; + } + else + { + divHorizontal = _dividerWidth; + divVertical = NSHeight(_frame); + /* set the default limits on the dragging */ + minCoord = NSMinX(bigRect) + divHorizontal; + maxCoord = NSWidth(bigRect) + NSMinX(bigRect) - divHorizontal; + } + + /* find out what the dragging limit is */ + if (_delegate) + { + float delMin = minCoord, delMax = maxCoord; + + if ([_delegate respondsToSelector: + @selector(splitView: + constrainMinCoordinate: + maxCoordinate: + ofSubviewAt:)]) + { + [_delegate splitView:self + constrainMinCoordinate:&delMin + maxCoordinate:&delMax + ofSubviewAt:offset]; + } + else + { + if ([_delegate respondsToSelector: + @selector(splitView: + constrainMinCoordinate: + ofSubviewAt:)]) + { + delMin = [_delegate splitView:self + constrainMinCoordinate:minCoord + ofSubviewAt:offset]; + } + if ([_delegate respondsToSelector: + @selector(splitView:constrainMaxCoordinate:ofSubviewAt:)]) + { + delMax = [_delegate splitView: self + constrainMaxCoordinate: maxCoord + ofSubviewAt: offset]; + } + } + + /* we are still constrained by the original bounds */ + if (delMin > minCoord) + { + minCoord = delMin; + } + if (delMax < maxCoord) + { + maxCoord = delMax; + } + } + + oldRect = NSZeroRect; + [self lockFocus]; + + [[NSRunLoop currentRunLoop] limitDateForMode: NSEventTrackingRunLoopMode]; + + [_dividerColor set]; + r.size.width = divHorizontal; + r.size.height = divVertical; + e = [app nextEventMatchingMask: eventMask + untilDate: farAway + inMode: NSEventTrackingRunLoopMode + dequeue: YES]; + + if (delegateConstrains) + { + constrainImp = (floatIMP)[_delegate methodForSelector: constrainSel]; + } + + // Save the old position + op = p; + NSLog(@"SplitView: entering knob loop"); +//--- Dragging start ---------------------------------------------------------- + // user is moving the knob loop until left mouse up + while ([e type] != NSLeftMouseUp) + { + p = [self convertPoint: [e locationInWindow] fromView: nil]; + if (delegateConstrains) + { + if (_isVertical) + { + p.x = (*constrainImp)(_delegate, constrainSel, self, + p.x, offset); + } + else + { + p.y = (*constrainImp)(_delegate, constrainSel, self, + p.y, offset); + } + } + + if (_isVertical == NO) + { + if (p.y < minCoord) + { + p.y = minCoord; + } + if (p.y > maxCoord) + { + p.y = maxCoord; + } + r.origin.y = p.y - (divVertical/2.); + r.origin.x = NSMinX(vis); + } + else + { + if (p.x < minCoord) + { + p.x = minCoord; + } + if (p.x > maxCoord) + { + p.x = maxCoord; + } + r.origin.x = p.x - (divHorizontal/2.); + r.origin.y = NSMinY(vis); + } + if (NSEqualRects(r, oldRect) == NO) + { + NSDebugLLog(@"NSSplitView", @"drawing divider at %@\n", + NSStringFromRect(r)); + [_dividerColor set]; + + + if (lit == YES) + { + if (_isVertical == NO) + { + if ((NSMinY(r) > NSMaxY(oldRect)) + || (NSMaxY(r) < NSMinY(oldRect))) + // the two rects don't intersect + { + NSHighlightRect(oldRect); + NSHighlightRect(r); + } + else + // the two rects intersect + { + if (NSMinY(r) > NSMinY(oldRect)) + { + NSRect onRect, offRect; + onRect.size.width = r.size.width; + onRect.origin.x = r.origin.x; + offRect.size.width = r.size.width; + offRect.origin.x = r.origin.x; + + offRect.origin.y = NSMinY(oldRect); + offRect.size.height = + NSMinY(r) - NSMinY(oldRect); + + onRect.origin.y = NSMaxY(oldRect); + onRect.size.height = + NSMaxY(r) - NSMaxY(oldRect); + + NSHighlightRect(onRect); + NSHighlightRect(offRect); + + //NSLog(@"on : %@", NSStringFromRect(onRect)); + //NSLog(@"off : %@", NSStringFromRect(offRect)); + //NSLog(@"old : %@", NSStringFromRect(oldRect)); + //NSLog(@"r : %@", NSStringFromRect(r)); + } + else + { + NSRect onRect, offRect; + onRect.size.width = r.size.width; + onRect.origin.x = r.origin.x; + offRect.size.width = r.size.width; + offRect.origin.x = r.origin.x; + + offRect.origin.y = NSMaxY(r); + offRect.size.height = + NSMaxY(oldRect) - NSMaxY(r); + + onRect.origin.y = NSMinY(r); + onRect.size.height = + NSMinY(oldRect) - NSMinY(r); + + NSHighlightRect(onRect); + NSHighlightRect(offRect); + + //NSLog(@"on : %@", NSStringFromRect(onRect)); + //NSLog(@"off : %@", NSStringFromRect(offRect)); + //NSLog(@"old : %@", NSStringFromRect(oldRect)); + //NSLog(@"r : %@", NSStringFromRect(r)); + } + } + } + else + { + if ((NSMinX(r) > NSMaxX(oldRect)) + || (NSMaxX(r) < NSMinX(oldRect))) + // the two rects don't intersect + { + NSHighlightRect (oldRect); + NSHighlightRect(r); + } + else + // the two rects intersect + { + if (NSMinX(r) > NSMinX(oldRect)) + { + NSRect onRect, offRect; + onRect.size.height = r.size.height; + onRect.origin.y = r.origin.y; + offRect.size.height = r.size.height; + offRect.origin.y = r.origin.y; + + offRect.origin.x = NSMinX(oldRect); + offRect.size.width = + NSMinX(r) - NSMinX(oldRect); + + onRect.origin.x = NSMaxX(oldRect); + onRect.size.width = + NSMaxX(r) - NSMaxX(oldRect); + + NSHighlightRect(onRect); + NSHighlightRect(offRect); + } + else + { + NSRect onRect, offRect; + onRect.size.height = r.size.height; + onRect.origin.y = r.origin.y; + offRect.size.height = r.size.height; + offRect.origin.y = r.origin.y; + + offRect.origin.x = NSMaxX(r); + offRect.size.width = + NSMaxX(oldRect) - NSMaxX(r); + + onRect.origin.x = NSMinX(r); + onRect.size.width = + NSMinX(oldRect) - NSMinX(r); + + NSHighlightRect(onRect); + NSHighlightRect(offRect); + } + } + + } + } + else + { + NSHighlightRect(r); + } + [_window flushWindow]; + /* + if (lit == YES) + { + NSHighlightRect(oldRect); + lit = NO; + } + NSHighlightRect(r); + */ + lit = YES; + oldRect = r; + } + + { + NSEvent *ee; + + e = [app nextEventMatchingMask: eventMask + untilDate: farAway + inMode: NSEventTrackingRunLoopMode + dequeue: YES]; + + if ((ee = [app nextEventMatchingMask: NSLeftMouseUpMask + untilDate: longTimeAgo + inMode: NSEventTrackingRunLoopMode + dequeue: YES]) != nil) + { + [app discardEventsMatchingMask:NSLeftMouseDraggedMask + beforeEvent:ee]; + e = ee; + } + else + { + ee = e; + do + { + e = ee; + ee = [app nextEventMatchingMask: NSLeftMouseDraggedMask + untilDate: longTimeAgo + inMode: NSEventTrackingRunLoopMode + dequeue: YES]; + } + while (ee != nil); + } + } + + } +//--- Draggind end ------------------------------------------------------------ + NSLog(@"SplitView: exiting knob loop: %f -- %f", op.x, p.x); + + if (lit == YES) + { + [_dividerColor set]; + NSHighlightRect(oldRect); + lit = NO; + } + + [self unlockFocus]; + + // Divider position hasn't changed don't try to resize subviews + if (_isVertical == YES) // This + { // was + if (p.x == op.x) // fixed + { + NSLog(@"Divider position hasn't changed: %f == %f", p.x, op.x); + [self setNeedsDisplay: YES]; + return; + } + } + else if (p.y == op.y) + { + NSLog(@"Divider position hasn't changed: %f == %f", p.y, op.y); + [self setNeedsDisplay: YES]; + return; + } + + [nc postNotificationName: NSSplitViewWillResizeSubviewsNotification + object: self]; + + /* resize the subviews accordingly */ + r = [prev frame]; + if (_isVertical == NO) + { + r.size.height = p.y - NSMinY(bigRect) - (divVertical/2.); + if (NSHeight(r) < 1.) + { + r.size.height = 1.; + } + } + else + { + r.size.width = p.x - NSMinX(bigRect) - (divHorizontal/2.); + if (NSWidth(r) < 1.) + { + r.size.width = 1.; + } + } + [prev setFrame: r]; + NSDebugLLog(@"NSSplitView", @"drawing PREV at x: %d, y: %d, w: %d, h: %d\n", + (int)NSMinX(r),(int)NSMinY(r),(int)NSWidth(r),(int)NSHeight(r)); + + r1 = [v frame]; + if (_isVertical == NO) + { + r1.origin.y = p.y + (divVertical/2.); + if (NSMinY(r1) < 0.) + { + r1.origin.y = 0.; + } + r1.size.height = NSHeight(bigRect) - NSHeight(r) - divVertical; + if (NSHeight(r) < 1.) + { + r.size.height = 1.; + } + } + else + { + r1.origin.x = p.x + (divHorizontal/2.); + if (NSMinX(r1) < 0.) + { + r1.origin.x = 0.; + } + r1.size.width = NSWidth(bigRect) - NSWidth(r) - divHorizontal; + if (NSWidth(r1) < 1.) + { + r1.size.width = 1.; + } + } + [v setFrame: r1]; + NSLog(@"NSSplitView drawing LAST at x: %d, y: %d, w: %d, h: %d\n", + (int)NSMinX(r1),(int)NSMinY(r1),(int)NSWidth(r1),(int)NSHeight(r1)); + + [_window invalidateCursorRectsForView: self]; + + [nc postNotificationName: NSSplitViewDidResizeSubviewsNotification + object: self]; + +// [self _autosaveSubviewProportions]; + + [self setNeedsDisplay: YES]; + + //[self display]; } @end diff --git a/GNUmakefile b/GNUmakefile index bb2f87b..bb54e92 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -94,7 +94,7 @@ Modules/Debuggers/ProjectCenter/ProjectCenter.debugger \ Modules/Preferences/Build/Build.preferences \ Modules/Preferences/Saving/Saving.preferences \ Modules/Preferences/Misc/Misc.preferences \ -Modules/Preferences/Interface/Interface.preferences +Modules/Preferences/EditorFSC/EditorFSC.preferences # # Localization diff --git a/Headers/ProjectCenter/PCProjectWindow.h b/Headers/ProjectCenter/PCProjectWindow.h index 5a07c32..bd3784f 100644 --- a/Headers/ProjectCenter/PCProjectWindow.h +++ b/Headers/ProjectCenter/PCProjectWindow.h @@ -77,8 +77,6 @@ // ============================================================================ // ==== Accessory methods // ============================================================================ -- (BOOL)hasCustomView; -- (BOOL)hasLoadedFilesView; - (NSView *)customContentView; - (void)setCustomContentView:(NSView *)subview; - (void)updateStatusLineWithText:(NSString *)text; diff --git a/Modules/GNUmakefile b/Modules/GNUmakefile index 78953a8..4474d84 100644 --- a/Modules/GNUmakefile +++ b/Modules/GNUmakefile @@ -39,7 +39,7 @@ SUBPROJECTS = \ Preferences/Build \ Preferences/Saving \ Preferences/Misc \ - Preferences/Interface + Preferences/EditorFSC # Do not compile the Debuggers/ProjectCenter module on MinGW since I'm # told at the moment it doesn't even compile there. diff --git a/Modules/Preferences/EditorFSC/EditorFSC.preferences/EditorFSC b/Modules/Preferences/EditorFSC/EditorFSC.preferences/EditorFSC new file mode 100755 index 0000000..fb2e63a Binary files /dev/null and b/Modules/Preferences/EditorFSC/EditorFSC.preferences/EditorFSC differ diff --git a/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/EditorFSCPrefs.gorm/data.classes b/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/EditorFSCPrefs.gorm/data.classes new file mode 100644 index 0000000..ca44951 --- /dev/null +++ b/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/EditorFSCPrefs.gorm/data.classes @@ -0,0 +1,24 @@ +{ + "## Comment" = "Do NOT change this file, Gorm maintains it"; + PCEditorFSCPrefs = { + Actions = ( + "setEditorPlainTextFont:", + "setEditorRichTextFont:", + "setEditorSize:", + "setEditorColor:" + ); + Outlets = ( + editorFSCView, + plainTextFontButton, + plainTextFontField, + richTextFontButton, + richTextFontField, + editorLinesField, + editorColumnsField, + foregroundColorWell, + backgroundColorWell, + selectionColorWell + ); + Super = NSObject; + }; +} \ No newline at end of file diff --git a/Modules/Preferences/Interface/Resources/InterfacePrefs.gorm/data.info b/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/EditorFSCPrefs.gorm/data.info similarity index 100% rename from Modules/Preferences/Interface/Resources/InterfacePrefs.gorm/data.info rename to Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/EditorFSCPrefs.gorm/data.info diff --git a/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/EditorFSCPrefs.gorm/objects.gorm b/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/EditorFSCPrefs.gorm/objects.gorm new file mode 100644 index 0000000..51b5565 Binary files /dev/null and b/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/EditorFSCPrefs.gorm/objects.gorm differ diff --git a/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/Info-gnustep.plist b/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/Info-gnustep.plist new file mode 100644 index 0000000..967ff6c --- /dev/null +++ b/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/Info-gnustep.plist @@ -0,0 +1,6 @@ +{ + NOTE = "Automatically generated, do not edit!"; + NSExecutable = "EditorFSC"; + NSMainNibFile = ""; + NSPrincipalClass = "PCEditorFSCPrefs"; +} diff --git a/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/Info.table b/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/Info.table new file mode 100644 index 0000000..37c170b --- /dev/null +++ b/Modules/Preferences/EditorFSC/EditorFSC.preferences/Resources/Info.table @@ -0,0 +1,6 @@ +{ + Type = "Preferences"; + Name = "Editor: Fonts, Sizes & Colors"; + Description = "Common editor's preferences."; + PrincipalClassName = "PCEditorFSCPrefs"; +} diff --git a/Modules/Preferences/EditorFSC/EditorFSC.preferences/stamp.make b/Modules/Preferences/EditorFSC/EditorFSC.preferences/stamp.make new file mode 100644 index 0000000..67bb787 --- /dev/null +++ b/Modules/Preferences/EditorFSC/EditorFSC.preferences/stamp.make @@ -0,0 +1 @@ +OLD_GNUSTEP_STAMP_ASTRING = _PCEditorFSCPrefs- diff --git a/Modules/Preferences/EditorFSC/GNUmakefile b/Modules/Preferences/EditorFSC/GNUmakefile new file mode 100644 index 0000000..9010c7d --- /dev/null +++ b/Modules/Preferences/EditorFSC/GNUmakefile @@ -0,0 +1,41 @@ +# +# GNUmakefile - EditorFSC preferences +# +PACKAGE_NAME = EditorFSC +include $(GNUSTEP_MAKEFILES)/common.make + +# +# Bundle +# +BUNDLE_NAME = EditorFSC +BUNDLE_EXTENSION = .preferences +EditorFSC_PRINCIPAL_CLASS = PCEditorFSCPrefs + + +# +# Additional libraries +# +EditorFSC_LIBRARIES_DEPEND_UPON += + +# +# Resource files +# +EditorFSC_RESOURCE_FILES= \ + Resources/EditorFSCPrefs.gorm \ + Resources/Info.table + +# +# Header files +# +EditorFSC_HEADERS= \ + PCEditorFSCPrefs.h + +# +# Class files +# +EditorFSC_OBJC_FILES= \ + PCEditorFSCPrefs.m + +include ../../GNUmakefile.bundles +include $(GNUSTEP_MAKEFILES)/bundle.make + diff --git a/Modules/Preferences/Interface/PCInterfacePrefs.h b/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.h similarity index 51% rename from Modules/Preferences/Interface/PCInterfacePrefs.h rename to Modules/Preferences/EditorFSC/PCEditorFSCPrefs.h index a5740ca..ba23273 100644 --- a/Modules/Preferences/Interface/PCInterfacePrefs.h +++ b/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.h @@ -26,27 +26,43 @@ #import #import -#define SeparateBuilder @"SeparateBuilder" -#define SeparateLauncher @"SeparateLauncher" -#define SeparateLoadedFiles @"SeparateLoadedFiles" -#define SeparateEditor @"SeparateEditor" -#define EditorLines @"EditorLines" -#define EditorColumns @"EditorColumns" +#define EditorPlainTextFont @"EditorPlainTextFont" +#define EditorPlainTextFontSize @"EditorPlainTextFontSize" +#define EditorRichTextFont @"EditorRichTextFont" +#define EditorRichTextFontSize @"EditorRichTextFontSize" -@interface PCInterfacePrefs : NSObject +#define EditorLines @"EditorLines" +#define EditorColumns @"EditorColumns" + +#define EditorForegroundColor @"EditorForegroundColor" +#define EditorBackgroundColor @"EditorBackgroundColor" +#define EditorSelectionColor @"EditorSelectionColor" + + +@interface PCEditorFSCPrefs : NSObject { id prefs; - IBOutlet NSBox *interfaceView; + IBOutlet NSBox *editorFSCView; - IBOutlet NSButton *separateBuilder; - IBOutlet NSButton *separateLauncher; - IBOutlet NSButton *separateEditor; - IBOutlet NSButton *separateLoadedFiles; + IBOutlet NSButton *plainTextFontButton; + IBOutlet NSTextField *plainTextFontField; + IBOutlet NSButton *richTextFontButton; + IBOutlet NSTextField *richTextFontField; IBOutlet NSTextField *editorLinesField; IBOutlet NSTextField *editorColumnsField; + + IBOutlet NSColorWell *foregroundColorWell; + IBOutlet NSColorWell *backgroundColorWell; + IBOutlet NSColorWell *selectionColorWell; } +- (void)setEditorPlainTextFont:(id)sender; +- (void)setEditorRichTextFont:(id)sender; + +- (void)setEditorSize:(id)sender; +- (void)setEditorColor:(id)sender; + @end diff --git a/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m b/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m new file mode 100644 index 0000000..b7ab484 --- /dev/null +++ b/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m @@ -0,0 +1,177 @@ +// +// GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html +// +// Copyright (C) 2001-2009 Free Software Foundation +// +// Authors: Sergii Stoian +// +// Description: +// +// This file is part of GNUstep. +// +// This application is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This application is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Library General Public License for more details. +// +// You should have received a copy of the GNU General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. + +#import +#import + +#import "PCEditorFSCPrefs.h" + +@implementation PCEditorFSCPrefs + +// ---------------------------------------------------------------------------- +// --- Init and free +// ---------------------------------------------------------------------------- + +- (id)initWithPrefController:(id )aPrefs +{ + self = [super init]; + + if ([NSBundle loadNibNamed:@"EditorFSCPrefs" owner:self] == NO) + { + NSLog(@"PCEditorFSCPrefs: error loading NIB file!"); + } + + prefs = aPrefs; + + RETAIN(editorFSCView); + + return self; +} + +- (void)dealloc +{ +#ifdef DEBUG + NSLog (@"PCEditorFSCPrefs: dealloc"); +#endif + + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + RELEASE(editorFSCView); + + [super dealloc]; +} + +- (void)awakeFromNib +{ + [plainTextFontButton setRefusesFirstResponder:YES]; + [plainTextFontField setDelegate:self]; + [richTextFontButton setRefusesFirstResponder:YES]; +} + +// Protocol +- (void)setDefaults +{ + [prefs setObject:@"30" forKey:EditorLines notify:NO]; + [prefs setObject:@"80" forKey:EditorColumns notify:NO]; +} + +- (void)readPreferences +{ + NSString *val; + NSNumber *fval; + NSFont *font; + + // Plain text font + font = [NSFont userFixedPitchFontOfSize:0.0]; + if (!(val = [prefs objectForKey:EditorPlainTextFont])) + { + val = [font fontName]; + } + if (!(val = [prefs objectForKey:EditorPlainTextFontSize])) + { + fval = [NSNumber numberWithFloat:[font pointSize]]; + } + [plainTextFontField setStringValue: + [NSString stringWithFormat:@"%@ %0.1f", val, [fval floatValue]]]; + +/* // Rich text font + font = [NSFont systemFontOfSize:0.0]; + if (!(val = [prefs objectForKey:EditorRichTextFont])) + { + val = [font fontName]; + } + if (!(fval = [prefs objectForKey:EditorRichTextFontSize])) + { + fval = [font pointSize]; + } + [richTextFontField setStringValue: + [NSString stringWithFormat:@"%@ %0.1f", val, fval];*/ + + // Editor window size + if (!(val = [prefs objectForKey:EditorLines])) + val = @"30"; + [editorLinesField setStringValue:val]; + if (!(val = [prefs objectForKey:EditorColumns])) + val = @"80"; + [editorColumnsField setStringValue:val]; +} + +- (NSView *)view +{ + return editorFSCView; +} + +// Actions +- (void)setEditorPlainTextFont:(id)sender +{ + NSFontManager *fm = [NSFontManager sharedFontManager]; + NSFont *currentFont; + + [[editorFSCView window] makeFirstResponder:plainTextFontField]; + currentFont = [NSFont + fontWithName:[prefs objectForKey:EditorPlainTextFont] + size:[[prefs objectForKey:EditorPlainTextFontSize] floatValue]]; + + [fm setSelectedFont:currentFont isMultiple:NO]; + [fm orderFrontFontPanel:self]; +} + +- (void)setEditorRichTextFont:(id)sender +{ +} + +- (void)setEditorSize:(id)sender +{ + NSString *val = nil; + NSString *key = nil; + + if (sender == editorLinesField) + { + key = EditorLines; + val = [editorLinesField stringValue]; + } + else if (sender == editorColumnsField) + { + key = EditorColumns; + val = [editorColumnsField stringValue]; + } + + [prefs setObject:val forKey:key notify:YES]; +} + +- (void)setEditorColor:(id)sender +{ +} + +-(void)changeFont:(id)sender +{ + NSLog(@"%@: Font: '%@ %0.1f'", [sender className], + [[NSFont userFixedPitchFontOfSize:0.0] fontName], + [[NSFont userFixedPitchFontOfSize:0.0] pointSize]); + +} + +@end + diff --git a/Modules/Preferences/EditorFSC/Resources/EditorFSCPrefs.gorm/data.classes b/Modules/Preferences/EditorFSC/Resources/EditorFSCPrefs.gorm/data.classes new file mode 100644 index 0000000..ca44951 --- /dev/null +++ b/Modules/Preferences/EditorFSC/Resources/EditorFSCPrefs.gorm/data.classes @@ -0,0 +1,24 @@ +{ + "## Comment" = "Do NOT change this file, Gorm maintains it"; + PCEditorFSCPrefs = { + Actions = ( + "setEditorPlainTextFont:", + "setEditorRichTextFont:", + "setEditorSize:", + "setEditorColor:" + ); + Outlets = ( + editorFSCView, + plainTextFontButton, + plainTextFontField, + richTextFontButton, + richTextFontField, + editorLinesField, + editorColumnsField, + foregroundColorWell, + backgroundColorWell, + selectionColorWell + ); + Super = NSObject; + }; +} \ No newline at end of file diff --git a/Modules/Preferences/EditorFSC/Resources/EditorFSCPrefs.gorm/data.info b/Modules/Preferences/EditorFSC/Resources/EditorFSCPrefs.gorm/data.info new file mode 100644 index 0000000..da98e43 Binary files /dev/null and b/Modules/Preferences/EditorFSC/Resources/EditorFSCPrefs.gorm/data.info differ diff --git a/Modules/Preferences/EditorFSC/Resources/EditorFSCPrefs.gorm/objects.gorm b/Modules/Preferences/EditorFSC/Resources/EditorFSCPrefs.gorm/objects.gorm new file mode 100644 index 0000000..51b5565 Binary files /dev/null and b/Modules/Preferences/EditorFSC/Resources/EditorFSCPrefs.gorm/objects.gorm differ diff --git a/Modules/Preferences/EditorFSC/Resources/Info.table b/Modules/Preferences/EditorFSC/Resources/Info.table new file mode 100644 index 0000000..37c170b --- /dev/null +++ b/Modules/Preferences/EditorFSC/Resources/Info.table @@ -0,0 +1,6 @@ +{ + Type = "Preferences"; + Name = "Editor: Fonts, Sizes & Colors"; + Description = "Common editor's preferences."; + PrincipalClassName = "PCEditorFSCPrefs"; +} diff --git a/Modules/Preferences/EditorFSC/obj/PCEditorFSCPrefs.m.d b/Modules/Preferences/EditorFSC/obj/PCEditorFSCPrefs.m.d new file mode 100644 index 0000000..6f2bed0 --- /dev/null +++ b/Modules/Preferences/EditorFSC/obj/PCEditorFSCPrefs.m.d @@ -0,0 +1,740 @@ +obj/PCEditorFSCPrefs.m.o: PCEditorFSCPrefs.m \ + ../../../Headers/ProjectCenter/PCDefines.h \ + /Developer/Headers/Foundation/Foundation.h \ + /Developer/Headers/GNUstepBase/GSVersionMacros.h \ + /Developer/Headers/Foundation/FoundationErrors.h \ + /Developer/Headers/Foundation/NSObject.h \ + /Developer/Headers/Foundation/NSObjCRuntime.h \ + /Developer/Headers/GNUstepBase/preface.h \ + /Developer/Headers/GNUstepBase/objc-gnu2next.h \ + /Developer/Headers/GNUstepBase/GSConfig.h \ + /Developer/Headers/GNUstepBase/GSObjCRuntime.h \ + /Developer/Headers/Foundation/NSZone.h \ + /Developer/Headers/GNUstepBase/GNUstep.h \ + /Developer/Headers/Foundation/NSDate.h \ + /Developer/Headers/Foundation/NSDebug.h \ + /Developer/Headers/Foundation/NSProcessInfo.h \ + /Developer/Headers/Foundation/NSAffineTransform.h \ + /Developer/Headers/Foundation/NSGeometry.h \ + /Developer/Headers/Foundation/NSString.h \ + /Developer/Headers/Foundation/NSRange.h \ + /Developer/Headers/Foundation/NSArchiver.h \ + /Developer/Headers/Foundation/NSCoder.h \ + /Developer/Headers/Foundation/NSArray.h \ + /Developer/Headers/Foundation/NSAttributedString.h \ + /Developer/Headers/Foundation/NSDictionary.h \ + /Developer/Headers/Foundation/NSAutoreleasePool.h \ + /Developer/Headers/Foundation/NSBundle.h \ + /Developer/Headers/Foundation/NSByteOrder.h \ + /Developer/Headers/Foundation/NSCalendarDate.h \ + /Developer/Headers/Foundation/NSCharacterSet.h \ + /Developer/Headers/Foundation/NSClassDescription.h \ + /Developer/Headers/Foundation/NSException.h \ + /Developer/Headers/Foundation/NSComparisonPredicate.h \ + /Developer/Headers/Foundation/NSExpression.h \ + /Developer/Headers/Foundation/NSPredicate.h \ + /Developer/Headers/Foundation/NSCompoundPredicate.h \ + /Developer/Headers/Foundation/NSConnection.h \ + /Developer/Headers/Foundation/NSTimer.h \ + /Developer/Headers/Foundation/NSRunLoop.h \ + /Developer/Headers/Foundation/NSMapTable.h \ + /Developer/Headers/Foundation/NSData.h \ + /Developer/Headers/Foundation/NSSerialization.h \ + /Developer/Headers/Foundation/NSDateFormatter.h \ + /Developer/Headers/Foundation/NSFormatter.h \ + /Developer/Headers/Foundation/NSDecimalNumber.h \ + /Developer/Headers/Foundation/NSDecimal.h \ + /Developer/Headers/Foundation/NSValue.h \ + /Developer/Headers/Foundation/NSDistantObject.h \ + /Developer/Headers/Foundation/NSProxy.h \ + /Developer/Headers/Foundation/NSDistributedLock.h \ + /Developer/Headers/Foundation/NSDistributedNotificationCenter.h \ + /Developer/Headers/Foundation/NSLock.h \ + /Developer/Headers/Foundation/NSNotification.h \ + /Developer/Headers/Foundation/NSEnumerator.h \ + /Developer/Headers/Foundation/NSError.h \ + /Developer/Headers/Foundation/NSFileHandle.h \ + /Developer/Headers/Foundation/NSFileManager.h \ + /Developer/Headers/Foundation/NSGarbageCollector.h \ + /Developer/Headers/Foundation/NSHashTable.h \ + /Developer/Headers/Foundation/NSHost.h \ + /Developer/Headers/Foundation/NSHTTPCookie.h \ + /Developer/Headers/Foundation/NSHTTPCookieStorage.h \ + /Developer/Headers/Foundation/NSIndexPath.h \ + /Developer/Headers/Foundation/NSIndexSet.h \ + /Developer/Headers/Foundation/NSInvocation.h \ + /Developer/Headers/Foundation/NSMethodSignature.h \ + /Developer/Headers/Foundation/NSKeyedArchiver.h \ + /Developer/Headers/Foundation/NSPropertyList.h \ + /Developer/Headers/Foundation/NSKeyValueCoding.h \ + /Developer/Headers/Foundation/NSNotificationQueue.h \ + /Developer/Headers/Foundation/NSNetServices.h \ + /Developer/Headers/Foundation/NSNull.h \ + /Developer/Headers/Foundation/NSNumberFormatter.h \ + /Developer/Headers/Foundation/NSPathUtilities.h \ + /Developer/Headers/Foundation/NSPointerArray.h \ + /Developer/Headers/Foundation/NSPointerFunctions.h \ + /Developer/Headers/Foundation/NSPortCoder.h \ + /Developer/Headers/Foundation/NSPortMessage.h \ + /Developer/Headers/Foundation/NSPort.h \ + /Developer/Headers/Foundation/NSPortNameServer.h \ + /Developer/Headers/Foundation/NSProtocolChecker.h \ + /Developer/Headers/Foundation/NSScanner.h \ + /Developer/Headers/Foundation/NSSet.h \ + /Developer/Headers/Foundation/NSSortDescriptor.h \ + /Developer/Headers/Foundation/NSSpellServer.h \ + /Developer/Headers/Foundation/NSStream.h \ + /Developer/Headers/Foundation/NSTask.h \ + /Developer/Headers/Foundation/NSThread.h \ + /Developer/Headers/Foundation/NSTimeZone.h \ + /Developer/Headers/Foundation/NSUndoManager.h \ + /Developer/Headers/Foundation/NSURLAuthenticationChallenge.h \ + /Developer/Headers/Foundation/NSURLCache.h \ + /Developer/Headers/Foundation/NSURLConnection.h \ + /Developer/Headers/Foundation/NSURLCredential.h \ + /Developer/Headers/Foundation/NSURLCredentialStorage.h \ + /Developer/Headers/Foundation/NSURLDownload.h \ + /Developer/Headers/Foundation/NSURLError.h \ + /Developer/Headers/Foundation/NSURL.h \ + /Developer/Headers/Foundation/NSURLHandle.h \ + /Developer/Headers/Foundation/NSURLProtectionSpace.h \ + /Developer/Headers/Foundation/NSURLProtocol.h \ + /Developer/Headers/Foundation/NSURLRequest.h \ + /Developer/Headers/Foundation/NSURLResponse.h \ + /Developer/Headers/Foundation/NSUserDefaults.h \ + /Developer/Headers/Foundation/NSValueTransformer.h \ + /Developer/Headers/Foundation/NSXMLParser.h \ + ../../../Headers/ProjectCenter/PCFileManager.h \ + /Developer/Headers/AppKit/AppKit.h \ + /Developer/Headers/GNUstepGUI/GSVersion.h \ + /Developer/Headers/AppKit/NSGraphics.h \ + /Developer/Headers/AppKit/NSGraphicsContext.h \ + /Developer/Headers/AppKit/AppKitDefines.h \ + /Developer/Headers/GNUstepGUI/GSMethodTable.h \ + /Developer/Headers/AppKit/NSFont.h /Developer/Headers/AppKit/NSColor.h \ + /Developer/Headers/AppKit/NSActionCell.h \ + /Developer/Headers/AppKit/NSCell.h \ + /Developer/Headers/AppKit/NSParagraphStyle.h \ + /Developer/Headers/AppKit/NSText.h /Developer/Headers/AppKit/NSView.h \ + /Developer/Headers/AppKit/NSResponder.h \ + /Developer/Headers/AppKit/NSInterfaceStyle.h \ + /Developer/Headers/AppKit/NSSpellProtocol.h \ + /Developer/Headers/AppKit/NSStringDrawing.h \ + /Developer/Headers/AppKit/NSAnimation.h \ + /Developer/Headers/GNUstepGUI/GSAnimator.h \ + /Developer/Headers/AppKit/NSApplication.h \ + /Developer/Headers/AppKit/NSAttributedString.h \ + /Developer/Headers/AppKit/NSFontManager.h \ + /Developer/Headers/AppKit/NSBitmapImageRep.h \ + /Developer/Headers/AppKit/NSImageRep.h \ + /Developer/Headers/AppKit/NSBox.h /Developer/Headers/AppKit/NSBrowser.h \ + /Developer/Headers/AppKit/NSControl.h \ + /Developer/Headers/AppKit/NSBrowserCell.h \ + /Developer/Headers/AppKit/NSButton.h \ + /Developer/Headers/AppKit/NSButtonCell.h \ + /Developer/Headers/AppKit/NSCachedImageRep.h \ + /Developer/Headers/AppKit/NSClipView.h \ + /Developer/Headers/AppKit/NSColorList.h \ + /Developer/Headers/AppKit/NSColorPanel.h \ + /Developer/Headers/AppKit/NSColorPicking.h \ + /Developer/Headers/AppKit/NSColorWell.h \ + /Developer/Headers/AppKit/NSMatrix.h \ + /Developer/Headers/AppKit/NSNibDeclarations.h \ + /Developer/Headers/AppKit/NSPanel.h \ + /Developer/Headers/AppKit/NSWindow.h \ + /Developer/Headers/AppKit/NSSlider.h \ + /Developer/Headers/AppKit/NSSliderCell.h \ + /Developer/Headers/AppKit/NSSplitView.h \ + /Developer/Headers/AppKit/NSColorPicker.h \ + /Developer/Headers/AppKit/NSCursor.h \ + /Developer/Headers/AppKit/NSCustomImageRep.h \ + /Developer/Headers/AppKit/NSDataLink.h \ + /Developer/Headers/AppKit/NSDataLinkManager.h \ + /Developer/Headers/AppKit/NSDataLinkPanel.h \ + /Developer/Headers/AppKit/NSDragging.h \ + /Developer/Headers/AppKit/NSEPSImageRep.h \ + /Developer/Headers/AppKit/NSEvent.h \ + /Developer/Headers/AppKit/NSFontPanel.h \ + /Developer/Headers/AppKit/NSForm.h \ + /Developer/Headers/AppKit/NSFormCell.h \ + /Developer/Headers/AppKit/NSHelpPanel.h \ + /Developer/Headers/AppKit/NSImage.h \ + /Developer/Headers/AppKit/NSImageCell.h \ + /Developer/Headers/AppKit/NSImageView.h \ + /Developer/Headers/AppKit/NSMenu.h \ + /Developer/Headers/AppKit/NSMenuItem.h \ + /Developer/Headers/AppKit/NSUserInterfaceValidation.h \ + /Developer/Headers/AppKit/NSMenuItemCell.h \ + /Developer/Headers/AppKit/NSMenuView.h \ + /Developer/Headers/AppKit/NSScreen.h \ + /Developer/Headers/AppKit/NSNibLoading.h \ + /Developer/Headers/AppKit/NSOpenPanel.h \ + /Developer/Headers/AppKit/NSSavePanel.h \ + /Developer/Headers/AppKit/NSPageLayout.h \ + /Developer/Headers/AppKit/NSPasteboard.h \ + /Developer/Headers/AppKit/NSPopUpButton.h \ + /Developer/Headers/AppKit/NSPopUpButtonCell.h \ + /Developer/Headers/AppKit/NSPrinter.h \ + /Developer/Headers/AppKit/NSPrintInfo.h \ + /Developer/Headers/AppKit/NSPrintOperation.h \ + /Developer/Headers/AppKit/NSPrintPanel.h \ + /Developer/Headers/AppKit/NSScroller.h \ + /Developer/Headers/AppKit/NSScrollView.h \ + /Developer/Headers/AppKit/NSSegmentedCell.h \ + /Developer/Headers/AppKit/NSSegmentedControl.h \ + /Developer/Headers/AppKit/NSSelection.h \ + /Developer/Headers/AppKit/NSSpellChecker.h \ + /Developer/Headers/AppKit/NSTextField.h \ + /Developer/Headers/AppKit/NSTextFieldCell.h \ + /Developer/Headers/AppKit/NSWorkspace.h \ + /Developer/Headers/AppKit/NSAlert.h \ + /Developer/Headers/AppKit/NSAffineTransform.h \ + /Developer/Headers/AppKit/NSArrayController.h \ + /Developer/Headers/AppKit/NSObjectController.h \ + /Developer/Headers/AppKit/NSController.h \ + /Developer/Headers/AppKit/NSBezierPath.h \ + /Developer/Headers/AppKit/NSComboBox.h \ + /Developer/Headers/AppKit/NSComboBoxCell.h \ + /Developer/Headers/AppKit/NSDocument.h \ + /Developer/Headers/AppKit/NSDocumentController.h \ + /Developer/Headers/AppKit/NSDrawer.h \ + /Developer/Headers/AppKit/NSFileWrapper.h \ + /Developer/Headers/AppKit/NSHelpManager.h \ + /Developer/Headers/AppKit/NSInputManager.h \ + /Developer/Headers/AppKit/NSInputServer.h \ + /Developer/Headers/AppKit/NSKeyValueBinding.h \ + /Developer/Headers/AppKit/NSLayoutManager.h \ + /Developer/Headers/GNUstepGUI/GSLayoutManager.h \ + /Developer/Headers/AppKit/NSGlyphGenerator.h \ + /Developer/Headers/AppKit/NSTextView.h \ + /Developer/Headers/AppKit/NSTextAttachment.h \ + /Developer/Headers/AppKit/NSLevelIndicator.h \ + /Developer/Headers/AppKit/NSLevelIndicatorCell.h \ + /Developer/Headers/AppKit/NSLevelIndicatorCell.h \ + /Developer/Headers/AppKit/NSMovie.h \ + /Developer/Headers/AppKit/NSMovieView.h \ + /Developer/Headers/AppKit/NSNib.h /Developer/Headers/AppKit/NSOpenGL.h \ + /Developer/Headers/AppKit/NSOpenGLView.h \ + /Developer/Headers/AppKit/NSOutlineView.h \ + /Developer/Headers/AppKit/NSTableView.h \ + /Developer/Headers/AppKit/NSProgressIndicator.h \ + /Developer/Headers/AppKit/NSRulerMarker.h \ + /Developer/Headers/AppKit/NSRulerView.h \ + /Developer/Headers/AppKit/NSSearchField.h \ + /Developer/Headers/AppKit/NSSearchFieldCell.h \ + /Developer/Headers/AppKit/NSSecureTextField.h \ + /Developer/Headers/AppKit/NSSound.h \ + /Developer/Headers/AppKit/NSStepper.h \ + /Developer/Headers/AppKit/NSStepperCell.h \ + /Developer/Headers/AppKit/NSTableColumn.h \ + /Developer/Headers/AppKit/NSTableHeaderCell.h \ + /Developer/Headers/AppKit/NSTableHeaderView.h \ + /Developer/Headers/AppKit/NSTabView.h \ + /Developer/Headers/AppKit/NSTabViewItem.h \ + /Developer/Headers/AppKit/NSTextContainer.h \ + /Developer/Headers/AppKit/NSTextList.h \ + /Developer/Headers/AppKit/NSTextStorage.h \ + /Developer/Headers/AppKit/NSTextTable.h \ + /Developer/Headers/AppKit/NSToolbar.h \ + /Developer/Headers/AppKit/NSToolbarItem.h \ + /Developer/Headers/AppKit/NSUserDefaultsController.h \ + /Developer/Headers/AppKit/NSWindowController.h \ + /Developer/Headers/AppKit/PSOperators.h \ + /Developer/Headers/AppKit/DPSOperators.h PCEditorFSCPrefs.h \ + ../../../Headers/Protocols/Preferences.h + +../../../Headers/ProjectCenter/PCDefines.h: + +/Developer/Headers/Foundation/Foundation.h: + +/Developer/Headers/GNUstepBase/GSVersionMacros.h: + +/Developer/Headers/Foundation/FoundationErrors.h: + +/Developer/Headers/Foundation/NSObject.h: + +/Developer/Headers/Foundation/NSObjCRuntime.h: + +/Developer/Headers/GNUstepBase/preface.h: + +/Developer/Headers/GNUstepBase/objc-gnu2next.h: + +/Developer/Headers/GNUstepBase/GSConfig.h: + +/Developer/Headers/GNUstepBase/GSObjCRuntime.h: + +/Developer/Headers/Foundation/NSZone.h: + +/Developer/Headers/GNUstepBase/GNUstep.h: + +/Developer/Headers/Foundation/NSDate.h: + +/Developer/Headers/Foundation/NSDebug.h: + +/Developer/Headers/Foundation/NSProcessInfo.h: + +/Developer/Headers/Foundation/NSAffineTransform.h: + +/Developer/Headers/Foundation/NSGeometry.h: + +/Developer/Headers/Foundation/NSString.h: + +/Developer/Headers/Foundation/NSRange.h: + +/Developer/Headers/Foundation/NSArchiver.h: + +/Developer/Headers/Foundation/NSCoder.h: + +/Developer/Headers/Foundation/NSArray.h: + +/Developer/Headers/Foundation/NSAttributedString.h: + +/Developer/Headers/Foundation/NSDictionary.h: + +/Developer/Headers/Foundation/NSAutoreleasePool.h: + +/Developer/Headers/Foundation/NSBundle.h: + +/Developer/Headers/Foundation/NSByteOrder.h: + +/Developer/Headers/Foundation/NSCalendarDate.h: + +/Developer/Headers/Foundation/NSCharacterSet.h: + +/Developer/Headers/Foundation/NSClassDescription.h: + +/Developer/Headers/Foundation/NSException.h: + +/Developer/Headers/Foundation/NSComparisonPredicate.h: + +/Developer/Headers/Foundation/NSExpression.h: + +/Developer/Headers/Foundation/NSPredicate.h: + +/Developer/Headers/Foundation/NSCompoundPredicate.h: + +/Developer/Headers/Foundation/NSConnection.h: + +/Developer/Headers/Foundation/NSTimer.h: + +/Developer/Headers/Foundation/NSRunLoop.h: + +/Developer/Headers/Foundation/NSMapTable.h: + +/Developer/Headers/Foundation/NSData.h: + +/Developer/Headers/Foundation/NSSerialization.h: + +/Developer/Headers/Foundation/NSDateFormatter.h: + +/Developer/Headers/Foundation/NSFormatter.h: + +/Developer/Headers/Foundation/NSDecimalNumber.h: + +/Developer/Headers/Foundation/NSDecimal.h: + +/Developer/Headers/Foundation/NSValue.h: + +/Developer/Headers/Foundation/NSDistantObject.h: + +/Developer/Headers/Foundation/NSProxy.h: + +/Developer/Headers/Foundation/NSDistributedLock.h: + +/Developer/Headers/Foundation/NSDistributedNotificationCenter.h: + +/Developer/Headers/Foundation/NSLock.h: + +/Developer/Headers/Foundation/NSNotification.h: + +/Developer/Headers/Foundation/NSEnumerator.h: + +/Developer/Headers/Foundation/NSError.h: + +/Developer/Headers/Foundation/NSFileHandle.h: + +/Developer/Headers/Foundation/NSFileManager.h: + +/Developer/Headers/Foundation/NSGarbageCollector.h: + +/Developer/Headers/Foundation/NSHashTable.h: + +/Developer/Headers/Foundation/NSHost.h: + +/Developer/Headers/Foundation/NSHTTPCookie.h: + +/Developer/Headers/Foundation/NSHTTPCookieStorage.h: + +/Developer/Headers/Foundation/NSIndexPath.h: + +/Developer/Headers/Foundation/NSIndexSet.h: + +/Developer/Headers/Foundation/NSInvocation.h: + +/Developer/Headers/Foundation/NSMethodSignature.h: + +/Developer/Headers/Foundation/NSKeyedArchiver.h: + +/Developer/Headers/Foundation/NSPropertyList.h: + +/Developer/Headers/Foundation/NSKeyValueCoding.h: + +/Developer/Headers/Foundation/NSNotificationQueue.h: + +/Developer/Headers/Foundation/NSNetServices.h: + +/Developer/Headers/Foundation/NSNull.h: + +/Developer/Headers/Foundation/NSNumberFormatter.h: + +/Developer/Headers/Foundation/NSPathUtilities.h: + +/Developer/Headers/Foundation/NSPointerArray.h: + +/Developer/Headers/Foundation/NSPointerFunctions.h: + +/Developer/Headers/Foundation/NSPortCoder.h: + +/Developer/Headers/Foundation/NSPortMessage.h: + +/Developer/Headers/Foundation/NSPort.h: + +/Developer/Headers/Foundation/NSPortNameServer.h: + +/Developer/Headers/Foundation/NSProtocolChecker.h: + +/Developer/Headers/Foundation/NSScanner.h: + +/Developer/Headers/Foundation/NSSet.h: + +/Developer/Headers/Foundation/NSSortDescriptor.h: + +/Developer/Headers/Foundation/NSSpellServer.h: + +/Developer/Headers/Foundation/NSStream.h: + +/Developer/Headers/Foundation/NSTask.h: + +/Developer/Headers/Foundation/NSThread.h: + +/Developer/Headers/Foundation/NSTimeZone.h: + +/Developer/Headers/Foundation/NSUndoManager.h: + +/Developer/Headers/Foundation/NSURLAuthenticationChallenge.h: + +/Developer/Headers/Foundation/NSURLCache.h: + +/Developer/Headers/Foundation/NSURLConnection.h: + +/Developer/Headers/Foundation/NSURLCredential.h: + +/Developer/Headers/Foundation/NSURLCredentialStorage.h: + +/Developer/Headers/Foundation/NSURLDownload.h: + +/Developer/Headers/Foundation/NSURLError.h: + +/Developer/Headers/Foundation/NSURL.h: + +/Developer/Headers/Foundation/NSURLHandle.h: + +/Developer/Headers/Foundation/NSURLProtectionSpace.h: + +/Developer/Headers/Foundation/NSURLProtocol.h: + +/Developer/Headers/Foundation/NSURLRequest.h: + +/Developer/Headers/Foundation/NSURLResponse.h: + +/Developer/Headers/Foundation/NSUserDefaults.h: + +/Developer/Headers/Foundation/NSValueTransformer.h: + +/Developer/Headers/Foundation/NSXMLParser.h: + +../../../Headers/ProjectCenter/PCFileManager.h: + +/Developer/Headers/AppKit/AppKit.h: + +/Developer/Headers/GNUstepGUI/GSVersion.h: + +/Developer/Headers/AppKit/NSGraphics.h: + +/Developer/Headers/AppKit/NSGraphicsContext.h: + +/Developer/Headers/AppKit/AppKitDefines.h: + +/Developer/Headers/GNUstepGUI/GSMethodTable.h: + +/Developer/Headers/AppKit/NSFont.h: + +/Developer/Headers/AppKit/NSColor.h: + +/Developer/Headers/AppKit/NSActionCell.h: + +/Developer/Headers/AppKit/NSCell.h: + +/Developer/Headers/AppKit/NSParagraphStyle.h: + +/Developer/Headers/AppKit/NSText.h: + +/Developer/Headers/AppKit/NSView.h: + +/Developer/Headers/AppKit/NSResponder.h: + +/Developer/Headers/AppKit/NSInterfaceStyle.h: + +/Developer/Headers/AppKit/NSSpellProtocol.h: + +/Developer/Headers/AppKit/NSStringDrawing.h: + +/Developer/Headers/AppKit/NSAnimation.h: + +/Developer/Headers/GNUstepGUI/GSAnimator.h: + +/Developer/Headers/AppKit/NSApplication.h: + +/Developer/Headers/AppKit/NSAttributedString.h: + +/Developer/Headers/AppKit/NSFontManager.h: + +/Developer/Headers/AppKit/NSBitmapImageRep.h: + +/Developer/Headers/AppKit/NSImageRep.h: + +/Developer/Headers/AppKit/NSBox.h: + +/Developer/Headers/AppKit/NSBrowser.h: + +/Developer/Headers/AppKit/NSControl.h: + +/Developer/Headers/AppKit/NSBrowserCell.h: + +/Developer/Headers/AppKit/NSButton.h: + +/Developer/Headers/AppKit/NSButtonCell.h: + +/Developer/Headers/AppKit/NSCachedImageRep.h: + +/Developer/Headers/AppKit/NSClipView.h: + +/Developer/Headers/AppKit/NSColorList.h: + +/Developer/Headers/AppKit/NSColorPanel.h: + +/Developer/Headers/AppKit/NSColorPicking.h: + +/Developer/Headers/AppKit/NSColorWell.h: + +/Developer/Headers/AppKit/NSMatrix.h: + +/Developer/Headers/AppKit/NSNibDeclarations.h: + +/Developer/Headers/AppKit/NSPanel.h: + +/Developer/Headers/AppKit/NSWindow.h: + +/Developer/Headers/AppKit/NSSlider.h: + +/Developer/Headers/AppKit/NSSliderCell.h: + +/Developer/Headers/AppKit/NSSplitView.h: + +/Developer/Headers/AppKit/NSColorPicker.h: + +/Developer/Headers/AppKit/NSCursor.h: + +/Developer/Headers/AppKit/NSCustomImageRep.h: + +/Developer/Headers/AppKit/NSDataLink.h: + +/Developer/Headers/AppKit/NSDataLinkManager.h: + +/Developer/Headers/AppKit/NSDataLinkPanel.h: + +/Developer/Headers/AppKit/NSDragging.h: + +/Developer/Headers/AppKit/NSEPSImageRep.h: + +/Developer/Headers/AppKit/NSEvent.h: + +/Developer/Headers/AppKit/NSFontPanel.h: + +/Developer/Headers/AppKit/NSForm.h: + +/Developer/Headers/AppKit/NSFormCell.h: + +/Developer/Headers/AppKit/NSHelpPanel.h: + +/Developer/Headers/AppKit/NSImage.h: + +/Developer/Headers/AppKit/NSImageCell.h: + +/Developer/Headers/AppKit/NSImageView.h: + +/Developer/Headers/AppKit/NSMenu.h: + +/Developer/Headers/AppKit/NSMenuItem.h: + +/Developer/Headers/AppKit/NSUserInterfaceValidation.h: + +/Developer/Headers/AppKit/NSMenuItemCell.h: + +/Developer/Headers/AppKit/NSMenuView.h: + +/Developer/Headers/AppKit/NSScreen.h: + +/Developer/Headers/AppKit/NSNibLoading.h: + +/Developer/Headers/AppKit/NSOpenPanel.h: + +/Developer/Headers/AppKit/NSSavePanel.h: + +/Developer/Headers/AppKit/NSPageLayout.h: + +/Developer/Headers/AppKit/NSPasteboard.h: + +/Developer/Headers/AppKit/NSPopUpButton.h: + +/Developer/Headers/AppKit/NSPopUpButtonCell.h: + +/Developer/Headers/AppKit/NSPrinter.h: + +/Developer/Headers/AppKit/NSPrintInfo.h: + +/Developer/Headers/AppKit/NSPrintOperation.h: + +/Developer/Headers/AppKit/NSPrintPanel.h: + +/Developer/Headers/AppKit/NSScroller.h: + +/Developer/Headers/AppKit/NSScrollView.h: + +/Developer/Headers/AppKit/NSSegmentedCell.h: + +/Developer/Headers/AppKit/NSSegmentedControl.h: + +/Developer/Headers/AppKit/NSSelection.h: + +/Developer/Headers/AppKit/NSSpellChecker.h: + +/Developer/Headers/AppKit/NSTextField.h: + +/Developer/Headers/AppKit/NSTextFieldCell.h: + +/Developer/Headers/AppKit/NSWorkspace.h: + +/Developer/Headers/AppKit/NSAlert.h: + +/Developer/Headers/AppKit/NSAffineTransform.h: + +/Developer/Headers/AppKit/NSArrayController.h: + +/Developer/Headers/AppKit/NSObjectController.h: + +/Developer/Headers/AppKit/NSController.h: + +/Developer/Headers/AppKit/NSBezierPath.h: + +/Developer/Headers/AppKit/NSComboBox.h: + +/Developer/Headers/AppKit/NSComboBoxCell.h: + +/Developer/Headers/AppKit/NSDocument.h: + +/Developer/Headers/AppKit/NSDocumentController.h: + +/Developer/Headers/AppKit/NSDrawer.h: + +/Developer/Headers/AppKit/NSFileWrapper.h: + +/Developer/Headers/AppKit/NSHelpManager.h: + +/Developer/Headers/AppKit/NSInputManager.h: + +/Developer/Headers/AppKit/NSInputServer.h: + +/Developer/Headers/AppKit/NSKeyValueBinding.h: + +/Developer/Headers/AppKit/NSLayoutManager.h: + +/Developer/Headers/GNUstepGUI/GSLayoutManager.h: + +/Developer/Headers/AppKit/NSGlyphGenerator.h: + +/Developer/Headers/AppKit/NSTextView.h: + +/Developer/Headers/AppKit/NSTextAttachment.h: + +/Developer/Headers/AppKit/NSLevelIndicator.h: + +/Developer/Headers/AppKit/NSLevelIndicatorCell.h: + +/Developer/Headers/AppKit/NSLevelIndicatorCell.h: + +/Developer/Headers/AppKit/NSMovie.h: + +/Developer/Headers/AppKit/NSMovieView.h: + +/Developer/Headers/AppKit/NSNib.h: + +/Developer/Headers/AppKit/NSOpenGL.h: + +/Developer/Headers/AppKit/NSOpenGLView.h: + +/Developer/Headers/AppKit/NSOutlineView.h: + +/Developer/Headers/AppKit/NSTableView.h: + +/Developer/Headers/AppKit/NSProgressIndicator.h: + +/Developer/Headers/AppKit/NSRulerMarker.h: + +/Developer/Headers/AppKit/NSRulerView.h: + +/Developer/Headers/AppKit/NSSearchField.h: + +/Developer/Headers/AppKit/NSSearchFieldCell.h: + +/Developer/Headers/AppKit/NSSecureTextField.h: + +/Developer/Headers/AppKit/NSSound.h: + +/Developer/Headers/AppKit/NSStepper.h: + +/Developer/Headers/AppKit/NSStepperCell.h: + +/Developer/Headers/AppKit/NSTableColumn.h: + +/Developer/Headers/AppKit/NSTableHeaderCell.h: + +/Developer/Headers/AppKit/NSTableHeaderView.h: + +/Developer/Headers/AppKit/NSTabView.h: + +/Developer/Headers/AppKit/NSTabViewItem.h: + +/Developer/Headers/AppKit/NSTextContainer.h: + +/Developer/Headers/AppKit/NSTextList.h: + +/Developer/Headers/AppKit/NSTextStorage.h: + +/Developer/Headers/AppKit/NSTextTable.h: + +/Developer/Headers/AppKit/NSToolbar.h: + +/Developer/Headers/AppKit/NSToolbarItem.h: + +/Developer/Headers/AppKit/NSUserDefaultsController.h: + +/Developer/Headers/AppKit/NSWindowController.h: + +/Developer/Headers/AppKit/PSOperators.h: + +/Developer/Headers/AppKit/DPSOperators.h: + +PCEditorFSCPrefs.h: + +../../../Headers/Protocols/Preferences.h: diff --git a/Modules/Preferences/Interface/GNUmakefile b/Modules/Preferences/Interface/GNUmakefile deleted file mode 100644 index b0a4401..0000000 --- a/Modules/Preferences/Interface/GNUmakefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# GNUmakefile - Interface preferences -# -PACKAGE_NAME = Interface -include $(GNUSTEP_MAKEFILES)/common.make - -# -# Bundle -# -BUNDLE_NAME = Interface -BUNDLE_EXTENSION = .preferences -Interface_PRINCIPAL_CLASS = PCInterfacePrefs - - -# -# Additional libraries -# -Interface_LIBRARIES_DEPEND_UPON += - -# -# Resource files -# -Interface_RESOURCE_FILES= \ - Resources/InterfacePrefs.gorm \ - Resources/Info.table - -# -# Header files -# -Interface_HEADERS= \ - PCInterfacePrefs.h - -# -# Class files -# -Interface_OBJC_FILES= \ - PCInterfacePrefs.m - -include ../../GNUmakefile.bundles -include $(GNUSTEP_MAKEFILES)/bundle.make - diff --git a/Modules/Preferences/Interface/PCInterfacePrefs.m b/Modules/Preferences/Interface/PCInterfacePrefs.m deleted file mode 100644 index 64661fa..0000000 --- a/Modules/Preferences/Interface/PCInterfacePrefs.m +++ /dev/null @@ -1,213 +0,0 @@ -// -// GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html -// -// Copyright (C) 2001-2009 Free Software Foundation -// -// Authors: Sergii Stoian -// -// Description: -// -// This file is part of GNUstep. -// -// This application is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This application is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. - -#import -#import - -#import "PCInterfacePrefs.h" - -@implementation PCInterfacePrefs - -// ---------------------------------------------------------------------------- -// --- Init and free -// ---------------------------------------------------------------------------- - -- (id)initWithPrefController:(id )aPrefs -{ - self = [super init]; - - if ([NSBundle loadNibNamed:@"InterfacePrefs" owner:self] == NO) - { - NSLog(@"PCInterfacePrefs: error loading NIB file!"); - } - - prefs = aPrefs; - - RETAIN(interfaceView); - - return self; -} - -- (void)dealloc -{ -#ifdef DEBUG - NSLog (@"PCInterfacePrefs: dealloc"); -#endif - - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - RELEASE(interfaceView); - - [super dealloc]; -} - -- (void)awakeFromNib -{ - [separateBuilder setRefusesFirstResponder:YES]; - [separateLauncher setRefusesFirstResponder:YES]; - [separateEditor setRefusesFirstResponder:YES]; - [separateLoadedFiles setRefusesFirstResponder:YES]; -} - -- (void)setEditorSizeEnabled:(BOOL)yn -{ - if (yn) - { - [editorLinesField setEnabled:YES]; - [editorLinesField setTextColor:[NSColor blackColor]]; - [editorLinesField setEditable:YES]; - [editorColumnsField setEnabled:YES]; - [editorColumnsField setTextColor:[NSColor blackColor]]; - [editorColumnsField setEditable:YES]; - } - else - { - [editorLinesField setEnabled:NO]; - [editorLinesField setTextColor:[NSColor darkGrayColor]]; - [editorLinesField setEditable:NO]; - [editorColumnsField setEnabled:NO]; - [editorColumnsField setTextColor:[NSColor darkGrayColor]]; - [editorColumnsField setEditable:NO]; - } -} - -// Protocol -- (void)setDefaults -{ - [prefs setObject:@"YES" forKey:SeparateBuilder notify:NO]; - [prefs setObject:@"YES" forKey:SeparateLauncher notify:NO]; - [prefs setObject:@"NO" forKey:SeparateEditor notify:NO]; - [prefs setObject:@"YES" forKey:SeparateLoadedFiles notify:NO]; - - [prefs setObject:@"30" forKey:EditorLines notify:NO]; - [prefs setObject:@"80" forKey:EditorColumns notify:NO]; -} - -- (void)readPreferences -{ - NSString *val; - int state; - - val = [prefs objectForKey:SeparateBuilder]; - state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState; - [separateBuilder setState:state]; - - val = [prefs objectForKey:SeparateLauncher]; - state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState; - [separateLauncher setState:state]; - - val = [prefs objectForKey:SeparateEditor]; - state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState; - [separateEditor setState:state]; - - val = [prefs objectForKey:SeparateLoadedFiles]; - state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState; - [separateLoadedFiles setState:state]; - - if (!(val = [prefs objectForKey:EditorLines])) - val = @"30"; - [editorLinesField setStringValue:val]; - if (!(val = [prefs objectForKey:EditorColumns])) - val = @"80"; - [editorColumnsField setStringValue:val]; -/* if ([separateEditor state] == NSOffState - || ![[editorField stringValue] isEqualToString:@"ProjectCenter"]) - { - [self setEditorSizeEnabled:NO]; - }*/ -} - -- (NSView *)view -{ - return interfaceView; -} - -// Actions -- (void)setDisplayPanels:(id)sender -{ - NSString *key; - NSString *state; - - NSLog(@"PCInterfacePrefs: setDisplayPanels"); - - if (sender == separateBuilder) - { - NSLog(@"PCInterfacePrefs: separateBuilder"); - key = [NSString stringWithString:SeparateBuilder]; - } - else if (sender == separateLauncher) - { - NSLog(@"PCInterfacePrefs: separateLauncher"); - key = [NSString stringWithString:SeparateLauncher]; - } - else if (sender == separateEditor) - { - NSLog(@"PCInterfacePrefs: separateEditor"); - key = [NSString stringWithString:SeparateEditor]; - } - else if (sender == separateLoadedFiles) - { - NSLog(@"PCInterfacePrefs: separateLoadedFiles"); - key = [NSString stringWithString:SeparateLoadedFiles]; - } - - if (sender == separateEditor) - { - if ([sender state] == NSOffState) - { - [self setEditorSizeEnabled:NO]; - } - else - { - [self setEditorSizeEnabled:YES]; - } - [sender becomeFirstResponder]; - } - - state = ([sender state] == NSOffState) ? @"NO" : @"YES"; - [prefs setObject:state forKey:key notify:YES]; -} - -- (void)setEditorSize:(id)sender -{ - NSString *val = nil; - NSString *key = nil; - - if (sender == editorLinesField) - { - key = EditorLines; - val = [editorLinesField stringValue]; - } - else if (sender == editorColumnsField) - { - key = EditorColumns; - val = [editorColumnsField stringValue]; - } - - [prefs setObject:val forKey:key notify:YES]; -} - -@end - diff --git a/Modules/Preferences/Interface/Resources/Info.table b/Modules/Preferences/Interface/Resources/Info.table deleted file mode 100644 index 49f5a90..0000000 --- a/Modules/Preferences/Interface/Resources/Info.table +++ /dev/null @@ -1,6 +0,0 @@ -{ - Type = "Preferences"; - Name = "Interface"; - Description = "ProjectCenter interface options."; - PrincipalClassName = "PCInterfacePrefs"; -} diff --git a/Modules/Preferences/Interface/Resources/InterfacePrefs.gorm/data.classes b/Modules/Preferences/Interface/Resources/InterfacePrefs.gorm/data.classes deleted file mode 100644 index 7cf8455..0000000 --- a/Modules/Preferences/Interface/Resources/InterfacePrefs.gorm/data.classes +++ /dev/null @@ -1,37 +0,0 @@ -{ - "## Comment" = "Do NOT change this file, Gorm maintains it"; - FirstResponder = { - Actions = ( - "setDisplayLog:", - "setDebugger:", - "setDeleteCache:", - "setDisplayPanels:", - "setEditor:", - "setEditorSize:", - "setFullPathInFilePanels:", - "setPromptWhenQuit:", - "setRememberWindows:" - ); - Super = NSObject; - }; - PCInterfacePrefs = { - Actions = ( - "setDisplayLog:", - "setDisplayPanels:", - "setEditorSize:", - "setRememberWindows:" - ); - Outlets = ( - editorColumnsField, - editorLinesField, - interfaceView, - displayLog, - rememberWindows, - separateBuilder, - separateEditor, - separateLauncher, - separateLoadedFiles - ); - Super = NSObject; - }; -} \ No newline at end of file diff --git a/Modules/Preferences/Interface/Resources/InterfacePrefs.gorm/objects.gorm b/Modules/Preferences/Interface/Resources/InterfacePrefs.gorm/objects.gorm deleted file mode 100644 index f703603..0000000 Binary files a/Modules/Preferences/Interface/Resources/InterfacePrefs.gorm/objects.gorm and /dev/null differ