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

* configure.ac

Browse source 
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
This commit is contained in:
Dave Wetzel 2010-06-03 23:33:33 +00:00
parent 86ddea2fa3
commit eab4c9915c
8 changed files with 60 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Apps/EOModelEditor/Inspectors/AdvancedAttributeInspector.gsmarkup
View file

@ -26,7 +26,6 @@
</gridRow>
</grid>
</box>
<hbox height="220" />
</vbox>

2
Apps/EOModelEditor/Inspectors/AttributeInspector.gsmarkup
View file

@ -9,7 +9,7 @@
</window>
<window id="window" title="Inspector" width="268.0" resizable="no" autosaveName="Inspector" visible="no">
<vbox>
<vbox height="387">
<grid rowType="proportional" columnType="proportional">
<gridRow>
<label halign="right" selectable="no">Name:</label> <textField id="nameField" delegate="#NSOwner"></textField>

10
Apps/EOModelEditor/Inspectors/EntityInspector.gsmarkup
View file

@ -2,9 +2,9 @@
<!DOCTYPE gsmarkup>
<gsmarkup>
<objects>
<window id="window" title="Inspector" width="268.0" xheight="405" resizable="no" autosaveName="Inspector" visible="no">
<vbox>
<box title="Names" topPadding="58" leftPadding="4" rightPadding="4" width="260">
<window id="window" title="Inspector" width="268.0" resizable="no" autosaveName="Inspector" visible="no">
<vbox height="387">
<box title="Names" topPadding="0" leftPadding="4" rightPadding="4" width="260">
<grid>
<gridRow>
<label halign="right" selectable="no">Name:</label>
@ -20,8 +20,8 @@
</gridRow>
</grid>
</box>
<box title="Properties" leftPadding="4" rightPadding="4" height="250" width="260">
<label font="small" halign="center" selectable="no">Not in this version</label>
<box title="Properties" leftPadding="4" rightPadding="4" height="200" width="260">
<label font="small" halign="center" selectable="no">Not in this version</label>
</box>
</vbox>

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

@ -2,9 +2,9 @@
<!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="200" leftPadding="4" rightPadding="4" width="260">
<box topPadding="0" leftPadding="4" rightPadding="4" width="260">
<grid>
<gridRow>
<label halign="right" selectable="no">Insert:</label>

43
Apps/EOModeler/EOMInspectorController.m
View file

@ -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];

13
ChangeLog
View file

@ -1,3 +1,16 @@
2010-06-03 David Wetzel <dave@turbocat.de>
* 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 <dave@turbocat.de>
* Apps/EOModelEditor/Inspectors/*.gsmarkup
trying to fix offsets on X11

6
configure vendored
View file

@ -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.

2
configure.ac
View file

@ -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,