mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 07:00:46 +00:00
Fix issue mentioned by fred.
This commit is contained in:
Gregory John Casamento
parent
a1776f21da
commit
df3eaafdf3
2 changed files with 85 additions and 71 deletions
|
|
@ -39,11 +39,10 @@
|
|||
#import "AppKit/NSApplication.h"
|
||||
#import "AppKit/NSMenu.h"
|
||||
#import "AppKit/NSNib.h"
|
||||
|
||||
#import "GNUstepGUI/GSModelLoaderFactory.h"
|
||||
#import "GNUstepGUI/GSNibLoading.h"
|
||||
#import "GNUstepGUI/GSXibLoading.h"
|
||||
#import "GSXib5KeyedUnarchiver.h"
|
||||
#import "GNUstepGUI/GSXibKeyedUnarchiver.h"
|
||||
|
||||
@interface NSApplication (NibCompatibility)
|
||||
- (void) _setMainMenu: (NSMenu*)aMenu;
|
||||
|
|
@ -54,16 +53,14 @@
|
|||
@end
|
||||
|
||||
@implementation NSMenu (XibCompatibility)
|
||||
|
||||
- (BOOL) _isMainMenu
|
||||
{
|
||||
if (_name)
|
||||
return [_name isEqualToString:@"_NSMainMenu"];
|
||||
return NO;
|
||||
}
|
||||
@end
|
||||
|
||||
@interface NSCustomObject5 (Private)
|
||||
- (NSString *) userLabel;
|
||||
@end
|
||||
|
||||
@interface GSXibLoader: GSModelLoader
|
||||
|
|
@ -91,15 +88,16 @@
|
|||
NSEnumerator *en;
|
||||
id obj;
|
||||
NSUInteger index = 0;
|
||||
BOOL ownerSetForOldXib = NO;
|
||||
|
||||
|
||||
if ([rootObjects count] == 0)
|
||||
{
|
||||
NSWarnMLog(@"No root objects in XIB!");
|
||||
return;
|
||||
}
|
||||
|
||||
// Iterate over root objects
|
||||
// Use the owner as first root object
|
||||
[(NSCustomObject*)[rootObjects objectAtIndex: 0] setRealObject: owner];
|
||||
|
||||
en = [rootObjects objectEnumerator];
|
||||
while ((obj = [en nextObject]) != nil)
|
||||
{
|
||||
|
|
@ -110,43 +108,14 @@
|
|||
obj = [obj nibInstantiate];
|
||||
}
|
||||
|
||||
// IGNORE file's owner, first responder and NSApplication instances
|
||||
// these are represented by NSCustomObject or it's subclasses...
|
||||
if (obj != nil)
|
||||
// IGNORE file's owner, first responder and NSApplication instances...
|
||||
if ((obj != nil) && (index > 3))
|
||||
{
|
||||
if ([obj isKindOfClass: [NSCustomObject5 class]])
|
||||
{
|
||||
NSCustomObject5 *co = (NSCustomObject5 *)obj;
|
||||
NSString *userLabel = [co userLabel];
|
||||
if ([userLabel isEqualToString: @"File's Owner"])
|
||||
{
|
||||
[co setRealObject: owner];
|
||||
continue;
|
||||
}
|
||||
else if ([userLabel isEqualToString: @"First Responder"] ||
|
||||
[userLabel isEqualToString: @"Application"])
|
||||
{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else if ([obj isKindOfClass: [NSCustomObject class]] &&
|
||||
ownerSetForOldXib == NO)
|
||||
{
|
||||
[obj setRealObject: owner]; // set on first object in list...
|
||||
ownerSetForOldXib = YES;
|
||||
}
|
||||
|
||||
// Some custom objects should be stored in topLevelObjects, the ones which
|
||||
// shouldn't are skipped above.
|
||||
if ([obj isKindOfClass: [NSApplication class]] == NO)
|
||||
{
|
||||
[topLevelObjects addObject: obj];
|
||||
|
||||
// All top level objects must be released by the caller to avoid
|
||||
// leaking, unless they are going to be released by other nib
|
||||
// objects on behalf of the owner.
|
||||
RETAIN(obj);
|
||||
}
|
||||
[topLevelObjects addObject: obj];
|
||||
// All top level objects must be released by the caller to avoid
|
||||
// leaking, unless they are going to be released by other nib
|
||||
// objects on behalf of the owner.
|
||||
RETAIN(obj);
|
||||
}
|
||||
|
||||
if (([obj isKindOfClass: [NSMenu class]]) &&
|
||||
|
|
@ -173,7 +142,7 @@
|
|||
|
||||
- (BOOL) loadModelData: (NSData *)data
|
||||
externalNameTable: (NSDictionary *)context
|
||||
withZone: (NSZone *)zone
|
||||
withZone: (NSZone *)zone;
|
||||
{
|
||||
BOOL loaded = NO;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,31 @@ static NSStoryboard *mainStoryboard = nil;
|
|||
|
||||
@implementation NSStoryboard
|
||||
|
||||
- (NSXMLElement *) _createCustomObjectWithId: (NSString *)ident
|
||||
userLabel: (NSString *)userLabel
|
||||
customClass: (NSString *)className
|
||||
{
|
||||
NSXMLElement *customObject =
|
||||
[[NSXMLElement alloc] initWithName: @"customObject"];
|
||||
NSXMLNode *idValue =
|
||||
[NSXMLNode attributeWithName: @"id"
|
||||
stringValue: ident];
|
||||
NSXMLNode *usrLabel =
|
||||
[NSXMLNode attributeWithName: @"userLabel"
|
||||
stringValue: userLabel];
|
||||
NSXMLNode *customCls =
|
||||
[NSXMLNode attributeWithName: @"customClass"
|
||||
stringValue: className];
|
||||
|
||||
[customObject addAttribute: idValue];
|
||||
[customObject addAttribute: usrLabel];
|
||||
[customObject addAttribute: customCls];
|
||||
|
||||
AUTORELEASE(customObject);
|
||||
|
||||
return customObject;
|
||||
}
|
||||
|
||||
- (void) _processStoryboard: (NSXMLDocument *)storyboardXml
|
||||
{
|
||||
NSArray *docNodes = [storyboardXml nodesForXPath: @"document" error: NULL];
|
||||
|
|
@ -104,52 +129,72 @@ static NSStoryboard *mainStoryboard = nil;
|
|||
[appNode detach];
|
||||
|
||||
// create a customObject entry for NSApplication reference...
|
||||
NSXMLNode *appCustomClass = (NSXMLNode *)[(NSXMLElement *)appNode attributeForName: @"customClass"];
|
||||
NSXMLNode *appCustomClass = (NSXMLNode *)[(NSXMLElement *)appNode
|
||||
attributeForName: @"customClass"];
|
||||
customClassString = ([appCustomClass stringValue] == nil) ?
|
||||
@"NSApplication" : [appCustomClass stringValue];
|
||||
NSXMLElement *customObject = [[NSXMLElement alloc] initWithName: @"customObject"];
|
||||
NSXMLNode *idValue = [NSXMLNode attributeWithName: @"id"
|
||||
stringValue: @"-3"];
|
||||
NSXMLNode *usrLabel = [NSXMLNode attributeWithName: @"userLabel"
|
||||
stringValue: @"File's Owner"];
|
||||
NSXMLNode *customCls = [NSXMLNode attributeWithName: @"customClass"
|
||||
stringValue: customClassString];
|
||||
[customObject addAttribute: idValue];
|
||||
[customObject addAttribute: usrLabel];
|
||||
[customObject addAttribute: customCls];
|
||||
|
||||
@"NSApplication" : [appCustomClass stringValue];
|
||||
NSXMLElement *customObject = nil;
|
||||
|
||||
customObject =
|
||||
[self _createCustomObjectWithId: @"-3"
|
||||
userLabel: @"Application"
|
||||
customClass: @"NSObject"];
|
||||
[child insertChild: customObject
|
||||
atIndex: 0];
|
||||
customObject =
|
||||
[self _createCustomObjectWithId: @"-1"
|
||||
userLabel: @"First Responder"
|
||||
customClass: @"FirstResponder"];
|
||||
[child insertChild: customObject
|
||||
atIndex: 0];
|
||||
customObject =
|
||||
[self _createCustomObjectWithId: @"-2"
|
||||
userLabel: @"File's Owner"
|
||||
customClass: customClassString];
|
||||
if (appCons != nil)
|
||||
{
|
||||
[customObject addChild: appCons];
|
||||
}
|
||||
[child insertChild: customObject
|
||||
atIndex: 0];
|
||||
|
||||
|
||||
// Add it to the document
|
||||
[objects addChild: customObject];
|
||||
[objects detach];
|
||||
[doc addChild: objects];
|
||||
RELEASE(customObject);
|
||||
|
||||
// Assign application scene...
|
||||
ASSIGN(_applicationSceneId, sceneId);
|
||||
}
|
||||
else
|
||||
{
|
||||
NSXMLElement *customObject = [[NSXMLElement alloc] initWithName: @"customObject"];
|
||||
NSXMLNode *idValue = [NSXMLNode attributeWithName: @"id"
|
||||
stringValue: @"-3"];
|
||||
NSXMLNode *usrLabel = [NSXMLNode attributeWithName: @"userLabel"
|
||||
stringValue: @"File's Owner"];
|
||||
NSXMLNode *customCls = [NSXMLNode attributeWithName: @"customClass"
|
||||
stringValue: customClassString];
|
||||
[customObject addAttribute: idValue];
|
||||
[customObject addAttribute: usrLabel];
|
||||
[customObject addAttribute: customCls];
|
||||
NSXMLElement *customObject = nil;
|
||||
|
||||
customObject =
|
||||
[self _createCustomObjectWithId: @"-3"
|
||||
userLabel: @"Application"
|
||||
customClass: @"NSObject"];
|
||||
[child insertChild: customObject
|
||||
atIndex: 0];
|
||||
customObject =
|
||||
[self _createCustomObjectWithId: @"-1"
|
||||
userLabel: @"First Responder"
|
||||
customClass: @"FirstResponder"];
|
||||
[child insertChild: customObject
|
||||
atIndex: 0];
|
||||
customObject =
|
||||
[self _createCustomObjectWithId: @"-2"
|
||||
userLabel: @"File's Owner"
|
||||
customClass: customClassString];
|
||||
[child insertChild: customObject
|
||||
atIndex: 0];
|
||||
|
||||
[child detach];
|
||||
[child addChild: customObject];
|
||||
[doc addChild: child];
|
||||
}
|
||||
|
||||
// Add other custom objects...
|
||||
|
||||
// fix other custom objects
|
||||
document = [[NSXMLDocument alloc] initWithRootElement: doc]; // put it into the document, so we can use Xpath.
|
||||
NSArray *windowControllers = [document nodesForXPath: @"//windowController" error: NULL];
|
||||
|
|
|
|||
Loading…
Reference in a new issue