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 aa6b40d68bb53e219c21861de0fe8361cd30bed2 Author: jcouteau <couteau@codelutin.com> Date: Thu Jun 14 15:26:18 2018 +0200 fix calculatrice --- .../swing/content/demande/QuantitiesByRangeUI.jaxx | 6 ++++- .../demande/QuantitiesByRangeUIHandler.java | 26 ++++++++++++++++++---- 2 files changed, 27 insertions(+), 5 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 c2834ad2..9006723d 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,13 +42,16 @@ <QuantitiesByRangeUIModel id='model' initializer='getContextValue(QuantitiesByRangeUIModel.class)'/> + <JScrollPane> <Table fill="both"> <row> <cell> <JLabel id='enCoursRangeLabel'/> </cell> <cell weightx='1'> - <JScrollPane id="scrollPane"><JXTable id='enCoursRangeTable'/></JScrollPane> + <JPanel id="enCoursTablePanel" layout='{new BorderLayout()}'> + <JXTable id='enCoursRangeTable' constraints='BorderLayout.CENTER'/> + </JPanel> </cell> </row> @@ -69,6 +72,7 @@ </cell> </row> </Table> + </JScrollPane> <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 934871c9..9e937541 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 @@ -33,6 +33,8 @@ import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.util.Cancelable; import javax.swing.*; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableColumnModel; import java.awt.*; import java.beans.PropertyChangeEvent; @@ -87,25 +89,38 @@ public class QuantitiesByRangeUIHandler extends AbstractFaxToMailUIHandler<Quant columnModel.getColumn(0).setPreferredWidth(120); enCoursRangeTableModel = new RangeTableModel(columnModel); + /*enCoursRangeTableModel.addTableModelListener(new TableModelListener() { + @Override + public void tableChanged(TableModelEvent tableModelEvent) { + enCoursRangeTable.setPreferredScrollableViewportSize(enCoursRangeTable.getSize()); + + } + });*/ enCoursRangeTableModel.setRows(getModel().getEnCoursRangeRows()); enCoursRangeTable.setModel(enCoursRangeTableModel); enCoursRangeTable.setColumnModel(columnModel); enCoursRangeTable.getTableHeader().setReorderingAllowed(false); enCoursRangeTable.getTableHeader().setVisible(true); + ui.getEnCoursTablePanel().add(enCoursRangeTable.getTableHeader(),BorderLayout.NORTH); + + enCoursRangeTable.getTableHeader().setResizingAllowed(false); + //enCoursRangeTable.setPreferredScrollableViewportSize(enCoursRangeTable.getSize()); + //enCoursRangeTable.setPreferredScrollableViewportSize(enCoursRangeTable.ca); - final JScrollPane scrollPane = ui.getScrollPane(); - scrollPane.setBorder(null); - scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); + //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)); + //scrollPane.setMinimumSize(new Dimension(0,(enCoursRangeTableModel.getRowCount()+2)*19)); getModel().addPropertyChangeListener(QuantitiesByRangeUIModel.PROPERTY_ENCOURS_RANGE_ROWS, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { setEnCoursRangeRows((List<RangeRowModel>) evt.getNewValue()); + //enCoursRangeTable.setPreferredScrollableViewportSize(enCoursRangeTable.getSize()); } }); @@ -136,6 +151,7 @@ public class QuantitiesByRangeUIHandler extends AbstractFaxToMailUIHandler<Quant enAttenteRangeTable.setModel(enAttenteRangeTableModel); enAttenteRangeTable.setColumnModel(enAttenteColumnModel); enAttenteRangeTable.getTableHeader().setReorderingAllowed(false); + enAttenteRangeTable.getTableHeader().setResizingAllowed(false); getModel().addPropertyChangeListener(QuantitiesByRangeUIModel.PROPERTY_ENATTENTE_RANGE_ROWS, new PropertyChangeListener() { @@ -173,6 +189,8 @@ public class QuantitiesByRangeUIHandler extends AbstractFaxToMailUIHandler<Quant totalsRangeTable.setModel(totalsRangeTableModel); totalsRangeTable.setColumnModel(totalsColumnModel); totalsRangeTable.getTableHeader().setReorderingAllowed(false); + totalsRangeTable.getTableHeader().setResizingAllowed(false); + getModel().addPropertyChangeListener(QuantitiesByRangeUIModel.PROPERTY_TOTALS_RANGE_ROWS, new PropertyChangeListener() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.