Author: kmorin Date: 2014-04-02 17:46:04 +0200 (Wed, 02 Apr 2014) New Revision: 25 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/25 Log: refs #4655 [ECRAN] D?\195?\169tail d'un mail / fax affichage de l'historique refs #4666 [ECRAN] Pi?\195?\168ces jointes croix bleu au lieu de rouge Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/attachment/AttachmentEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/attachment/PDFEditorCrossUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryItem.jaxx trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_en_GB.properties trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/faxtomail-ui-swing/src/main/resources/icons/action-cross.png Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2014-04-02 13:47:41 UTC (rev 24) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2014-04-02 15:46:04 UTC (rev 25) @@ -244,6 +244,14 @@ boolean isSelected, int row, int column) { Attachment attachment = (Attachment) value; attachmentItem.setAttachment(attachment); + + if (attachment != null) { + JLabel label = attachmentItem.getAttachmentNameLabel(); + String actionIconName = Boolean.TRUE.equals(attachment.getAddedByUser()) ? "user" : "email"; + Icon icon = SwingUtil.createActionIcon(actionIconName); + label.setIcon(icon); + } + return attachmentItem; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/attachment/PDFEditorCrossUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/attachment/PDFEditorCrossUI.jaxx 2014-04-02 13:47:41 UTC (rev 24) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/attachment/PDFEditorCrossUI.jaxx 2014-04-02 15:46:04 UTC (rev 25) @@ -10,10 +10,10 @@ <script><![CDATA[ - public static final String CROSS_IMAGE_FILE = "cross.png"; + public static final String CROSS_IMAGE_FILE = "cross_blue.png"; public PDFEditorCrossUI() { - setImage(SwingUtil.createImageIcon("cross.png").getImage()); + setImage(SwingUtil.createImageIcon(CROSS_IMAGE_FILE).getImage()); } protected void removeCross() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryItem.css 2014-04-02 13:47:41 UTC (rev 24) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryItem.css 2014-04-02 15:46:04 UTC (rev 25) @@ -2,17 +2,28 @@ border: { BorderFactory.createEmptyBorder(2, 3, 2, 3) }; } -#type { - text : { JAXXUtil.getStringValue(model.getType().getLabelKey()) }; +#data { + opaque: false; +} + +#dateLabel { + text : "faxtomail.common.on.label"; + font-style: "italic"; +} + +#date { + text : { handler.decorate(model.getModificationDate()) }; font-weight: "bold"; } -#fields { - text : { handler.decorateFields(model.getFields()) }; +#typeLabel { + text : ":"; + font-style: "italic"; } -#data { - opaque: false; +#type { + text : { JAXXUtil.getStringValue(model.getType().getLabel()) }; + font-weight: "bold"; } #userLabel { @@ -24,11 +35,6 @@ text : { handler.decorateUser(model.getFaxToMailUser(), true) }; } -#dateLabel { - text : "faxtomail.common.on.label"; - font-style: "italic"; -} - -#date { - text : { handler.decorate(model.getModificationDate()) }; -} +#fields { + text : { handler.decorateFields(model.getFields()) }; +} \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryItem.jaxx 2014-04-02 13:47:41 UTC (rev 24) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/history/HistoryItem.jaxx 2014-04-02 15:46:04 UTC (rev 25) @@ -21,16 +21,17 @@ } ]]></script> - <JLabel id='type'/> - - <JLabel id='fields'/> - <JPanel id="data" layout="{new FlowLayout(FlowLayout.LEADING)}"> + + <JLabel id='dateLabel'/> + <JLabel id='date'/> + <JLabel id='typeLabel'/> + <JLabel id='type'/> <JLabel id='userLabel'/> <JLabel id='user'/> - <JLabel id='dateLabel'/> - <JLabel id='date'/> </JPanel> + <JLabel id='fields'/> + </JPanel> \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_en_GB.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_en_GB.properties 2014-04-02 13:47:41 UTC (rev 24) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_en_GB.properties 2014-04-02 15:46:04 UTC (rev 25) @@ -1,5 +1,6 @@ \ |\ = 1\ -\ Volets\ roulants= +\:= Ajouter= Derni\\u00e8re\ modification\ par\ Utilisateur\ 1\ le\ 14/01/2014\ \\u00e0\ 08\:42= Editer= Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-04-02 13:47:41 UTC (rev 24) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-04-02 15:46:04 UTC (rev 25) @@ -1,4 +1,5 @@ \ |\ = +\:= X= application.action.create.error= application.error.ui.business.warning= Modified: trunk/faxtomail-ui-swing/src/main/resources/icons/action-cross.png =================================================================== (Binary files differ)