This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 171e9e27b9de7824857b7436f6ac3ac57d037d28 Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 31 10:51:08 2015 +0200 ajout des attributs sur les attachments pour marquer les pj internes à l'email et les pj moins importantes pour l'utilisateur (refs #7421) --- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32674 -> 32762 bytes .../services/service/ConfigurationServiceImpl.java | 2 ++ 2 files changed, 2 insertions(+) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 0247562..ea071eb 100644 Binary files a/faxtomail-persistence/src/main/xmi/faxtomail.zargo and b/faxtomail-persistence/src/main/xmi/faxtomail.zargo differ diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java index 78b5ab3..1f787cc 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java @@ -187,6 +187,8 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements Stamp currentStamp; if (StringUtils.isBlank(stamp.getTopiaId()) || stamp.getTopiaId().startsWith("new_")) { currentStamp = new StampImpl(); + currentStamp.setSigning(false); + } else { currentStamp = allStampsIndex.remove(stamp.getTopiaId()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 7ab85c3f2fe50e8905afa478d6d3e81f32a5c43a Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 31 17:08:07 2015 +0200 ui pour marque les pj comme non importantes (refs #7421) --- .../content/attachment/AttachmentEditorUI.css | 15 +++++++ .../content/attachment/AttachmentEditorUI.jaxx | 12 +++++- .../attachment/AttachmentEditorUIHandler.java | 31 +++++++++++++ .../attachment/AttachmentEditorUIModel.java | 48 ++++++++++++++++++++- .../ui/swing/content/attachment/AttachmentItem.css | 1 + .../swing/content/attachment/AttachmentItem.jaxx | 3 ++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 ++ .../src/main/resources/icons/action-important.png | Bin 0 -> 672 bytes .../main/resources/icons/action-not-important.png | Bin 0 -> 671 bytes 9 files changed, 112 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css index 565279d..e1522bc 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css @@ -25,6 +25,20 @@ minimumSize: { new java.awt.Dimension(250, 0) }; } +#markItemAsLessImportantMenu { + actionIcon: not-important; + text: "faxtomail.attachmentEditor.action.markItemAsLessImportant"; + toolTipText: "faxtomail.attachmentEditor.action.markItemAsLessImportant.tip"; + visible: { !model.getSelectedAttachment().isLessImportant() }; +} + +#unmarkItemAsLessImportantMenu { + actionIcon: important; + text: "faxtomail.attachmentEditor.action.unmarkItemAsLessImportant"; + toolTipText: "faxtomail.attachmentEditor.action.unmarkItemAsLessImportant.tip"; + visible: { model.getSelectedAttachment().isLessImportant() }; +} + #body { title: "faxtomail.attachmentEditor.title"; } @@ -39,6 +53,7 @@ #attachments { editable: true; visible: { !model.getAttachment().isEmpty() }; + selectionMode: { ListSelectionModel.SINGLE_SELECTION }; } #formPanel { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx index a575b86..4702a90 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx @@ -35,7 +35,9 @@ org.jdesktop.swingx.JXTable org.jdesktop.swingx.JXTitledPanel + javax.swing.JComponent + javax.swing.ListSelectionModel </import> <script><![CDATA[ @@ -49,6 +51,13 @@ <AttachmentEditorUIModel id='model' initializer='new AttachmentEditorUIModel()'/> + <JPopupMenu id='attachmentsPopup'> + <JMenuItem id='markItemAsLessImportantMenu' + onActionPerformed='handler.markItemAsLessImportant()'/> + <JMenuItem id='unmarkItemAsLessImportantMenu' + onActionPerformed='handler.unmarkItemAsLessImportant()'/> + </JPopupMenu> + <JXTitledPanel id='body'> <JScrollPane id='attachmentBodyScrollPane'> <JPanel id='mainPanel' layout="{new BorderLayout()}"> @@ -60,7 +69,8 @@ <row> <cell weightx="1.0"> - <JXTable id='attachments'/> + <JXTable id='attachments' + onMouseClicked='handler.autoSelectRowInTable(event, attachmentsPopup)'/> </cell> </row> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java index 7c4f642..3ef6f6f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java @@ -33,6 +33,8 @@ import com.google.common.collect.Iterables; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.HighlighterFactory; @@ -59,6 +61,11 @@ import static org.nuiton.i18n.I18n.t; */ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<AttachmentEditorUIModel, AttachmentEditorUI> { + /** + * Logger. + */ + private static final Log log = LogFactory.getLog(AttachmentEditorUIHandler.class); + @Override public void afterInit(AttachmentEditorUI ui) { @@ -186,6 +193,30 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac return attachment != null && attachment.getTopiaId() == null; } + @Override + protected void beforeOpenPopup(int modelRowIndex, int modelColumnIndex) { + super.beforeOpenPopup(modelRowIndex, modelColumnIndex); + AttachmentEditorUIModel model = getModel(); + Attachment attachment = model.getAttachment().get(modelRowIndex); + model.setSelectedAttachment(attachment); + } + + public void markItemAsLessImportant() { + setSelectedAttachmentLessImportant(true); + } + + public void unmarkItemAsLessImportant() { + setSelectedAttachmentLessImportant(false); + } + + protected void setSelectedAttachmentLessImportant(boolean lessImportant) { + AttachmentEditorUIModel model = getModel(); + Attachment selectedAttachment = model.getSelectedAttachment(); + selectedAttachment.setLessImportant(lessImportant); + model.sortAttachments(); + model.setSelectedAttachment(null); + } + protected class AttachmentItemRenderer extends AttachmentItem implements TableCellRenderer { public AttachmentItemRenderer() { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java index 4fda891..dd6c583 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java @@ -26,10 +26,14 @@ package com.franciaflex.faxtomail.ui.swing.content.attachment; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -40,12 +44,39 @@ public class AttachmentEditorUIModel extends AbstractFaxToMailBeanUIModel<Attach //public static final String PROPERTY_FILE = "file"; public static final String PROPERTY_EDITABLE = "editable"; + public static final String PROPERTY_SELECTED_ATTACHMENT = "selectedAttachment"; + + public static final Comparator<Attachment> ATTACHMENT_COMPARATOR = new Comparator<Attachment>() { + @Override + public int compare(Attachment o1, Attachment o2) { + if (o1 == null) { + + if (o2 == null) { + return 0; + } + + return o2 == null ? 0 : -1; + } + if (o2 == null) { + return 1; + } + + if (o1.isLessImportant() ^ o2.isLessImportant()) { + return o1.isLessImportant() ? 1 : -1; + } + + return ObjectUtils.compare(StringUtils.lowerCase(o1.getOriginalFileName()), + StringUtils.lowerCase(o2.getOriginalFileName())); + } + }; //protected File file; protected boolean editable = true; protected final List<Attachment> attachments = new ArrayList<Attachment>(); + protected Attachment selectedAttachment; + protected List<AttachmentListener> openingListeners = new ArrayList<AttachmentListener>(); protected static Binder<AttachmentEditorUIModel, AttachmentModelAware> toBeanBinder = @@ -92,14 +123,29 @@ public class AttachmentEditorUIModel extends AbstractFaxToMailBeanUIModel<Attach } public void setAttachment(List<Attachment> attachments) { - Object oldValue = new ArrayList<Attachment>(getAttachment()); + Object oldValue = new ArrayList<>(getAttachment()); this.attachments.clear(); if (attachments != null) { this.attachments.addAll(attachments); + sortAttachments(); } firePropertyChange(AttachmentModelAware.PROPERTY_ATTACHMENT, oldValue, this.attachments); } + public void sortAttachments() { + Collections.sort(this.attachments, ATTACHMENT_COMPARATOR); + } + + public Attachment getSelectedAttachment() { + return selectedAttachment; + } + + public void setSelectedAttachment(Attachment selectedAttachment) { + Object oldValue = getSelectedAttachment(); + this.selectedAttachment = selectedAttachment; + firePropertyChange(PROPERTY_SELECTED_ATTACHMENT, oldValue, selectedAttachment); + } + @Override protected AttachmentModelAware newEntity() { return null; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css index 29a6dc4..55f6209 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css @@ -27,6 +27,7 @@ #attachmentNameLabel { text: { attachment != null ? getAttachment().getOriginalFileName() : null }; + foreground: { attachment != null && getAttachment().isLessImportant() ? Color.LIGHT_GRAY : Color.BLACK }; } #toolbar { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx index b2477b1..2362bf0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx @@ -25,6 +25,9 @@ <import> com.franciaflex.faxtomail.persistence.entities.Attachment + + java.awt.Color + static org.nuiton.i18n.I18n.t static jaxx.runtime.JAXXUtil.getStringValue </import> diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index 7ca77d6..dffb827 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -57,10 +57,14 @@ faxtomail.attachmentCellRenderer.text=(%s) faxtomail.attachmentEditor.action.add.tip=Ajouter une pièce jointe 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.markItemAsLessImportant=Non important +faxtomail.attachmentEditor.action.markItemAsLessImportant.tip=Marquer la pièce jointe comme non important 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.action.unmarkItemAsLessImportant=Important +faxtomail.attachmentEditor.action.unmarkItemAsLessImportant.tip=Marquer la pièce jointe comme importante faxtomail.attachmentEditor.attachments.empty=Aucune pièce jointe faxtomail.attachmentEditor.deleteAttachment.message=Êtes-vous sûr de vouloir supprimer la pièce-jointe %s ? faxtomail.attachmentEditor.deleteAttachment.title=Suppression de pièce-jointe diff --git a/faxtomail-ui-swing/src/main/resources/icons/action-important.png b/faxtomail-ui-swing/src/main/resources/icons/action-important.png new file mode 100644 index 0000000..e4bc611 Binary files /dev/null and b/faxtomail-ui-swing/src/main/resources/icons/action-important.png differ diff --git a/faxtomail-ui-swing/src/main/resources/icons/action-not-important.png b/faxtomail-ui-swing/src/main/resources/icons/action-not-important.png new file mode 100644 index 0000000..14c89a5 Binary files /dev/null and b/faxtomail-ui-swing/src/main/resources/icons/action-not-important.png differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit a0d223a85bb25ad5391a519da66808a28757dae3 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 2 15:32:16 2015 +0200 détermination de la propriété inline des pj à la réception (refs #7421) --- .../com/franciaflex/faxtomail/services/service/EmailServiceImpl.java | 4 +++- .../faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css | 5 +++-- .../faxtomail/ui/swing/content/demande/DemandeUIModel.java | 2 +- .../src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 5bc93e0..295f589 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -1894,6 +1894,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe name = t("faxtomail.email.content.attachment.plainFileName"); } Attachment attachment = convertTextToPdf(content, name); + attachment.setInlineAttachment(Part.INLINE.equals(disposition)); attachments.add(attachment); } @@ -1926,10 +1927,10 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe } } if (attachment != null) { + attachment.setInlineAttachment(Part.INLINE.equals(disposition)); attachments.add(attachment); } - // else, this is an attachment } else { String fileName = bp.getFileName(); @@ -1972,6 +1973,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe attachmentFile.setFilename(fileName); attachment.setOriginalFile(attachmentFile); attachment.setContentId(contentID); + attachment.setInlineAttachment(Part.INLINE.equals(disposition)); // convert attachment if defined by admin convertIfNecessary(attachment); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css index d17f400..7b03af9 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css @@ -57,9 +57,10 @@ } #inlineAttachmentsHidor { - hideText: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.hideText", model.getInlineAttachments().size()) }; + text: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.text", model.getInlineAttachments().size()) }; + hideText: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.text", model.getInlineAttachments().size()) }; hideTip: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.hideTip", model.getInlineAttachments().size()) }; - showText: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.showText", model.getInlineAttachments().size()) }; + showText: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.text", model.getInlineAttachments().size()) }; showTip: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.showTip", model.getInlineAttachments().size()) }; target: { inlineAttachments }; targetVisible: false; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java index b411796..21a3a08 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java @@ -967,7 +967,7 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU for (int j = 0; j < multiPartCount; j++) { BodyPart bp = mimeMultipart.getBodyPart(j); - // if it is a text part, the,n this is the email content + // if it is a text part, then this is the email content String disposition = bp.getDisposition(); if (bp.isMimeType("text/*") && !Part.ATTACHMENT.equals(disposition)) { Charset charset = FaxToMailServiceUtils.getCharset(bp); diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index 120785f..2d1647b 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -69,10 +69,9 @@ faxtomail.attachmentEditor.attachments.empty=Aucune pièce jointe faxtomail.attachmentEditor.deleteAttachment.message=Êtes-vous sûr de vouloir supprimer la pièce-jointe %s ? faxtomail.attachmentEditor.deleteAttachment.title=Suppression de pièce-jointe faxtomail.attachmentEditor.field.file=Fichier -faxtomail.attachmentEditor.inlineAttachments.hidor.hideText=Divers (%s) faxtomail.attachmentEditor.inlineAttachments.hidor.hideTip=Cacher les fichiers divers (%s) -faxtomail.attachmentEditor.inlineAttachments.hidor.showText=Divers (%s) faxtomail.attachmentEditor.inlineAttachments.hidor.showTip=Afficher les fichiers divers (%s) +faxtomail.attachmentEditor.inlineAttachments.hidor.text=Divers (%s) faxtomail.attachmentEditor.none.tip=Aucune pièce-jointe faxtomail.attachmentEditor.text=Pièces jointes (%s) faxtomail.attachmentEditor.title=Pièces jointes -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 5e85d649d99cb3cbe5b0a23f309c3483b9dcb183 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 2 15:49:17 2015 +0200 correction orthographe et conjugaison dans la doc --- src/site/rst/import.rst | 14 +++++++------- src/site/rst/index.rst | 2 +- src/site/rst/install.rst | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/site/rst/import.rst b/src/site/rst/import.rst index 553ca5d..2808901 100644 --- a/src/site/rst/import.rst +++ b/src/site/rst/import.rst @@ -22,13 +22,13 @@ .. * #L% .. - -Import par fichier CSV +Import par fichiers CSV ====================== Format ------ -Les fichiers d'import doivent être formater suivant le standart CSV (Comma-separated values) et +Les fichiers d'import doivent être formatés suivant le standard CSV (Comma-separated values) et utiliser le séparateur ``;``. Exemple avec le fichier d'import des États d'attente:: @@ -47,17 +47,17 @@ Voici un exemple plus complet avec le fichier client:: 253142;FX;Gerard Menvussa;A+;40 Nabi;NULL;05 12 23 34 45;gerard.menvussa@code.com;99154 253242;FX;Ella Elli;NULL;38 LA;NULL;04 98 87 76 65;NULL;99184 -Ce fichier comporte 9 colonnes séparée par le séparateur ``;``. Il comporte une ligne d'entete et +Ce fichier comporte 9 colonnes séparées par le séparateur ``;``. Il comporte une ligne d'entête et 3 lignes de données. Encodage -------- -Il est très difficile de déterminé le format d'encodage du fichier texte (CSV). L'application FaxToMail +Il est très difficile de déterminer le format d'encodage du fichier texte (CSV). L'application FaxToMail impose donc l'utilisation du format d'encodage standardisé unicode (UTF-8). -Cependant, certains système d'exploitation, comme Windows, n'utilisent pas ce standard. +Cependant, certains systèmes d'exploitation, comme Windows, n'utilisent pas ce standard. Il faut donc spécifier lors de l'enregistrement du fichier: * l'encodage des caractères à utiliser @@ -67,7 +67,7 @@ notepad++ ~~~~~~~~~ Pour éditer un fichier au format texte, le logiciel `notepad++`_ est plus évolué que les outils -basique mis à la disposition par défaut par Windows. Il dispose de plus d'une option pour spécifier +basiques mis à la disposition par défaut par Windows. Il dispose, de plus, d'une option pour spécifier le format d'encodage lors de la sauvegarde. .. _notepad++: http://notepad-plus-plus.org/ @@ -77,7 +77,7 @@ le format d'encodage lors de la sauvegarde. Openoffice/Libreoffice ~~~~~~~~~~~~~~~~~~~~~~ -Openoffice et Libreoffice sont deux equivalents libre de la suite bureautique Microsoft Office. Ce +Openoffice et Libreoffice sont deux equivalents libres de la suite bureautique Microsoft Office. Ce logiciel propose plus facilement les options d'encodage lors de l'enregistrement du fichier CSV. Il s'agit d'une simple option à sélection dans la fenêtre de sauvegarde. diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index c3fa3c4..7e9d5c4 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -25,5 +25,5 @@ Accueil ======= -Bienvenue sur le site de FaxToMail. Il contient certaines documentation utilisateur et technique +Bienvenue sur le site de FaxToMail. Il contient certaines documentations utilisateur et techniques concernant l'installation et l'utilisation de l'application FaxToMail. diff --git a/src/site/rst/install.rst b/src/site/rst/install.rst index 0e69fae..94af041 100644 --- a/src/site/rst/install.rst +++ b/src/site/rst/install.rst @@ -86,7 +86,7 @@ Tomcat ------ * Télécharger le war depuis l'adresse : http://forge.codelutin.com/projects/faxtomail/files -* Enregistrez le dans le dossier ''C:\Program Files\Apache Software Foundation\Tomcat 7.0\webapps\'' avec le nom ''ROOT.war'' (supprimer le dossier ROOT) +* Enregistrer le dans le dossier ''C:\Program Files\Apache Software Foundation\Tomcat 7.0\webapps\'' avec le nom ''ROOT.war'' (supprimer le dossier ROOT) * Créer le fichier ''C:\Windows\System32\faxToMail.properties'' avec en contenu :: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.