mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-09-07 03:07:12 +00:00
Aparajita Fishman
69bbe627a9
Previously, table view cells (non-view-based) were not being decoded with all of the available cell attributes in IB, and many attributes were hard-coded. In addition, there was a bunch of initialization code that has been made redundant by theming. With this commit, decoding of all control classes has been refactored so that table view cells can use the same code, thus ensuring they decode all available cell attributes. In addition, the redundant code has been eliminated. It is now possible to apply most table cell attributes such as font, color, alignment, sendsActionOnEndEditing, and so on, directly in IB. Closes #1803 BREAKING CHANGE: Changes have been made to table cell decoding in nib2cib. All xibs should be re-converted with `find . -name '*.xib' -exec nib2cib {} \;`.
126 lines
4.0 KiB
Plaintext
126 lines
4.0 KiB
Plaintext
/*
|
|
* NSLevelIndicator.j
|
|
* nib2cib
|
|
*
|
|
* Created by Alexander Ljungberg.
|
|
* Copyright 2011, WireLoad Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
@import <AppKit/CPLevelIndicator.j>
|
|
|
|
@import "NSCell.j"
|
|
|
|
|
|
@implementation CPLevelIndicator (CPCoding)
|
|
|
|
- (id)NS_initWithCoder:(CPCoder)aCoder
|
|
{
|
|
var cell = [aCoder decodeObjectForKey:@"NSCell"];
|
|
|
|
// Initialise before [super ...] to ensure setObjectValue constrains the values properly.
|
|
_minValue = [cell minValue];
|
|
_maxValue = [cell maxValue];
|
|
|
|
return [super NS_initWithCoder:aCoder];
|
|
}
|
|
|
|
/*!
|
|
Intialise the receiver given a cell. This method is meant for reuse by controls which contain
|
|
cells other than CPLevelIndicator itself.
|
|
*/
|
|
- (void)NS_initWithCell:(NSCell)cell
|
|
{
|
|
[super NS_initWithCell:cell];
|
|
|
|
_minValue = [cell minValue];
|
|
_maxValue = [cell maxValue];
|
|
_levelIndicatorStyle = [cell levelIndicatorStyle];
|
|
_warningValue = [cell warningValue];
|
|
_criticalValue = [cell criticalValue];
|
|
_tickMarkPosition = [cell tickMarkPosition];
|
|
_numberOfTickMarks = [cell numberOfTickMarks];
|
|
_numberOfMajorTickMarks = [cell numberOfMajorTickMarks];
|
|
|
|
[self setEditable:[cell isEditable]];
|
|
[self setEnabled:[cell isEnabled]];
|
|
[self setContinuous:[cell isContinuous]];
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation NSLevelIndicator : CPLevelIndicator
|
|
{
|
|
}
|
|
|
|
- (id)initWithCoder:(CPCoder)aCoder
|
|
{
|
|
self = [self NS_initWithCoder:aCoder];
|
|
|
|
if (self)
|
|
{
|
|
var cell = [aCoder decodeObjectForKey:@"NSCell"];
|
|
[self NS_initWithCell:cell];
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (Class)classForKeyedArchiver
|
|
{
|
|
return [CPLevelIndicator class];
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation NSLevelIndicatorCell : NSCell
|
|
{
|
|
CPLevelIndicator _levelIndicatorStyle @accessors(readonly, getter=levelIndicatorStyle);
|
|
double _minValue @accessors(readonly, getter=minValue);
|
|
double _maxValue @accessors(readonly, getter=maxValue);
|
|
double _warningValue @accessors(readonly, getter=warningValue);
|
|
double _criticalValue @accessors(readonly, getter=criticalValue);
|
|
CPTickMarkPosition _tickMarkPosition @accessors(readonly, getter=tickMarkPosition);
|
|
int _numberOfTickMarks @accessors(readonly, getter=numberOfTickMarks);
|
|
int _numberOfMajorTickMarks @accessors(readonly, getter=numberOfMajorTickMarks);
|
|
}
|
|
|
|
- (id)initWithCoder:(CPCoder)aCoder
|
|
{
|
|
self = [super initWithCoder:aCoder];
|
|
|
|
if (self)
|
|
{
|
|
_objectValue = [aCoder decodeDoubleForKey:@"NSValue"];
|
|
|
|
_minValue = [aCoder decodeDoubleForKey:@"NSMinValue"];
|
|
_maxValue = [aCoder decodeDoubleForKey:@"NSMaxValue"];
|
|
_warningValue = [aCoder decodeDoubleForKey:@"NSWarningValue"];
|
|
_criticalValue = [aCoder decodeDoubleForKey:@"NSCriticalValue"];
|
|
|
|
_levelIndicatorStyle = [aCoder decodeIntForKey:@"NSIndicatorStyle"];
|
|
|
|
// None of these are included in the XIB if the defaults are used.
|
|
_tickMarkPosition = [aCoder decodeIntForKey:@"NSTickMarkPosition"];
|
|
_numberOfTickMarks = [aCoder decodeIntForKey:@"NSNumberOfTickMarks"];
|
|
_numberOfTickMarks = [aCoder decodeIntForKey:@"NSNumberOfMajorTickMarks"];
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
@end
|