From fc23863d85bcfa8546e86eb301c55e80c75d399f Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Mon, 2 Jul 2012 09:43:08 -0400 Subject: [PATCH 1/2] Added support for alternate button title in nib2cib --- Tools/nib2cib/NSButton.j | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tools/nib2cib/NSButton.j b/Tools/nib2cib/NSButton.j index afdc6cfa5..6221a18fe 100644 --- a/Tools/nib2cib/NSButton.j +++ b/Tools/nib2cib/NSButton.j @@ -118,6 +118,7 @@ var NSButtonIsBorderedMask = 0x00800000, NIB_CONNECTION_EQUIVALENCY_TABLE[[cell UID]] = self; _title = [cell title]; + _alternateTitle = [cell alternateTitle]; _controlSize = CPRegularControlSize; [self setBordered:[cell isBordered]]; @@ -254,6 +255,7 @@ var NSButtonIsBorderedMask = 0x00800000, int _bezelStyle @accessors(readonly, getter=bezelStyle); CPString _title @accessors(readonly, getter=title); + CPString _alternateTitle @accessors(readonly, getter=alternateTitle); CPImage _normalImage @accessors(readonly, getter=normalImage); CPImage _alternateImage @accessors(readonly, getter=alternateImage); @@ -281,8 +283,9 @@ var NSButtonIsBorderedMask = 0x00800000, _isBordered = (buttonFlags & NSButtonIsBorderedMask) ? YES : NO; _bezelStyle = (buttonFlags2 & 0x7) | ((buttonFlags2 & 0x20) >> 2); - // NSContents for NSButton is actually the title + // NSContents/NSAlternateContents for NSButton is actually the title/alternate title _title = [aCoder decodeObjectForKey:@"NSContents"]; + _alternateTitle = [aCoder decodeObjectForKey:@"NSAlternateContents"]; // ... and _objectValue is _state _objectValue = [self state]; From 2f27291c53abb71434372adc85e3bfd734b21d74 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Mon, 2 Jul 2012 09:43:33 -0400 Subject: [PATCH 2/2] Tweaked debug output of custom image resources in nib2cib --- Tools/nib2cib/NSCustomResource.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/nib2cib/NSCustomResource.j b/Tools/nib2cib/NSCustomResource.j index 998a3a121..3c1370f08 100644 --- a/Tools/nib2cib/NSCustomResource.j +++ b/Tools/nib2cib/NSCustomResource.j @@ -65,7 +65,7 @@ var FILE = require("file"), if (resourcePath && FILE.extension(resourcePath) !== FILE.extension(_resourceName)) _resourceName += FILE.extension(resourcePath); - CPLog.debug("Image path: %s\nImage size: %dx%d", FILE.canonical(resourcePath), size.width, size.height); + CPLog.debug(" Path: %s\n Size: %dx%d", FILE.canonical(resourcePath), size.width, size.height); } _properties = [CPDictionary dictionaryWithObject:size forKey:@"size"];