From: <jm...@us...> - 2010-03-14 16:02:49
|
Revision: 1301 http://eulergui.svn.sourceforge.net/eulergui/?rev=1301&view=rev Author: jmvanel Date: 2010-03-14 16:02:43 +0000 (Sun, 14 Mar 2010) Log Message: ----------- GUI enhancement: glue together the components between the button bar and the bottom text panel, so that the bottom text panel can grow in size. Modified Paths: -------------- trunk/eulergui/src/main/java/eulergui/gui/view/ButtonsForN3Source.java trunk/eulergui/src/main/java/n3_project/ProjectGUI.java trunk/eulergui/src/main/java/n3_project/RunOptionsManagement.java trunk/eulergui/src/main/java/n3_project/SourceFilesView.java trunk/eulergui/src/main/java/n3_project/SubProjectsManagement.java Modified: trunk/eulergui/src/main/java/eulergui/gui/view/ButtonsForN3Source.java =================================================================== --- trunk/eulergui/src/main/java/eulergui/gui/view/ButtonsForN3Source.java 2010-03-14 12:29:29 UTC (rev 1300) +++ trunk/eulergui/src/main/java/eulergui/gui/view/ButtonsForN3Source.java 2010-03-14 16:02:43 UTC (rev 1301) @@ -45,6 +45,8 @@ boolean isActivated = n3.isActivated(); subPanel = this; +// sourceFilesView.getButtonsPanel().add( Box.createVerticalGlue() ); +// sourceFilesView.getButtonsPanel().add( Box.createRigidArea(new Dimension(0,5)) ); sourceFilesView.getButtonsPanel().add(subPanel); if (!isActivated) { subPanel.setBackground(Color.WHITE); @@ -207,6 +209,9 @@ subPanel.add(parserButton); // ---------------- +// subPanel.setPreferredSize(new Dimension( editButton.getHeight(), 800 )); +// subPanel.setMaximumSize( new Dimension( editButton.getHeight(), 800 )); + projectGUI.getCenterPanel().validate(); projectGUI.getCenterPanel().invalidate(); } Modified: trunk/eulergui/src/main/java/n3_project/ProjectGUI.java =================================================================== --- trunk/eulergui/src/main/java/n3_project/ProjectGUI.java 2010-03-14 12:29:29 UTC (rev 1300) +++ trunk/eulergui/src/main/java/n3_project/ProjectGUI.java 2010-03-14 16:02:43 UTC (rev 1301) @@ -230,8 +230,7 @@ getCenterPanel().add(runOptionsManagement.getJComponent()); sourceFilesView.makeButtonsPanel(); -// JScrollPane scrollPane = new JScrollPane(getTextPane()); -// getCenterPanel().add(scrollPane); +// getContentPane().add( getTextPane().getComponent(), BorderLayout.SOUTH); getCenterPanel().add( getTextPane().getComponent() ); pack(); Modified: trunk/eulergui/src/main/java/n3_project/RunOptionsManagement.java =================================================================== --- trunk/eulergui/src/main/java/n3_project/RunOptionsManagement.java 2010-03-14 12:29:29 UTC (rev 1300) +++ trunk/eulergui/src/main/java/n3_project/RunOptionsManagement.java 2010-03-14 16:02:43 UTC (rev 1301) @@ -1,5 +1,7 @@ package n3_project; +import java.awt.Dimension; + import javax.swing.BoxLayout; import javax.swing.JComponent; import javax.swing.JPanel; @@ -18,7 +20,16 @@ } JComponent getJComponent() { - component = new JPanel(); + component = new JPanel(){ + private static final long serialVersionUID = 1L; + public Dimension getMaximumSize() { + Dimension d0 = getPreferredSize(); + Dimension d = new Dimension(d0); + // apparently this value means "no constraint" : + d.width = Short.MAX_VALUE; + return d; + } + }; component.setLayout(new BoxLayout(component, BoxLayout.Y_AXIS)); eulerField = new TextFieldWithLabel("Euler args", ""); component.add(eulerField); Modified: trunk/eulergui/src/main/java/n3_project/SourceFilesView.java =================================================================== --- trunk/eulergui/src/main/java/n3_project/SourceFilesView.java 2010-03-14 12:29:29 UTC (rev 1300) +++ trunk/eulergui/src/main/java/n3_project/SourceFilesView.java 2010-03-14 16:02:43 UTC (rev 1301) @@ -64,6 +64,12 @@ fireEventsToUpdateN3SourceComponents(); + // glue together the buttons for N3 sources + getButtonsPanel().setMaximumSize( getButtonsPanel().getPreferredSize() ); +// System.out.println("SourceFilesView.makeButtonsPanel(): " + +// "getButtonsPanel().getPreferredSize(): " +// + getButtonsPanel().getPreferredSize() ); + getCenterPanel().validate(); getCenterPanel().invalidate(); getProjectGUI().updateWindowTitle(); Modified: trunk/eulergui/src/main/java/n3_project/SubProjectsManagement.java =================================================================== --- trunk/eulergui/src/main/java/n3_project/SubProjectsManagement.java 2010-03-14 12:29:29 UTC (rev 1300) +++ trunk/eulergui/src/main/java/n3_project/SubProjectsManagement.java 2010-03-14 16:02:43 UTC (rev 1301) @@ -16,6 +16,8 @@ } JComponent getJComponent() { + // glue together the button for the sub-Project with the others components in their parent + panel.setMaximumSize( panel.getPreferredSize() ); return panel; } @@ -25,7 +27,7 @@ subProject, "imported: " ); if( button != null ) { panel.add(button); - panel.validate(); + panel.validate(); // actually update the GUI with the new button projectGUI.pack(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |