From 8141cbdef1b51295d88d96cbb6c3531c37518a00 Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Wed, 4 Aug 2004 04:52:43 +0000 Subject: [PATCH] Added new gorm file for Controls palette. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@19822 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 14 +- GormDocument.m | 8 +- .../ControlsPalette.gorm/data.classes | 159 ++++++++++++++++++ .../2Controls/ControlsPalette.gorm/data.info | Bin 0 -> 184 bytes .../ControlsPalette.gorm/objects.gorm | Bin 0 -> 6893 bytes Palettes/2Controls/GNUmakefile | 4 +- Palettes/2Controls/main.m | 149 +--------------- Palettes/2Controls/palette.table | 7 + 8 files changed, 193 insertions(+), 148 deletions(-) create mode 100644 Palettes/2Controls/ControlsPalette.gorm/data.classes create mode 100644 Palettes/2Controls/ControlsPalette.gorm/data.info create mode 100644 Palettes/2Controls/ControlsPalette.gorm/objects.gorm create mode 100644 Palettes/2Controls/palette.table diff --git a/ChangeLog b/ChangeLog index ec067034..0117b761 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,16 @@ -2004-08-02 23 Gregory John Casamento +2004-08-04 00:52 Gregory John Casamento + + * GormDocument.m: -[GormDocument setupDefaults:] changed + size of the window for a new palette. If it's too big it + causes problems with event handling in the palettes. + * Palettes/2Controls/GNUmakefile: Added ControlsPalette.gorm + * Palettes/2Controls/main.m: Removed much of the code + from the ControlsPalette class. It's not needed now + that the palette uses a .gorm file. + * Palettes/2Controls/ControlsPalette.gorm: New gui for the + palette. + +2004-08-02 23:00 Gregory John Casamento * GormViewEditor.m: Added stub for initWithCoder just for completeness. diff --git a/GormDocument.m b/GormDocument.m index 24cb0709..8619b81f 100644 --- a/GormDocument.m +++ b/GormDocument.m @@ -2513,7 +2513,6 @@ static NSImage *fileImage = nil; // the first menu attached becomes the main menu. [self attachObject: aMenu toParent: nil]; [[aMenu window] setFrameTopLeftPoint: origin]; - // RETAIN(aMenu); } else if ([type isEqual: @"Inspector"] == YES) { @@ -2543,7 +2542,6 @@ static NSImage *fileImage = nil; [aWindow setTitle: _(@"Inspector Window")]; [self setName: @"InspectorWin" forObject: aWindow]; [self attachObject: aWindow toParent: nil]; - // RELEASE(aWindow); } else if ([type isEqual: @"Palette"] == YES) { @@ -2554,7 +2552,7 @@ static NSImage *fileImage = nil; if ([NSWindow respondsToSelector: @selector(allocSubstitute)]) { aWindow = [[NSWindow allocSubstitute] - initWithContentRect: NSMakeRect(0,0,272,192) + initWithContentRect: NSMakeRect(0,0,272,160) styleMask: style backing: NSBackingStoreRetained defer: NO]; @@ -2562,7 +2560,7 @@ static NSImage *fileImage = nil; else { aWindow = [[NSWindow alloc] - initWithContentRect: NSMakeRect(0,0,272,192) + initWithContentRect: NSMakeRect(0,0,272,160) styleMask: style backing: NSBackingStoreRetained defer: NO]; @@ -2573,7 +2571,6 @@ static NSImage *fileImage = nil; [aWindow setTitle: _(@"Palette Window")]; [self setName: @"PaletteWin" forObject: aWindow]; [self attachObject: aWindow toParent: nil]; - // RELEASE(aWindow); } } @@ -2583,7 +2580,6 @@ static NSImage *fileImage = nil; NSString *oldName; NSMutableDictionary *cc = [classManager customClassMap]; NSString *className; - // NSString *nameCopy; if (object == nil) { diff --git a/Palettes/2Controls/ControlsPalette.gorm/data.classes b/Palettes/2Controls/ControlsPalette.gorm/data.classes new file mode 100644 index 00000000..0f9667e3 --- /dev/null +++ b/Palettes/2Controls/ControlsPalette.gorm/data.classes @@ -0,0 +1,159 @@ +{ + ControlsPalette = { + Actions = ( + ); + Outlets = ( + ); + Super = IBPalette; + }; + FirstResponder = { + Actions = ( + "activateContextHelpMode:", + "alignCenter:", + "alignJustified:", + "alignLeft:", + "alignRight:", + "arrangeInFront:", + "cancel:", + "capitalizeWord:", + "changeColor:", + "checkSpelling:", + "close:", + "complete:", + "copy:", + "copyFont:", + "copyRuler:", + "cut:", + "delete:", + "deleteBackward:", + "deleteForward:", + "deleteToBeginningOfLine:", + "deleteToBeginningOfParagraph:", + "deleteToEndOfLine:", + "deleteToEndOfParagraph:", + "deleteToMark:", + "deleteWordBackward:", + "deleteWordForward:", + "deminiaturize:", + "deselectAll:", + "fax:", + "hide:", + "hideOtherApplications:", + "indent:", + "loosenKerning:", + "lowerBaseline:", + "lowercaseWord:", + "makeKeyAndOrderFront:", + "miniaturize:", + "miniaturizeAll:", + "moveBackward:", + "moveBackwardAndModifySelection:", + "moveDown:", + "moveDownAndModifySelection:", + "moveForward:", + "moveForwardAndModifySelection:", + "moveLeft:", + "moveRight:", + "moveToBeginningOfDocument:", + "moveToBeginningOfLine:", + "moveToBeginningOfParagraph:", + "moveToEndOfDocument:", + "moveToEndOfLine:", + "moveToEndOfParagraph:", + "moveUp:", + "moveUpAndModifySelection:", + "moveWordBackward:", + "moveWordBackwardAndModifySelection:", + "moveWordForward:", + "moveWordForwardAndModifySelection:", + "newDocument:", + "ok:", + "open:", + "openDocument:", + "orderBack:", + "orderFront:", + "orderFrontColorPanel:", + "orderFrontDataLinkPanel:", + "orderFrontHelpPanel:", + "orderFrontStandardAboutPanel:", + "orderFrontStandardInfoPanel:", + "orderOut:", + "pageDown:", + "pageUp:", + "paste:", + "pasteAsPlainText:", + "pasteAsRichText:", + "pasteFont:", + "pasteRuler:", + "performClose:", + "performMiniaturize:", + "performZoom:", + "print:", + "raiseBaseline:", + "redo:", + "revertDocumentToSaved:", + "runPageLayout:", + "runToolbarCustomizationPalette:", + "saveAllDocuments:", + "saveDocument:", + "saveDocumentAs:", + "saveDocumentTo:", + "scrollLineDown:", + "scrollLineUp:", + "scrollPageDown:", + "scrollPageUp:", + "scrollViaScroller:", + "selectAll:", + "selectLine:", + "selectNextKeyView:", + "selectParagraph:", + "selectPreviousKeyView:", + "selectText:", + "selectToMark:", + "selectWord:", + "showContextHelp:", + "showGuessPanel:", + "showHelp:", + "showWindow:", + "stop:", + "subscript:", + "superscript:", + "swapWithMark:", + "takeDoubleValueFrom:", + "takeFloatValueFrom:", + "takeIntValueFrom:", + "takeObjectValueFrom:", + "takeStringValueFrom:", + "terminate:", + "tightenKerning:", + "toggle:", + "toggleContinuousSpellChecking:", + "toggleRuler:", + "toggleToolbarShown:", + "toggleTraditionalCharacterShape:", + "transpose:", + "transposeWords:", + "turnOffKerning:", + "turnOffLigatures:", + "underline:", + "undo:", + "unhide:", + "unhideAllApplications:", + "unscript:", + "uppercaseWord:", + "useAllLigatures:", + "useStandardKerning:", + "useStandardLigatures:", + "yank:", + "zoom:" + ); + Super = NSObject; + }; + GormNSPopUpButton = { + Actions = ( + ); + Outlets = ( + ); + Super = NSPopUpButton; + }; +} \ No newline at end of file diff --git a/Palettes/2Controls/ControlsPalette.gorm/data.info b/Palettes/2Controls/ControlsPalette.gorm/data.info new file mode 100644 index 0000000000000000000000000000000000000000..374f7ab8f1199041e1cdc45cd3e7119355d1f992 GIT binary patch literal 184 zcmZ?w3oR~5El@}-O3uhEOEmxjqeM$HD-Z(+j4>DnRtAiQj0_^~`9-;InK`KeMX71U zzKMB>>8V8wKw!wkz~L9{pOlrFTms@Vs4_6Ha~LogGK0i}ONuh{(t)Ck3~E4<4=BmN tDhgsT`6QO47MCc5r4|)u=I0qOZ)66k;DM{)VG5}%NKH`y8j+fq3jlYyC;R{a literal 0 HcmV?d00001 diff --git a/Palettes/2Controls/ControlsPalette.gorm/objects.gorm b/Palettes/2Controls/ControlsPalette.gorm/objects.gorm new file mode 100644 index 0000000000000000000000000000000000000000..46112e3d3f505006442ed5b9084e2d3b24ef4c1e GIT binary patch literal 6893 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 literal 0 HcmV?d00001 diff --git a/Palettes/2Controls/GNUmakefile b/Palettes/2Controls/GNUmakefile index 938db635..0e1f3d85 100644 --- a/Palettes/2Controls/GNUmakefile +++ b/Palettes/2Controls/GNUmakefile @@ -44,7 +44,9 @@ PALETTE_NAME = 2Controls GormNSStepperInspector.gorm \ GormNSTextFieldInspector.gorm \ GormNSColorWellInspector.gorm \ - GormNSProgressIndicatorInspector.gorm + GormNSProgressIndicatorInspector.gorm \ + ControlsPalette.gorm \ + palette.table 2Controls_STANDARD_INSTALL = no diff --git a/Palettes/2Controls/main.m b/Palettes/2Controls/main.m index c9b816bc..27f87077 100644 --- a/Palettes/2Controls/main.m +++ b/Palettes/2Controls/main.m @@ -1,9 +1,10 @@ -/* main.m +/** + main.m - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 2004 Free Software Foundation, Inc. - Author: Richard frith-Macdonald (richard@brainstorm.co.uk> - Date: 1999 + Author: Gregory John Casamento + Date: 2004 This file is part of GNUstep. @@ -21,17 +22,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include -#include -#include "GormCustomView.h" -// @class GormPopUpNSMenu; +#include +#include +#include + @class GormNSPopUpButton; @interface ControlsPalette: IBPalette -{ -} @end @@ -41,141 +39,12 @@ NSView *contents; id v; - originalWindow = [[NSWindow alloc] initWithContentRect: - NSMakeRect(0, 0, 272, 192) - styleMask: NSBorderlessWindowMask - backing: NSBackingStoreRetained - defer: NO]; contents = [originalWindow contentView]; - - -/*******************/ -/* First Column... */ -/*******************/ - - // Editable text field - v = [[NSTextField alloc] initWithFrame: NSMakeRect(10, 147, 56, 21)]; - [v setEditable: YES]; - [v setStringValue: @"Text"]; - [contents addSubview: v]; - RELEASE(v); - - // Push button - v = [[NSButton alloc] initWithFrame: NSMakeRect(10, 110, 56, 24)]; - [v setButtonType: NSMomentaryPushButton]; - [v setTitle: @"Button"]; - [contents addSubview: v]; - RELEASE(v); - - // Checkbox - v = [[NSButton alloc] initWithFrame: NSMakeRect(10, 80, 56, 16)]; - [v setButtonType: NSSwitchButton]; - [v setImagePosition: NSImageRight]; - [v setTitle: @"Switch"]; - [v setBordered: NO]; - [contents addSubview: v]; - RELEASE(v); - - // Radio button: default on - v = [[NSButton alloc] initWithFrame: NSMakeRect(10, 55, 56, 16)]; - [v setButtonType: NSRadioButton]; - [v setImagePosition: NSImageLeft]; - [v setTitle: @"Radio"]; - [v setBordered: NO]; - [v setState: NSOnState]; - [contents addSubview: v]; - RELEASE(v); - - // Radio button: default off - v = [[NSButton alloc] initWithFrame: NSMakeRect(10, 37, 56, 16)]; - [v setButtonType: NSRadioButton]; - [v setImagePosition: NSImageLeft]; - [v setTitle: @"Radio"]; - [v setBordered: NO]; - [v setState: NSOffState]; - [contents addSubview: v]; - RELEASE(v); - - -/********************/ -/* Second Column... */ -/********************/ - - // Non editable text field (label) - v = [[NSTextField alloc] initWithFrame: NSMakeRect(78, 152, 83, 18)]; - [v setEditable: NO]; - [v setSelectable: NO]; - [v setBezeled: NO]; - [v setAlignment: NSCenterTextAlignment]; - [v setFont: [NSFont systemFontOfSize: 14.0]]; - [v setDrawsBackground: NO]; - [v setStringValue: @"Title"]; - [contents addSubview: v]; - RELEASE(v); - - // Group box - v = [[NSBox alloc] initWithFrame: NSMakeRect(78, 98, 53, 44)]; - [v setTitle: @"Box"]; - [contents addSubview: v]; - RELEASE(v); - - // Color well - v = [[NSColorWell alloc] initWithFrame: NSMakeRect(78, 62, 53, 30)]; - [contents addSubview: v]; - RELEASE(v); - - // Horizontal Slider - v = [[NSSlider alloc] initWithFrame: NSMakeRect(78, 39, 83, 16)]; - [v setDoubleValue: 0]; - [v setContinuous: YES]; - [contents addSubview: v]; - RELEASE(v); - - // Vertical Slider - v = [[NSSlider alloc] initWithFrame: NSMakeRect(145, 62, 16, 76)]; - [v setDoubleValue: 0]; - [v setContinuous: YES]; - [contents addSubview: v]; - RELEASE(v); - - // Progress Indicator - v = [[NSProgressIndicator alloc] initWithFrame: NSMakeRect(78, 15, 83, 18)]; - [v setIndeterminate: NO]; - [v setDoubleValue: 50.]; - [contents addSubview: v]; - RELEASE(v); - - -/*******************/ -/* Third Column... */ -/*******************/ - - // Popup button v = [[GormNSPopUpButton alloc] initWithFrame: NSMakeRect(172, 147, 89, 20)]; [v addItemWithTitle: @"Item 1"]; [v addItemWithTitle: @"Item 2"]; [v addItemWithTitle: @"Item 3"]; [contents addSubview: v]; RELEASE(v); - - // Form - v = [[NSForm alloc] initWithFrame: NSMakeRect(172, 101, 87, 45)]; - [v addEntry: @"Field 1"]; - [v addEntry: @"Field 2"]; - [v setEntryWidth: 87]; - [v setInterlineSpacing: 3]; - [v setCellSize: NSMakeSize([v cellSize].width, 21)]; - [contents addSubview: v]; - RELEASE(v); - - // Stepper - v = [[NSStepper alloc] initWithFrame: NSMakeRect(172, 76, 16, 23)]; - [contents addSubview: v]; - RELEASE(v); - - // CustomView - v = [[GormCustomView alloc] initWithFrame: NSMakeRect(172, 19, 89, 40)]; - [contents addSubview: v]; - RELEASE(v); } @end diff --git a/Palettes/2Controls/palette.table b/Palettes/2Controls/palette.table new file mode 100644 index 00000000..7e6879b2 --- /dev/null +++ b/Palettes/2Controls/palette.table @@ -0,0 +1,7 @@ +{ + NibFile = "ControlsPalette"; + Class = "ControlsPalette"; + Icon = "ControlsPalette"; + ExportClasses = (); + ExportImages = (); +} \ No newline at end of file