From 7a53fefbf0b1aa2eaaddb06998d0bbe7d9c5b42e Mon Sep 17 00:00:00 2001 From: FredKiefer Date: Tue, 24 Feb 2004 19:31:33 +0000 Subject: [PATCH] Made images easier to be changed by themes. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@18647 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 11 +++++++++++ Images/nsmapping.strings | 3 ++- Source/GSNibCompatibility.m | 36 ++++++++++++++++++++++-------------- Source/NSButtonCell.m | 8 ++++---- Source/NSCursor.m | 5 +++++ Source/NSMenuItem.m | 4 ++-- Source/NSMenuItemCell.m | 2 +- 7 files changed, 47 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 397686d67..6ce9ad4a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-02-24 Fred Kiefer + + * Images/nsmapping.strings: + Added definition for NSMenuMixedState. + * Source/NSButtonCell.m: (-setButtonType:) + * Source/NSMenuItemCell.m: (+initialize) + * Source/NSMenuItem.m: (-initWithTitle:action:keyEquivalent:) + Use image aliases instead of file names. + * Source/GSNibCompatibility.m: Reenabled keyed archiver for + NSWindowTemplate and added missing include. + 2004-02-20 Fred Kiefer * Headers/AppKit/NSView.h: diff --git a/Images/nsmapping.strings b/Images/nsmapping.strings index 3cecb9603..4423248b1 100644 --- a/Images/nsmapping.strings +++ b/Images/nsmapping.strings @@ -8,4 +8,5 @@ NSRadioButton = common_RadioOff; NSHighlightedRadioButton = common_RadioOn; AppleMenuImage = GNUstepMenuImage; NSMenuCheckmark = common_2DCheckMark; -NSMenuArrow = common_3DArrowRight; \ No newline at end of file +NSMenuArrow = common_3DArrowRight; +NSMenuMixedState = common_2DDash; \ No newline at end of file diff --git a/Source/GSNibCompatibility.m b/Source/GSNibCompatibility.m index dfc150a32..bc4796ce0 100644 --- a/Source/GSNibCompatibility.m +++ b/Source/GSNibCompatibility.m @@ -52,6 +52,7 @@ #include #include #include +#include #include "AppKit/AppKit.h" #include #include @@ -97,16 +98,13 @@ - (id) initWithCoder: (NSCoder *)aDecoder { - /* + /**/ if ([aDecoder allowsKeyedCoding]) { - NSRect screenRect = [aDecoder decodeRectForKey: @"NSScreenRect"]; + //NSRect screenRect = [aDecoder decodeRectForKey: @"NSScreenRect"]; NSRect windowRect = [aDecoder decodeRectForKey: @"NSWindowRect"]; - NSString *viewClass = [aDecoder decodeObjectForKey: @"NSViewClass"]; + //NSString *viewClass = [aDecoder decodeObjectForKey: @"NSViewClass"]; NSString *windowClass = [aDecoder decodeObjectForKey: @"NSWindowClass"]; - NSString *title = [aDecoder decodeObjectForKey: @"NSWindowTitle"]; - NSView *view = [aDecoder decodeObjectForKey: @"NSWindowView"]; - int flags = [aDecoder decodeIntForKey: @"NSWTFlags"]; int style = [aDecoder decodeIntForKey: @"NSWindowStyleMask"]; int backing = [aDecoder decodeIntForKey: @"NSWindowBacking"]; @@ -116,8 +114,16 @@ backing: backing defer: NO screen: nil]; - [self setContentView: view]; + if ([aDecoder containsValueForKey: @"NSWindowView"]) + { + [self setContentView: + [aDecoder decodeObjectForKey: @"NSWindowView"]]; + } + if ([aDecoder containsValueForKey: @"NSWTFlags"]) + { + //int flags = [aDecoder decodeIntForKey: @"NSWTFlags"]; + } if ([aDecoder containsValueForKey: @"NSMinSize"]) { NSSize minSize = [aDecoder decodeSizeForKey: @"NSMinSize"]; @@ -128,18 +134,20 @@ NSSize maxSize = [aDecoder decodeSizeForKey: @"NSMaxSize"]; [self setMaxSize: maxSize]; } - [self setTitle: title]; + if ([aDecoder containsValueForKey: @"NSWindowTitle"]) + { + [self setTitle: [aDecoder decodeObjectForKey: @"NSWindowTitle"]]; + } return self; } else { - */ - [aDecoder decodeValueOfObjCType: @encode(id) at: &_className]; - [aDecoder decodeValueOfObjCType: @encode(id) at: &_parentClassName]; - [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_deferFlag]; - return [super initWithCoder: aDecoder]; - //} + [aDecoder decodeValueOfObjCType: @encode(id) at: &_className]; + [aDecoder decodeValueOfObjCType: @encode(id) at: &_parentClassName]; + [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_deferFlag]; + return [super initWithCoder: aDecoder]; + } } - (void) encodeWithCoder: (NSCoder *)aCoder diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m index 2394033ea..a58ace12d 100644 --- a/Source/NSButtonCell.m +++ b/Source/NSButtonCell.m @@ -533,8 +533,8 @@ case NSSwitchButton: [self setHighlightsBy: NSContentsCellMask]; [self setShowsStateBy: NSContentsCellMask]; - [self setImage: [NSImage imageNamed: @"common_SwitchOff"]]; - [self setAlternateImage: [NSImage imageNamed: @"common_SwitchOn"]]; + [self setImage: [NSImage imageNamed: @"NSSwitch"]]; + [self setAlternateImage: [NSImage imageNamed: @"NSHighlightedSwitch"]]; [self setImagePosition: NSImageLeft]; [self setAlignment: NSLeftTextAlignment]; [self setBordered: NO]; @@ -544,8 +544,8 @@ case NSRadioButton: [self setHighlightsBy: NSContentsCellMask]; [self setShowsStateBy: NSContentsCellMask]; - [self setImage: [NSImage imageNamed: @"common_RadioOff"]]; - [self setAlternateImage: [NSImage imageNamed: @"common_RadioOn"]]; + [self setImage: [NSImage imageNamed: @"NSRadioButton"]]; + [self setAlternateImage: [NSImage imageNamed: @"NSHighlightedRadioButton"]]; [self setImagePosition: NSImageLeft]; [self setAlignment: NSLeftTextAlignment]; [self setBordered: NO]; diff --git a/Source/NSCursor.m b/Source/NSCursor.m index d373880e2..f097b88fa 100644 --- a/Source/NSCursor.m +++ b/Source/NSCursor.m @@ -392,6 +392,11 @@ backgroundColorHint:(NSColor *)bg { self = [NSCursor IBeamCursor]; } + else + { + // FIXME + self = [NSCursor arrowCursor]; + } if ([aDecoder containsValueForKey: @"NSHotSpot"]) { diff --git a/Source/NSMenuItem.m b/Source/NSMenuItem.m index 062650c3b..4632c461b 100644 --- a/Source/NSMenuItem.m +++ b/Source/NSMenuItem.m @@ -127,8 +127,8 @@ static Class imageClass; _enabled = YES; //_image = nil; // Set the images according to the spec. On: check mark; off: dash. - [self setOnStateImage: [imageClass imageNamed: @"common_2DCheckMark"]]; - [self setMixedStateImage: [imageClass imageNamed: @"common_2DDash"]]; + [self setOnStateImage: [imageClass imageNamed: @"NSMenuCheckmark"]]; + [self setMixedStateImage: [imageClass imageNamed: @"NSMenuMixedState"]]; //_offStateImage = nil; //_target = nil; _action = aSelector; diff --git a/Source/NSMenuItemCell.m b/Source/NSMenuItemCell.m index e495fa425..86246c12e 100644 --- a/Source/NSMenuItemCell.m +++ b/Source/NSMenuItemCell.m @@ -54,7 +54,7 @@ static NSImage *arrowImage = nil; /* Cache arrow image. */ if (self == [NSMenuItemCell class]) { [self setVersion: 2]; - arrowImage = [[NSImage imageNamed: @"common_3DArrowRight"] copy]; + arrowImage = [[NSImage imageNamed: @"NSMenuArrow"] copy]; } }