Move all IBObjectAdditions definitions from various files into one file.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@21616 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2005-08-06 19:32:38 +00:00
parent 2cbb6a93ed
commit 0a4eb9ce3a
9 changed files with 108 additions and 105 deletions

View file

@ -1,3 +1,19 @@
2005-08-06 15:40 Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/0Menus/GNUmakefile: Add new file
* Palettes/0Menus/GormMenuAttributesInspector.m: Removed
IBObjectAdditions definitions from this file.
* Palettes/0Menus/GormMenuEditor.m: Same
* Palettes/0Menus/GormMenuInspectors.m: Same
* Palettes/0Menus/GormMenuItemAttributesInspector.m: Same
* Palettes/0Menus/inspectors.m: new file to hold implementation of
IBObjectAdditions.
* Palettes/1Windows/GNUmakefile: Add new file.
* Palettes/1Windows/GormWindowAttributesInspector.m: Remove
IBObjectAdditions definitions from this file.
* Palettes/1Windows/inspectors.m: new file to hold implementation of
IBObjectAdditions.
2005-08-06 15:24 Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/0Menus/GNUmakefile

View file

@ -32,7 +32,8 @@ PALETTE_NAME = 0Menus
GormNSMenu.m \
GormMenuItemAttributesInspector.m\
GormMenuAttributesInspector.m\
MenusPalette.m
MenusPalette.m \
inspectors.m
0Menus_RESOURCE_FILES = MenusPalette.tiff \
GormMenuDrag.tiff \

View file

@ -5,6 +5,8 @@
Author: Richard frith-Macdonald (richard@brainstorm.co.uk>
Date: 1999
Author: Gregory John Casamento <greg_casamento@yahoo.com>
Date: 2003
This file is part of GNUstep.
@ -46,14 +48,6 @@
#define SERVICESMENUTAG 1
#define NORMALMENUTAG 2
@implementation NSMenu (IBObjectAdditions)
- (NSString*) inspectorClassName
{
return @"GormMenuAttributesInspector";
}
@end
@implementation GormMenuAttributesInspector
- (id) init

View file

@ -26,35 +26,6 @@
#include <InterfaceBuilder/InterfaceBuilder.h>
#include <GormCore/GormFunctions.h>
@implementation NSMenu (IBObjectAdditionsEditor)
- (NSString*) editorClassName
{
return @"GormMenuEditor";
}
/*
* Method to return the image that should be used to display menus within
* the matrix containing the objects in a document.
*/
- (NSImage*) imageForViewer
{
static NSImage *image = nil;
if (image == nil)
{
NSBundle *bundle = [NSBundle mainBundle];
NSString *path = [bundle pathForImageResource: @"GormMenu"];
image = [[NSImage alloc] initWithContentsOfFile: path];
}
return image;
}
- (NSString*) inspectorClassName
{
return @"GormMenuAttributesInspector";
}
@end
/*
* This method will allow us to check if the menu is
* open, so that it can be conditionally closed.

View file

@ -4,6 +4,8 @@
*
* Author: Richard Frith-Macdonald <richard@brainstrom.co.uk>
* Date: 2000
* Author: Gregory John Casamento <greg_casamento@yahoo.com>
* Date: 2003
*
* This file is part of GNUstep.
*
@ -134,30 +136,6 @@
@implementation NSMenuItem (IBObjectAdditions)
- (NSString*) inspectorClassName
{
return @"GormMenuItemAttributesInspector";
}
/*
- (void)awakeFromDocument: (id <IBDocuments>)doc
{
NSMenu *menu = [self menu];
if(menu != nil)
{
if([menu supermenu] != nil)
{
// NSLog(@"Menu = %@",menu);
// [menu display];
[menu close];
[menu closeTransient];
}
}
}
*/
@end
@interface GormMenuItemAttributesInspector : IBInspector
{
NSTextField *titleText;

View file

@ -39,15 +39,6 @@
#include <AppKit/NSNibLoading.h>
#include <AppKit/NSTextField.h>
@implementation NSMenuItem (IBObjectAdditions)
- (NSString*) inspectorClassName
{
return @"GormMenuItemAttributesInspector";
}
@end
@implementation GormMenuItemAttributesInspector
- (id) init

View file

@ -0,0 +1,68 @@
/* inspectors.m
*
* This file defines the mapping between objects and thier editors/inspectors.
*
* Copyright (C) 2000 Free Software Foundation, Inc.
*
* Author: Gregory John Casamento <greg_casamento@yahoo.com>
* Date: 2005
*
* This file is part of GNUstep.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
*/
#include <AppKit/AppKit.h>
#include <InterfaceBuilder/InterfaceBuilder.h>
@implementation NSMenu (IBObjectAdditions)
- (NSString*) inspectorClassName
{
return @"GormMenuAttributesInspector";
}
- (NSString*) editorClassName
{
return @"GormMenuEditor";
}
/*
* Method to return the image that should be used to display menus within
* the matrix containing the objects in a document.
*/
- (NSImage*) imageForViewer
{
static NSImage *image = nil;
if (image == nil)
{
NSBundle *bundle = [NSBundle mainBundle];
NSString *path = [bundle pathForImageResource: @"GormMenu"];
image = [[NSImage alloc] initWithContentsOfFile: path];
}
return image;
}
@end
@implementation NSMenuItem (IBObjectAdditions)
- (NSString*) inspectorClassName
{
return @"GormMenuItemAttributesInspector";
}
@end

View file

@ -26,24 +26,28 @@ include $(GNUSTEP_MAKEFILES)/common.make
PALETTE_NAME = 1Windows
1Windows_PALETTE_ICON = WindowsPalette
1Windows_OBJC_FILES = WindowsPalette.m \
GormNSWindow.m\
GormNSPanel.m\
GormWindowAttributesInspector.m\
GormWindowSizeInspector.m
1Windows_OBJC_FILES = \
WindowsPalette.m \
GormNSWindow.m\
GormNSPanel.m\
GormWindowAttributesInspector.m\
GormWindowSizeInspector.m \
inspectors.m
1Windows_HEADER_FILES = GormNSWindow.h \
GormWindowAttributesInspector.h\
GormWindowSizeInspector.h\
GormNSPanel.h
1Windows_HEADER_FILES = \
GormNSWindow.h \
GormWindowAttributesInspector.h\
GormWindowSizeInspector.h\
GormNSPanel.h
1Windows_PRINCIPAL_CLASS = WindowsPalette
1Windows_RESOURCE_FILES = WindowsPalette.tiff \
WindowDrag.tiff \
GormNSWindowSizeInspector.gorm \
GormNSWindowInspector.gorm \
palette.table
1Windows_RESOURCE_FILES = \
WindowsPalette.tiff \
WindowDrag.tiff \
GormNSWindowSizeInspector.gorm \
GormNSWindowInspector.gorm \
palette.table
1Windows_STANDARD_INSTALL = no

View file

@ -38,26 +38,6 @@
#include <GormCore/NSColorWell+GormExtensions.h>
#include <AppKit/NSNibLoading.h>
/*
IBObjectAdditions category for NSPanel
*/
@implementation NSPanel (IBObjectAdditions)
- (NSString*) inspectorClassName
{
return @"GormWindowAttributesInspector";
}
@end
/*
IBObjectAdditions category for NSWindow
*/
@implementation NSWindow (IBObjectAdditions)
- (NSString*) inspectorClassName
{
return @"GormWindowAttributesInspector";
}
@end
@implementation GormWindowAttributesInspector
- (id) init