This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 1c157ab3d202350ba1092b40038575bd2e0cb346 Author: jcouteau <couteau@codelutin.com> Date: Tue Jun 12 11:10:59 2018 +0200 refs #9951 - Still need to fix the first table height :( --- .../swing/content/demande/QuantitiesByRangeUI.jaxx | 36 ++++++++++++++++++---- .../demande/QuantitiesByRangeUIHandler.java | 17 +++++++++- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.jaxx index b35d2fe4..d752a187 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.jaxx @@ -42,16 +42,40 @@ <QuantitiesByRangeUIModel id='model' initializer='getContextValue(QuantitiesByRangeUIModel.class)'/> - <JScrollPane constraints='BorderLayout.CENTER'> - <JPanel layout='{new GridLayout(3, 2)}'> - <JLabel id='enCoursRangeLabel'/> - <JXTable id='enCoursRangeTable'/> + <Table fill="both"> + <row> + <cell> + <JLabel id='enCoursRangeLabel'/> + </cell> + <cell weightx='1'> + <JScrollPane id="scrollPane"><JXTable id='enCoursRangeTable'/></JScrollPane> + </cell> + </row> + + <row> + <cell> + <JLabel id='enAttenteRangeLabel'/> + </cell> + <cell weightx='1'> + <JXTable id='enAttenteRangeTable'/> + </cell> + </row> + <row> + <cell> + <JLabel id='totalsRangeLabel'/> + </cell> + <cell weightx='1'> + <JXTable id='totalsRangeTable'/> + </cell> + </row> + </Table> + + <!--JPanel layout='{new GridLayout(3, 2)}'> <JLabel id='enAttenteRangeLabel'/> <JXTable id='enAttenteRangeTable'/> <JLabel id='totalsRangeLabel'/> <JXTable id='totalsRangeTable'/> - </JPanel> - </JScrollPane> + </JPanel--> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='okButton' onActionPerformed='handler.cancel()'/> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java index 39d1a35b..02f76ce4 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java @@ -32,7 +32,8 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.util.Cancelable; -import javax.swing.JComponent; +import javax.swing.*; +import javax.swing.table.DefaultTableColumnModel; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -82,11 +83,22 @@ public class QuantitiesByRangeUIHandler extends AbstractFaxToMailUIHandler<Quant null, enCoursRangeTable); + columnModel.getColumn(0).setPreferredWidth(150); + enCoursRangeTableModel = new RangeTableModel(columnModel); enCoursRangeTableModel.setRows(getModel().getEnCoursRangeRows()); enCoursRangeTable.setModel(enCoursRangeTableModel); enCoursRangeTable.setColumnModel(columnModel); enCoursRangeTable.getTableHeader().setReorderingAllowed(false); + enCoursRangeTable.getTableHeader().setVisible(true); + + //enCoursRangeTable.setRowHeight(50); + //enCoursRangeTable.se + enCoursRangeTable.setPreferredScrollableViewportSize(enCoursRangeTable.getPreferredSize()); + + final JScrollPane scrollPane = ui.getScrollPane(); + scrollPane.setBorder(null); + scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); getModel().addPropertyChangeListener(QuantitiesByRangeUIModel.PROPERTY_ENCOURS_RANGE_ROWS, new PropertyChangeListener() { @@ -116,6 +128,8 @@ public class QuantitiesByRangeUIHandler extends AbstractFaxToMailUIHandler<Quant null, enAttenteRangeTable); + enAttenteColumnModel.getColumn(0).setPreferredWidth(150); + enAttenteRangeTableModel = new RangeTableModel(enAttenteColumnModel); enAttenteRangeTableModel.setRows(getModel().getEnAttenteRangeRows()); enAttenteRangeTable.setModel(enAttenteRangeTableModel); @@ -151,6 +165,7 @@ public class QuantitiesByRangeUIHandler extends AbstractFaxToMailUIHandler<Quant RangeTableModel.SAV_QUANTITY_COLUMN, null, totalsRangeTable); + totalsColumnModel.getColumn(0).setPreferredWidth(150); totalsRangeTableModel = new RangeTableModel(totalsColumnModel); totalsRangeTableModel.setRows(getModel().getTotalsRangeRows()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.