Author: chatellier Date: 2011-03-03 14:37:45 +0000 (Thu, 03 Mar 2011) New Revision: 765 Log: Fix filter layout (button) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2011-03-03 09:38:38 UTC (rev 764) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2011-03-03 14:37:45 UTC (rev 765) @@ -74,25 +74,43 @@ <row> <cell /> <cell /> - <cell fill="horizontal" insets="0" columns="2" anchor="west"> - <JPanel> - <JLabel text="coser.ui.selection.filter.occurrence" /> - <JTextField id="selectionFilterOccurrenceField" columns="3" text="{String.valueOf(getSelection().getOccurrenceFilter())}" /> - <javax.swing.text.Document javaBean="selectionFilterOccurrenceField.getDocument()" + <cell fill="horizontal" insets="0" columns="2"> + <Table> + <row> + <cell> + <JLabel text="coser.ui.selection.filter.occurrence" /> + </cell> + <cell> + <JTextField id="selectionFilterOccurrenceField" columns="3" text="{String.valueOf(getSelection().getOccurrenceFilter())}" /> + <javax.swing.text.Document javaBean="selectionFilterOccurrenceField.getDocument()" onInsertUpdate='applyOccDensFilter.setEnabled(true)' onRemoveUpdate='applyOccDensFilter.setEnabled(true)' /> - <JLabel text="coser.ui.selection.filter.occurrenceunit" /> - <JLabel text="coser.ui.selection.filter.density" /> - <JTextField id="selectionFilterDensityField" columns="3" text="{String.valueOf(getSelection().getDensityFilter())}" /> - <javax.swing.text.Document javaBean="selectionFilterDensityField.getDocument()" + </cell> + <cell> + <JLabel text="coser.ui.selection.filter.occurrenceunit" /> + </cell> + <cell> + <JLabel text="coser.ui.selection.filter.density" /> + </cell> + <cell> + <JTextField id="selectionFilterDensityField" columns="3" text="{String.valueOf(getSelection().getDensityFilter())}" /> + <javax.swing.text.Document javaBean="selectionFilterDensityField.getDocument()" onInsertUpdate='applyOccDensFilter.setEnabled(true)' onRemoveUpdate='applyOccDensFilter.setEnabled(true)' /> - <JLabel text="coser.ui.selection.filter.densityunit" /> - <JButton id="applyOccDensFilter" text="coser.ui.selection.filter.filter" enabled="false" - onActionPerformed="getHandler().updateOccurrenceDensityFilter(this);applyOccDensFilter.setEnabled(false)" /> - </JPanel> + </cell> + <cell> + <JLabel text="coser.ui.selection.filter.densityunit" /> + </cell> + </row> + <row> + <cell columns="6" anchor="center"> + <JButton id="applyOccDensFilter" text="coser.ui.selection.filter.filter" enabled="false" + onActionPerformed="getHandler().updateOccurrenceDensityFilter(this);applyOccDensFilter.setEnabled(false)" /> + </cell> + </row> + </Table> </cell> - <cell columns="2"> + <cell fill="horizontal" insets="0" columns="2"> <JPanel> <JButton icon="chart_curve.png" toolTipText="coser.ui.graph.compareNumberCatchLength" onActionPerformed="getHandler().displayCompareNumberCatchGraph(this)" />