From f7a34388e6cbbf2dc4442871130f0dcb53730b67 Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Wed, 21 Apr 2021 16:41:33 -0400 Subject: [PATCH 01/19] Add classes to plist --- Resources/ClassInformation.plist | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Resources/ClassInformation.plist b/Resources/ClassInformation.plist index 9cacacfd..2d71f1e4 100644 --- a/Resources/ClassInformation.plist +++ b/Resources/ClassInformation.plist @@ -260,7 +260,6 @@ NSMutableArray = {Super = NSArray; }; NSMutableDictionary = {Super = NSDictionary; }; NSNumberFormatter = {Super = NSFormatter; }; - NSObject = {}; NSOpenGLView = {Super = NSView; }; NSOutlineView = {Super = NSTableView; }; NSPanel = {Super = NSWindow; }; @@ -416,4 +415,19 @@ Super = NSArrayController; }; Object = {}; + }; + NSDatePicker = { + Super = NSControl; + }; + NSPathControl = { + Super = NSControl; + }; + NSGridView = { + Super = NSView; + }; + NSSwitch = { + Super = NSControl; + }; + NSObject = {}; + Object = {}; } From ccd06c7e64de60ba0a9d446a03fda66bd6c01a56 Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Wed, 21 Apr 2021 17:31:54 -0400 Subject: [PATCH 02/19] Add template for new palette --- Palettes/5Formatters/FormattersPalette.h | 0 Palettes/5Formatters/FormattersPalette.m | 0 Palettes/5Formatters/GNUmakefile | 44 +++++++++++++++++++++++ Palettes/5Formatters/GNUmakefile.preamble | 21 +++++++++++ Palettes/5Formatters/palette.table | 6 ++++ 5 files changed, 71 insertions(+) create mode 100644 Palettes/5Formatters/FormattersPalette.h create mode 100644 Palettes/5Formatters/FormattersPalette.m create mode 100644 Palettes/5Formatters/GNUmakefile create mode 100644 Palettes/5Formatters/GNUmakefile.preamble create mode 100644 Palettes/5Formatters/palette.table diff --git a/Palettes/5Formatters/FormattersPalette.h b/Palettes/5Formatters/FormattersPalette.h new file mode 100644 index 00000000..e69de29b diff --git a/Palettes/5Formatters/FormattersPalette.m b/Palettes/5Formatters/FormattersPalette.m new file mode 100644 index 00000000..e69de29b diff --git a/Palettes/5Formatters/GNUmakefile b/Palettes/5Formatters/GNUmakefile new file mode 100644 index 00000000..4a50a799 --- /dev/null +++ b/Palettes/5Formatters/GNUmakefile @@ -0,0 +1,44 @@ +# GNUmakefile +# +# Copyright (C) 1999 Free Software Foundation, Inc. +# +# 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 2 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., 675 Mass Ave, Cambridge, MA 02139, USA. + +PACKAGE_NAME = gorm +include $(GNUSTEP_MAKEFILES)/common.make + +PALETTE_NAME = 5Formatters +5Formatters_PALETTE_ICON = FormatterPalette.tiff +5Formatters_PRINCIPAL_CLASS = FormatterPalette + +5Formatters_OBJC_FILES = \ + FormatterPalette.m + +5Formatters_RESOURCE_FILES = \ + FormatterPalette.tiff + palette.table + +5Formatters_STANDARD_INSTALL = no + +-include GNUmakefile.preamble + +-include GNUmakefile.local + +include $(GNUSTEP_MAKEFILES)/palette.make + +#-include GNUmakefile.postamble + diff --git a/Palettes/5Formatters/GNUmakefile.preamble b/Palettes/5Formatters/GNUmakefile.preamble new file mode 100644 index 00000000..f8fb2590 --- /dev/null +++ b/Palettes/5Formatters/GNUmakefile.preamble @@ -0,0 +1,21 @@ +# Additional include directories the compiler should search +ADDITIONAL_INCLUDE_DIRS += -I../.. + +ifeq ($(GNUSTEP_TARGET_OS),mingw32) +ADDITIONAL_LIB_DIRS += \ + -L../../GormLib/$(GNUSTEP_OBJ_DIR) \ + -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \ + -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \ + -L../../GormCore/$(GNUSTEP_OBJ_DIR) + +ADDITIONAL_GUI_LIBS += -lGorm -lGormCore +endif +ifeq ($(GNUSTEP_TARGET_OS),cygwin) +ADDITIONAL_LIB_DIRS += \ + -L../../GormLib/$(GNUSTEP_OBJ_DIR) \ + -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \ + -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \ + -L../../GormCore/$(GNUSTEP_OBJ_DIR) + +5Formatters_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore +endif \ No newline at end of file diff --git a/Palettes/5Formatters/palette.table b/Palettes/5Formatters/palette.table new file mode 100644 index 00000000..00b8e3f6 --- /dev/null +++ b/Palettes/5Formatters/palette.table @@ -0,0 +1,6 @@ +{ + NOTE = "Automatically generated, do not edit!"; + NibFile = ""; + Class = "FormatterPalette"; + Icon = "FormatterPalette"; +} From a872d616f35c6447a91e6635d9939a7755935dca Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Wed, 2 Jun 2021 06:51:33 -0400 Subject: [PATCH 03/19] New palette for formatters --- GNUmakefile | 1 + Palettes/5Formatters/FormattersPalette.h | 66 +++++++ Palettes/5Formatters/FormattersPalette.m | 207 ++++++++++++++++++++ Palettes/5Formatters/FormattersPalette.tiff | Bin 0 -> 450 bytes Palettes/5Formatters/GNUmakefile | 12 +- Palettes/5Formatters/GNUmakefile.preamble | 2 +- Palettes/5Formatters/palette.table | 4 +- Palettes/GNUmakefile | 4 +- 8 files changed, 286 insertions(+), 10 deletions(-) create mode 100644 Palettes/5Formatters/FormattersPalette.tiff diff --git a/GNUmakefile b/GNUmakefile index 5999d783..6f0351dc 100644 --- a/GNUmakefile +++ b/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 \ diff --git a/Palettes/5Formatters/FormattersPalette.h b/Palettes/5Formatters/FormattersPalette.h index e69de29b..789661c6 100644 --- a/Palettes/5Formatters/FormattersPalette.h +++ b/Palettes/5Formatters/FormattersPalette.h @@ -0,0 +1,66 @@ +/* DataPalette - Formatter Additions... + + Copyright (C) 2021 Free Software Foundation, Inc. + + Author: Gregory Casamento + 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 +#include + +/* + * 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 +@end + +#endif + diff --git a/Palettes/5Formatters/FormattersPalette.m b/Palettes/5Formatters/FormattersPalette.m index e69de29b..67976185 100644 --- a/Palettes/5Formatters/FormattersPalette.m +++ b/Palettes/5Formatters/FormattersPalette.m @@ -0,0 +1,207 @@ +/* main.m + + Copyright (C) 1999 Free Software Foundation, Inc. + + Author: Laurent Julliard + 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 +#include + +#include +#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)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 diff --git a/Palettes/5Formatters/FormattersPalette.tiff b/Palettes/5Formatters/FormattersPalette.tiff new file mode 100644 index 0000000000000000000000000000000000000000..ecf2790c74392307296f6b77c5b70f83407d88b7 GIT binary patch literal 450 zcmebD)MEI;z`)SJpb%i8BF4+!!s@kQM`FlBuC_zh7|VYj{P&=K|NV&;YeN40uX0y9 z@9?|#u}p#f{RW0=K1-eY3H%2*o}}gcpLO=Rpy!o$Z2Yrb4(79eWil2PKRWS?z>a@9 z=a;#sebP9|P;1iVI=}ft%&yG}^&6gi{jr(PIlh2_p>VfL>fewa`?ue2Tn&6EzxjB| zq|}DY(E0;f)0lt02@`BTlK4OY>^K2FPL^iJ2OCys{Qb}0VSlgSMUS1jXt%4<#)>0F z=29KUml$!hba|`v98(JFj9KNY*>_s?)6Je;sphl&(l+n7W5CGS8ldn+!-a*9fq{{k zff49yWguomVlx5ROh7RvAY_J$vjX{SP&P=9AR`M{%_1O26e|H>%43b_ABz6#zT|na)IDmL55YGi-e;{u7!^I$=j-UY>-+52~ literal 0 HcmV?d00001 diff --git a/Palettes/5Formatters/GNUmakefile b/Palettes/5Formatters/GNUmakefile index 4a50a799..cbb2288d 100644 --- a/Palettes/5Formatters/GNUmakefile +++ b/Palettes/5Formatters/GNUmakefile @@ -2,6 +2,9 @@ # # Copyright (C) 1999 Free Software Foundation, Inc. # +# Author: Laurent Julliard +# 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 diff --git a/Palettes/5Formatters/GNUmakefile.preamble b/Palettes/5Formatters/GNUmakefile.preamble index f8fb2590..e9249b0e 100644 --- a/Palettes/5Formatters/GNUmakefile.preamble +++ b/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 \ No newline at end of file diff --git a/Palettes/5Formatters/palette.table b/Palettes/5Formatters/palette.table index 00b8e3f6..5db14514 100644 --- a/Palettes/5Formatters/palette.table +++ b/Palettes/5Formatters/palette.table @@ -1,6 +1,6 @@ { NOTE = "Automatically generated, do not edit!"; NibFile = ""; - Class = "FormatterPalette"; - Icon = "FormatterPalette"; + Class = "FormattersPalette"; + Icon = "FormattersPalette"; } diff --git a/Palettes/GNUmakefile b/Palettes/GNUmakefile index a70d82bb..712342fd 100644 --- a/Palettes/GNUmakefile +++ b/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 - From 4e1ff3228a9e274f176523f139caddb899168caf Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Wed, 2 Jun 2021 08:13:24 -0400 Subject: [PATCH 04/19] Update image --- Palettes/5Formatters/FormattersPalette.m | 14 +++++++++----- Palettes/5Formatters/FormattersPalette.tiff | Bin 450 -> 197378 bytes 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Palettes/5Formatters/FormattersPalette.m b/Palettes/5Formatters/FormattersPalette.m index 67976185..fde338e4 100644 --- a/Palettes/5Formatters/FormattersPalette.m +++ b/Palettes/5Formatters/FormattersPalette.m @@ -65,11 +65,14 @@ - (void) dealloc - (void) finishInstantiate { NSView *contents; - NSTextView *tv; id v; - NSNumberFormatter *nf; - NSDateFormatter *df; - NSRect rect; + NSByteCountFormatter *bcf; + NSDateComponentsFormatter *dcf; + NSDateIntervalFormatter *dif; + NSEnergyFormatter *ef; + NSLengthFormatter *lf; + NSMeasurementFormatter *mf; + NSPersonNameComponentsFormatter *pncf; originalWindow = [[NSWindow alloc] initWithContentRect: NSMakeRect(0, 0, 272, 192) @@ -90,7 +93,7 @@ - (void) finishInstantiate [v setImage: [NSImage imageNamed: @"number_formatter.tiff"]]; [contents addSubview: v]; - nf = [[NSNumberFormatter alloc] init]; + bcf = [[NSByteCountFormatter alloc] init]; [nf setFormat: [NSNumberFormatter defaultFormat]]; [self associateObject: nf type: IBFormatterPboardType with: v]; RELEASE(v); @@ -100,6 +103,7 @@ - (void) finishInstantiate [v setImageScaling: NSScaleProportionally]; [v setImageAlignment: NSImageAlignCenter]; [v setImage: [NSImage imageNamed: @"date_formatter.tiff"]]; + [v setToolTip: @"Formatter"]; [contents addSubview: v]; df = [[NSDateFormatter alloc] diff --git a/Palettes/5Formatters/FormattersPalette.tiff b/Palettes/5Formatters/FormattersPalette.tiff index ecf2790c74392307296f6b77c5b70f83407d88b7..9e0f0bc624d928fdfc27de42dc1748379df2f24e 100644 GIT binary patch literal 197378 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 From 4a832aff1e63b3159bb8f4904dec3d836e43ac63 Mon Sep 17 00:00:00 2001 From: Gregory Casamento Date: Wed, 2 Jun 2021 08:17:14 -0400 Subject: [PATCH 05/19] improved icon --- Palettes/5Formatters/FormattersPalette.tiff | Bin 197378 -> 3884 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Palettes/5Formatters/FormattersPalette.tiff b/Palettes/5Formatters/FormattersPalette.tiff index 9e0f0bc624d928fdfc27de42dc1748379df2f24e..fa9ab4bb9cd569dcdb70c7beac6467b16a7fb24b 100644 GIT binary patch literal 3884 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 L^T?NkFJJx(m;&Z% literal 197378 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 Date: Wed, 2 Jun 2021 13:51:31 -0400 Subject: [PATCH 06/19] Add bytecount formatter image. --- Palettes/5Formatters/bytecount_formatter.tiff | Bin 0 -> 3820 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Palettes/5Formatters/bytecount_formatter.tiff diff --git a/Palettes/5Formatters/bytecount_formatter.tiff b/Palettes/5Formatters/bytecount_formatter.tiff new file mode 100644 index 0000000000000000000000000000000000000000..2f984dbc9b03323f89807a0382c6e372e7c06e03 GIT binary patch literal 3820 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 AJOBUy literal 0 HcmV?d00001 From a1de322982e1cd062bee6d44ce624715f911caec Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Wed, 2 Jun 2021 09:55:14 -0400 Subject: [PATCH 07/19] Place formatters properly in Palette --- Palettes/5Formatters/FormattersPalette.m | 107 ++++++++++++++--------- Palettes/5Formatters/GNUmakefile | 2 + 2 files changed, 66 insertions(+), 43 deletions(-) diff --git a/Palettes/5Formatters/FormattersPalette.m b/Palettes/5Formatters/FormattersPalette.m index fde338e4..b7962a7e 100644 --- a/Palettes/5Formatters/FormattersPalette.m +++ b/Palettes/5Formatters/FormattersPalette.m @@ -22,11 +22,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. */ -#include -#include +#import +#import +#import -#include -#include "FormattersPalette.h" +#import +#import "FormattersPalette.h" /* ----------------------------------------------------------- * Some additions to the Formatters Classes specific to Gorm @@ -62,17 +63,31 @@ - (void) dealloc [super dealloc]; } +- (void) placeFormatter: (NSFormatter *)fm + withImageNamed: (NSString *)imageName + atRect: (NSRect)frame + inView: (NSView *)contents + toolTip: (NSString *)tooltip +{ + id v; + NSImage *img; + + img = [NSImage imageNamed: imageName]; + NSLog(@"img = %@", img); + v = [[NSImageView alloc] initWithFrame: frame]; + [v setImageFrameStyle: NSImageFramePhoto]; + [v setImageScaling: NSScaleProportionally]; + [v setImageAlignment: NSImageAlignCenter]; + [v setImage: img]; + [v setToolTip: tooltip]; + [contents addSubview: v]; + [self associateObject: fm type: IBFormatterPboardType with: v]; + RELEASE(v); +} + - (void) finishInstantiate { NSView *contents; - id v; - NSByteCountFormatter *bcf; - NSDateComponentsFormatter *dcf; - NSDateIntervalFormatter *dif; - NSEnergyFormatter *ef; - NSLengthFormatter *lf; - NSMeasurementFormatter *mf; - NSPersonNameComponentsFormatter *pncf; originalWindow = [[NSWindow alloc] initWithContentRect: NSMakeRect(0, 0, 272, 192) @@ -81,37 +96,43 @@ - (void) finishInstantiate 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]; - - bcf = [[NSByteCountFormatter 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"]]; - [v setToolTip: @"Formatter"]; - [contents addSubview: v]; - - df = [[NSDateFormatter alloc] - initWithDateFormat: [NSDateFormatter defaultFormat] - allowNaturalLanguage: NO]; - - [self associateObject: df type: IBFormatterPboardType with: v]; - RELEASE(v); + + /* Formatters. */ + [self placeFormatter: [[NSByteCountFormatter alloc] init] + withImageNamed: @"bytecount_formatter" + atRect: NSMakeRect(192, 48, 43, 43) + inView: contents + toolTip: @"Byte Count"]; + + [self placeFormatter: [[NSDateComponentsFormatter alloc] init] + withImageNamed: @"date_comp_formatter" + atRect: NSMakeRect(144, 48, 43, 43) + inView: contents + toolTip: @"Date Components"]; + + [self placeFormatter: [[NSDateIntervalFormatter alloc] init] + withImageNamed: @"date_comp_formatter" + atRect: NSMakeRect(96, 48, 43, 43) + inView: contents + toolTip: @"Date Interval"]; + + [self placeFormatter: [[NSPersonNameComponentsFormatter alloc] init] + withImageNamed: @"date_comp_formatter" + atRect: NSMakeRect(48, 48, 43, 43) + inView: contents + toolTip: @"Energy"]; + + [self placeFormatter: [[NSMeasurementFormatter alloc] init] + withImageNamed: @"date_comp_formatter" + atRect: NSMakeRect(0, 48, 43, 43) + inView: contents + toolTip: @"Measurement"]; + + [self placeFormatter: [[NSLengthFormatter alloc] init] + withImageNamed: @"date_comp_formatter" + atRect: NSMakeRect(0, 96, 43, 43) + inView: contents + toolTip: @"Length"]; } - (void) willInspectObject: (NSNotification *)notification diff --git a/Palettes/5Formatters/GNUmakefile b/Palettes/5Formatters/GNUmakefile index cbb2288d..091fd444 100644 --- a/Palettes/5Formatters/GNUmakefile +++ b/Palettes/5Formatters/GNUmakefile @@ -32,6 +32,8 @@ PALETTE_NAME = 5Formatters FormattersPalette.m 5Formatters_RESOURCE_FILES = FormattersPalette.tiff \ + bytecount_formatter.tiff \ + date_comp_formatter.tiff \ palette.table 5Formatters_STANDARD_INSTALL = no From 2a524613684d21504f9c1d43d7ead8155c6f30e7 Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Wed, 2 Jun 2021 13:54:39 -0400 Subject: [PATCH 08/19] Add date components formatter --- Palettes/5Formatters/date_comp_formatter.tiff | Bin 0 -> 3884 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Palettes/5Formatters/date_comp_formatter.tiff diff --git a/Palettes/5Formatters/date_comp_formatter.tiff b/Palettes/5Formatters/date_comp_formatter.tiff new file mode 100644 index 0000000000000000000000000000000000000000..fa9ab4bb9cd569dcdb70c7beac6467b16a7fb24b GIT binary patch literal 3884 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 L^T?NkFJJx(m;&Z% literal 0 HcmV?d00001 From 3c06db624fde139678adb3fb0865ae0f85b36f0a Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Thu, 3 Jun 2021 18:49:28 -0400 Subject: [PATCH 09/19] Fix to find images correctly --- Palettes/5Formatters/FormattersPalette.m | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Palettes/5Formatters/FormattersPalette.m b/Palettes/5Formatters/FormattersPalette.m index b7962a7e..3dd5ac77 100644 --- a/Palettes/5Formatters/FormattersPalette.m +++ b/Palettes/5Formatters/FormattersPalette.m @@ -71,9 +71,10 @@ - (void) placeFormatter: (NSFormatter *)fm { id v; NSImage *img; - - img = [NSImage imageNamed: imageName]; - NSLog(@"img = %@", img); + NSString *path = [[NSBundle bundleForClass: [self class]] + pathForImageResource: imageName]; + + img = [[NSImage alloc] initWithContentsOfFile: path]; v = [[NSImageView alloc] initWithFrame: frame]; [v setImageFrameStyle: NSImageFramePhoto]; [v setImageScaling: NSScaleProportionally]; @@ -83,6 +84,7 @@ - (void) placeFormatter: (NSFormatter *)fm [contents addSubview: v]; [self associateObject: fm type: IBFormatterPboardType with: v]; RELEASE(v); + RELEASE(img); } - (void) finishInstantiate From e78182e7e228fe1c185a9f21e2bcdc017301dc88 Mon Sep 17 00:00:00 2001 From: Gregory Casamento Date: Fri, 4 Jun 2021 06:34:44 -0400 Subject: [PATCH 10/19] Update image for date comp formatter --- Palettes/5Formatters/bytecount_formatter.tiff | Bin 3820 -> 3700 bytes Palettes/5Formatters/date_comp_formatter.tiff | Bin 3884 -> 3662 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Palettes/5Formatters/bytecount_formatter.tiff b/Palettes/5Formatters/bytecount_formatter.tiff index 2f984dbc9b03323f89807a0382c6e372e7c06e03..ea09e4fe8b0d9d1d6e5d7af6c81923f47df6b34a 100644 GIT binary patch delta 371 zcmV-(0gV3a9rPT3O-%qQ0003>fIr|*@B|hO2ZTalP`G3^9S?{^Vo^985+@goMq^R9 zjb=JN4>70vulgFxZwVLjNtMs?!!OMCFnrnWoCiup8NXtiR+3Ebnj+sC`0-l>n0uL7jdiV*I^O)NaiAWu|5 z2|@2lc@m@1EKe6DF@if8LUB}5#W{%c;HpOvYH0gJKab2g1HbUQ^p{94JYyB25Y#On zz|yR#5Xt}qW}?Svq@>(C68te8AM5Oe8_O}GZ6?bS?9`ski7ah5rSpn?G|q{7lSu(4 i0hE()0bc>Slh6S>4V;H_00#g73`hU~0;IDT0$dE>=I5ON diff --git a/Palettes/5Formatters/date_comp_formatter.tiff b/Palettes/5Formatters/date_comp_formatter.tiff index fa9ab4bb9cd569dcdb70c7beac6467b16a7fb24b..916a43b19e303a35ea4523271ea6d7422c5bfe77 100644 GIT binary patch delta 336 zcmV-W0k8h79?l$pO-%qQ0003bfIr|*@B|hO2ZTalP`G3^9S?{^Vo^985+@goMq^R9 zTO=MNFquV|55X2CM*qfGWTm#0sldtk&zXXf=wn53xai?C`5h8rM&^+AJ08HF^(q zf?H$POP!Jvc(2ziH{1=5YjKBQFc*9#Dz9q0M6q^UCNl+*j!bfJTy|dlTE^vandpXZ z3vts%sF$oXFIlM3XEr!ke!{ts&&Vp3E#&JFz2Hjs^qo%z8M~Y7^BibzB6-E;LV44k zhevU_rFD8H*S=jhwcF|T_#Ph?^U39?`TZ2%SFV%o_fdWy8V}FuJ^Ov02i^i zoOV4QkVs*%SX^L-8jeV%Qn_TdNf(U9*PsbBqGt!1!RAv)%<5Aupip44_)O*vJCe*} zlUdy|e-QxGVGueM28jr#OzSm@RNi4Hq(iD85Cu{XW3s@1s0u|2UM7P?w zHy$0#g!DIm{4K9%xzPZ0_d7hSKe43m!~0vVUk+K~&gweQ-#@cWz4Y_{J@0RKIEyL@ zlg6MvXoKqgKd#&oL9R;1qZwk!_5mna8xp(z-UAz z5U>!U6y8GdL_mbY%Oq14Ft98S89)eRR~$$P>^J~_F99?3sRYz3RC Date: Fri, 4 Jun 2021 13:38:40 -0400 Subject: [PATCH 11/19] Date interval --- Palettes/5Formatters/date_interval_formatter.tif | Bin 0 -> 3744 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Palettes/5Formatters/date_interval_formatter.tif diff --git a/Palettes/5Formatters/date_interval_formatter.tif b/Palettes/5Formatters/date_interval_formatter.tif new file mode 100644 index 0000000000000000000000000000000000000000..a679a469b0465da0de6126cb9b40b3035cdf760b GIT binary patch literal 3744 zcmbW32UJtb7KZ1X^hSV$P^5(3L68zadT&w%MHE63AOZnH0*D0*q5?KR6i^ZLqKFr~ zDn+ayhy@WV_8Ub66cr1Im3N{(<-N7;eQ(`4Yt8zy_dm1u>^pbE@SgP{+iiKXBkd`M5W3|mb+)$QixvzeSU)&phc+-6IQdbX& zl5xDLIS6=qBug{|+3X0YDgN-pjbm5UYcS(kxKo*D>Ggp$mdD4{#F{IK;;g{<4dJVA z)QZY;%{o~}Iuggr#D|pyTcb6PW)IwYp?hfltH>75YaepzW2#oDGU3|X@&&Oig;sc| zu#+=-Olg57wPZDK_nmc5Nyf!pT#Mdibegq#?~qB$$#8A|qK=`r_II$^3Jrb3*2fFY zVt8`*N5-ud$Yd&X-sXtz%~CWj-tr`2BFicM$iBuN{)Y#~FDEM>4!vc6p}b5zdHb!z zF^oLe@Ie1w%x9;GZRcLx9se>jr*d25yL{(@{-=`-RR2Ec%sS4<$u?O(1x#CSz9QZ& zxb8Aai&Q*G(G9Mq$vAC+L#Rdv?wiy%@{@fI9o#b0W5UIF={%C>uudec&EiDbkAZ#U+gxlv494}bvyV1WeyY)*PwV3=39bh)pmJ2M>-N%_|pzxC~8;JT?# zFq8Sq{(q4iCrv0qP7{o%XK;Dx9E5WbPRW=VCq=@8%DI7P2MZ7E|PXOFg(-sT)35g=60mqPOVQ0r;`tUN7 zc_NW%Fq@Oa7IK;HsVQk}!D0ZupIN#J$V+R>M2c)men^$cQk|FZpB`^%PE4FGElsm> z1}Q@tkS=5lSwbwx3G##jpipQo6bmIl0!R!kg;qlaP!UuPRYA4TAJ8$V4Y~kbh3-I) zpke3@^btnEWS9=C!FsSc%z|BEe>fbT4=2Ej;A}V--Ux4ptKoxi6Wj)0f^WhS_&Gd= zeB??O1kt`G(Y zpNMiqeWD{VoVbvHFY&_ zwKTOdwXI`)k^@Zvs>ZjC)HE0@68hnisjnf*>m4OxashC2;=jbI~dqeP<$qbtU+v5hg` zc&G7I6O4(SiNK`Vq|cOW>S~%{T4(ymjA0gFw#uy8?4`Mmd6fAU^DgtR)2*i`Pv1NJ zo`t-HpT#PRR*N^5MwT4Q3db5n_I?#Hpb-VQ!8(SNp zO})*qt&VN1?GD>M7M&H$DrB9v!`Qjm<=CCD`(STlFS0*u|H{GCA<5x@!_Z9qnY@{M zXZAa4IkFwA93@Unr&y=mP7-HLXSQ>-^J5on7p_Z<%b=^F>q6Iqt}orDy9wPI-QK&~ zyDxJ;@s#(R?OE>m&`ZlJ!K=<|)Z5y7iT4>FjE}$17N0&}HD8Wzt?#Ix zt=}@g4u7(Ln18wd;{c-oVL)pj9OxHV9C&}0?kvHq<{%K{8&n+hAXqoa@cpvEzSrjRmV?JluoJ(_6 z=JMyZMB$<$qH3bX=6TNBI&UD_Iyx`<)_nc>S@SO}P+5??;A9Lnh8=Sx784s8dm#2R zJBVG)9*gsh+YvX)ap!E~Jm4M_v(cFy1k~D1IoxF`+nNIMF$=G;xIQ&M)V` zUg)#1a^d@=prn0ClgW|E4Jr7P*py=ec|nq(BUL>$EA?ucaavxQWRd-%t&2v5{=%Ac zD1ClSAR(P-2zmm8zY31cr(^nO(dbc`qb!)C#?uy+0HQsCL z@?`Rad3|dg)>f`Vuj8-lSwCZa+4`^f-296L(+f%qJ{NKdFK)2duzkbi#`ujrn`}1i z+Kk;S*nDe?^OpTZaz)ui{l$UBO(o2d{E~NDW42x>wJNRLM%*UeCfOday`@a2Y;)P? z^2G9+6>b#`J5+b9-|>DYcjvWTF1zY0)hY`rKknx5zFp;A)l{ulUAhOmCu7gky%Br6 zeq;SsTcc7_Q1fMCpc+uGU#ss}dJ!FA%g;e*i!dw=)%y`|o?zN&%IP;dww z5+8c@N9-TB4*MT&Kf*dve^mGAjz(HzeiPKRxM{RGv02hGx8>?FzhmvK4y}#H&5rLo zp?RX>q{7Kfr--L=PfecAK0S6O?aWA9LR)`(O#8jFbI#uA2&g6 z;N{U*F0Z;r=Zp@#7QUW*Q}|Z-?Y?(b@7l+L#~zNSjDLEcKcPIa{{!no*T=|@gP$@# V<34ZyV)&)?tN+*glPQyv{{lkwsha=* literal 0 HcmV?d00001 From 1490472c370d3a39c8ad39c950dba2cc2dde5741 Mon Sep 17 00:00:00 2001 From: Gregory Casamento Date: Fri, 4 Jun 2021 13:42:02 -0400 Subject: [PATCH 12/19] Add image --- Palettes/5Formatters/FormattersPalette.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Palettes/5Formatters/FormattersPalette.m b/Palettes/5Formatters/FormattersPalette.m index 3dd5ac77..691c4867 100644 --- a/Palettes/5Formatters/FormattersPalette.m +++ b/Palettes/5Formatters/FormattersPalette.m @@ -1,9 +1,9 @@ -/* main.m +/* FormattersPalette.m - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 2021 Free Software Foundation, Inc. - Author: Laurent Julliard - Date: Nov 2001 + Author: Gregory Casamento + Date: Jun 4 2021 This file is part of GNUstep. @@ -113,7 +113,7 @@ - (void) finishInstantiate toolTip: @"Date Components"]; [self placeFormatter: [[NSDateIntervalFormatter alloc] init] - withImageNamed: @"date_comp_formatter" + withImageNamed: @"date_interval_formatter" atRect: NSMakeRect(96, 48, 43, 43) inView: contents toolTip: @"Date Interval"]; From b20ae8c30bf2ff29773ec9747eda3955bf913a4c Mon Sep 17 00:00:00 2001 From: Gregory Casamento Date: Fri, 4 Jun 2021 13:44:40 -0400 Subject: [PATCH 13/19] Rename tiff --- ...l_formatter.tif => date_interval_formatter.tiff} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename Palettes/5Formatters/{date_interval_formatter.tif => date_interval_formatter.tiff} (100%) diff --git a/Palettes/5Formatters/date_interval_formatter.tif b/Palettes/5Formatters/date_interval_formatter.tiff similarity index 100% rename from Palettes/5Formatters/date_interval_formatter.tif rename to Palettes/5Formatters/date_interval_formatter.tiff From 37273d3b25fcb2d2d6208d2299bb4c15da99df4b Mon Sep 17 00:00:00 2001 From: Gregory Casamento Date: Fri, 4 Jun 2021 14:46:18 -0400 Subject: [PATCH 14/19] Add energy formatter icon --- Palettes/5Formatters/FormattersPalette.m | 2 +- Palettes/5Formatters/GNUmakefile | 1 + Palettes/5Formatters/energy_formatter.tiff | Bin 0 -> 3788 bytes 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Palettes/5Formatters/energy_formatter.tiff diff --git a/Palettes/5Formatters/FormattersPalette.m b/Palettes/5Formatters/FormattersPalette.m index 691c4867..6d801a39 100644 --- a/Palettes/5Formatters/FormattersPalette.m +++ b/Palettes/5Formatters/FormattersPalette.m @@ -119,7 +119,7 @@ - (void) finishInstantiate toolTip: @"Date Interval"]; [self placeFormatter: [[NSPersonNameComponentsFormatter alloc] init] - withImageNamed: @"date_comp_formatter" + withImageNamed: @"energy_formatter" atRect: NSMakeRect(48, 48, 43, 43) inView: contents toolTip: @"Energy"]; diff --git a/Palettes/5Formatters/GNUmakefile b/Palettes/5Formatters/GNUmakefile index 091fd444..b298e976 100644 --- a/Palettes/5Formatters/GNUmakefile +++ b/Palettes/5Formatters/GNUmakefile @@ -34,6 +34,7 @@ PALETTE_NAME = 5Formatters 5Formatters_RESOURCE_FILES = FormattersPalette.tiff \ bytecount_formatter.tiff \ date_comp_formatter.tiff \ + energy_formatter.tiff \ palette.table 5Formatters_STANDARD_INSTALL = no diff --git a/Palettes/5Formatters/energy_formatter.tiff b/Palettes/5Formatters/energy_formatter.tiff new file mode 100644 index 0000000000000000000000000000000000000000..f30fffbebe044e5b06dbefa8d5464559c6b6d95b GIT binary patch literal 3788 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 literal 0 HcmV?d00001 From 39a43fc8ab41efbdb4504c1db23f4fbc72321530 Mon Sep 17 00:00:00 2001 From: Gregory Casamento Date: Fri, 4 Jun 2021 15:02:14 -0400 Subject: [PATCH 15/19] Add measurement formatter --- Palettes/5Formatters/FormattersPalette.m | 2 +- Palettes/5Formatters/GNUmakefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Palettes/5Formatters/FormattersPalette.m b/Palettes/5Formatters/FormattersPalette.m index 6d801a39..a99ec5b6 100644 --- a/Palettes/5Formatters/FormattersPalette.m +++ b/Palettes/5Formatters/FormattersPalette.m @@ -125,7 +125,7 @@ - (void) finishInstantiate toolTip: @"Energy"]; [self placeFormatter: [[NSMeasurementFormatter alloc] init] - withImageNamed: @"date_comp_formatter" + withImageNamed: @"measurement_formatter" atRect: NSMakeRect(0, 48, 43, 43) inView: contents toolTip: @"Measurement"]; diff --git a/Palettes/5Formatters/GNUmakefile b/Palettes/5Formatters/GNUmakefile index b298e976..99c8fd48 100644 --- a/Palettes/5Formatters/GNUmakefile +++ b/Palettes/5Formatters/GNUmakefile @@ -35,6 +35,7 @@ PALETTE_NAME = 5Formatters bytecount_formatter.tiff \ date_comp_formatter.tiff \ energy_formatter.tiff \ + measurement_formatter.tiff \ palette.table 5Formatters_STANDARD_INSTALL = no From 9a9feb37f1fd5c69d75d67a9776d203e7aed07de Mon Sep 17 00:00:00 2001 From: Gregory Casamento Date: Fri, 4 Jun 2021 15:05:24 -0400 Subject: [PATCH 16/19] measurement image --- Palettes/5Formatters/measurement_formatter.tiff | Bin 0 -> 3784 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Palettes/5Formatters/measurement_formatter.tiff diff --git a/Palettes/5Formatters/measurement_formatter.tiff b/Palettes/5Formatters/measurement_formatter.tiff new file mode 100644 index 0000000000000000000000000000000000000000..9e63087e4a4b993026fdf6f246808590dd044bad GIT binary patch literal 3784 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 M&)56k62E=>7Z%6D*#H0l literal 0 HcmV?d00001 From d9ccbbb007863fab79133e5d3ea6010be92381ee Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Thu, 9 Dec 2021 01:59:08 -0500 Subject: [PATCH 17/19] Update from master --- Palettes/5Formatters/GNUmakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Palettes/5Formatters/GNUmakefile b/Palettes/5Formatters/GNUmakefile index 99c8fd48..2671bb0d 100644 --- a/Palettes/5Formatters/GNUmakefile +++ b/Palettes/5Formatters/GNUmakefile @@ -36,6 +36,7 @@ PALETTE_NAME = 5Formatters date_comp_formatter.tiff \ energy_formatter.tiff \ measurement_formatter.tiff \ + date_interval_formatter.tiff \ palette.table 5Formatters_STANDARD_INSTALL = no From aaa071bf37418f02a5a616f1fa96672d63c6e05e Mon Sep 17 00:00:00 2001 From: Gregory Casamento Date: Fri, 4 Jun 2021 15:21:42 -0400 Subject: [PATCH 18/19] Add length icon --- Palettes/5Formatters/FormattersPalette.m | 2 +- Palettes/5Formatters/GNUmakefile | 5 +++-- Palettes/5Formatters/length_formatter.tiff | Bin 0 -> 3714 bytes 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Palettes/5Formatters/length_formatter.tiff diff --git a/Palettes/5Formatters/FormattersPalette.m b/Palettes/5Formatters/FormattersPalette.m index a99ec5b6..64aaccff 100644 --- a/Palettes/5Formatters/FormattersPalette.m +++ b/Palettes/5Formatters/FormattersPalette.m @@ -131,7 +131,7 @@ - (void) finishInstantiate toolTip: @"Measurement"]; [self placeFormatter: [[NSLengthFormatter alloc] init] - withImageNamed: @"date_comp_formatter" + withImageNamed: @"length_formatter" atRect: NSMakeRect(0, 96, 43, 43) inView: contents toolTip: @"Length"]; diff --git a/Palettes/5Formatters/GNUmakefile b/Palettes/5Formatters/GNUmakefile index 2671bb0d..e16dda12 100644 --- a/Palettes/5Formatters/GNUmakefile +++ b/Palettes/5Formatters/GNUmakefile @@ -1,8 +1,8 @@ # GNUmakefile # -# Copyright (C) 1999 Free Software Foundation, Inc. +# Copyright (C) 1999, 2021 Free Software Foundation, Inc. # -# Author: Laurent Julliard +# Author: Gregory Casamento # Date: Nov 2001 # # This file is part of GNUstep. @@ -37,6 +37,7 @@ PALETTE_NAME = 5Formatters energy_formatter.tiff \ measurement_formatter.tiff \ date_interval_formatter.tiff \ + length_formatter.tiff \ palette.table 5Formatters_STANDARD_INSTALL = no diff --git a/Palettes/5Formatters/length_formatter.tiff b/Palettes/5Formatters/length_formatter.tiff new file mode 100644 index 0000000000000000000000000000000000000000..a713324fef23db0e39870229750b4c88c1a1ed77 GIT binary patch literal 3714 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 literal 0 HcmV?d00001 From a4bc43f35e7c72f5c7e0d1491e61c12d6f90f59d Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Fri, 4 Jun 2021 17:11:49 -0400 Subject: [PATCH 19/19] Add stack/grid view palette --- GNUmakefile | 1 + Palettes/5Formatters/FormattersPalette.h | 4 +- Palettes/6GridStack/GNUmakefile | 48 +++++ Palettes/6GridStack/GNUmakefile.preamble | 21 +++ Palettes/6GridStack/GridStackPalette.h | 35 ++++ Palettes/6GridStack/GridStackPalette.m | 207 ++++++++++++++++++++++ Palettes/6GridStack/GridStackPalette.tiff | Bin 0 -> 3884 bytes Palettes/6GridStack/grid_view.tiff | Bin 0 -> 3784 bytes Palettes/6GridStack/palette.table | 6 + Palettes/6GridStack/stack_view.tiff | Bin 0 -> 3714 bytes Palettes/GNUmakefile | 3 +- 11 files changed, 322 insertions(+), 3 deletions(-) create mode 100644 Palettes/6GridStack/GNUmakefile create mode 100644 Palettes/6GridStack/GNUmakefile.preamble create mode 100644 Palettes/6GridStack/GridStackPalette.h create mode 100644 Palettes/6GridStack/GridStackPalette.m create mode 100644 Palettes/6GridStack/GridStackPalette.tiff create mode 100644 Palettes/6GridStack/grid_view.tiff create mode 100644 Palettes/6GridStack/palette.table create mode 100644 Palettes/6GridStack/stack_view.tiff diff --git a/GNUmakefile b/GNUmakefile index 6f0351dc..508998fd 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -80,6 +80,7 @@ Gorm_RESOURCE_FILES = \ Palettes/3Containers/3Containers.palette \ Palettes/4Data/4Data.palette \ Palettes/5Formatters/5Formatters.palette \ + Palettes/6GridStack/6GridStack.palette \ Plugins/Gorm/Gorm.plugin \ Plugins/Nib/Nib.plugin \ Plugins/GModel/GModel.plugin \ diff --git a/Palettes/5Formatters/FormattersPalette.h b/Palettes/5Formatters/FormattersPalette.h index 789661c6..a3f68515 100644 --- a/Palettes/5Formatters/FormattersPalette.h +++ b/Palettes/5Formatters/FormattersPalette.h @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. */ -#ifndef INCLUDED_DataPalette_h -#define INCLUDED_DataPalette_h +#ifndef INCLUDED_FormattersPalette_h +#define INCLUDED_FormattersPalette_h #include #include diff --git a/Palettes/6GridStack/GNUmakefile b/Palettes/6GridStack/GNUmakefile new file mode 100644 index 00000000..46b79198 --- /dev/null +++ b/Palettes/6GridStack/GNUmakefile @@ -0,0 +1,48 @@ +# GNUmakefile +# +# Copyright (C) 1999 Free Software Foundation, Inc. +# +# Author: Laurent Julliard +# 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 2 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., 675 Mass Ave, Cambridge, MA 02139, USA. + +PACKAGE_NAME = gorm +include $(GNUSTEP_MAKEFILES)/common.make + +PALETTE_NAME = 6GridStack +6GridStack_PALETTE_ICON = GridStackPalette +6GridStack_PRINCIPAL_CLASS = GridStackPalette + +6GridStack_OBJC_FILES = \ + GridStackPalette.m + +6GridStack_RESOURCE_FILES = GridStackPalette.tiff \ + stack_view.tiff \ + grid_view.tiff \ + palette.table + +6GridStack_STANDARD_INSTALL = no + +-include GNUmakefile.preamble + +-include GNUmakefile.local + +include $(GNUSTEP_MAKEFILES)/palette.make + +#-include GNUmakefile.postamble + diff --git a/Palettes/6GridStack/GNUmakefile.preamble b/Palettes/6GridStack/GNUmakefile.preamble new file mode 100644 index 00000000..e9249b0e --- /dev/null +++ b/Palettes/6GridStack/GNUmakefile.preamble @@ -0,0 +1,21 @@ +# Additional include directories the compiler should search +ADDITIONAL_INCLUDE_DIRS += -I../.. + +ifeq ($(GNUSTEP_TARGET_OS),mingw32) +ADDITIONAL_LIB_DIRS += \ + -L../../GormLib/$(GNUSTEP_OBJ_DIR) \ + -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \ + -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \ + -L../../GormCore/$(GNUSTEP_OBJ_DIR) + +ADDITIONAL_GUI_LIBS += -lGorm -lGormCore +endif +ifeq ($(GNUSTEP_TARGET_OS),cygwin) +ADDITIONAL_LIB_DIRS += \ + -L../../GormLib/$(GNUSTEP_OBJ_DIR) \ + -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \ + -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \ + -L../../GormCore/$(GNUSTEP_OBJ_DIR) + +4Data_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore +endif \ No newline at end of file diff --git a/Palettes/6GridStack/GridStackPalette.h b/Palettes/6GridStack/GridStackPalette.h new file mode 100644 index 00000000..a10b96b0 --- /dev/null +++ b/Palettes/6GridStack/GridStackPalette.h @@ -0,0 +1,35 @@ +/* GridStackPalette + + Copyright (C) 2021 Free Software Foundation, Inc. + + Author: Gregory Casamento + 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_GridStackPalette_h +#define INCLUDED_GridStackPalette_h + +#include +#include + +@interface GridStackPalette: IBPalette +@end + +#endif + diff --git a/Palettes/6GridStack/GridStackPalette.m b/Palettes/6GridStack/GridStackPalette.m new file mode 100644 index 00000000..b67319a1 --- /dev/null +++ b/Palettes/6GridStack/GridStackPalette.m @@ -0,0 +1,207 @@ +/* GridStackPalette.m + + Copyright (C) 2021 Free Software Foundation, Inc. + + Author: Gregory Casamento + Date: Jun 4 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. +*/ + +#import +#import + +#import +#import "GridStackPalette.h" + +/* ---------------------------------------------------------------------- + * Some additions to the NSGridView, NSStackView Classes specific to Gorm + * ----------------------------------------------------------------------*/ + +@implementation GridStackPalette + +- (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) placeView: (NSView *)o + withImageNamed: (NSString *)imageName + atRect: (NSRect)frame + inView: (NSView *)contents + toolTip: (NSString *)tooltip +{ + id v; + NSImage *img; + NSString *path = [[NSBundle bundleForClass: [self class]] + pathForImageResource: imageName]; + + img = [[NSImage alloc] initWithContentsOfFile: path]; + v = [[NSImageView alloc] initWithFrame: frame]; + [v setImageFrameStyle: NSImageFramePhoto]; + [v setImageScaling: NSScaleProportionally]; + [v setImageAlignment: NSImageAlignCenter]; + [v setImage: img]; + [v setToolTip: tooltip]; + [contents addSubview: v]; + [self associateObject: o type: IBViewPboardType with: v]; + RELEASE(v); + RELEASE(img); +} + +- (void) finishInstantiate +{ + NSView *contents; + + originalWindow = [[NSWindow alloc] initWithContentRect: + NSMakeRect(0, 0, 272, 192) + styleMask: NSBorderlessWindowMask + backing: NSBackingStoreRetained + defer: NO]; + [originalWindow setTitle: @"NSGridView / NSStackView"]; + contents = [originalWindow contentView]; + + /* views */ + [self placeView: [[NSStackView alloc] initWithFrame: NSMakeRect(10, 10, 100, 100)] + withImageNamed: @"stack_view" + atRect: NSMakeRect(192, 48, 43, 43) + inView: contents + toolTip: @"NSStackView"]; + + [self placeView: [[NSGridView alloc] initWithFrame: NSMakeRect(10, 10, 100, 100)] + withImageNamed: @"grid_view" + atRect: NSMakeRect(144, 48, 43, 43) + inView: contents + toolTip: @"NSGridView"]; +} + +- (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)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: IBViewPboardType]; +} + +@end diff --git a/Palettes/6GridStack/GridStackPalette.tiff b/Palettes/6GridStack/GridStackPalette.tiff new file mode 100644 index 0000000000000000000000000000000000000000..fa9ab4bb9cd569dcdb70c7beac6467b16a7fb24b GIT binary patch literal 3884 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 L^T?NkFJJx(m;&Z% literal 0 HcmV?d00001 diff --git a/Palettes/6GridStack/grid_view.tiff b/Palettes/6GridStack/grid_view.tiff new file mode 100644 index 0000000000000000000000000000000000000000..9e63087e4a4b993026fdf6f246808590dd044bad GIT binary patch literal 3784 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 M&)56k62E=>7Z%6D*#H0l literal 0 HcmV?d00001 diff --git a/Palettes/6GridStack/palette.table b/Palettes/6GridStack/palette.table new file mode 100644 index 00000000..745a24e1 --- /dev/null +++ b/Palettes/6GridStack/palette.table @@ -0,0 +1,6 @@ +{ + NOTE = "Automatically generated, do not edit!"; + NibFile = ""; + Class = "GridStackPalette"; + Icon = "GridStackPalette"; +} diff --git a/Palettes/6GridStack/stack_view.tiff b/Palettes/6GridStack/stack_view.tiff new file mode 100644 index 0000000000000000000000000000000000000000..a713324fef23db0e39870229750b4c88c1a1ed77 GIT binary patch literal 3714 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 literal 0 HcmV?d00001 diff --git a/Palettes/GNUmakefile b/Palettes/GNUmakefile index 712342fd..6565bde2 100644 --- a/Palettes/GNUmakefile +++ b/Palettes/GNUmakefile @@ -33,7 +33,8 @@ SUBPROJECTS = \ 2Controls \ 3Containers \ 4Data \ - 5Formatters + 5Formatters \ + 6GridStack -include GNUmakefile.preamble