Commit 2cdb4f3f authored by Eric Heintzmann's avatar Eric Heintzmann

Import Upstream version 1.0.6

parent 65b49324
1 ANNOUNCE
**********
This is version 1.0.4 of Gorm.
This is version 1.0.6 of Gorm.
1.1 What is Gorm?
=================
......@@ -12,20 +12,22 @@ GNUstep Object Relationship Modeler).
Gorm is a clone of the NeXTstep `Interface Builder' application for
GNUstep.
1.2 Noteworthy changes in version `1.0.4'
1.2 Noteworthy changes in version `1.0.6'
=========================================
This is a bugfix release.
* Corrected some bug#15236 with window style mask settings.
* Entirely new icon set, for palettes, gorm, gmodel, nib and the
application.
* Corrected bug#15236, which caused window fields in the inspector
not to update when the field was being edited and a new window is
selected.
* Replaced some of the images for the inspectors.
* Corrected bug #15178.
* Corrected the following bugs since the last release: #16049,
#16050, #15988, #16049, #15989, #15987, #15817, #15780, #15642,
#15556.
* Corrected problem with standalone views
* Changed formatting in some of the inspectors so that they are
easier to navigate.
1.3 How can I get support for this software?
============================================
......
2006-04-08 15:16 Gregory John Casamento <greg_casamento@yahoo.com>
* Version 1.0.6
2006-04-08 15:15 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormFilePrefsManager.m
2006-04-08 14:40 Gregory John Casamento <greg_casamento@yahoo.com>
* ANNOUNCE
* Documentation/news.texi
* NEWS
* Version: Changed for release 1.0.6.
2006-04-06 07:29 Gregory John Casamento <greg_casamento@yahoo.com>
* GormInfo.plist: Update date in info file.
2006-03-25 10:32 Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/4Data/GormNSNumberFormatterInspector.gorm: Change labels
in inspector to clarify.
2006-03-24 17:34 Gregory John Casamento <greg_casamento@yahoo.com>
* Images/GormTesting.tiff: New testing icon
* Palettes/2Controls/GormNSButtonInspector.gorm:
* Palettes/2Controls/GormNSTextFieldInspector.gorm:
* Palettes/4Data/GormNSImageViewInspector.gorm: Usability changes.
Some inspectors had some "dead" space.
2006-03-21 20:03 Gregory John Casamento <greg_casamento@yahoo.com>
* Images/Gorm.tiff: Slight change so that .xpm renders a little more
nicely when docking.
2006-03-21 19:54 Gregory John Casamento <greg_casamento@yahoo.com>
* GNUmakefile
* GormInfo.plist
* Images/Gorm.tiff: Improved icon.
2006-03-20 22:41 Gregory John Casamento <greg_casamento@yahoo.com>
* GNUmakefile: Added entries for new icons
* GormInfo.plist: Added entries for new icons
* Images/FileIcon_gmodel.tiff: Changed icon
* Images/GormFile.tiff: New icon
* Images/GormPalette.tiff: New icon
* Images/GormTesting.tiff: Changed icon
* Images/Gorm.tiff: Changed icon
2006-03-19 23:38 Gregory John Casamento <greg_casamento@yahoo.com>
* GormInfo.plist: Added 2006
* Images/centeralign_nib.tiff
* Images/leftalign_nib.tiff
* Images/rightalign_nib.tiff: Recreated images.
2006-03-19 22:42 Gregory John Casamento <greg_casamento@yahoo.com>
* GormInfo.plist: Update date.
2006-03-19 21:43 Gregory John Casamento <greg_casamento@yahoo.com>
* Images/GormEHCoil.tiff
* Images/GormEHLine.tiff
* Images/GormEVCoil.tiff
* Images/GormEVLine.tiff
* Images/GormMHCoil.tiff
* Images/GormMHLine.tiff
* Images/GormMVCoil.tiff
* Images/GormMVLine.tiff: Improved images.
2006-03-18 20:12 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormDocument.m: Generalize rule for adding documentView
objects from a scrollview.
* GormCore/GormInspectorsManager.m: Correct logic which selects the
object to send to the inspector.
* GormCore/GormScrollViewEditor.m: Cleanup code a little bit.
2006-03-16 06:33 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormViewWithContentViewEditor.m: Correction related to
bug#16049. There was an issue with moving a table column while the
table was selected.
2006-03-11 20:40 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormViewWithContentViewEditor.m: Minor formatting changes.
* Palettes/4Data/DataPalette.m: Correction for bug#15988, patch by
Matt Rice.
2006-03-11 16:57 Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/3Containers/GormTableViewEditor.m: Correction for
bug#16050.
2006-03-10 01:24 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormViewEditor.m: Correction for bug#16049
2006-03-09 05:18 Gregory John Casamento <greg_casamento@yahoo.com>
* Images/GormEHCoil.tiff
* Images/GormEHLine.tiff
* Images/GormEVCoil.tiff
* Images/GormEVLine.tiff
* Images/GormMHCoil.tiff
* Images/GormMHLine.tiff
* Images/GormMVCoil.tiff
* Images/GormMVLine.tiff: Remade coil/lines to look cleaner.
2006-03-05 20:10 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormPalettesManager.m: Correction for bug#15989
2006-03-04 19:44 Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/3Containers/GormTableViewEditor.m: Correction for
bug#15987.
2006-02-22 22:52 Gregory John Casamento <greg_casamento@yahoo.com>
* Gorm.m: Overide arrangeInFront: so that when testing the interface
it doesn't inadvertantly bring the edited window forward.
2006-02-20 08:54 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormScrollViewEditor.m: Correction for bug#15817.
Returning only GormScrollViewEditor was causing an issue with
editing tables.
2006-02-19 12:07 Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/2Controls/GormTextFieldAttributesInspector.m: Correction
for bug#15780.
2006-02-09 23:36 Gregory John Casamento <greg_casamento@yahoo.com>
* GormInfo.plist: Change "RELEASE" to SVN to indicate that 1.0.5 is
an unstable version.
2006-02-06 21:06 Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/3Containers/GormNSTableViewInspector.gorm
* Palettes/3Containers/GormTableViewAttributesInspector.m:
Correction for bug#15642.
2006-02-03 21:56 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormScrollViewAttributesInspector.m
* GormCore/GormScrollViewEditor.m: Corrected problem with adding
something to a scrollview.
2006-02-01 23:24 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormFilePrefsManager.m
* GormInfo.plist
* Version: Updated with new version information.
2006-02-01 22:08 Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/4Data/GormDateFormatterAttributesInspector.m: Correction
for bug#15556
2006-01-25 05:21 Gregory John Casamento <greg_casamento@yahoo.com>
* Version 1.0.4
......
......@@ -3,6 +3,20 @@
@ifset TEXT-ONLY
@include version.texi
@end ifset
@section Noteworthy changes in version @samp{1.0.6}
This is a bugfix release.
@itemize @bullet
@item Entirely new icon set, for palettes, gorm, gmodel, nib and the application.
@item Replaced some of the images for the inspectors.
@item Corrected the following bugs since the last release: #16049, #16050, #15988, #16049, #15989, #15987, #15817, #15780, #15642, #15556.
@item Changed formatting in some of the inspectors so that they are easier to navigate.
@end itemize
@ifclear ANNOUNCE-ONLY
@c ====================================================================
@c Keep the next line just below the list of changes in most recent version.
@section Noteworthy changes in version @samp{1.0.4}
......@@ -15,11 +29,7 @@ This is a bugfix release.
@item Corrected problem with standalone views
@end itemize
@ifclear ANNOUNCE-ONLY
@c ====================================================================
@c Keep the next line just below the list of changes in most recent version.
@section Noteworthy changes in version @samp{1.0.0}
@section Noteworthy changes in version @samp{1.0.2}
This is a bugfix release.
......
......@@ -80,6 +80,9 @@ Gorm_RESOURCE_FILES = \
Images/GormMVCoil.tiff \
Images/GormMVLine.tiff \
Images/Gorm.tiff \
Images/GormFile.tiff \
Images/GormNib.tiff \
Images/GormPalette.tiff \
Images/leftalign_nib.tiff \
Images/rightalign_nib.tiff \
Images/centeralign_nib.tiff \
......
......@@ -543,6 +543,14 @@
[(GormDocument *)[self activeDocument] openImage: sender];
}
- (void) arrangeInFront: (id)sender
{
if([self isTestingInterface] == NO)
{
[super arrangeInFront: sender];
}
}
- (void) testInterface: (id)sender
{
if (isTesting == YES)
......@@ -677,11 +685,20 @@
// so we don't get the warning...
[self setServicesMenu: nil];
[[self mainMenu] display];
[[NSApp mainWindow] makeKeyAndOrderFront: self];
en = [[self windows] objectEnumerator];
while((obj = [en nextObject]) != nil)
{
if([obj isVisible])
{
[obj makeKeyAndOrderFront: self];
}
}
// [[NSApp mainWindow] makeKeyAndOrderFront: self];
// we're now in testing mode.
[notifCenter postNotificationName: IBDidBeginTestingInterfaceNotification
object: self];
object: self];
[NSApp unhide: self];
}
......
......@@ -673,7 +673,7 @@ static NSImage *fileImage = nil;
toParent: tv];
}
}
else if ([[anObject documentView] isKindOfClass: [NSTextView class]] == YES)
else // if ([[anObject documentView] isKindOfClass: [NSTextView class]] == YES)
{
[self attachObject: [anObject documentView] toParent: anObject];
}
......
......@@ -83,7 +83,7 @@ NSString *formatVersion(int version)
+ (int) currentVersion
{
return appVersion(1,0,4);
return appVersion(1,0,6);
}
- (void) awakeFromNib
......
......@@ -296,12 +296,12 @@
if ([obj isKindOfClass: [NSScrollView class]] &&
[(NSScrollView *)obj documentView])
{
// && [[(NSScrollView *)obj documentView] conformsToProtocol: @protocol(IBEditors)] == NO)
id docView = [(NSScrollView *)obj documentView];
obj = [(NSScrollView *)obj documentView];
// FIXME: Find a more generalized way to do this.
if ([obj isKindOfClass: [NSTableView class]])
// FIXME: Really need to find a more generalized way to do this.
if ([docView isKindOfClass: [NSTableView class]])
{
obj = docView;
if ([obj selectedColumn] != -1)
{
obj = [[obj tableColumns] objectAtIndex:
......
......@@ -370,6 +370,21 @@ static NSImage *dragImage = nil;
return self;
}
- (BOOL) bundlePathIsLoaded: (NSString *)path
{
int col = 0;
NSBundle *bundle;
for (col = 0; col < [bundles count]; col++)
{
bundle = [bundles objectAtIndex: col];
if ([path isEqualToString: [bundle bundlePath]] == YES)
{
return YES;
}
}
return NO;
}
- (BOOL) loadPalette: (NSString*)path
{
NSBundle *bundle;
......@@ -385,15 +400,11 @@ static NSImage *dragImage = nil;
NSImageCell *cell;
int col;
for (col = 0; col < [bundles count]; col++)
if([self bundlePathIsLoaded: path])
{
bundle = [bundles objectAtIndex: col];
if ([path isEqualToString: [bundle bundlePath]] == YES)
{
NSRunAlertPanel (nil, _(@"Palette has already been loaded"),
_(@"OK"), nil, nil);
return NO;
}
NSRunAlertPanel (nil, _(@"Palette has already been loaded"),
_(@"OK"), nil, nil);
return NO;
}
bundle = [NSBundle bundleWithPath: path];
if (bundle == nil)
......@@ -552,11 +563,25 @@ static NSImage *dragImage = nil;
{
NSString *aFile = [filesToOpen objectAtIndex: i];
[newUserPalettes addObject: aFile];
if([self loadPalette: aFile] == NO)
if([self bundlePathIsLoaded: aFile] == YES &&
[userPalettes containsObject: aFile] == NO)
{
// This is done here so that, if we try to reload a palette
// that has previously been deleted during this session that
// the palette manager won't fail, but it will simply add
// the palette back in. If this returns NO, then we should
// flag a problem otherwise it's successful if the palette is
// already in the bundles array. This is to address bug#15989.
[newUserPalettes addObject: aFile];
}
else if([self loadPalette: aFile] == NO)
{
return nil;
}
else
{
[newUserPalettes addObject: aFile];
}
}
// reset the defaults to include the new palette.
......
......@@ -28,26 +28,6 @@
#include <AppKit/AppKit.h>
#include "GormScrollViewAttributesInspector.h"
#include <InterfaceBuilder/IBObjectAdditions.h>
@implementation NSScrollView (IBObjectAdditions)
- (NSString *) inspectorClassName
{
return @"GormScrollViewAttributesInspector";
}
- (NSString*) editorClassName
{
if ([self documentView])
{
return [[self documentView] editorClassName];
}
else
{
return @"GormScrollViewEditor";
}
}
@end
@implementation GormScrollViewAttributesInspector
- init
......
......@@ -3,6 +3,7 @@
* Copyright (C) 2002 Free Software Foundation, Inc.
*
* Author: Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* Author: Gregory John Casamento <greg_casamento@yahoo.com>
* Date: 2002
*
* This file is part of GNUstep.
......@@ -23,11 +24,28 @@
*/
#include <AppKit/AppKit.h>
#include <InterfaceBuilder/IBObjectAdditions.h>
#include "GormPrivate.h"
#include "GormBoxEditor.h"
#include "GormViewKnobs.h"
@implementation NSScrollView (IBObjectAdditions)
- (NSString *) inspectorClassName
{
return @"GormScrollViewAttributesInspector";
}
- (NSString*) editorClassName
{
if ([[self documentView] isKindOfClass: [NSTableView class]])
{
return [[self documentView] editorClassName];
}
return @"GormScrollViewEditor";
}
@end
#define _EO ((NSScrollView *)_editedObject)
@interface GormScrollViewEditor : GormViewWithSubviewsEditor
......@@ -135,16 +153,14 @@
if ((self = [super initWithObject: anObject
inDocument: aDocument]) == nil)
return nil;
selection = [[NSMutableArray alloc] initWithCapacity: 5];
{
return nil;
}
selection = [[NSMutableArray alloc] initWithCapacity: 5];
[self registerForDraggedTypes: [NSArray arrayWithObjects:
IBViewPboardType, GormLinkPboardType, IBFormatterPboardType, nil]];
return self;
}
......@@ -153,13 +169,14 @@
id documentView = [_EO documentView];
NSArray *subviews = [documentView subviews];
NSMutableArray *newSelection = [NSMutableArray array];
id thisView = nil;
if([documentView conformsToProtocol: @protocol(IBEditors)] == YES)
{
id internalView = [subviews objectAtIndex: 0];
NSEnumerator *enumerator = [[internalView subviews] objectEnumerator];
GormViewEditor *subview;
[parent makeSubeditorResign];
while ((subview = [enumerator nextObject]) != nil)
{
......@@ -182,16 +199,13 @@
frame = [parent convertRect: frame fromView: _EO];
[documentView setFrame: frame];
[newSelection addObject: documentView];
[_EO setDocumentView: nil]; // remove any reference to the box.
// RELEASE(_EO);
[_EO setDocumentView: nil];
}
{
id thisView = [self editedObject];
[self close];
[thisView removeFromSuperview];
[document detachObject: thisView];
}
thisView = [self editedObject];
[self close];
[thisView removeFromSuperview];
[document detachObject: thisView];
return newSelection;
}
......
......@@ -1178,24 +1178,22 @@ static BOOL currently_displaying = NO;
NSString *name = [document nameForObject: anObject];
NSPoint dragPoint = [theEvent locationInWindow];
pb = [NSPasteboard pasteboardWithName: NSDragPboard];
[pb declareTypes: [NSArray arrayWithObject: GormLinkPboardType]
owner: self];
[pb setString: name forType: GormLinkPboardType];
[NSApp displayConnectionBetween: anObject and: nil];
// isLinkSource = YES;
[self dragImage: [NSApp linkImage]
at: dragPoint
offset: NSZeroSize
event: theEvent
pasteboard: pb
source: self
slideBack: YES];
// isLinkSource = NO;
return;
if(name != nil)
{
pb = [NSPasteboard pasteboardWithName: NSDragPboard];
[pb declareTypes: [NSArray arrayWithObject: GormLinkPboardType]
owner: self];
[pb setString: name forType: GormLinkPboardType];
[NSApp displayConnectionBetween: anObject and: nil];
[self dragImage: [NSApp linkImage]
at: dragPoint
offset: NSZeroSize
event: theEvent
pasteboard: pb
source: self
slideBack: YES];
}
}
- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender
......
......@@ -556,43 +556,46 @@
if ([selection count] == 1)
{
[[selection objectAtIndex: 0]
setFrameOrigin:
NSMakePoint(NSMaxX([self bounds]),
NSMaxY([self bounds]))];
[superview display];
r = oldMovingFrame;
r.origin.x += xDiff;
r.origin.y += yDiff;
r.origin.x = (int) r.origin.x;
r.origin.y = (int) r.origin.y;
r.size.width = (int) r.size.width;
r.size.height = (int) r.size.height;
oldMovingFrame = r;
//case guideLine
if ( _followGuideLine )
suggestedFrame = [[selection objectAtIndex: 0]
_displayMovingFrameWithHint: r
andPlacementInfo: gpi];
else
id obj = [selection objectAtIndex: 0];
if([obj isKindOfClass: [NSView class]])
{
suggestedFrame = NSMakeRect (NSMinX(r),
NSMinY(r),
NSMaxX(r) - NSMinX(r),
NSMaxY(r) - NSMinY(r));
[[selection objectAtIndex: 0]
setFrameOrigin:
NSMakePoint(NSMaxX([self bounds]),
NSMaxY([self bounds]))];
[superview display];
r = oldMovingFrame;
r.origin.x += xDiff;
r.origin.y += yDiff;
r.origin.x = (int) r.origin.x;
r.origin.y = (int) r.origin.y;
r.size.width = (int) r.size.width;
r.size.height = (int) r.size.height;
oldMovingFrame = r;
//case guideLine
if ( _followGuideLine )
{
suggestedFrame = [obj _displayMovingFrameWithHint: r
andPlacementInfo: gpi];
}
else
{
suggestedFrame = NSMakeRect (NSMinX(r),
NSMinY(r),
NSMaxX(r) - NSMinX(r),
NSMaxY(r) - NSMinY(r));
}
[obj setFrame: suggestedFrame];
[obj setNeedsDisplay: YES];
}
[[selection objectAtIndex: 0] setFrame:
suggestedFrame];
[[selection objectAtIndex: 0] setNeedsDisplay: YES];
}
else
}
else
{
enumerator = [selection objectEnumerator];
enumerator = [selection objectEnumerator];
while ((subview = [enumerator nextObject]) != nil)
{
NSRect oldFrame = [subview frame];
......@@ -609,7 +612,7 @@
[subview setNeedsDisplay: YES];
}
}
/*
* Flush any drawing performed for this event.
*/
......
......@@ -4,19 +4,27 @@
NSTypes = (
{
NSUnixExtensions = ( "gorm" );
NSIcon = "Gorm.tiff";
NSIcon = "GormFile.tiff";
},
{
NSUnixExtensions = ( "gmodel" );
NSIcon = "FileIcon_gmodel.tiff";
},
{
NSUnixExtensions = ( "nib" );
NSIcon = "GormNib.tiff";
},
{
NSUnixExtensions = ( "palette" );
NSIcon = "GormPalette.tiff";
}
);
ApplicationDescription = "[GNUstep | Graphical] Object Relationship Modeller";
ApplicationIcon = "Gorm.tiff";
ApplicationName = "Gorm";
ApplicationRelease = "Gorm 1.0.4 (Release)";
ApplicationRelease = "Gorm 1.0.6 (Release)";
Authors = ("Gregory John Casamento <greg_casamento@yahoo.com>","Richard Frith-Macdonald <rfm@gnu.org>","Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>");
Copyright = "Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 FSF";
Copyright = "Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 FSF";
CopyrightDescription = "Released under the GNU General Public License 2.0";
NSBuildVersion = "1.0.4 Jan 25 2006";
NSBuildVersion = "1.0.6 Apr 8 2006";
}
Images/FileIcon_gmodel.tiff

3.25 KB | W: | H:

Images/FileIcon_gmodel.tiff

9.34 KB | W: | H:

Images/FileIcon_gmodel.tiff
Images/FileIcon_gmodel.tiff
Images/FileIcon_gmodel.tiff
Images/FileIcon_gmodel.tiff
  • 2-up
  • Swipe
  • Onion skin
Images/Gorm.tiff

4.04 KB | W: | H:

Images/Gorm.tiff

9.31 KB | W: | H:

Images/Gorm.tiff
Images/Gorm.tiff
Images/Gorm.tiff
Images/Gorm.tiff
  • 2-up
  • Swipe
  • Onion skin
Images/GormEHCoil.tiff

3.75 KB | W: | H:

Images/GormEHCoil.tiff

4.02 KB | W: | H:

Images/GormEHCoil.tiff
Images/GormEHCoil.tiff
Images/GormEHCoil.tiff
Images/GormEHCoil.tiff
  • 2-up
  • Swipe
  • Onion skin
Images/GormEHLine.tiff

3.75 KB | W: | H:

Images/GormEHLine.tiff

4.02 KB | W: | H:

Images/GormEHLine.tiff
Images/GormEHLine.tiff
Images/GormEHLine.tiff
Images/GormEHLine.tiff
  • 2-up
  • Swipe
  • Onion skin
Images/GormEVCoil.tiff

3.9 KB | W: | H:

Images/GormEVCoil.tiff

4.02 KB | W: | H:

Images/GormEVCoil.tiff
Images/GormEVCoil.tiff
Images/GormEVCoil.tiff
Images/GormEVCoil.tiff
  • 2-up
  • Swipe
  • Onion skin
Images/GormEVLine.tiff

3.9 KB | W: | H:

Images/GormEVLine.tiff

4.02 KB | W: | H:

Images/GormEVLine.tiff
Images/GormEVLine.tiff
Images/GormEVLine.tiff
Images/GormEVLine.tiff
  • 2-up
  • Swipe
  • Onion skin
Images/GormMHCoil.tiff

6.94 KB | W: | H:

Images/GormMHCoil.tiff

7.06 KB | W: | H:

Images/GormMHCoil.tiff
Images/GormMHCoil.tiff
Images/GormMHCoil.tiff
Images/GormMHCoil.tiff
  • 2-up
  • Swipe
  • Onion skin
Images/GormMHLine.tiff

6.94 KB | W: | H:

Images/GormMHLine.tiff

7.06 KB | W: | H:

Images/GormMHLine.tiff
Images/GormMHLine.tiff
Images/GormMHLine.tiff
Images/GormMHLine.tiff
  • 2-up
  • Swipe
  • Onion skin
Images/GormMVCoil.tiff

7.24 KB | W: | H:

Images/GormMVCoil.tiff

7.07 KB | W: | H:

Images/GormMVCoil.tiff
Images/GormMVCoil.tiff
Images/GormMVCoil.tiff
Images/GormMVCoil.tiff
  • 2-up
  • Swipe
  • Onion skin
Images/GormMVLine.tiff

7.24 KB | W: | H:

Images/GormMVLine.tiff

7.07 KB | W: | H:

Images/GormMVLine.tiff
Images/GormMVLine.tiff
Images/GormMVLine.tiff
Images/GormMVLine.tiff
  • 2-up
  • Swipe
  • Onion skin