gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-02-24 03:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removal of some old code and correction for table data source.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@21419 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2005-07-07 17:23:56 +00:00
parent 01252416bf
commit 7aac9ffaa4
4 changed files with 52 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ChangeLog
View file

@ -1,3 +1,11 @@
2005-07-07 13:22 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormControlEditor.m: Removed commented out code
in GormControlEditor.
* GormCore/GormDocument.m: Removed unused variables.
* Palettes/3Containers/GormNSTableView.m: Added encoder methods to
the data source/delegate to allow testInterface: to work properly.
2005-07-07 fabien <fabien@sonappart.net>
* English.lproj/GormClassInspector.gorm : Improve UI
@ -20,13 +28,20 @@
* English.lproj/GormViewSizeInspector.gorm : Ditto
* Palettes/0Menus/GormMenuInspectors.m: Implement the delegate method
controlTextDidChange for textField
* Palettes/0Menus/GormMenuAttributesInspector.gorm: Improve UI,set setNextView:, initialFirstResponder: ...
* Palettes/0Menus/GormMenuItemAttributesInspector.gorm: Improve UI,set setNextView:, initialFirstResponder: ...
* Palettes/1Windows/main.m: Implement delegate methodcontrolTextDidChange for textFields
* Palettes/1Windows/GormNSWindowInspector.gorm: Improve UI,set setNextView:, initialFirstResponder: ...
* Palettes/1Windows/GormNSWindowSizeInspector.gorm: Improve UI,set setNextView:, initialFirstResponder: ...
* Palettes/2Controls/inspectors.m: Implement delegate methodcontrolTextDidChange for textFields
* Palettes/2Controls/ControlsPalette.gorm: Improve UI,set setNextView:, initialFirstResponder: ...
* Palettes/0Menus/GormMenuAttributesInspector.gorm: Improve UI,
set setNextView:, initialFirstResponder: ...
* Palettes/0Menus/GormMenuItemAttributesInspector.gorm: Improve UI,
set setNextView:, initialFirstResponder: ...
* Palettes/1Windows/main.m: Implement delegate method
controlTextDidChange for textFields
* Palettes/1Windows/GormNSWindowInspector.gorm: Improve UI,set
setNextView:, initialFirstResponder: ...
* Palettes/1Windows/GormNSWindowSizeInspector.gorm: Improve UI,set
setNextView:, initialFirstResponder: ...
* Palettes/2Controls/inspectors.m: Implement delegate
method controlTextDidChange: for textFields
* Palettes/2Controls/ControlsPalette.gorm: Improve UI,set
setNextView:, initialFirstResponder: ...
* Palettes/2Controls/GormNSBoxInspector.gorm: Ditto
* Palettes/2Controls/GormNSButtonInspector.gorm: Ditto
* Palettes/2Controls/GormNSCellInspector.gorm: Ditto
@ -38,8 +53,10 @@
* Palettes/2Controls/GormNSSliderInspector.gorm : Ditto
* Palettes/2Controls/GormNSStepperInspector.gorm : Ditto
* Palettes/2Controls/GormNSTextFieldInspector.gorm : Ditto
* Palettes/3Containers/inspectors.m: Implement delegate methodcontrolTextDidChange for textFields
* Palettes/3Containers/GormNSBrowserInspector.gorm :Improve UI,set setNextView:, initialFirstResponder: ...
* Palettes/3Containers/inspectors.m: Implement delegate method
controlTextDidChange: for textFields
* Palettes/3Containers/GormNSBrowserInspector.gorm :Improve UI,
set setNextView:, initialFirstResponder: ...
* Palettes/3Containers/GormNSTableColumnInspector.gorm :Ditto
* Palettes/3Containers/GormNSTableColumnSizeInspector.gorm :Ditto
* Palettes/3Containers/GormNSTableViewInspector.gorm :Ditto
@ -50,13 +67,11 @@
* Palettes/4Data/GormNSNumberFormatterInspector.gorm: Ditto
* Palettes/4Data/GormNSTextViewInspector.gorm: Ditto
=======
2005-07-06 10:48 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormDocument.m: changeToViewWithTag: added code to
change current selection when switching the editor.
>>>>>>> 1.696
2005-07-05 10:59 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormDocument.m: Corrected problem where the Gorm

95
GormCore/GormControlEditor.m
View file

@ -616,10 +616,10 @@
@interface GormTextFieldEditor : GormControlEditor
@end
@implementation GormTextFieldEditor
- (void) mouseDown: (NSEvent*)theEvent
{
// double-clicked -> let's edit
@ -637,98 +637,5 @@
}
}
/*
- (unsigned) draggingEntered: (id<NSDraggingInfo>)sender
{
NSPasteboard *dragPb;
NSArray *types;
unsigned result = NSDragOperationNone;
dragPb = [sender draggingPasteboard];
types = [dragPb types];
if ([types containsObject: IBFormatterPboardType] == YES)
{
result = NSDragOperationCopy;
}
else
{
result = [super draggingEntered: sender];
}
return result;
}
- (BOOL) performDragOperation: (id<NSDraggingInfo>)sender
{
NSPasteboard *dragPb;
NSArray *types;
BOOL result = NO;
dragPb = [sender draggingPasteboard];
types = [dragPb types];
if ([types containsObject: IBFormatterPboardType] == YES)
{
NSData *data = [dragPb dataForType: IBFormatterPboardType];
id array = RETAIN([NSUnarchiver unarchiveObjectWithData: data]);
if(array != nil)
{
if([array count] > 0)
{
id object = [array objectAtIndex: 0];
if([_editedObject respondsToSelector: @selector(setFormatter:)])
{
id fieldValue = nil;
[_editedObject setFormatter: object];
if ([object isMemberOfClass: [NSNumberFormatter class]])
{
fieldValue = [NSNumber numberWithFloat: 1.123456789];
[_editedObject setStringValue: [fieldValue stringValue]];
[_editedObject setObjectValue: fieldValue];
}
else if ([object isMemberOfClass: [NSDateFormatter class]])
{
fieldValue = [NSDate date];
[_editedObject setStringValue: [fieldValue description]];
[_editedObject setObjectValue: fieldValue];
}
[document setSelectionFromEditor: self];
result = YES;
}
}
}
}
else
{
[super performDragOperation: sender];
}
return result;
}
- (BOOL) prepareForDragOperation: (id<NSDraggingInfo>)sender
{
NSPasteboard *dragPb;
NSArray *types;
BOOL result = NO;
dragPb = [sender draggingPasteboard];
types = [dragPb types];
if ([types containsObject: IBFormatterPboardType] == YES)
{
result = YES;
}
else
{
result = [super prepareForDragOperation: sender];
}
return result;
}
*/
@end

5
GormCore/GormDocument.m
View file

@ -1963,10 +1963,7 @@ static NSImage *fileImage = nil;
NSDictionary *substituteClasses = [palettesManager substituteClasses];
NSEnumerator *en = [substituteClasses keyEnumerator];
NSString *subClassName = nil;
unsigned int
version = NSNotFound,
winversion = NSNotFound,
panversion = NSNotFound;
unsigned int version = NSNotFound;
// If someone attempts to open a .gmodel using open or in a
// workspace manager, open it.. otherwise open the .gorm file.

23
Palettes/3Containers/GormNSTableView.m
View file

@ -23,18 +23,16 @@
*/
#include <Foundation/NSObject.h>
#include <InterfaceBuilder/IBApplicationAdditions.h>
#include <AppKit/NSTableColumn.h>
#include "GormNSTableView.h"
/* ---------------------------------------------------------------
* NSTableView dataSource
*/
@interface NSTableViewDataSource: NSObject
{
}
@interface NSTableViewDataSource: NSObject <NSCoding>
- (int) numberOfRowsInTableView: (NSTableView *)tv;
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
@end
static NSString* value1[] =
@ -67,6 +65,7 @@ static NSString* value2[] =
{
return 10;
}
- (id)tableView:(NSTableView *)aTableView
objectValueForTableColumn:(NSTableColumn *)aTableColumn
row:(int)rowIndex
@ -78,6 +77,15 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
return value2[rowIndex];
}
- (void) encodeWithCoder: (NSCoder *)coder
{
return;
}
- (id) initWithCoder: (NSCoder *)coder
{
return self;
}
@end
static id _sharedDataSource = nil;
@ -142,9 +150,13 @@ static id _sharedDataSource = nil;
_allowsMultipleSelection = _gormAllowsMultipleSelection;
_allowsEmptySelection = _gormAllowsEmptySelection;
if([(id<IB>)NSApp isTestingInterface] == NO)
{
_dataSource = _gormDataSource;
oldDelegate = _delegate;
_delegate = _gormDelegate;
}
_numberOfRows = 0;
[super encodeWithCoder: aCoder];
_numberOfRows = 10;
@ -154,8 +166,11 @@ static id _sharedDataSource = nil;
_allowsMultipleSelection = NO;
_allowsEmptySelection = YES;
if([(id<IB>)NSApp isTestingInterface] == NO)
{
_delegate = oldDelegate;
_dataSource = _sharedDataSource;
}
}
- (id) initWithCoder: (NSCoder*) aCoder