From 7d5af7c34141db8f7324983e3e453fb879eba07e Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 14 Sep 2010 22:17:35 +0900 Subject: [PATCH] Finish the gorm file, for certain values of finished. --- tools/Forge/Bundles/MapEdit/Clipper.m | 7 ++-- tools/Forge/Bundles/MapEdit/GNUmakefile | 4 +- .../Forge/Bundles/MapEdit/InspectorControl.m | 11 +++-- tools/Forge/Bundles/MapEdit/KeypairView.m | 3 +- .../Bundles/MapEdit/MapEdit.gorm/data.classes | 38 ++++++++++++++++++ .../Bundles/MapEdit/MapEdit.gorm/objects.gorm | Bin 49503 -> 93151 bytes tools/Forge/Bundles/MapEdit/Project.m | 3 +- tools/Forge/Bundles/MapEdit/TextureView.m | 2 +- tools/Forge/Bundles/MapEdit/Things.m | 7 ++-- tools/Forge/Bundles/MapEdit/XYView.m | 3 +- tools/Forge/Bundles/MapEdit/ZView.m | 3 +- 11 files changed, 59 insertions(+), 22 deletions(-) diff --git a/tools/Forge/Bundles/MapEdit/Clipper.m b/tools/Forge/Bundles/MapEdit/Clipper.m index 17ea3fb74..3321c9ce2 100644 --- a/tools/Forge/Bundles/MapEdit/Clipper.m +++ b/tools/Forge/Bundles/MapEdit/Clipper.m @@ -188,8 +188,8 @@ XYDrag char text[8]; PSsetrgbcolor (1, 0.5, 0); - GSSetFont (DEFCTXT, [NSFont fontWithName: @"Helvetica-Medium" - size: 10 / [xyview_i currentScale]]); + + [[NSFont systemFontOfSize: 10 / [xyview_i currentScale]] set]; PSrotate (0); for (i = 0; i < num; i++) { @@ -209,8 +209,7 @@ XYDrag char text[8]; PSsetrgbcolor (1, 0.5, 0); - GSSetFont (DEFCTXT, [NSFont fontWithName: @"Helvetica-Medium" - size: 10 / [zview_i currentScale]]); + [[NSFont systemFontOfSize: 10 / [zview_i currentScale]] set]; PSrotate (0); for (i = 0; i < num; i++) { diff --git a/tools/Forge/Bundles/MapEdit/GNUmakefile b/tools/Forge/Bundles/MapEdit/GNUmakefile index 7e0da3062..9e633754d 100644 --- a/tools/Forge/Bundles/MapEdit/GNUmakefile +++ b/tools/Forge/Bundles/MapEdit/GNUmakefile @@ -21,8 +21,8 @@ ADDITIONAL_GUI_LIBS += # # Resource files # -QuakeEd_MAIN_MODEL_FILE= MapEdit.gorm -QuakeEd_RESOURCE_FILES= MapEdit.gorm +QuakeEd_MAIN_MODEL_FILE= QuakeEd.gmodel +QuakeEd_RESOURCE_FILES= QuakeEd.gmodel QuakeEd_LOCALIZED_RESOURCE_FILES= diff --git a/tools/Forge/Bundles/MapEdit/InspectorControl.m b/tools/Forge/Bundles/MapEdit/InspectorControl.m index cc7076897..fa4c2263f 100644 --- a/tools/Forge/Bundles/MapEdit/InspectorControl.m +++ b/tools/Forge/Bundles/MapEdit/InspectorControl.m @@ -8,6 +8,11 @@ id inspcontrol_i; +@interface CustomView:NSView +@end +@implementation CustomView +@end + @implementation InspectorControl -awakeFromNib { @@ -15,9 +20,9 @@ id inspcontrol_i; currentInspectorType = -1; - contentList =[[NSArray alloc] init]; - windowList =[[NSArray alloc] init]; - itemList =[[NSArray alloc] init]; + contentList =[[NSMutableArray alloc] init]; + windowList =[[NSMutableArray alloc] init]; + itemList =[[NSMutableArray alloc] init]; // ADD NEW INSPECTORS HERE... diff --git a/tools/Forge/Bundles/MapEdit/KeypairView.m b/tools/Forge/Bundles/MapEdit/KeypairView.m index 5dab07609..30df12a39 100644 --- a/tools/Forge/Bundles/MapEdit/KeypairView.m +++ b/tools/Forge/Bundles/MapEdit/KeypairView.m @@ -48,8 +48,7 @@ initWithFrame: PSsetgray(NSLightGray); PSrectfill (0, 0, _bounds.size.width, _bounds.size.height); - GSSetFont (DEFCTXT, [NSFont fontWithName: @"Helvetica-Medium" - size: FONTSIZE]); + [[NSFont systemFontOfSize: FONTSIZE] set]; PSrotate (0); PSsetgray (0); diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes index f79dd054d..8a1a585dc 100644 --- a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes +++ b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes @@ -12,6 +12,13 @@ ); Super = NSView; }; + Clipper = { + Actions = ( + ); + Outlets = ( + ); + Super = NSObject; + }; FirstResponder = { Actions = ( "BSP_FastVis:", @@ -86,6 +93,37 @@ ); Super = NSObject; }; + InspectorControl = { + Actions = ( + "changeInspector:" + ); + Outlets = ( + inspectorView_i, + inspectorSubview_i, + contentList, + windowList, + obj_textures_i, + obj_genkeypair_i, + popUpButton_i, + popUpMatrix_i, + itemList, + win_project_i, + win_textures_i, + win_things_i, + win_prefs_i, + win_settings_i, + win_output_i, + win_help_i, + itemProject_i, + itemTextures_i, + itemThings_i, + itemPrefs_i, + itemSettings_i, + itemOutput_i, + itemHelp_i + ); + Super = NSObject; + }; Map = { Actions = ( "setCurrentEntity:", diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm index 3b3a5c8d6c991941584371297e8e51a9f6b9920e..f0d729f642321f8735703f6f0455ede33e3e5340 100644 GIT binary patch literal 93151 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 literal 49503 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%0AgPIDRO$-xn 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 diff --git a/tools/Forge/Bundles/MapEdit/Project.m b/tools/Forge/Bundles/MapEdit/Project.m index 18570a5e3..8c765c56b 100644 --- a/tools/Forge/Bundles/MapEdit/Project.m +++ b/tools/Forge/Bundles/MapEdit/Project.m @@ -205,7 +205,7 @@ t in:(id) obj // Fill the QuakeEd Maps or wads browser // (Delegate method - delegated in Interface Builder) // --(int) browser: sender fillMatrix: matrix inColumn:(int) column +-(void) browser: sender createRowsForColumn:(int) column inMatrix: matrix { id cell, list; int max; @@ -230,7 +230,6 @@ t in:(id) obj [cell setLeaf:YES]; [cell setLoaded:YES]; } - return i; } // diff --git a/tools/Forge/Bundles/MapEdit/TextureView.m b/tools/Forge/Bundles/MapEdit/TextureView.m index 5cb7796ac..f8a02b3b3 100644 --- a/tools/Forge/Bundles/MapEdit/TextureView.m +++ b/tools/Forge/Bundles/MapEdit/TextureView.m @@ -44,7 +44,7 @@ NOTE: I am specifically not using cached image reps, because the data is also ne selected =[parent_i getSelectedTexture]; list_i =[parent_i getList]; - GSSetFont (DEFCTXT,[NSFont fontWithName: @"Helvetica-Medium" size:FONTSIZE]); + [[NSFont systemFontOfSize: FONTSIZE] set]; PSrotate (0); PSsetgray (NSLightGray); diff --git a/tools/Forge/Bundles/MapEdit/Things.m b/tools/Forge/Bundles/MapEdit/Things.m index 076bb321e..40a4e4f2e 100644 --- a/tools/Forge/Bundles/MapEdit/Things.m +++ b/tools/Forge/Bundles/MapEdit/Things.m @@ -150,7 +150,7 @@ id things_i; else flags = atoi (flagname); - [flags_i setAutodisplay:NO]; + //[flags_i setAutodisplay:NO]; for (r = 0; r < 4; r++) for (c = 0; c < 3; c++) { cell =[flags_i cellAtRow: r column:c]; @@ -160,7 +160,7 @@ id things_i; } [cell setIntValue:(flags & (1 << ((c * 4) + r))) > 0]; } - [flags_i setAutodisplay:YES]; + //[flags_i setAutodisplay:YES]; [flags_i display]; // [keyInput_i setStringValue: ""]; @@ -294,7 +294,7 @@ id things_i; // Fill the Entity browser // (Delegate method - delegated in Interface Builder) // --(int) browser: sender fillMatrix: matrix inColumn:(int) column +-(void) browser: sender createRowsForColumn:(int) column inMatrix: matrix { id cell; int max; @@ -312,7 +312,6 @@ id things_i; [cell setLeaf:YES]; [cell setLoaded:YES]; } - return i; } @end diff --git a/tools/Forge/Bundles/MapEdit/XYView.m b/tools/Forge/Bundles/MapEdit/XYView.m index 55ccfc600..af340d73b 100644 --- a/tools/Forge/Bundles/MapEdit/XYView.m +++ b/tools/Forge/Bundles/MapEdit/XYView.m @@ -799,8 +799,7 @@ NSRect xy_draw_rect; // setup for text // PSselectfont("Helvetica-Medium",10/scale); - //GSSetFont (DEFCTXT,[NSFont fontWithName: @"Helvetica-Medium" size:10 / scale]); - [[NSFont systemFontOfSize: 10] set]; + [[NSFont systemFontOfSize: 10 / scale] set]; PSrotate (0); if (drawmode == dr_texture || drawmode == dr_flat) diff --git a/tools/Forge/Bundles/MapEdit/ZView.m b/tools/Forge/Bundles/MapEdit/ZView.m index 0fbc58c89..71b2a2c53 100644 --- a/tools/Forge/Bundles/MapEdit/ZView.m +++ b/tools/Forge/Bundles/MapEdit/ZView.m @@ -389,8 +389,7 @@ Rect is in global world (unscaled) coordinates [path removeAllPoints]; PSsetgray (0); // for text - //GSSetFont (DEFCTXT,[NSFont fontWithName: @"Helvetica-Medium" size:10 / scale]); - [[NSFont systemFontOfSize: 10] set]; + [[NSFont systemFontOfSize: 10 / scale] set]; PSrotate (0); for (; y <= stopy; y += 64) {