Commit 749f1950 authored by Gürkan Myczko's avatar Gürkan Myczko Committed by Eric Heintzmann

Import Debian patch 1.2.4-1

parents 14888784 9ebba0d7
1 ANNOUNCE
**********
This is version 1.2.2 of Gorm.
This is version 1.2.3 of Gorm.
1.1 What is Gorm?
=================
......@@ -12,26 +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.2.2'
1.2 Noteworthy changes in version `1.2.4'
=========================================
Requires: gnustep-gui-0.13.0.
Requires: gnustep-gui-0.13.2. Reason: Due to changes in popupbutton
controller logic.
* Moved to GPLv3
* Corrected bug#'s 19640, 21845, 19792, 15637, 17892, 18171.
* Added text field to NSTableColumn inspector to allow editing of
table column title.
* Added error panel to show the detected inconsistencies in a file.
* Corrected issue with selection.
* Added preference setting to turn on or off the gorm file repair
logic.
* Added button modifiers for special keys to button inspectors.
* Added capability to repair logic to fix window level issue.
* Corrected issue with loading of older gorm files.
* Fix to allow Gorm's menus to be Mac-style, but not the one being
edited.
* Other miscellaneous bug corrections.
* Added ruler switch to scroll view inspector.
1.3 How can I get support for this software?
============================================
......
2008-04-06 22:09-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Version: 1.2.4
2008-04-06 22:09-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* ANNOUNCE
* ChangeLog
* Documentation/news.texi
* GormCore/GormFilePrefsManager.m
* GormInfo.plist
* NEWS
* Version: Updating for release.
2008-03-05 20:45-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormWrapperLoader.m: Correct c99'ism.
2008-02-18 20:31-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/2Controls/GormPopUpButtonEditor.m: Change to use helper
method to set up "preferred edge" correctly.
2008-02-17 12:49-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormViewEditor.m
* GormCore/GormViewWindow.m: Minor correction to view resizing for
windowless views to show contents properly. Still working on
editor issues.
2008-02-17 01:07-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormInternalViewEditor.m
* GormCore/GormScrollViewEditor.m
* GormCore/GormSplitViewEditor.m
* GormCore/GormViewEditor.m
* GormCore/GormViewWithContentViewEditor.m: Corrections for
bug#18171. Fixes issues with grouping and ungrouping.
2008-02-16 20:54-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/2Controls/GormSliderAttributesInspector.m: Cleaned up
code to use NSOnState and NSOffState properly, since we can't depend
on them always reflecting YES and NO respectively.
* Palettes/3Containers/GormTableViewAttributesInspector.m:
Corrected call in ok: to use enclosingScrollView instead of
simply getting the superview of the table. This corrects bug#22333.
2008-02-09 Adam Fedor <fedor@gnu.org>
* GormCore/GormGenericEditor.m ([GormGenericEditor -refreshCells]):
Avoid segfault on solaris machines.
2008-02-09 12:15-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormClassEditor.m
* GormCore/GormGenericEditor.m
* GormCore/GormObjectEditor.m: Change background color of
object view.
2008-01-10 Nicola Pero <nicola.pero@meta-innovation.com>
* GNUmakefile.postamble (LN_S_RECURSIVE): For
backwards-compatibility with older versions of gnustep-make,
define to be the same as LN_S if not defined yet.
(before-all): Use RM_LN_S to delete the symlink, and use
LN_S_RECURSIVE to create it.
(after-clean): Use RM_LN_S to delete the symlink.
* GormPrefs/GormPrefController.m ([-init]): Avoid compiler
warning.
2008-01-07 20:04-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/0Menus/GormMenuItemAttributesInspector.h
* Palettes/0Menus/GormMenuItemAttributesInspector.m: Moved strings
for non-printable characters to class variables.
2008-01-07 18:50-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormGenericEditor.m: Removed patch for bug#17539. Was
causing issues on load.
* GormCore/GormNibWrapperLoader.m: Removed extra NSLog(...);
2008-01-07 18:37-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormNibWrapperLoader.m: Minor issues corrected with c99
changes.
2008-01-07 17:40-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/1Windows/GormDrawerAttributesInspector.gorm:
Fixed issue with dropdown.
* Palettes/2Controls/GormButtonEditor.m: Fixed minor resize issue.
2008-01-05 Riccardo Mottola <riccardo@kaffe.org>
* GormCore/GormWrapperBuilder.m: removed some c99-isms
2008-01-04 Riccardo Mottola <riccardo@kaffe.org>
* GormCore/GormGormWrapperLoader.m: removed some c99-isms
* GormCore/GormNibWrapperLoader.m: removed some c99-isms
2008-01-04 18:38-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormViewWindow.m: Try to get the editor for the
standalone view and activate it.
2008-01-04 13:22-EST Gregory John Casamento <greg_casamento@yahoo.com>
* English.lproj/Gorm.gorm: Changed delete to require command,
it was causing issues with editing text fields.
* English.lproj/GormScrollViewAttributesInspector.gorm
* GormCore/GormScrollViewAttributesInspector.h
* GormCore/GormScrollViewAttributesInspector.m: Added ruler switches
to inspector.
2008-01-04 12:05-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormDocument.m
* GormLib/IBDocuments.h: Addition of private methods for bug#17892.
2008-01-03 20:39-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormGenericEditor.m: Reformed and applied patch provided
by Sergey Golovin. Corrects bug#17539.
2008-01-03 20:17-EST Gregory John Casamento <greg_casamento@yahoo.com>
* English.lproj/Gorm.gorm: Added menu shortcut for delete/backspace
to correct bug#15637.
2008-01-03 20:02-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormNibWrapperLoader.m: Corrections for bug#19792.
Nib loader connector logic modified to correct this issue.
2008-01-03 19:40-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormViewKnobs.m: drkgrey changed to fgcolor.
2008-01-03 17:22-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormViewKnobs.m: Draw initial knobs as red
to differentiate them from the black ones which indicates that
the inside of a non-simple view is selected. Corrects bug#21479.
2008-01-03 14:50-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormGormWrapperLoader.m: Correct invalid window level
in _repairFile: method.
2008-01-01 23:07-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormGormWrapperLoader.m: Touch the document to mark it
as modified in the _repairFile method only if corrections have been
made.
2008-01-01 22:57-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormGormWrapperLoader.m: Cleanup array after
display of errors/warnings.
2008-01-01 15:26-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Plugins/GModel/GNUmakefile
* Plugins/Gorm/GNUmakefile
* Plugins/Nib/GNUmakefile: Add dummy makefiles.
2008-01-01 15:21-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Plugins/GNUmakefile: Add makefile in plugins dir.
2008-01-01 14:03-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormGormWrapperLoader.m: More corrections to the
_repairFile method.
* GormInfo.plist: Changed to reflect SVN status
2007-12-31 21:22-EST Gregory John Casamento <greg_casamento@yahoo.com>
* English.lproj/GormInconsistenciesPanel.gorm: Error panel to show
detected inconsistencies.
* English.lproj/GormPrefGeneral.gorm: Added option to turn on
repair method.
* GNUmakefile: Added reference to new gorm file.
* GormCore/GormGormWrapperLoader.m: Added code to bring up the
new panel and show the errors.
* GormPrefs/GormGeneralPref.[mh]: Added new method and ivar to
handle switch for consistency checking.
2007-12-19 19:03-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormGormWrapperLoader.m
* GormCore/GormNibWrapperBuilder.m: Correction for bug#21845.
2007-12-04 20:52-EST Gregory John Casamento <greg_casamento@yahoo.com>
* English.lproj/GormViewSizeInspector.gorm: Correction for
bug#19640.
2007-11-30 15:58-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GNUmakefile
* GormLib/GNUmakefile
* GormLib/IBPlugin.h
* GormLib/IBPlugin.m
* GormLib/InterfaceBuilder.h
* Plugins/GNUmakefile: First cut at changes to add Plugin support
to Gorm.
2007-11-11 15:40-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Version: 1.2.2
2007-11-11 15:38-EST Gregory John Casamento <greg_casamento@yahoo.com>
* ANNOUNCE
......
......@@ -4,6 +4,23 @@
@include version.texi
@end ifset
@section Noteworthy changes in version @samp{1.2.4}
Requires: gnustep-gui-0.13.2.
Reason: Due to changes in popupbutton controller logic.
@itemize @bullet
@item Corrected bug#'s 19640, 21845, 19792, 15637, 17892, 18171.
@item Added error panel to show the detected inconsistencies in a file.
@item Added preference setting to turn on or off the gorm file repair logic.
@item Added capability to repair logic to fix window level issue.
@item Added ruler switch to scroll view inspector.
@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.2.2}
Requires: gnustep-gui-0.13.0.
......@@ -18,10 +35,6 @@ Requires: gnustep-gui-0.13.0.
@item Other miscellaneous bug corrections.
@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.2.1}
@itemize @bullet
......
{"## Comment" = "Do NOT change this file, Gorm maintains it"; FirstResponder = {Actions = ("arrangeSelectedObjects:", "exportStrings:", "alignSelectedObjects:", "orderFrontFontPanel:", "translate:"); Super = NSObject; }; Gorm = {Actions = ("editClass:", "createSubclass:", "testInterface:", "setName:", "selectAllItems:", "paste:", "palettes:", "loadSound:", "loadPalette:", "inspector:", "infoPanel:", "endTesting:", "delete:", "cut:", "copy:", "close:", "miniaturize:", "debug:", "loadImage:", "orderFrontFontPanel:", "ungroup:", "groupSelectionInScrollView:", "groupSelectionInBox:", "groupSelectionInSplitView:", "remove:", "addAttributeToClass:", "instantiateClass:", "createClassFiles:", "loadClass:", "preferencesPanel:", "guideline:"); Outlets = (gormMenu, guideLineMenuItem); Super = NSApplication; }; GormDocumentController = {Actions = (); Outlets = (); Super = NSDocumentController; }; }
\ No newline at end of file
{
"## Comment" = "Do NOT change this file, Gorm maintains it";
FirstResponder = {
Actions = (
"arrangeSelectedObjects:",
"exportStrings:",
"alignSelectedObjects:",
"orderFrontFontPanel:",
"translate:"
);
Super = NSObject;
};
Gorm = {
Actions = (
"editClass:",
"createSubclass:",
"testInterface:",
"setName:",
"selectAllItems:",
"paste:",
"palettes:",
"loadSound:",
"loadPalette:",
"inspector:",
"infoPanel:",
"endTesting:",
"delete:",
"cut:",
"copy:",
"close:",
"miniaturize:",
"debug:",
"loadImage:",
"orderFrontFontPanel:",
"ungroup:",
"groupSelectionInScrollView:",
"groupSelectionInBox:",
"groupSelectionInSplitView:",
"remove:",
"addAttributeToClass:",
"instantiateClass:",
"createClassFiles:",
"loadClass:",
"preferencesPanel:",
"guideline:"
);
Outlets = (
gormMenu,
guideLineMenuItem
);
Super = NSApplication;
};
GormDocumentController = {
Actions = (
);
Outlets = (
);
Super = NSDocumentController;
};
}
\ No newline at end of file
{
"## Comment" = "Do NOT change this file, Gorm maintains it";
GormGormWrapperLoader = {
Actions = (
);
Outlets = (
message,
textField,
panel
);
Super = GormWrapperLoader;
};
GormWrapperLoader = {
Actions = (
);
Outlets = (
);
Super = NSObject;
};
}
\ No newline at end of file
......@@ -4,6 +4,7 @@
Actions = (
"archiveAction:",
"classesAction:",
"consistencyAction:",
"orderFrontFontPanel:"
);
Super = NSObject;
......@@ -14,7 +15,8 @@
"inspectorAction:",
"backupAction:",
"archiveAction:",
"classesAction:"
"classesAction:",
"consistencyAction:"
);
Outlets = (
window,
......@@ -22,7 +24,8 @@
inspectorButton,
backupButton,
archiveMatrix,
interfaceMatrix
interfaceMatrix,
checkConsistency
);
Super = NSObject;
};
......
......@@ -2,11 +2,13 @@
"## Comment" = "Do NOT change this file, Gorm maintains it";
FirstResponder = {
Actions = (
"orderFrontFontPanel:",
"borderSelected:",
"colorSelected:",
"horizontalRuler:",
"horizontalSelected:",
"verticalSelected:",
"colorSelected:"
"verticalRuler:",
"orderFrontFontPanel:",
"verticalSelected:"
);
Super = NSObject;
};
......@@ -15,7 +17,9 @@
"borderSelected:",
"horizontalSelected:",
"verticalSelected:",
"colorSelected:"
"colorSelected:",
"horizontalRuler:",
"verticalRuler:"
);
Outlets = (
borderMatrix,
......@@ -23,7 +27,9 @@
verticalScroll,
color,
lineAmount,
pageContext
pageContext,
horizontalRuler,
verticalRuler
);
Super = IBInspector;
};
......
......@@ -45,7 +45,8 @@ SUBPROJECTS = \
GormLib \
GormCore \
GormPrefs \
Palettes
Palettes \
Plugins
#
# MAIN APP
......@@ -144,6 +145,7 @@ Gorm_LOCALIZED_RESOURCE_FILES = \
GormHelpInspector.gorm \
Gorm.gorm \
GormImageInspector.gorm \
GormInconsistenciesPanel.gorm \
GormInspectorPanel.gorm \
GormObjectInspector.gorm \
GormNSSplitViewInspector.gorm \
......
......@@ -24,9 +24,15 @@
# USA.
#
# Define this variable if not defined for backwards-compatibility as
# it is only available in gnustep-make >= 2.0.5
ifeq ($(LN_S_RECURSIVE),)
LN_S_RECURSIVE = $(LN_S)
endif
before-all::
rm -rf InterfaceBuilder
$(LN_S) GormLib InterfaceBuilder
$(RM_LN_S) InterfaceBuilder; \
$(LN_S_RECURSIVE) GormLib InterfaceBuilder
after-all::
......@@ -35,4 +41,4 @@ after-clean::
after-distclean::
after-clean::
rm -rf InterfaceBuilder
$(RM_LN_S) InterfaceBuilder
......@@ -71,10 +71,10 @@ NSImage *browserImage = nil;
NSRect scrollRect = [classesView frame]; // = {{0, 0}, {340, 188}};
NSRect mainRect = NSMakeRect(20,0,scrollRect.size.width-20,
scrollRect.size.height);
NSColor *salmonColor = [NSColor colorWithCalibratedRed: 0.850980
green: 0.737255
blue: 0.576471
alpha: 1.0 ];
NSColor *color = [NSColor colorWithCalibratedRed: 0.850980
green: 0.737255
blue: 0.576471
alpha: 1.0 ];
NSTableColumn *tableColumn;
// setup the view...
......@@ -114,7 +114,7 @@ NSImage *browserImage = nil;
[outlineView setAttributeOffset: 30];
[outlineView setRowHeight: 18];
[outlineView setMenu: [(id<Gorm>)NSApp classMenu]];
[outlineView setBackgroundColor: salmonColor];
[outlineView setBackgroundColor: color];
// add the table columns...
tableColumn = [(NSTableColumn *)[NSTableColumn alloc] initWithIdentifier: @"classes"];
......@@ -163,7 +163,6 @@ NSImage *browserImage = nil;
[browserView setRefusesFirstResponder:YES];
[browserView loadColumnZero];
// observe certain notifications...
[nc addObserver: self
selector: @selector(handleNotification:)
......
......@@ -3512,6 +3512,23 @@ static void _real_close(GormDocument *self,
[super setFileType: type];
[filePrefsManager setFileTypeName: type];
}
//// PRIVATE METHODS...
- (NSString *) classForObject: (id)obj
{
return [classManager classNameForObject: obj];
}
- (NSArray *) actionsOfClass: (NSString *)className
{
return [classManager allActionsForClassNamed: className];
}
- (NSArray *) outletsOfClass: (NSString *)className
{
return [classManager allOutletsForClassNamed: className];
}
@end
@implementation GormDocument (MenuValidation)
......
......@@ -85,7 +85,7 @@ NSString *formatVersion(int version)
+ (int) currentVersion
{
return appVersion(1,2,2);
return appVersion(1,2,4);
}
- (void) awakeFromNib
......
......@@ -151,7 +151,7 @@
document = aDocument;
closed = NO;
activated = NO;
resourceManager = nil;
resourceManager = nil;
}
return self;
}
......@@ -260,7 +260,8 @@
int rows = 0;
int width = 0;
width = [[self superview] bounds].size.width;
if ([self superview])
width = [[self superview] bounds].size.width;
while (width >= 72)
{
width -= (72 + 8);
......
This diff is collapsed.
......@@ -905,43 +905,29 @@ static NSImage *horizontalImage;
- (NSArray *)destroyAndListSubviews
{
if ([parent isKindOfClass: [GormBoxEditor class]]
&&
([[parent parent] isKindOfClass:
[GormViewWithContentViewEditor class]]
|| [[parent parent] isKindOfClass:
[GormSplitViewEditor class]]))
NSEnumerator *enumerator = [[_editedObject subviews] objectEnumerator];
GormViewEditor *subview;
NSMutableArray *newSelection = [NSMutableArray array];
[[parent parent] makeSubeditorResign];
while ((subview = [enumerator nextObject]) != nil)
{
NSEnumerator *enumerator = [[_editedObject subviews] objectEnumerator];
GormViewEditor *subview;
NSMutableArray *newSelection = [NSMutableArray array];
[[parent parent] makeSubeditorResign];
while ((subview = [enumerator nextObject]) != nil)
{
id v;
NSRect frame;
v = [subview editedObject];
frame = [v frame];
frame = [[parent parent] convertRect: frame
fromView: _editedObject];
[subview deactivate];
[v setFrame: frame];
[newSelection addObject: v];
}
{
id thisView = [parent editedObject];
[parent close];
[thisView removeFromSuperview];
[document detachObject: thisView];
}
id v;
NSRect frame;
v = [subview editedObject];
frame = [v frame];
frame = [[parent parent] convertRect: frame
fromView: _editedObject];
[subview deactivate];
return newSelection;
[v setFrame: frame];
[newSelection addObject: v];
}
return nil;
[parent close];
return newSelection;
}
- (void) deleteSelection: (id) sender
......
......@@ -98,8 +98,20 @@
}
NSMapInsert(_objects, src, dst);
if(dst == nil)
{
NSLog(@"==> WARNING: value for object %@ is %@ in objects map.",src,dst);
}
NSMapInsert(_names, src, name);
if(dst == nil)
{
NSLog(@"==> WARNING: value for object %@ is %@ in names map.",src,dst);
}
NSMapInsert(_oids, src, currOid);
if(dst == nil)
{
NSLog(@"==> WARNING: value for object %@ is %@ in oids map.",src,dst);
}
}
else
{
......
......@@ -83,25 +83,30 @@
NSData *data = nil;
NSData *classes = nil;
NSKeyedUnarchiver *u = nil;
NSEnumerator *enumerator = nil;
NSString *key = nil;
GormPalettesManager *palettesManager = [(id<Gorm>)NSApp palettesManager];
NSDictionary *substituteClasses = [palettesManager substituteClasses];
NSEnumerator *en = [substituteClasses keyEnumerator];
NSString *subClassName = nil;
NSDictionary *fileWrappers = nil;
if ([super loadFileWrapper: wrapper withDocument: doc])
{
GormClassManager *classManager = [document classManager];
id docFilesOwner;
NSMapTable objects;
NSArray *objs;
NSEnumerator *en;
id o;
NSMapTable *classesTable;
NSArray *classKeys;
key = nil;
fileWrappers = [wrapper fileWrappers];
// turn off custom classes...
[NSClassSwapper setIsInInterfaceBuilder: YES];
enumerator = [fileWrappers keyEnumerator];
while((key = [enumerator nextObject]) != nil)
en = [fileWrappers keyEnumerator];
while((key = [en nextObject]) != nil)
{
NSFileWrapper *fw = [fileWrappers objectForKey: key];
if([fw isRegularFile])
......@@ -152,6 +157,7 @@
/*
* Substitute any classes specified by the palettes...
*/
en = [substituteClasses keyEnumerator];
while((subClassName = [en nextObject]) != nil)
{
NSString *realClassName = [substituteClasses objectForKey: subClassName];
......@@ -170,11 +176,11 @@
}
nibFilesOwner = [container objectForName: @"File's Owner"];
id docFilesOwner = [document filesOwner];
NSMapTable objects = [container names];
NSArray *objs = NSAllMapTableKeys(objects);
NSEnumerator *en = [objs objectEnumerator];
id o = nil;
docFilesOwner = [document filesOwner];
objects = [container names];
objs = NSAllMapTableKeys(objects);
en = [objs objectEnumerator];
o = nil;
//
// set the current class on the File's owner...
......@@ -233,13 +239,13 @@
//
// Add custom classes...
//
NSMapTable *classes = [container classes];
NSArray *classKeys = NSAllMapTableKeys(classes);
classesTable = [container classes];