New palette for formatters

GNUmakefile

@@ -79,6 +79,7 @@ Gorm_RESOURCE_FILES = \
 	Palettes/2Controls/2Controls.palette \
 	Palettes/3Containers/3Containers.palette \
 	Palettes/4Data/4Data.palette \
+	Palettes/5Formatters/5Formatters.palette \
 	Plugins/Gorm/Gorm.plugin \
 	Plugins/Nib/Nib.plugin \
 	Plugins/GModel/GModel.plugin \

Palettes/5Formatters/FormattersPalette.h

@@ -0,0 +1,66 @@
+/* DataPalette - Formatter Additions...
+
+   Copyright (C) 2021 Free Software Foundation, Inc.
+
+   Author:  Gregory Casamento <greg.casamento@gmail.com>
+   Date: June 1 2021
+   
+   This file is part of GNUstep.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program 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 General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+*/
+
+#ifndef INCLUDED_DataPalette_h
+#define INCLUDED_DataPalette_h
+
+#include <Foundation/Foundation.h>
+#include <InterfaceBuilder/InterfaceBuilder.h>
+
+/*
+ * NSDateFormatter and NSNumberFormatter extensions
+ * for Gorm Formatters used in the Data Palette
+ */
+
+@interface NSDateFormatter (GormAdditions)
+
++ (int) formatCount;
++ (NSString *) formatAtIndex: (int)index;
++ (NSInteger) indexOfFormat: (NSString *) format;
++ (NSString *) defaultFormat;
++ (id) defaultFormatValue;
+
+@end
+
+@interface NSNumberFormatter (GormAdditions)
+
++ (int) formatCount;
++ (NSString *) formatAtIndex: (int)index;
++ (NSString *) positiveFormatAtIndex: (int)index;
++ (NSString *) zeroFormatAtIndex: (int)index;
++ (NSString *) negativeFormatAtIndex: (int)index;
++ (NSDecimalNumber *) positiveValueAtIndex: (int)index;
++ (NSDecimalNumber *) negativeValueAtIndex: (int)index;
++ (NSInteger) indexOfFormat: (NSString *)format;
++ (NSString *) defaultFormat;
++ (id) defaultFormatValue;
+- (NSString *) zeroFormat;
+
+@end
+
+@interface FormattersPalette: IBPalette <IBViewResourceDraggingDelegates>
+@end
+
+#endif
+

Palettes/5Formatters/FormattersPalette.m

@@ -0,0 +1,207 @@
+/* main.m
+
+   Copyright (C) 1999 Free Software Foundation, Inc.
+
+   Author:  Laurent Julliard <laurent@julliard-online.org>
+   Date: Nov 2001
+   
+   This file is part of GNUstep.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program 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 General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+*/
+
+#include <Foundation/Foundation.h>
+#include <AppKit/AppKit.h>
+
+#include <InterfaceBuilder/InterfaceBuilder.h>
+#include "FormattersPalette.h"
+
+/* -----------------------------------------------------------
+ * Some additions to the Formatters Classes specific to Gorm
+ * -----------------------------------------------------------*/
+NSArray *predefinedNumberFormats;
+int defaultNumberFormatIndex = 0;
+
+@implementation FormattersPalette
+
+- (id) init
+{
+  if((self = [super init]) != nil)
+    {
+      // Make ourselves a delegate, so that when the formatter is dragged in, 
+      // this code is called...
+      [NSView registerViewResourceDraggingDelegate: self];
+
+      // subscribe to the notification...      
+      [[NSNotificationCenter defaultCenter]
+	addObserver: self
+	selector: @selector(willInspectObject:)
+	name: IBWillInspectObjectNotification
+	object: nil];      
+    }
+  
+  return self;
+}
+
+- (void) dealloc
+{
+  [NSView unregisterViewResourceDraggingDelegate: self];
+  [[NSNotificationCenter defaultCenter] removeObserver: self];
+  [super dealloc];
+}
+
+- (void) finishInstantiate
+{ 
+  NSView	*contents;
+  NSTextView	*tv;
+  id		v;
+  NSNumberFormatter *nf;
+  NSDateFormatter *df;
+  NSRect rect;
+
+  originalWindow = [[NSWindow alloc] initWithContentRect: 
+				       NSMakeRect(0, 0, 272, 192)
+				       styleMask: NSBorderlessWindowMask 
+					 backing: NSBackingStoreRetained
+					   defer: NO];
+  [originalWindow setTitle: @"Formatters"];
+  contents = [originalWindow contentView];
+
+  /* Number and Date formatters. Note that they have a specific drag type.
+     * All other palette objects are views and use the default  IBViewPboardType
+     * drag type
+     */
+  v = [[NSImageView alloc] initWithFrame: NSMakeRect(153, 48, 43, 43)];
+  [v setImageFrameStyle: NSImageFramePhoto];
+  [v setImageScaling: NSScaleProportionally];
+  [v setImageAlignment: NSImageAlignCenter];
+  [v setImage: [NSImage imageNamed: @"number_formatter.tiff"]];
+  [contents addSubview: v];
+
+  nf = [[NSNumberFormatter alloc] init];
+  [nf setFormat: [NSNumberFormatter defaultFormat]];
+  [self associateObject: nf type: IBFormatterPboardType with: v];
+  RELEASE(v);
+
+  v = [[NSImageView alloc] initWithFrame: NSMakeRect(206, 48, 43, 43)];
+  [v setImageFrameStyle: NSImageFramePhoto];
+  [v setImageScaling: NSScaleProportionally];
+  [v setImageAlignment: NSImageAlignCenter];
+  [v setImage: [NSImage imageNamed: @"date_formatter.tiff"]];
+  [contents addSubview: v];
+
+  df = [[NSDateFormatter alloc]
+           initWithDateFormat: [NSDateFormatter defaultFormat]
+         allowNaturalLanguage: NO];
+
+  [self associateObject: df type: IBFormatterPboardType with: v];
+  RELEASE(v);
+}
+
+- (void) willInspectObject: (NSNotification *)notification
+{
+  id o = [notification object];
+  if([o respondsToSelector: @selector(cell)])
+    {
+      id cell = [o cell];
+      if([cell respondsToSelector: @selector(formatter)])
+	{
+	  id formatter = [o formatter];
+	  if([formatter isKindOfClass: [NSFormatter class]])
+	    {
+	      NSString *ident = NSStringFromClass([formatter class]);
+	      [[IBInspectorManager sharedInspectorManager]
+		addInspectorModeWithIdentifier: ident 
+		forObject: o
+		localizedLabel: _(@"Formatter")
+		inspectorClassName: [formatter inspectorClassName]
+		ordering: -1.0];      
+	    }
+	}
+    }
+}
+
+// view resource dragging delegate...
+
+/**
+ * Ask if the view accepts the object.
+ */
+- (BOOL) acceptsViewResourceFromPasteboard: (NSPasteboard *)pb
+                                 forObject: (id)obj
+                                   atPoint: (NSPoint)p
+{
+  return ([obj respondsToSelector: @selector(setFormatter:)] && 
+	  [[pb types] containsObject: IBFormatterPboardType]);
+}
+
+/**
+ * Perform the action of depositing the object.
+ */
+- (void) depositViewResourceFromPasteboard: (NSPasteboard *)pb
+                                  onObject: (id)obj
+                                   atPoint: (NSPoint)p
+{
+  NSData *data = [pb dataForType: IBFormatterPboardType];
+  id array = [NSUnarchiver unarchiveObjectWithData: data];
+  
+  if(array != nil)
+    {
+      if([array count] > 0)
+	{
+	  id formatter = [array objectAtIndex: 0];
+
+	  // Add the formatter if the object accepts one...
+	  if([obj respondsToSelector: @selector(setFormatter:)])
+	    {
+	      // Touch the document...
+	      [[(id<IB>)NSApp activeDocument] touch];
+
+	      [obj setFormatter: formatter];
+	      RETAIN(formatter);
+	      if ([formatter isMemberOfClass: [NSNumberFormatter class]])
+		{
+		  id fieldValue = [NSNumber numberWithFloat: 1.123456789];
+		  [obj setStringValue: [fieldValue stringValue]];
+		  [obj setObjectValue: fieldValue];
+		}
+	      else if ([formatter isMemberOfClass: [NSDateFormatter class]])
+		{
+		  id fieldValue = [NSDate date];
+		  [obj setStringValue: [fieldValue description]];
+		  [obj setObjectValue: fieldValue];
+		}	      
+	    }
+	}
+    }
+}
+
+/**
+ * Should we draw the connection frame when the resource is
+ * dragged in?
+ */
+- (BOOL) shouldDrawConnectionFrame
+{
+  return NO;
+}
+
+/**
+ * Types of resources accepted by this view.
+ */
+- (NSArray *)viewResourcePasteboardTypes
+{
+  return [NSArray arrayWithObject: IBFormatterPboardType];
+}
+
+@end

Palettes/5Formatters/GNUmakefile

@@ -2,6 +2,9 @@
 #
 #   Copyright (C) 1999 Free Software Foundation, Inc.
 #
+#   Author:  Laurent Julliard <laurent@julliard-online.org>
+#   Date: Nov 2001
+#   
 #   This file is part of GNUstep.
 #   
 #   This program is free software; you can redistribute it and/or modify
@@ -22,14 +25,13 @@ PACKAGE_NAME = gorm
 include $(GNUSTEP_MAKEFILES)/common.make
 
 PALETTE_NAME = 5Formatters
-5Formatters_PALETTE_ICON = FormatterPalette.tiff
-5Formatters_PRINCIPAL_CLASS = FormatterPalette
+5Formatters_PALETTE_ICON = FormattersPalette
+5Formatters_PRINCIPAL_CLASS = FormattersPalette
 
 5Formatters_OBJC_FILES = \
-	FormatterPalette.m 
+	FormattersPalette.m
 
-5Formatters_RESOURCE_FILES = \
-	FormatterPalette.tiff
+5Formatters_RESOURCE_FILES = FormattersPalette.tiff \
 	palette.table
 
 5Formatters_STANDARD_INSTALL = no

Palettes/5Formatters/GNUmakefile.preamble

@@ -17,5 +17,5 @@ ADDITIONAL_LIB_DIRS += \
         -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
         -L../../GormCore/$(GNUSTEP_OBJ_DIR)
 
-5Formatters_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
+4Data_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
 endif

Palettes/5Formatters/palette.table

@@ -1,6 +1,6 @@
 {
   NOTE = "Automatically generated, do not edit!";
   NibFile = "";
-  Class = "FormatterPalette";
-  Icon = "FormatterPalette";
+  Class = "FormattersPalette";
+  Icon = "FormattersPalette";
 }

Palettes/GNUmakefile

@@ -32,7 +32,8 @@ SUBPROJECTS = \
 	1Windows \
 	2Controls \
 	3Containers \
-	4Data 
+	4Data \
+	5Formatters
 
 -include GNUmakefile.preamble
 
@@ -41,4 +42,3 @@ SUBPROJECTS = \
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 
 -include GNUmakefile.postamble
-