mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-08-25 21:17:03 +00:00
Aparajita Fishman
d9117bd9a0
* State * Previously the Converter class needlessly copied a whole bunch of state from the Nib2Cib class, which was not only poor factoring, but made for easy omissions of state when instantiating a new Converter, such as was done in NSNib.j. This commit pushes all state not specific to Converter up to Nib2Cib. This allowed removal of redundant code in NSNib -NS_initWithCoder. * Resources * Previously it was not possible to use custom images that were located in a framework, because only the app's Resources directory was searched. This commit automatically searches all frameworks for Resources directories. When a custom image is specified in Xcode, first the app's Resources directory is searched, then all framework Resource directories. Alternately, the specific framework to use can be specified in Xcode by using the form framework@image. At runtime, the framework is loaded by its identifier (as specified in Info.plist), and if there is no identifier, by searching next to the current AppKit framework. All of this renders the nib2cib -R option completely obsolete, so it was removed from the NibApplication/Jakefile template.
124 lines
3.6 KiB
Plaintext
124 lines
3.6 KiB
Plaintext
/*
|
|
* NSComboBox.j
|
|
* nib2cib
|
|
*
|
|
* Created by Aparajita Fishman.
|
|
* Copyright (c) 2012, The Cappuccino Foundation
|
|
*
|
|
* 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/CPTextField.j>
|
|
@import <AppKit/CPComboBox.j>
|
|
|
|
@import "NSTextField.j"
|
|
|
|
@class Nib2Cib
|
|
|
|
|
|
@implementation CPComboBox (NSCoding)
|
|
|
|
- (id)NS_initWithCoder:(CPCoder)aCoder
|
|
{
|
|
return [super NS_initWithCoder:aCoder];
|
|
}
|
|
|
|
- (void)NS_initWithCell:(NSCell)cell
|
|
{
|
|
[super NS_initWithCell:cell];
|
|
|
|
_items = [cell itemList];
|
|
_usesDataSource = [cell usesDataSource];
|
|
_completes = [cell completes];
|
|
_numberOfVisibleItems = [cell visibleItemCount];
|
|
_hasVerticalScroller = [cell hasVerticalScroller];
|
|
[self setButtonBordered:[cell borderedButton]];
|
|
[self setEnabled:[cell isEnabled]];
|
|
|
|
// Make sure the height is clipped to the max given by the theme
|
|
var theme = [Nib2Cib defaultTheme],
|
|
maxSize = [theme valueForAttributeWithName:@"max-size" forClass:[CPComboBox class]],
|
|
size = [self frameSize],
|
|
widthOffset = -3;
|
|
|
|
// Adjust for differences between Cocoa and Cappuccino widget framing.
|
|
if ([theme name] == @"Aristo")
|
|
{
|
|
_frame.origin.x += 1;
|
|
widthOffset = -5;
|
|
}
|
|
|
|
[self setFrameSize:CGSizeMake(size.width + widthOffset, MIN(size.height, maxSize.height))];
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation NSComboBox : CPComboBox
|
|
|
|
- (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 [CPComboBox class];
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation NSComboBoxCell : NSTextFieldCell
|
|
{
|
|
int _visibleItemCount @accessors(readonly, getter=visibleItemCount);
|
|
BOOL _hasVerticalScroller @accessors(readonly, getter=hasVerticalScroller);
|
|
BOOL _usesDataSource @accessors(readonly, getter=usesDataSource);
|
|
BOOL _completes @accessors(readonly, getter=completes);
|
|
CPArray _itemList @accessors(readonly, getter=itemList);
|
|
BOOL _borderedButton @accessors(readonly, getter=borderedButton);
|
|
}
|
|
|
|
- (id)initWithCoder:(CPCoder)aCoder
|
|
{
|
|
self = [super initWithCoder:aCoder];
|
|
|
|
if (self)
|
|
{
|
|
_visibleItemCount = [aCoder decodeIntForKey:@"NSVisibleItemCount"];
|
|
_hasVerticalScroller = [aCoder decodeBoolForKey:@"NSHasVerticalScroller"];
|
|
_usesDataSource = [aCoder decodeBoolForKey:@"NSUsesDataSource"];
|
|
_completes = [aCoder decodeBoolForKey:@"NSCompletes"];
|
|
|
|
if (!_usesDataSource)
|
|
_itemList = [aCoder decodeObjectForKey:@"NSPopUpListData"] || [];
|
|
else
|
|
_itemList = [];
|
|
|
|
// NSButtonBordered key is present only if the value is NO, go figure
|
|
_borderedButton = [aCoder containsValueForKey:@"NSButtonBordered"] ? [aCoder decodeBoolForKey:@"NSButtonBordered"] : YES;
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
@end
|