mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-04-24 23:11:04 +00:00
Added a fix for testInterface and also added (temporarily) an alert to remind users not to run user bundles while running Gorm.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@18299 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
f72c2b677c
commit
fe486dea59
2 changed files with 35 additions and 11 deletions
21
ChangeLog
21
ChangeLog
|
@ -1,11 +1,19 @@
|
||||||
|
2003-12-31 20:33 Gregory John Casamento <greg_casamento@yahoo.com>
|
||||||
|
|
||||||
|
* Gorm.m: Corrected an issue with testInterface because of the new
|
||||||
|
signature for awakeWithContext:. Also added an alert to anyone
|
||||||
|
loading bundles using GSAppKitUserBundles. Bundles that replace
|
||||||
|
classes of AppKit can cause issues in Gorm since they might interfere
|
||||||
|
with encoding.
|
||||||
|
|
||||||
2003-12-30 00:41 Gregory John Casamento <greg_casamento@yahoo.com>
|
2003-12-30 00:41 Gregory John Casamento <greg_casamento@yahoo.com>
|
||||||
|
|
||||||
* GormDocument.m: Removed uneeded method which was overriding
|
* GormDocument.m: Removed uneeded method which was overriding
|
||||||
awakeWithContext:. This method is called from loadNibNamed: and, since
|
awakeWithContext:. This method is called from loadNibNamed: and,
|
||||||
the GormDocument is a subclass, but is never loaded by that method
|
since the GormDocument is a subclass, but is never loaded by that
|
||||||
overriding the other implementation is uncessary.
|
method overriding the other implementation is uncessary.
|
||||||
* ClassInformation.plist: Some of the parent information was wrong, this
|
* ClassInformation.plist: Some of the parent information was wrong,
|
||||||
was corrected.
|
this was corrected.
|
||||||
* Gorm.m: Added code in -validateMenuItem: to grey out certain menu
|
* Gorm.m: Added code in -validateMenuItem: to grey out certain menu
|
||||||
items under given conditions. This improves usability and prevents
|
items under given conditions. This improves usability and prevents
|
||||||
the user from corrupting the .gorm file by doing something that's
|
the user from corrupting the .gorm file by doing something that's
|
||||||
|
@ -21,7 +29,8 @@
|
||||||
|
|
||||||
* Gorm.m: Added a NS_DURING block around the main portions of the
|
* Gorm.m: Added a NS_DURING block around the main portions of the
|
||||||
testInterface method and also added some of the classes to the list
|
testInterface method and also added some of the classes to the list
|
||||||
of classes which need to be translated from their "GormNS*" equivalents.
|
of classes which need to be translated from their "GormNS*"
|
||||||
|
equivalents.
|
||||||
|
|
||||||
2003-12-23 23:32 Gregory John Casamento <greg_casamento@yahoo.com>
|
2003-12-23 23:32 Gregory John Casamento <greg_casamento@yahoo.com>
|
||||||
|
|
||||||
|
|
25
Gorm.m
25
Gorm.m
|
@ -284,14 +284,29 @@ NSString *GormWillDetachObjectFromDocumentNotification = @"GormWillDetachObjectF
|
||||||
|
|
||||||
- (void) applicationDidFinishLaunching: (NSApplication*)sender
|
- (void) applicationDidFinishLaunching: (NSApplication*)sender
|
||||||
{
|
{
|
||||||
if ( [[NSUserDefaults standardUserDefaults] boolForKey: @"ShowInspectors"] )
|
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
|
||||||
|
NSArray *a = nil;
|
||||||
|
|
||||||
|
if ( [defaults boolForKey: @"ShowInspectors"] )
|
||||||
{
|
{
|
||||||
[[[self inspectorsManager] panel] makeKeyAndOrderFront: self];
|
[[[self inspectorsManager] panel] makeKeyAndOrderFront: self];
|
||||||
}
|
}
|
||||||
if ( [[NSUserDefaults standardUserDefaults] boolForKey: @"ShowPalettes"] )
|
if ( [defaults boolForKey: @"ShowPalettes"] )
|
||||||
{
|
{
|
||||||
[[[self palettesManager] panel] makeKeyAndOrderFront: self];
|
[[[self palettesManager] panel] makeKeyAndOrderFront: self];
|
||||||
}
|
}
|
||||||
|
if((a = [defaults arrayForKey: @"GSAppKitUserBundles"]) != nil)
|
||||||
|
{
|
||||||
|
if([a count] > 0)
|
||||||
|
{
|
||||||
|
BOOL result = NSRunAlertPanel(NULL, _(@"Please deactivate any user bundles before starting Gorm."),
|
||||||
|
_(@"Continue"),_( @"Quit"), nil);
|
||||||
|
if(result != NSAlertDefaultReturn)
|
||||||
|
{
|
||||||
|
[self terminate: self];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -721,8 +736,9 @@ NSString *GormWillDetachObjectFromDocumentNotification = @"GormWillDetachObjectF
|
||||||
testContainer = [NSUnarchiver unarchiveObjectWithData: data];
|
testContainer = [NSUnarchiver unarchiveObjectWithData: data];
|
||||||
if (testContainer != nil)
|
if (testContainer != nil)
|
||||||
{
|
{
|
||||||
[testContainer awakeWithContext: nil];
|
[testContainer awakeWithContext: nil
|
||||||
// RETAIN(testContainer);
|
topLevelItems: nil];
|
||||||
|
RETAIN(testContainer);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1504,7 +1520,6 @@ int
|
||||||
main(int argc, const char **argv)
|
main(int argc, const char **argv)
|
||||||
{
|
{
|
||||||
startDate = [[NSDate alloc] init];
|
startDate = [[NSDate alloc] init];
|
||||||
// [NSObject enableDoubleReleaseCheck: YES];
|
|
||||||
return NSApplicationMain(argc, argv);
|
return NSApplicationMain(argc, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue