gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-02-15 16:10:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Apps/EOModelEditor/Inspectors/AdvancedEntityInspector.gsmarkup

Browse source 
changed scrollView sizing
* Apps/EOModeler/EOMInspectorController.m
  refactored view switching into a single method
  disabled bounds logging
  Be sure to get the lastest gui if you try this!



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@30582 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel 2010-06-05 02:23:24 +00:00
parent 689fa01970
commit 003795c3d0
3 changed files with 50 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Apps/EOModelEditor/Inspectors/AdvancedEntityInspector.gsmarkup
View file

@ -2,7 +2,7 @@
<!DOCTYPE gsmarkup>
<gsmarkup>
<objects>
<window id="window" title="Inspector" width="268.0" height="405" resizable="no" autosaveName="Inspector" visible="no">
<window id="window" title="Inspector" width="268.0" resizable="no" autosaveName="Inspector" visible="no">
<vbox height="387">
<box topPadding="0" bottomPadding="3" leftPadding="4" rightPadding="4" width="260">
<grid>
@ -23,7 +23,7 @@
</box>
<box title="Parent" topPadding="0" bottomPadding="0" leftPadding="4" rightPadding="4">
<vbox>
<scrollView hasHorizontalScroller="no" height="115">
<scrollView hasHorizontalScroller="no" valign="expand">
<tableView id="parentTableView" usesAlternatingRowBackgroundColors="yes" drawsGrid="yes"
allowsEmptySelection="no" allowsColumnSelection="no" target="#NSOwner" action="tableViewClicked:">
<tableColumn editable="no" identifier="selected" title="" minWidth="16" maxWidth="16" width="16"/>

100
Apps/EOModeler/EOMInspectorController.m
View file

@ -39,7 +39,7 @@ static EOMInspectorController *_sharedInspectorController;
static NSMatrix *_iconBar;
@interface EOMInspectorController(Private)
- (void) _selectionChanged:(NSNotification *)notif;
- (void) selectionChanged:(NSNotification *)notif;
@end
NSString *EOMSelectionChangedNotification = @"EOModelerSelectionChanged";
@ -77,7 +77,7 @@ NSString *EOMSelectionChangedNotification = @"EOModelerSelectionChanged";
[_iconBar setAutosizesCells:NO];
[_iconBar setCellSize:NSMakeSize(64,64)];
[_iconBar setTarget:self];
[_iconBar setAction:@selector(_selectInspector:)];
[_iconBar setAction:@selector(selectInspector:)];
iconCell = [[NSButtonCell alloc] initTextCell:@""];
// [iconCell setButtonType:NSMomentaryPushInButton];
[iconCell setButtonType:NSOnOffButton];
@ -91,7 +91,7 @@ NSString *EOMSelectionChangedNotification = @"EOModelerSelectionChanged";
[[NSNotificationCenter defaultCenter]
addObserver:_sharedInspectorController
selector:@selector(_selectionChanged:)
selector:@selector(selectionChanged:)
name:EOMSelectionChangedNotification
object:nil];
@ -101,7 +101,7 @@ NSString *EOMSelectionChangedNotification = @"EOModelerSelectionChanged";
- (void) _showInspector
{
[window makeKeyAndOrderFront:self];
[self _selectionChanged:nil];
[self selectionChanged:nil];
}
+ (void) showInspector
@ -117,7 +117,38 @@ NSString *EOMSelectionChangedNotification = @"EOModelerSelectionChanged";
return _sharedInspectorController;
}
- (void) _selectionChanged:(NSNotification *)notif
- (void) _selectInspector:(EOMInspector*)inspector
{
[inspector prepareForDisplay];
if ([lastInspector view] && lastInspector != inspector)
[[lastInspector view] removeFromSuperviewWithoutNeedingDisplay];
if ([inspector view] && lastInspector != inspector) {
// NSRect bounds = [[inspector view] bounds];
[[window contentView] addSubview:[inspector view]
positioned:NSWindowBelow
relativeTo:scrollView];
[[inspector view] setFrameOrigin:NSMakePoint(0,0)];
[[inspector view] setNeedsDisplay:YES];
[[window contentView] setNeedsDisplay:YES];
[window setTitle:[inspector displayName]];
// NSLog(@"%@ view size: %f x %f origin: %f x %f", NSStringFromClass([inspector class]),
// bounds.size.width, bounds.size.height,
// bounds.origin.x, bounds.origin.y);
}
[[inspector view] setNeedsDisplay:YES];
[inspector refresh];
lastInspector = inspector;
}
- (void) selectionChanged:(NSNotification *)notif
{
id currentDocument = [[NSDocumentController sharedDocumentController] currentDocument];
@ -159,46 +190,19 @@ NSString *EOMSelectionChangedNotification = @"EOModelerSelectionChanged";
if ([inspectors containsObject:lastInspector])
{
inspector = lastInspector;
[inspector prepareForDisplay];
}
else
{
inspector = [inspectors objectAtIndex:0];
[inspector prepareForDisplay];
if ([lastInspector view] && lastInspector != inspector)
[[lastInspector view] removeFromSuperviewWithoutNeedingDisplay];
if ([inspector view] && lastInspector != inspector) {
NSRect bounds = [[inspector view] bounds];
[[window contentView] addSubview:[inspector view]
positioned:NSWindowBelow
relativeTo:scrollView];
[[inspector view] setFrameOrigin:NSMakePoint(0,0)];
[[inspector view] setNeedsDisplay:YES];
[[window contentView] setNeedsDisplay:YES];
NSLog(@"%@ view size: %f x %f origin: %f x %f", NSStringFromClass([inspector class]),
bounds.size.width, bounds.size.height,
bounds.origin.x, bounds.origin.y);
// NSLog(@"inspectorViewOrigin origin: %f x %f",
// inspectorViewOrigin.x, inspectorViewOrigin.y);
[window setTitle:[inspector displayName]];
}
}
[[inspector view] setNeedsDisplay:YES];
[inspector refresh];
lastInspector = inspector;
[self _selectInspector:inspector];
}
else
{
[[lastInspector view] removeFromSuperview];
lastInspector = nil;
NSLog(@"no inspector");
NSLog(@"no inspector for selection.");
}
}
else
@ -209,36 +213,12 @@ NSString *EOMSelectionChangedNotification = @"EOModelerSelectionChanged";
}
}
- (void) _selectInspector:(id)sender
- (void) selectInspector:(id)sender
{
EOMInspector *inspector = [[sender selectedCell] representedObject];
[inspector prepareForDisplay];
[self _selectInspector:inspector];
if ([lastInspector view] && lastInspector != inspector)
[[lastInspector view] removeFromSuperviewWithoutNeedingDisplay];
if ([inspector view] && lastInspector != inspector) {
NSRect bounds = [[inspector view] bounds];
[[window contentView] addSubview:[inspector view]
positioned:NSWindowBelow
relativeTo:scrollView];
[[inspector view] setFrameOrigin:NSMakePoint(0,0)];
[[inspector view] setNeedsDisplay:YES];
[[window contentView] setNeedsDisplay:YES];
[window setTitle:[inspector displayName]];
NSLog(@"%@ view size: %f x %f origin: %f x %f", NSStringFromClass([inspector class]),
bounds.size.width, bounds.size.height,
bounds.origin.x, bounds.origin.y);
}
[[inspector view] setNeedsDisplay:YES];
[inspector refresh];
lastInspector = inspector;
}
@end

8
ChangeLog
View file

@ -1,3 +1,11 @@
2010-06-04 David Wetzel <dave@turbocat.de>
* Apps/EOModelEditor/Inspectors/AdvancedEntityInspector.gsmarkup
changed scrollView sizing
* Apps/EOModeler/EOMInspectorController.m
refactored view switching into a single method
disabled bounds logging
Be sure to get the lastest gui if you try this!
2010-06-03 David Wetzel <dave@turbocat.de>
* EOAccess/EOAttribute.m
include EOSQLExpression.h