* Headers/AppKit/NSCollectionView.h

* Headers/AppKit/NSCollectionViewItem.h
	* Source/GNUmakefile
	* Source/NSCollectionViewItem.m
	* Source/NSCollectionView.m: Added NSCollectionView and
	NSCollectionViewItem classes from testplant branch.  Made changes
	to original patch to conform to coding standards, NSCoding for
	non-keyed archiving and moved instances of float/integer to
	CGFloat and NSInteger/NSUInteger as appropriate.
	Patch by Doug Simons (dsimons@testplant.com) and
	Frank LeGrand (flegrand@testplant.com).



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36545 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,17 @@
+2013-04-17 23:54-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Headers/AppKit/NSCollectionView.h
+	* Headers/AppKit/NSCollectionViewItem.h
+	* Source/GNUmakefile
+	* Source/NSCollectionViewItem.m
+	* Source/NSCollectionView.m: Added NSCollectionView and
+	NSCollectionViewItem classes from testplant branch.  Made changes
+	to original patch to conform to coding standards, NSCoding for
+	non-keyed archiving and moved instances of float/integer to
+	CGFloat and NSInteger/NSUInteger as appropriate.
+	Patch by Doug Simons (dsimons@testplant.com) and
+	Frank LeGrand (flegrand@testplant.com).
+
 2013-04-15  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/NSKeyValueBinding.h,

Headers/AppKit/NSCollectionView.h

@@ -0,0 +1,140 @@
+/* -*-objc-*-
+   NSCollectionView.h
+
+   Copyright (C) 2013 Free Software Foundation, Inc.
+
+   Author: Doug Simons (doug.simons@testplant.com)
+           Frank LeGrand (frank.legrand@testplant.com)
+   Date: February 2013
+   
+   This file is part of the GNUstep GUI Library.
+
+   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 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; see the file COPYING.LIB.
+   If not, see <http://www.gnu.org/licenses/> or write to the 
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, 
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef _GNUstep_H_NSCollectionView
+#define _GNUstep_H_NSCollectionView
+
+#import <AppKit/NSNibDeclarations.h>
+#import <GNUstepBase/GSVersionMacros.h>
+
+#import <AppKit/NSView.h>
+#import <AppKit/NSDragging.h>
+
+@class NSCollectionViewItem;
+@class NSCollectionView;
+
+enum
+{  
+  NSCollectionViewDropOn = 0,
+  NSCollectionViewDropBefore = 1,
+};
+typedef NSInteger NSCollectionViewDropOperation;
+
+@protocol NSCollectionViewDelegate <NSObject>
+
+- (NSImage *)collectionView:(NSCollectionView *)collectionView draggingImageForItemsAtIndexes:(NSIndexSet *)indexes withEvent:(NSEvent *)event offset:(NSPointPointer)dragImageOffset;
+- (BOOL)collectionView:(NSCollectionView *)collectionView writeItemsAtIndexes:(NSIndexSet *)indexes toPasteboard:(NSPasteboard *)pasteboard;
+- (BOOL)collectionView:(NSCollectionView *)collectionView canDragItemsAtIndexes:(NSIndexSet *)indexes withEvent:(NSEvent *)event;
+- (NSDragOperation)collectionView:(NSCollectionView *)collectionView validateDrop:(id < NSDraggingInfo >)draggingInfo proposedIndex:(NSInteger *)proposedDropIndex dropOperation:(NSCollectionViewDropOperation *)proposedDropOperation;
+- (BOOL)collectionView:(NSCollectionView *)collectionView acceptDrop:(id < NSDraggingInfo >)draggingInfo index:(NSInteger)index dropOperation:(NSCollectionViewDropOperation)dropOperation;
+- (NSArray *)collectionView:(NSCollectionView *)collectionView namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropURL forDraggedItemsAtIndexes:(NSIndexSet *)indexes;
+
+@end
+
+
+@interface NSCollectionView : NSView
+{
+  NSArray *_content;
+  IBOutlet NSCollectionViewItem *itemPrototype;
+  NSMutableArray *_items;
+  
+  BOOL _allowsMultipleSelection;
+  BOOL _isSelectable;
+  NSIndexSet *_selectionIndexes;
+  
+  NSArray *_backgroundColors;
+  IBOutlet id <NSCollectionViewDelegate> delegate;
+  
+  NSSize _itemSize;
+  NSSize _maxItemSize;
+  NSSize _minItemSize;
+  float _tileWidth;
+  float _verticalMargin;
+  float _horizontalMargin;
+
+  NSUInteger _maxNumberOfColumns;
+  NSUInteger _maxNumberOfRows;
+  long _numberOfColumns;
+  
+  NSDragOperation _draggingSourceOperationMaskForLocal;
+  NSDragOperation _draggingSourceOperationMaskForRemote;
+  
+  NSUInteger _draggingOnRow;
+  NSUInteger _draggingOnIndex;
+}
+
+- (BOOL) allowsMultipleSelection;
+- (void) setAllowsMultipleSelection: (BOOL)flag;
+
+- (NSArray *) backgroundColors;
+- (void) setBackgroundColors: (NSArray *)colors;
+
+- (NSArray *)content;
+- (void)setContent:(NSArray *)content;
+
+- (id < NSCollectionViewDelegate >) delegate;
+- (void) setDelegate: (id < NSCollectionViewDelegate >)aDelegate;
+
+- (NSCollectionViewItem *) itemPrototype;
+- (void) setItemPrototype: (NSCollectionViewItem *)prototype;
+
+- (NSSize) maxItemSize;
+- (void) setMaxItemSize: (NSSize)size;
+
+- (NSUInteger) maxNumberOfColumns;
+- (void) setMaxNumberOfColumns: (NSUInteger)number;
+
+- (NSUInteger) maxNumberOfRows;
+- (void) setMaxNumberOfRows: (NSUInteger)number;
+
+- (NSSize) minItemSize;
+- (void) setMinItemSize: (NSSize)size;
+
+- (BOOL) isSelectable;
+- (void) setSelectable: (BOOL)flag;
+
+- (NSIndexSet *) selectionIndexes;
+- (void) setSelectionIndexes: (NSIndexSet *)indexes;
+
+- (NSRect) frameForItemAtIndex: (NSUInteger)index;
+- (NSCollectionViewItem *) itemAtIndex: (NSUInteger)index;
+- (NSCollectionViewItem *) newItemForRepresentedObject:(id)object;
+
+- (void) tile;
+
+- (void) setDraggingSourceOperationMask: (NSDragOperation)dragOperationMask 
+                               forLocal: (BOOL)localDestination;
+							   
+- (NSImage *) draggingImageForItemsAtIndexes: (NSIndexSet *)indexes
+                                   withEvent: (NSEvent *)event
+                                      offset: (NSPointPointer)dragImageOffset;
+
+
+@end
+
+#endif /* _GNUstep_H_NSCollectionView */

Headers/AppKit/NSCollectionViewItem.h

@@ -0,0 +1,61 @@
+/* -*-objc-*-
+   NSCollectionViewItem.h
+
+   Copyright (C) 2013 Free Software Foundation, Inc.
+
+   Author: Doug Simons (doug.simons@testplant.com)
+           Frank LeGrand (frank.legrand@testplant.com)
+   Date: February 2013
+   
+   This file is part of the GNUstep GUI Library.
+
+   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 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; see the file COPYING.LIB.
+   If not, see <http://www.gnu.org/licenses/> or write to the 
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, 
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef _GNUstep_H_NSCollectionViewItem
+#define _GNUstep_H_NSCollectionViewItem
+
+#import <AppKit/NSNibDeclarations.h>
+#import <GNUstepBase/GSVersionMacros.h>
+#import <AppKit/NSTextField.h>
+#import <AppKit/NSImageView.h>
+#import <AppKit/NSView.h>
+#import <AppKit/NSViewController.h>
+#import <AppKit/NSCollectionView.h>
+#import <AppKit/NSDragging.h>
+
+
+@interface NSCollectionViewItem : NSViewController
+{
+  IBOutlet NSTextField *textField;
+  IBOutlet NSImageView *imageView;
+  BOOL _isSelected;
+}
+
+- (NSCollectionView *)collectionView;
+
+- (void)setSelected:(BOOL)shouldBeSelected;
+- (BOOL)isSelected;
+
+- (NSTextField *)textField;
+- (NSImageView *)imageView;
+- (void)setTextField:(NSTextField *)aTextField;
+- (void)setImageView:(NSImageView *)anImageView;
+
+@end
+
+#endif /* _GNUstep_H_NSCollectionView */

Source/GNUmakefile

@@ -67,6 +67,7 @@ NSButtonCell.m \
 NSCachedImageRep.m \
 NSCell.m \
 NSClipView.m \
+NSCollectionView.m \
 NSColor.m \
 NSColorList.m \
 NSColorPanel.m \
@@ -278,6 +279,7 @@ NSButtonCell.h \
 NSCachedImageRep.h \
 NSCell.h \
 NSClipView.h \
+NSCollectionView.h \
 NSColor.h \
 NSColorList.h \
 NSColorPanel.h \

Source/NSCollectionViewItem.m

@@ -0,0 +1,183 @@
+/** <title>NSCollectionViewItem</title>
+ 
+   Copyright (C) 2013 Free Software Foundation, Inc.
+ 
+   Author: Doug Simons (doug.simons@testplant.com)
+           Frank LeGrand (frank.legrand@testplant.com)
+   Date: February 2013
+ 
+   This file is part of the GNUstep GUI Library.
+
+   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 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; see the file COPYING.LIB.
+   If not, see <http://www.gnu.org/licenses/> or write to the 
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, 
+   Boston, MA 02110-1301, USA.
+*/
+
+#import "AppKit/NSCollectionViewItem.h"
+
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSFormatter.h>
+#import <Foundation/NSIndexSet.h>
+#import <Foundation/NSKeyValueCoding.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSSet.h>
+#import <Foundation/NSSortDescriptor.h>
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSValue.h>
+#import <Foundation/NSKeyedArchiver.h>
+
+#import "AppKit/NSTableView.h"
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSCell.h"
+#import "AppKit/NSClipView.h"
+#import "AppKit/NSColor.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSKeyValueBinding.h"
+#import "AppKit/NSScroller.h"
+#import "AppKit/NSScrollView.h"
+#import "AppKit/NSTableColumn.h"
+#import "AppKit/NSTableHeaderView.h"
+#import "AppKit/NSText.h"
+#import "AppKit/NSTextFieldCell.h"
+#import "AppKit/NSWindow.h"
+#import "AppKit/PSOperators.h"
+#import "AppKit/NSCachedImageRep.h"
+#import "AppKit/NSPasteboard.h"
+#import "AppKit/NSDragging.h"
+#import "AppKit/NSCustomImageRep.h"
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSStringDrawing.h"
+#import "GNUstepGUI/GSTheme.h"
+#import "GSBindingHelpers.h"
+
+#include <math.h>
+
+@implementation NSCollectionViewItem
+
+- (void)awakeFromNib
+{
+}
+
+- (BOOL)isSelected
+{
+  return _isSelected;
+}
+
+- (void)dealloc
+{
+  DESTROY (textField);
+  DESTROY (imageView);
+  [super dealloc];
+}
+
+- (NSCollectionView *)collectionView
+{
+  return (NSCollectionView *)[[self view] superview];
+}
+
+- (void)setSelected:(BOOL)flag
+{
+  if (_isSelected != flag)
+    {
+      _isSelected = flag;
+	}
+}
+
+- (id)representedObject
+{
+  return [super representedObject];
+}
+
+- (void)setRepresentedObject:(id)anObject
+{
+  [super setRepresentedObject:anObject];
+  //[textField setStringValue:[self representedObject]];
+}
+
+- (NSTextField *)textField
+{
+  return textField;
+}
+
+- (void)setTextField:(NSTextField *)aTextField
+{
+  if (textField != aTextField)
+    {
+      textField = aTextField;
+    }
+}
+
+- (NSImageView *)imageView
+{
+  return imageView;
+}
+
+- (void)setImageView:(NSImageView *)anImageView
+{
+  if (imageView != anImageView)
+    {
+      imageView = anImageView;
+    }
+}
+
+- (id)initWithCoder:(NSCoder *)aCoder
+{
+  self = [super initWithCoder:aCoder];
+  if (nil != self)
+    {
+      if(YES == [aCoder allowsKeyedCoding])
+	{
+	  textField = [aCoder decodeObjectForKey:@"textField"];
+	  imageView = [aCoder decodeObjectForKey:@"imageView"];
+	}
+      else
+	{
+	  textField = [aCoder decodeObject];
+	  imageView = [aCoder decodeObject];
+	}
+    }
+  return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
+  [super encodeWithCoder:aCoder];
+  if(YES == [aCoder allowsKeyedCoding])
+    {
+      [aCoder encodeObject:textField forKey:@"textField"];
+      [aCoder encodeObject:imageView forKey:@"imageView"];
+    }
+  else
+    {
+      [aCoder encodeObject:textField];
+      [aCoder encodeObject:imageView]
+    }
+}
+
+- (id) copyWithZone:(NSZone *)zone 
+{
+  NSData *itemAsData = [NSKeyedArchiver archivedDataWithRootObject:self];
+  NSCollectionViewItem *newItem = 
+    [NSKeyedUnarchiver unarchiveObjectWithData:itemAsData];
+  return newItem;
+}
+
+@end