diff --git a/Tools/nib2cib/Converter.j b/Tools/nib2cib/Converter.j index 171e7c6f0..46eb0036a 100644 --- a/Tools/nib2cib/Converter.j +++ b/Tools/nib2cib/Converter.j @@ -71,9 +71,9 @@ ConverterConversionException = @"ConverterConversionException"; inferredFormat = NibFormatIPhone; if (inferredFormat === NibFormatMac) - CPLog("Auto-detected Cocoa Nib or Xib File"); + CPLog.info("Auto-detected Cocoa Nib or Xib File"); else - CPLog("Auto-detected CocoaTouch Xib File"); + CPLog.info("Auto-detected CocoaTouch Xib File"); } var nibData = [self CPCompliantNibDataAtFilePath:inputPath]; diff --git a/Tools/nib2cib/NSAppKit.j b/Tools/nib2cib/NSAppKit.j index fb4a348f2..8a54fb2d1 100644 --- a/Tools/nib2cib/NSAppKit.j +++ b/Tools/nib2cib/NSAppKit.j @@ -77,7 +77,7 @@ function CP_NSMapClassName(aClassName) if (CPClassFromString(mappedClassName)) { - CPLog.warn("Mapping " + aClassName + " to " + mappedClassName); + CPLog.info("Mapping " + aClassName + " to " + mappedClassName); return mappedClassName; } diff --git a/Tools/nib2cib/NSButton.j b/Tools/nib2cib/NSButton.j index 0a28ad50f..9c13724e4 100644 --- a/Tools/nib2cib/NSButton.j +++ b/Tools/nib2cib/NSButton.j @@ -95,7 +95,7 @@ _CPButtonBezelStyleHeights[CPHUDBezelStyle] = 20; if ([cell isBordered]) { - CPLog.warn("Adjusting CPButton height from " +_frame.size.height+ " / " + _bounds.size.height+" to " + 24); + CPLog.info("Adjusting CPButton height from " +_frame.size.height+ " / " + _bounds.size.height+" to " + 24); _frame.size.height = 24.0; _bounds.size.height = 24.0; } diff --git a/Tools/nib2cib/NSColor.j b/Tools/nib2cib/NSColor.j index 454252a59..266fdd5df 100644 --- a/Tools/nib2cib/NSColor.j +++ b/Tools/nib2cib/NSColor.j @@ -55,8 +55,6 @@ var NSUnknownColorSpaceModel = -1, for (var i = 0; i < components.length && i < 4; i++) values[i] = [components[i] floatValue]; - - CPLog.warn("rgb="+rgb+" string=" + string + " values=" + values); result = [CPColor colorWithCalibratedRed:values[0] green:values[1] blue:values[2] alpha:values[3]]; break; diff --git a/Tools/nib2cib/NSCustomResource.j b/Tools/nib2cib/NSCustomResource.j index 76fba1b33..aa576a7e7 100644 --- a/Tools/nib2cib/NSCustomResource.j +++ b/Tools/nib2cib/NSCustomResource.j @@ -41,13 +41,13 @@ var FILE = require("file"); var size = CGSizeMakeZero(); if (![[aCoder resourcesPath] length]) - CPLog.warn("***WARNING: Resources found in nib, but no resources path specified with -R option."); + CPLog.warn("*** WARNING: Resources found in nib, but no resources path specified with -R option."); else { var resourcePath = [aCoder resourcePathForName:_resourceName]; if (!resourcePath) - CPLog.warn("***WARNING: Resource named " + _resourceName + " not found in supplied resources path."); + CPLog.warn("*** WARNING: Resource named " + _resourceName + " not found in supplied resources path."); else size = imageSize(FILE.join(FILE.cwd(), resourcePath)); } diff --git a/Tools/nib2cib/NSIBObjectData.j b/Tools/nib2cib/NSIBObjectData.j index 1f1fc43c1..33903f3a4 100644 --- a/Tools/nib2cib/NSIBObjectData.j +++ b/Tools/nib2cib/NSIBObjectData.j @@ -127,7 +127,7 @@ children.forEach(function(aChild) { - CPLog.warn("Promoted " + aChild + " to child of " + parent); + CPLog.info("Promoted " + aChild + " to child of " + parent); _objectsKeys.push(aChild); _objectsValues.push(parent); }); diff --git a/Tools/nib2cib/NSTextField.j b/Tools/nib2cib/NSTextField.j index ecd8af57b..e04c11f35 100644 --- a/Tools/nib2cib/NSTextField.j +++ b/Tools/nib2cib/NSTextField.j @@ -38,30 +38,30 @@ [self sendActionOn:CPKeyUpMask|CPKeyDownMask]; - [self setEditable:[cell isEditable]]; - [self setSelectable:[cell isSelectable]]; - - [self setBordered:[cell isBordered]]; - [self setBezeled:[cell isBezeled]]; + [self setEditable:[cell isEditable]]; + [self setSelectable:[cell isSelectable]]; + + [self setBordered:[cell isBordered]]; + [self setBezeled:[cell isBezeled]]; [self setBezelStyle:[cell bezelStyle]]; [self setDrawsBackground:[cell drawsBackground]]; //[self setLineBreakMode:???]; [self setTextFieldBackgroundColor:[cell backgroundColor]]; - [self setPlaceholderString:[cell placeholderString]]; + [self setPlaceholderString:[cell placeholderString]]; [self setTextColor:[cell textColor]]; - + var frame = [self frame]; [self setFrameOrigin:CGPointMake(frame.origin.x - 4.0, frame.origin.y - 4.0)]; [self setFrameSize:CGSizeMake(frame.size.width + 8.0, frame.size.height + 8.0)]; CPLog.debug([self stringValue] + " => isBordered=" + [self isBordered] + ", isBezeled=" + [self isBezeled] + ", bezelStyle=" + [self bezelStyle] + "("+[cell stringValue]+", " + [cell placeholderString] + ")"); - } - - return self; + } + + return self; } @end @@ -97,7 +97,7 @@ if (self) { - _bezelStyle = [aCoder decodeObjectForKey:@"NSTextBezelStyle"] || CPTextFieldSquareBezel; + _bezelStyle = [aCoder decodeObjectForKey:@"NSTextBezelStyle"] || CPTextFieldSquareBezel; _drawsBackground = [aCoder decodeBoolForKey:@"NSDrawsBackground"]; _backgroundColor = [aCoder decodeObjectForKey:@"NSBackgroundColor"]; _textColor = [aCoder decodeObjectForKey:@"NSTextColor"];