Author: echatellier Date: 2014-08-14 14:28:57 +0200 (Thu, 14 Aug 2014) New Revision: 561 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/561 Log: Ajout d'une icone diff?\195?\169rente pour l'icone d'ouverture de la PJ edit?\195?\169e Added: trunk/faxtomail-ui-swing/src/main/resources/icons/action-folder_edit.png Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css 2014-08-14 12:28:57 UTC (rev 561) @@ -43,9 +43,16 @@ actionIcon: "edit"; toolTipText: "faxtomail.attachmentEditor.action.edit.tip"; enabled: { handler != null && handler.isAttachmentEditable(getAttachment()) }; - // visible: { isEditable() }; + visible: { isEditable() }; } +#openEditedAttachmentButton { + actionIcon: "folder_edit"; + toolTipText: "faxtomail.attachmentEditor.action.openedited.tip"; + enabled: { handler != null && handler.isAttachmentEditable(getAttachment()) }; + visible: { !isEditable() }; +} + #removeAttachmentButton { actionIcon: "delete"; toolTipText: "faxtomail.attachmentEditor.action.remove.tip"; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx 2014-08-14 12:28:57 UTC (rev 561) @@ -40,6 +40,8 @@ <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <JButton id='openAttachmentButton' onActionPerformed='handler.openAttachment(attachment)'/> + <JButton id='openEditedAttachmentButton' + onActionPerformed='handler.editAttachment(attachment)'/> <JButton id='editAttachmentButton' onActionPerformed='handler.editAttachment(attachment)'/> <JButton id='removeAttachmentButton' Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java 2014-08-14 12:28:57 UTC (rev 561) @@ -27,7 +27,6 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; import java.io.Serializable; -import java.util.Collection; import java.util.List; /** @@ -39,12 +38,6 @@ String PROPERTY_ATTACHMENT = "attachment"; - String PROPERTY_OBJECT_ID = "objectId"; - -// AttachementObjectTypeEnum getObjectType(); - -// Integer getObjectId(); - List<Attachment> getAttachment(); void addAllAttachment(List<Attachment> attachments); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-14 12:28:57 UTC (rev 561) @@ -47,7 +47,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -72,7 +71,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.HashSet; import java.util.List; import java.util.Set; 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-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-14 12:28:57 UTC (rev 561) @@ -42,6 +42,7 @@ faxtomail.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes faxtomail.attachmentEditor.action.edit.tip=Editer la pièce jointe faxtomail.attachmentEditor.action.open.tip=Ouvrir la pièce jointe +faxtomail.attachmentEditor.action.openedited.tip=Ouvrir la pièce jointe éditée faxtomail.attachmentEditor.action.remove.tip=Supprimer la pièce jointe faxtomail.attachmentEditor.action.tip=Pièces jointes faxtomail.attachmentEditor.attachments.empty=Aucune pièce jointe Added: trunk/faxtomail-ui-swing/src/main/resources/icons/action-folder_edit.png =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-folder_edit.png ___________________________________________________________________ Added: svn:mime-type + image/png
participants (1)
-
echatellier@users.forge.codelutin.com