gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-04-22 22:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

2005-07-23 18:02 Gregory John Casamento <greg_casamento@yahoo.com>

Browse source 
* GormCore/GormInspectorsManager.m: Remove extra revert: call.
	* GormLib/IBInspector.m: Touch changes the inspector X to the broken
	X, per specs.
	* Gorm.m:
	* Palettes/0Menus/main.m: Added to authors list.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@21524 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2005-07-24 01:17:16 +00:00
parent 60c9f57054
commit a568609f3c
5 changed files with 60 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-07-23 18:02 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormInspectorsManager.m: Remove extra revert: call.
* GormLib/IBInspector.m: Touch changes the inspector X to the broken
X, per specs.
* Gorm.m:
* Palettes/0Menus/main.m: Added to authors list.
2005-07-23 10:10 Gregory John Casamento <greg_casamento@yahoo.com>
* Documentation/Makefile.postamble: Create documentation

86
Gorm.m
View file

@ -552,8 +552,6 @@
else
{
// top level objects
topObjects = [[NSMutableArray alloc] init];
NS_DURING
{
NSUserDefaults *defaults;
@ -565,8 +563,7 @@
NSDictionary *substituteClasses = [palettesManager substituteClasses];
NSString *subClassName;
id obj;
NSDictionary *context = [NSDictionary dictionaryWithObjectsAndKeys: topObjects,
@"NSTopLevelObjects", self, @"NSOwner", nil];
id savedDelegate = [NSApp delegate];
// which windows were open when testing started...
testingWindows = [[NSMutableArray alloc] init];
@ -628,54 +625,63 @@
testContainer = [NSUnarchiver unarchiveObjectWithData: data];
if (testContainer != nil)
{
NSDictionary *context = nil;
NSMutableDictionary *nameTable = [testContainer nameTable];
// initialize the context.
topObjects = [[NSMutableArray alloc] init];
context = [NSDictionary dictionaryWithObjectsAndKeys: topObjects,
@"NSTopLevelObjects", self, @"NSOwner", nil];
[nameTable removeObjectForKey: @"NSServicesMenu"];
[nameTable removeObjectForKey: @"NSWindowsMenu"];
[testContainer awakeWithContext: context];
}
/*
* If the NIB didn't have a main menu, create one,
* otherwise, ensure that 'quit' ends testing mode.
*/
if ([self mainMenu] == mainMenu)
{
NSMenu *testMenu;
[NSApp setDelegate: savedDelegate]; // makes sure the delegate isn't reset.
testMenu = [[NSMenu alloc] initWithTitle: _(@"Test Menu (Gorm)")];
[testMenu addItemWithTitle: _(@"Quit Test")
action: @selector(deferredEndTesting:)
keyEquivalent: @"q"];
[self setMainMenu: testMenu]; // released, when the menu is reset in endTesting.
}
else
{
NSMenu *testMenu = [self mainMenu];
id item;
NSString *newTitle = [[testMenu title] stringByAppendingString: @" (Gorm)"];
// set the menu up so that it's easy to tell we're testing and how to quit.
[testMenu setTitle: newTitle];
item = [testMenu itemWithTitle: _(@"Quit")];
if (item != nil)
{
[item setTitle: _(@"Quit Test")];
[item setAction: @selector(deferredEndTesting:)];
}
else
/*
* If the NIB didn't have a main menu, create one,
* otherwise, ensure that 'quit' ends testing mode.
*/
if ([self mainMenu] == mainMenu)
{
NSMenu *testMenu;
testMenu = [[NSMenu alloc] initWithTitle: _(@"Test Menu (Gorm)")];
[testMenu addItemWithTitle: _(@"Quit Test")
action: @selector(deferredEndTesting:)
keyEquivalent: @"q"];
[self setMainMenu: testMenu]; // released, when the menu is reset in endTesting.
}
else
{
NSMenu *testMenu = [self mainMenu];
id item;
NSString *newTitle = [[testMenu title] stringByAppendingString: @" (Gorm)"];
// set the menu up so that it's easy to tell we're testing and how to quit.
[testMenu setTitle: newTitle];
item = [testMenu itemWithTitle: _(@"Quit")];
if (item != nil)
{
[item setTitle: _(@"Quit Test")];
[item setAction: @selector(deferredEndTesting:)];
}
else
{
[testMenu addItemWithTitle: _(@"Quit Test")
action: @selector(deferredEndTesting:)
keyEquivalent: @"q"];
}
}
// so we don't get the warning...
[self setServicesMenu: nil];
[[self mainMenu] display];
[[NSApp mainWindow] orderFrontRegardless];
[notifCenter postNotificationName: IBDidBeginTestingInterfaceNotification
object: self];
}
// so we don't get the warning...
[self setServicesMenu: nil];
[[self mainMenu] display];
[notifCenter postNotificationName: IBDidBeginTestingInterfaceNotification
object: self];
RELEASE(data);
}
NS_HANDLER

3
GormCore/GormInspectorsManager.m
View file

@ -650,9 +650,6 @@
// inspect the object.
[inspector setObject: [currentMode object]];
// load the object.
[inspector revert: self];
}
@end

3
GormLib/IBInspector.m
View file

@ -92,6 +92,7 @@ static NSNotificationCenter *nc = nil;
- (void) revert: (id)sender
{
[window setDocumentEdited: NO];
}
- (NSButton*) revertButton
@ -112,7 +113,7 @@ static NSNotificationCenter *nc = nil;
- (void) touch: (id)sender
{
id<IBDocuments> doc = [(id<IB>)NSApp activeDocument];
// [window setDocumentEdited: YES];
[window setDocumentEdited: YES];
[doc touch];
}

5
Palettes/0Menus/main.m
View file

@ -2,8 +2,11 @@
Copyright (C) 1999,2000 Free Software Foundation, Inc.
Author: Richard frith-Macdonald (richard@brainstorm.co.uk>
Author: Richard frith-Macdonald <richard@brainstorm.co.uk>
Date: 1999
Author: Gregory John Casamento <greg_casamento@yahoo.com>
Date: 2003, 2004, 2005
This file is part of GNUstep.