This is an automated email from the git hooks/post-receive script. New commit to branch feature/8141 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 49416c0ffce06c9f750c71f1ee1089b82ba819f3 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 18 10:58:43 2016 +0100 - suppression des boutons pour afficher la popup de l'editeur de nombres - ajout de la formule en haut de la popup fixes #8141 --- .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 119 +++++++++++---------- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 10 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 25 ++--- 4 files changed, 83 insertions(+), 72 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx index 6b5a1f5..a2b5a47 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx @@ -72,80 +72,83 @@ public void closeEditor() { handler.closeEditor(); } <JButton id="nextRowButton"/> </JToolBar> - <JXTitledPanel id="bodyPanel" constraints='BorderLayout.NORTH'> - <JPanel layout="{new GridLayout(3, 1)}"> - <JPanel id="malePanel" layout="{new GridLayout(2, 1)}" border='{new TitledBorder(t("tutti.editRtp.malePanel"))}'> - <JPanel layout="{new GridLayout(1, 2)}"> - <Table id='maleAPanel' fill='both'> + <JXTitledPanel id="bodyPanel" constraints='BorderLayout.CENTER'> + <JPanel layout='{new BorderLayout()}'> + <JLabel id="rtpFormulaLabel" constraints='BorderLayout.NORTH'/> + <JPanel layout="{new GridLayout(3, 1)}" constraints='BorderLayout.CENTER'> + <JPanel id="malePanel" layout="{new GridLayout(2, 1)}" border='{new TitledBorder(t("tutti.editRtp.malePanel"))}'> + <JPanel layout="{new GridLayout(1, 2)}"> + <Table id='maleAPanel' fill='both'> + <row> + <cell> + <JLabel id='rtpMaleALabel'/> + </cell> + <cell weightx='1'> + <NumberEditor id='rtpMaleAField' styleClass="aEditor"/> + </cell> + </row> + </Table> + <Table id='maleBPanel' fill='both'> + <row> + <cell> + <JLabel id='rtpMaleBLabel'/> + </cell> + <cell weightx='1'> + <NumberEditor id='rtpMaleBField' styleClass="bEditor"/> + </cell> + </row> + </Table> + </JPanel> + <JButton id="copyValuesButton" /> + </JPanel> + + <JPanel id="femalePanel" layout="{new GridLayout(1, 2)}" + border='{new TitledBorder(t("tutti.editRtp.femalePanel"))}'> + <Table id='femaleAPanel' fill='both'> <row> <cell> - <JLabel id='rtpMaleALabel'/> + <JLabel id='rtpFemaleALabel'/> </cell> <cell weightx='1'> - <NumberEditor id='rtpMaleAField' styleClass="aEditor"/> + <NumberEditor id='rtpFemaleAField' styleClass="aEditor"/> </cell> </row> </Table> - <Table id='maleBPanel' fill='both'> + <Table id='femaleBPanel' fill='both'> <row> <cell> - <JLabel id='rtpMaleBLabel'/> + <JLabel id='rtpFemaleBLabel'/> </cell> <cell weightx='1'> - <NumberEditor id='rtpMaleBField' styleClass="bEditor"/> + <NumberEditor id='rtpFemaleBField' styleClass="bEditor"/> </cell> </row> </Table> </JPanel> - <JButton id="copyValuesButton" /> - </JPanel> - - <JPanel id="femalePanel" layout="{new GridLayout(1, 2)}" - border='{new TitledBorder(t("tutti.editRtp.femalePanel"))}'> - <Table id='femaleAPanel' fill='both'> - <row> - <cell> - <JLabel id='rtpFemaleALabel'/> - </cell> - <cell weightx='1'> - <NumberEditor id='rtpFemaleAField' styleClass="aEditor"/> - </cell> - </row> - </Table> - <Table id='femaleBPanel' fill='both'> - <row> - <cell> - <JLabel id='rtpFemaleBLabel'/> - </cell> - <cell weightx='1'> - <NumberEditor id='rtpFemaleBField' styleClass="bEditor"/> - </cell> - </row> - </Table> - </JPanel> - <JPanel id="undefinedPanel" layout="{new GridLayout(1, 2)}" - border='{new TitledBorder(t("tutti.editRtp.undefinedPanel"))}'> - <Table id='undefinedAPanel' fill='both'> - <row> - <cell> - <JLabel id='rtpUndefinedALabel'/> - </cell> - <cell weightx='1'> - <NumberEditor id='rtpUndefinedAField' styleClass="aEditor"/> - </cell> - </row> - </Table> - <Table id='undefinedBPanel' fill='both'> - <row> - <cell> - <JLabel id='rtpUndefinedBLabel'/> - </cell> - <cell weightx='1'> - <NumberEditor id='rtpUndefinedBField' styleClass="bEditor"/> - </cell> - </row> - </Table> + <JPanel id="undefinedPanel" layout="{new GridLayout(1, 2)}" + border='{new TitledBorder(t("tutti.editRtp.undefinedPanel"))}'> + <Table id='undefinedAPanel' fill='both'> + <row> + <cell> + <JLabel id='rtpUndefinedALabel'/> + </cell> + <cell weightx='1'> + <NumberEditor id='rtpUndefinedAField' styleClass="aEditor"/> + </cell> + </row> + </Table> + <Table id='undefinedBPanel' fill='both'> + <row> + <cell> + <JLabel id='rtpUndefinedBLabel'/> + </cell> + <cell weightx='1'> + <NumberEditor id='rtpUndefinedBField' styleClass="bEditor"/> + </cell> + </row> + </Table> + </JPanel> </JPanel> </JPanel> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss index 51d4a55..2b3dc7a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss @@ -1,7 +1,7 @@ NumberEditor { - autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; - showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; + autoPopup: false; + showPopupButton: false; bean: {model}; showReset: true; _selectOnFocus: {true}; @@ -42,6 +42,12 @@ NumberEditor { _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.rtp.actions.EditNextRowAction.class}; } +#rtpFormulaLabel { + text: "tutti.editRtp.formula"; + horizontalAlignment: "center"; + border: {BorderFactory.createEmptyBorder(5, 10, 5, 10)}; +} + #rtpMaleALabel { text: "tutti.editRtp.field.rtpMaleA"; toolTipText: "tutti.editRtp.field.rtpMaleA.tip"; diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 6cca7c3..73ba4c3 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1270,6 +1270,7 @@ tutti.editRtp.field.rtpUndefinedA= tutti.editRtp.field.rtpUndefinedA.tip= tutti.editRtp.field.rtpUndefinedB= tutti.editRtp.field.rtpUndefinedB.tip= +tutti.editRtp.formula= tutti.editRtp.malePanel= tutti.editRtp.simpleText= tutti.editRtp.tooltip= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index ff69d2e..ce4f8b1 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1181,18 +1181,19 @@ tutti.editRtp.action.save.tip=Enregister les RTP tutti.editRtp.button=RTP tutti.editRtp.button.tip=Éditer les RTP de l'espèce tutti.editRtp.femalePanel=Femelle -tutti.editRtp.field.rtpFemaleA=A -tutti.editRtp.field.rtpFemaleA.tip=Paramètre A -tutti.editRtp.field.rtpFemaleB=B -tutti.editRtp.field.rtpFemaleB.tip=Paramètre B -tutti.editRtp.field.rtpMaleA=A -tutti.editRtp.field.rtpMaleA.tip=Paramètre A -tutti.editRtp.field.rtpMaleB=B -tutti.editRtp.field.rtpMaleB.tip=Paramètre B -tutti.editRtp.field.rtpUndefinedA=A -tutti.editRtp.field.rtpUndefinedA.tip=Paramètre A -tutti.editRtp.field.rtpUndefinedB=B -tutti.editRtp.field.rtpUndefinedB.tip=Paramètre B +tutti.editRtp.field.rtpFemaleA=a +tutti.editRtp.field.rtpFemaleA.tip=Paramètre a +tutti.editRtp.field.rtpFemaleB=b +tutti.editRtp.field.rtpFemaleB.tip=Paramètre b +tutti.editRtp.field.rtpMaleA=a +tutti.editRtp.field.rtpMaleA.tip=Paramètre a +tutti.editRtp.field.rtpMaleB=b +tutti.editRtp.field.rtpMaleB.tip=Paramètre b +tutti.editRtp.field.rtpUndefinedA=a +tutti.editRtp.field.rtpUndefinedA.tip=Paramètre a +tutti.editRtp.field.rtpUndefinedB=b +tutti.editRtp.field.rtpUndefinedB.tip=Paramètre b +tutti.editRtp.formula=<html><body>Formule \: <em>Poids (g) \= a x Taille (cm) <sup>b</sup></em></body></html> tutti.editRtp.malePanel=Mâle tutti.editRtp.tooltip=<ul><li><strong>Mâle \:</strong> <em>a \: </em>%1$s - <em>b \: </em>%2$s</li><li><strong>Femelle \:</strong> <em>a \: </em>%3$s - <em>b \: </em>%4$s</li><li><strong>Inconnu \:</strong> <em>a \: </em>%5$s - <em>b \: </em>%6$s</li></ul> tutti.editRtp.undefinedPanel=Sexe inconnu -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.