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 d458b2cbbc0c0e2f9a0fe1a248396c42288bf3f0 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 13 11:10:09 2018 +0200 fixes #9951 - Calculatrice --- .../ui/swing/content/demande/QuantitiesByRangeUI.jaxx | 7 ------- .../swing/content/demande/QuantitiesByRangeUIHandler.java | 13 +++++++------ .../demande/actions/ComputeQuantitiesByRangeAction.java | 2 +- 3 files changed, 8 insertions(+), 14 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 d752a187..c2834ad2 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 @@ -70,13 +70,6 @@ </row> </Table> - <!--JPanel layout='{new GridLayout(3, 2)}'> - <JLabel id='enAttenteRangeLabel'/> - <JXTable id='enAttenteRangeTable'/> - <JLabel id='totalsRangeLabel'/> - <JXTable id='totalsRangeTable'/> - </JPanel--> - <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='okButton' onActionPerformed='handler.cancel()'/> </JPanel> 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 02f76ce4..934871c9 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 @@ -34,6 +34,7 @@ import org.nuiton.jaxx.application.swing.util.Cancelable; import javax.swing.*; import javax.swing.table.DefaultTableColumnModel; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -83,7 +84,7 @@ public class QuantitiesByRangeUIHandler extends AbstractFaxToMailUIHandler<Quant null, enCoursRangeTable); - columnModel.getColumn(0).setPreferredWidth(150); + columnModel.getColumn(0).setPreferredWidth(120); enCoursRangeTableModel = new RangeTableModel(columnModel); enCoursRangeTableModel.setRows(getModel().getEnCoursRangeRows()); @@ -92,13 +93,13 @@ public class QuantitiesByRangeUIHandler extends AbstractFaxToMailUIHandler<Quant enCoursRangeTable.getTableHeader().setReorderingAllowed(false); enCoursRangeTable.getTableHeader().setVisible(true); - //enCoursRangeTable.setRowHeight(50); - //enCoursRangeTable.se - enCoursRangeTable.setPreferredScrollableViewportSize(enCoursRangeTable.getPreferredSize()); + //enCoursRangeTable.setPreferredScrollableViewportSize(enCoursRangeTable.getSize()); final JScrollPane scrollPane = ui.getScrollPane(); scrollPane.setBorder(null); scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); + //Hack to display full table : rowCount + 2 to get subTotal and header ; 19 is row size + scrollPane.setMinimumSize(new Dimension(0,(enCoursRangeTableModel.getRowCount()+2)*19)); getModel().addPropertyChangeListener(QuantitiesByRangeUIModel.PROPERTY_ENCOURS_RANGE_ROWS, new PropertyChangeListener() { @@ -128,7 +129,7 @@ public class QuantitiesByRangeUIHandler extends AbstractFaxToMailUIHandler<Quant null, enAttenteRangeTable); - enAttenteColumnModel.getColumn(0).setPreferredWidth(150); + enAttenteColumnModel.getColumn(0).setPreferredWidth(120); enAttenteRangeTableModel = new RangeTableModel(enAttenteColumnModel); enAttenteRangeTableModel.setRows(getModel().getEnAttenteRangeRows()); @@ -165,7 +166,7 @@ public class QuantitiesByRangeUIHandler extends AbstractFaxToMailUIHandler<Quant RangeTableModel.SAV_QUANTITY_COLUMN, null, totalsRangeTable); - totalsColumnModel.getColumn(0).setPreferredWidth(150); + totalsColumnModel.getColumn(0).setPreferredWidth(120); totalsRangeTableModel = new RangeTableModel(totalsColumnModel); totalsRangeTableModel.setRows(getModel().getTotalsRangeRows()); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java index 3c47dc23..f86c5664 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java @@ -174,7 +174,7 @@ public class ComputeQuantitiesByRangeAction extends AbstractFaxToMailAction<Quan super.releaseAction(); if (!error) { - handler.openDialog(getUI(), t("faxtomail.quantitiesByRange.title"), new Dimension(350, 300)); + handler.openDialog(getUI(), t("faxtomail.quantitiesByRange.title"), new Dimension(450, 300)); } error = false; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.