More of the implementation for NSToolbarItem and the images for the "default" items.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17630 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2003-09-06 14:50:26 +00:00
parent 79ec1c46a6
commit 460936bb5a
8 changed files with 54 additions and 8 deletions

View file

@ -1,3 +1,13 @@
2003-09-06 Gregory John Casamento <greg_casamento@yahoo.com>
* Images/common_Printer.tiff
* Images/common_ToolbarSeperatorItem.tiff
* Images/common_ToolbarShowColorsItem.tiff
* Images/common_ToolbarShowFontsItem.tiff
* Images/common_ToolbarSpaceItem.tiff
* Source/NSToolbarItem.m: set the correct images and
target/action information for all of the standard toolbar items.
2003-09-06 Fred Kiefer <FredKiefer@gmx.de> 2003-09-06 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSMenuItem.m * Source/NSMenuItem.m

View file

@ -103,7 +103,12 @@ common_RightTabStop.tiff \
common_CenterTabStop.tiff \ common_CenterTabStop.tiff \
common_LeftTabStop.tiff \ common_LeftTabStop.tiff \
common_DecimalTabStop.tiff \ common_DecimalTabStop.tiff \
common_Diamond.tiff common_Diamond.tiff \
common_Printer.tiff \
common_ToolbarSeperatorItem.tiff \
common_ToolbarShowColorsItem.tiff \
common_ToolbarShowFontsItem.tiff \
common_ToolbarSpaceItem.tiff
-include GNUmakefile.preamble -include GNUmakefile.preamble

BIN
Images/common_Printer.tiff Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -267,8 +267,9 @@
@implementation GSToolbarSeperatorItem @implementation GSToolbarSeperatorItem
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarSeperatorItem"]; NSImage *image = [NSImage imageNamed: @"common_ToolbarSeperatorItem"];
NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[button setBordered: NO];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
@ -285,8 +286,9 @@
@implementation GSToolbarSpaceItem @implementation GSToolbarSpaceItem
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarSpaceItem"]; NSImage *image = [NSImage imageNamed: @"common_ToolbarSpaceItem"];
NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[button setBordered: NO];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
@ -303,8 +305,9 @@
@implementation GSToolbarFlexibleSpaceItem @implementation GSToolbarFlexibleSpaceItem
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarFlexibleSpaceItem"]; NSImage *image = [NSImage imageNamed: @"common_ToolbarFlexibleSpaceItem"];
NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[button setBordered: NO];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
@ -321,11 +324,18 @@
@implementation GSToolbarShowColorsItem @implementation GSToolbarShowColorsItem
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarShowColorsItem"]; NSImage *image = [NSImage imageNamed: @"common_ToolbarShowColorsItem"];
NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[button setBordered: YES];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
// set action...
[self setTarget: nil]; // goes to first responder..
[self setAction: @selector(orderFrontColorPanel:)];
// return
return self; return self;
} }
@end @end
@ -339,11 +349,18 @@
@implementation GSToolbarShowFontsItem @implementation GSToolbarShowFontsItem
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarShowFontsItem"]; NSImage *image = [NSImage imageNamed: @"common_ToolbarShowFontsItem"];
NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[button setBordered: YES];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
// set action...
[self setTarget: nil]; // goes to first responder..
[self setAction: @selector(orderFrontFontPanel:)];
// return
return self; return self;
} }
@end @end
@ -357,11 +374,18 @@
@implementation GSToolbarCustomizeToolbarItem @implementation GSToolbarCustomizeToolbarItem
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarCustomizeToolbarItem"]; NSImage *image = [NSImage imageNamed: @"common_ToolbarCustomizeToolbarItem"];
NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[button setBordered: YES];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
// set action...
[self setTarget: nil]; // goes to first responder..
[self setAction: @selector(runCustomizationPalette:)];
// return
return self; return self;
} }
@end @end
@ -375,11 +399,18 @@
@implementation GSToolbarPrintItem @implementation GSToolbarPrintItem
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarPrintItem"]; NSImage *image = [NSImage imageNamed: @"common_Printer"];
NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[button setBordered: YES];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
// set action...
[self setTarget: nil]; // goes to first responder..
[self setAction: @selector(print:)];
// return
return self; return self;
} }
@end @end