This is an automated email from the git hooks/post-receive script. New commit to branch feature/7937 in repository tutti. See http://git.codelutin.com/tutti.git commit e100100c24e30de40b568084cae8de2ebca084b3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 25 12:26:54 2016 +0100 ajouter bouton pour recopier les valeurs a et b saisie dans Mâle vers femelles et Indéterminé. (refs#7937) --- .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 45 ++++++++++++---------- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 10 +++++ .../protocol/rtp/actions/CopyMaleRtpAction.java | 29 ++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 ++ 5 files changed, 69 insertions(+), 21 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 6d2183e..58c9a5e 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 @@ -74,27 +74,30 @@ public void closeEditor() { handler.closeEditor(); } <JXTitledPanel id="bodyPanel" constraints='BorderLayout.NORTH'> <JPanel layout="{new GridLayout(3, 1)}"> - <JPanel id="malePanel" layout="{new GridLayout(1, 2)}" border='{new TitledBorder(t("tutti.editRtp.malePanel"))}'> - <Table id='maleAPanel' fill='both'> - <row> - <cell> - <JLabel id='rtpMaleALabel'/> - </cell> - <cell weightx='1'> - <NumberEditor id='rtpMaleAField'/> - </cell> - </row> - </Table> - <Table id='maleBPanel' fill='both'> - <row> - <cell> - <JLabel id='rtpMaleBLabel'/> - </cell> - <cell weightx='1'> - <NumberEditor id='rtpMaleBField'/> - </cell> - </row> - </Table> + <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'/> + </cell> + </row> + </Table> + <Table id='maleBPanel' fill='both'> + <row> + <cell> + <JLabel id='rtpMaleBLabel'/> + </cell> + <cell weightx='1'> + <NumberEditor id='rtpMaleBField'/> + </cell> + </row> + </Table> + </JPanel> + <JButton id="copyValuesButton" /> </JPanel> <JPanel id="femalePanel" layout="{new GridLayout(1, 2)}" 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 38443a3..44f6dff 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 @@ -60,6 +60,16 @@ NumberEditor { _help: {"tutti.editRtp.field.rtpMaleB.help"}; } +#copyValuesButton { + actionIcon: copy; + text: "tutti.editRtp.action.copyValues"; + toolTipText: "tutti.editRtp.action.copyValues.tip"; + i18nMnemonic: "tutti.editRtp.action.copyValues.mnemonic"; + enabled: {model.getRtpMaleA() != null && model.getRtpMaleB() != null}; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.rtp.actions.CopyMaleRtpAction.class}; + _help: {"tutti.editRtp.action.copyValues.help"}; +} + #rtpFemaleALabel { text: "tutti.editRtp.field.rtpFemaleA"; toolTipText: "tutti.editRtp.field.rtpFemaleA.tip"; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java new file mode 100644 index 0000000..2b4f6f4 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java @@ -0,0 +1,29 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.rtp.actions; + +import fr.ifremer.tutti.ui.swing.content.protocol.rtp.RtpEditorUI; +import fr.ifremer.tutti.ui.swing.content.protocol.rtp.RtpEditorUIModel; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * @author Kevin Morin (Code Lutin) + * @since 4.4 + */ +public class CopyMaleRtpAction extends SimpleActionSupport<RtpEditorUI> { + + public CopyMaleRtpAction(RtpEditorUI rtpEditorUI) { + super(rtpEditorUI); + } + + @Override + protected void onActionPerformed(RtpEditorUI rtpEditorUI) { + RtpEditorUIModel model = rtpEditorUI.getModel(); + + Float rtpMaleA = model.getRtpMaleA(); + model.setRtpFemaleA(rtpMaleA); + model.setRtpUndefinedA(rtpMaleA); + + Float rtpMaleB = model.getRtpMaleB(); + model.setRtpFemaleB(rtpMaleB); + model.setRtpUndefinedB(rtpMaleB); + } +} 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 0e5e9b6..336d396 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 @@ -1142,6 +1142,9 @@ tutti.editRtp.action.cancel.tip= tutti.editRtp.action.close= tutti.editRtp.action.close.mnemonic= tutti.editRtp.action.close.tip= +tutti.editRtp.action.copyValues= +tutti.editRtp.action.copyValues.mnemonic= +tutti.editRtp.action.copyValues.tip= tutti.editRtp.action.next.tip= tutti.editRtp.action.previous.tip= tutti.editRtp.action.save= 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 2d01e29..3a4c8b7 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 @@ -1087,6 +1087,9 @@ tutti.editProtocol.warn.import=Le protocole que vous venez d'importer ne sera sa tutti.editRtp.action.close=Fermer tutti.editRtp.action.close.mnemonic=F tutti.editRtp.action.close.tip=Fermer l'éditeur des RTP +tutti.editRtp.action.copyValues=Copier les valeurs +tutti.editRtp.action.copyValues.mnemonic=C +tutti.editRtp.action.copyValues.tip=Copier les valeurs du RTP mâle dans les autres RTP tutti.editRtp.action.next.tip=Editer les RTP de la ligne suivante tutti.editRtp.action.previous.tip=Editer les RTP de la ligne précédente tutti.editRtp.action.save=Enregistrer -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.