From 88eba7301509454889c5cec6bae56eb8a3cd0d74 Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Mon, 5 Nov 2007 23:22:02 +0000 Subject: [PATCH] Added new column title field to the inspector. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@25558 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 10 +++++++ GormCore/GormViewEditor.m | 28 ------------------ .../data.classes | 3 +- .../GormNSTableColumnInspector.gorm/data.info | Bin 184 -> 184 bytes .../objects.gorm | Bin 10740 -> 12926 bytes .../GormTableColumnAttributesInspector.h | 1 + .../GormTableColumnAttributesInspector.m | 7 +++++ Palettes/3Containers/GormTableViewEditor.m | 15 ---------- 8 files changed, 20 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84118c74..c6600903 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-11-05 18:20-EST Gregory John Casamento + + * GormCore/GormViewEditor.m: Removed commented out code. + * Palettes/3Containers/GormNSTableColumnInspector.gorm + * Palettes/3Containers/GormTableColumnAttributesInspector.h + * Palettes/3Containers/GormTableColumnAttributesInspector.m + * Palettes/3Containers/GormTableViewEditor.m: Added new column title + field to the inspector so that the title can be edited there instead + of directly. + 2007-11-05 01:56-EST Gregory John Casamento * GormCore/GormViewEditor.m: Change code to use drawRect: instead diff --git a/GormCore/GormViewEditor.m b/GormCore/GormViewEditor.m index faa2966a..fb8a41eb 100644 --- a/GormCore/GormViewEditor.m +++ b/GormCore/GormViewEditor.m @@ -1417,34 +1417,6 @@ static BOOL currently_displaying = NO; withObject: self]; } -/* -- (void) displayIfNeededInRectIgnoringOpacity: (NSRect) rect - inContext: (NSGraphicsConext *)gc -{ - if (currently_displaying == NO) - { - [[self window] disableFlushWindow]; - currently_displaying = YES; - [super displayIfNeededInRectIgnoringOpacity: rect - inContext: gc]; - [self lockFocus]; - [self postDraw: rect]; - [self unlockFocus]; - [[self window] enableFlushWindow]; - [[self window] flushWindow]; - currently_displaying = NO; - } - else - { - [super displayIfNeededInRectIgnoringOpacity: rect - inContext: gc]; - [self lockFocus]; - [self postDraw: rect]; - [self unlockFocus]; - } -} -*/ - - (void) drawRect: (NSRect) rect { if (currently_displaying == NO) diff --git a/Palettes/3Containers/GormNSTableColumnInspector.gorm/data.classes b/Palettes/3Containers/GormNSTableColumnInspector.gorm/data.classes index f65634d1..3615a287 100644 --- a/Palettes/3Containers/GormNSTableColumnInspector.gorm/data.classes +++ b/Palettes/3Containers/GormNSTableColumnInspector.gorm/data.classes @@ -11,7 +11,8 @@ titleAlignmentMatrix, cellTable, defaultButton, - setButton + setButton, + columnTitle ); Super = IBInspector; }; diff --git a/Palettes/3Containers/GormNSTableColumnInspector.gorm/data.info b/Palettes/3Containers/GormNSTableColumnInspector.gorm/data.info index 35701e5f84117b984d5c514f993bc215a6222413..e233f826678d75319f952731e1f6602aa013f991 100644 GIT binary patch delta 19 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 diff --git a/Palettes/3Containers/GormTableColumnAttributesInspector.h b/Palettes/3Containers/GormTableColumnAttributesInspector.h index 15757ad1..63d1d108 100644 --- a/Palettes/3Containers/GormTableColumnAttributesInspector.h +++ b/Palettes/3Containers/GormTableColumnAttributesInspector.h @@ -52,6 +52,7 @@ NSButton *setButton; NSButton *defaultButton; NSTableView *cellTable; + NSTextField *columnTitle; } @end diff --git a/Palettes/3Containers/GormTableColumnAttributesInspector.m b/Palettes/3Containers/GormTableColumnAttributesInspector.m index 566b6073..610a87d0 100644 --- a/Palettes/3Containers/GormTableColumnAttributesInspector.m +++ b/Palettes/3Containers/GormTableColumnAttributesInspector.m @@ -202,6 +202,12 @@ [[object tableView] setNeedsDisplay: YES]; [self setObject: [self object]]; // reset... } + else if (sender == columnTitle) + { + [[object headerCell] setStringValue: + [columnTitle stringValue]]; + [[[object tableView] headerView] setNeedsDisplay: YES]; + } [super ok:sender]; } @@ -259,6 +265,7 @@ } [identifierTextField setStringValue: [(NSTableColumn *)object identifier]]; + [columnTitle setStringValue: [[(NSTableColumn *)object headerCell] stringValue]]; /* options */ if ([object isResizable]) diff --git a/Palettes/3Containers/GormTableViewEditor.m b/Palettes/3Containers/GormTableViewEditor.m index 283fb683..a770e2de 100644 --- a/Palettes/3Containers/GormTableViewEditor.m +++ b/Palettes/3Containers/GormTableViewEditor.m @@ -40,21 +40,6 @@ static NSText *_textObject; @end @implementation GormTableViewEditor -/** - * Initialize the table editor. - */ - -/* -- (id) initWithObject: (id)anObject inDocument: (id)aDocument -{ - self = [super initWithObject: anObject inDocument: aDocument]; - if(self != nil) - { - } - return self; -} -*/ - - (void) setFrame: (NSRect)frame { if(tableView != nil)