From eab4c9915cdd4b89a85f03a8a63ac038dddd05aa Mon Sep 17 00:00:00 2001 From: Dave Wetzel Date: Thu, 3 Jun 2010 23:33:33 +0000 Subject: [PATCH] * configure.ac replaced DBModeler with Apps/EOModeler Apps/EOModelEditor * configure: regenerated * Apps/EOModelEditor/Inspectors/AttributeInspector.gsmarkup * Apps/EOModelEditor/Inspectors/EntityStoredProcedureInspector.gsmarkup * Apps/EOModelEditor/Inspectors/AdvancedAttributeInspector.gsmarkup * Apps/EOModelEditor/Inspectors/EntityInspector.gsmarkup Changed box sizes. * Apps/EOModeler/EOMInspectorController.m add inspector view in background. add NSLogs to help debugging (still broken on X11) git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@30568 72102866-910b-0410-8b05-ffd578937521 --- .../AdvancedAttributeInspector.gsmarkup | 1 - .../Inspectors/AttributeInspector.gsmarkup | 2 +- .../Inspectors/EntityInspector.gsmarkup | 10 ++--- .../EntityStoredProcedureInspector.gsmarkup | 4 +- Apps/EOModeler/EOMInspectorController.m | 43 +++++++++++++++---- ChangeLog | 13 ++++++ configure | 6 +-- configure.ac | 2 +- 8 files changed, 60 insertions(+), 21 deletions(-) diff --git a/Apps/EOModelEditor/Inspectors/AdvancedAttributeInspector.gsmarkup b/Apps/EOModelEditor/Inspectors/AdvancedAttributeInspector.gsmarkup index 4b784d5..655419b 100644 --- a/Apps/EOModelEditor/Inspectors/AdvancedAttributeInspector.gsmarkup +++ b/Apps/EOModelEditor/Inspectors/AdvancedAttributeInspector.gsmarkup @@ -26,7 +26,6 @@ - diff --git a/Apps/EOModelEditor/Inspectors/AttributeInspector.gsmarkup b/Apps/EOModelEditor/Inspectors/AttributeInspector.gsmarkup index 663abd9..34a0f72 100644 --- a/Apps/EOModelEditor/Inspectors/AttributeInspector.gsmarkup +++ b/Apps/EOModelEditor/Inspectors/AttributeInspector.gsmarkup @@ -9,7 +9,7 @@ - + diff --git a/Apps/EOModelEditor/Inspectors/EntityInspector.gsmarkup b/Apps/EOModelEditor/Inspectors/EntityInspector.gsmarkup index a271455..21983f1 100644 --- a/Apps/EOModelEditor/Inspectors/EntityInspector.gsmarkup +++ b/Apps/EOModelEditor/Inspectors/EntityInspector.gsmarkup @@ -2,9 +2,9 @@ - - - + + + @@ -20,8 +20,8 @@ - - + + diff --git a/Apps/EOModelEditor/Inspectors/EntityStoredProcedureInspector.gsmarkup b/Apps/EOModelEditor/Inspectors/EntityStoredProcedureInspector.gsmarkup index 7e1674a..4afe474 100644 --- a/Apps/EOModelEditor/Inspectors/EntityStoredProcedureInspector.gsmarkup +++ b/Apps/EOModelEditor/Inspectors/EntityStoredProcedureInspector.gsmarkup @@ -2,9 +2,9 @@ - + - + diff --git a/Apps/EOModeler/EOMInspectorController.m b/Apps/EOModeler/EOMInspectorController.m index f915d13..04dab9d 100644 --- a/Apps/EOModeler/EOMInspectorController.m +++ b/Apps/EOModeler/EOMInspectorController.m @@ -60,7 +60,7 @@ NSString *EOMSelectionChangedNotification = @"EOModelerSelectionChanged"; hasHorizontalScroller:YES hasVerticalScroller:NO borderType:NSNoBorder]; - + window = [[NSPanel alloc] initWithContentRect:NSMakeRect(220, 536, 272, 388+scrollSize.height) styleMask:NSTitledWindowMask | NSClosableWindowMask backing:NSBackingStoreBuffered @@ -167,12 +167,27 @@ NSString *EOMSelectionChangedNotification = @"EOModelerSelectionChanged"; [inspector prepareForDisplay]; if ([lastInspector view] && lastInspector != inspector) - [[lastInspector view] removeFromSuperview]; + [[lastInspector view] removeFromSuperviewWithoutNeedingDisplay]; - if ([inspector view] && lastInspector != inspector) - [[window contentView] addSubview:[inspector view]]; - - [window setTitle:[inspector displayName]]; + 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]; @@ -201,11 +216,23 @@ NSString *EOMSelectionChangedNotification = @"EOModelerSelectionChanged"; [inspector prepareForDisplay]; if ([lastInspector view] && lastInspector != inspector) - [[lastInspector view] removeFromSuperview]; + [[lastInspector view] removeFromSuperviewWithoutNeedingDisplay]; if ([inspector view] && lastInspector != inspector) { - [[window contentView] addSubview:[inspector view]]; + 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]; diff --git a/ChangeLog b/ChangeLog index cc45d04..d954592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2010-06-03 David Wetzel + * configure.ac + replaced DBModeler with Apps/EOModeler Apps/EOModelEditor + * configure: regenerated + * Apps/EOModelEditor/Inspectors/AttributeInspector.gsmarkup + * Apps/EOModelEditor/Inspectors/EntityStoredProcedureInspector.gsmarkup + * Apps/EOModelEditor/Inspectors/AdvancedAttributeInspector.gsmarkup + * Apps/EOModelEditor/Inspectors/EntityInspector.gsmarkup + Changed box sizes. + * Apps/EOModeler/EOMInspectorController.m + add inspector view in background. + add NSLogs to help debugging (still broken on X11) + 2010-06-03 David Wetzel * Apps/EOModelEditor/Inspectors/*.gsmarkup trying to fix offsets on X11 diff --git a/configure b/configure index 535845a..98d1f7c 100755 --- a/configure +++ b/configure @@ -3102,7 +3102,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f conftest* +rm -f -r conftest* fi @@ -3123,7 +3123,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f conftest* +rm -f -r conftest* fi @@ -4071,7 +4071,7 @@ else fi if test "$enable_gui_projects" = "yes"; then - GUI_SUBPROJECTS="$GUI_SUBPROJECTS EOInterface EOModeler DBModeler" + GUI_SUBPROJECTS="$GUI_SUBPROJECTS EOInterface Apps/EOModeler Apps/EOModelEditor" fi # Check whether --enable-gorm-palette was given. diff --git a/configure.ac b/configure.ac index 31740a7..3db2ef9 100644 --- a/configure.ac +++ b/configure.ac @@ -76,7 +76,7 @@ AC_ARG_ENABLE(gui-projects, [ --disable-gui-projects to disable building GUI projects], , enable_gui_projects=yes) if test "$enable_gui_projects" = "yes"; then - GUI_SUBPROJECTS="$GUI_SUBPROJECTS EOInterface EOModeler DBModeler" + GUI_SUBPROJECTS="$GUI_SUBPROJECTS EOInterface Apps/EOModeler Apps/EOModelEditor" fi AC_ARG_ENABLE(gorm-palette,