From scm@users.codelutin.com Wed Sep  2 15:49:36 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] 01/08: ajout d'un bouton pour cacher ou afficher
 les pj moins importantes (refs #7421)
Date: Wed, 02 Sep 2015 15:49:36 +0200
Message-ID: <20150902134936.126995CFB15@goh.codelutin.com>
In-Reply-To: <20150902134935.5801.17968@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3132655025177300416=="

--===============3132655025177300416==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 3781652a643c2062f755b1f1468444c4023e2507
Author: Kevin Morin <morin@codelutin.com>
Date:   Fri Aug 28 13:32:38 2015 +0200

    ajout d'un bouton pour cacher ou afficher les pj moins importantes (refs =
#7421)
---
 .../content/attachment/AttachmentEditorUI.jaxx     | 26 ++++++++++++++++++++=
+-
 pom.xml                                            |  2 +-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/content/attachment/AttachmentEditorUI.jaxx b/faxtomail-ui-swing/src/main/=
java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI=
.jaxx
index 4c81313..a575b86 100644
--- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUI.jaxx
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUI.jaxx
@@ -29,6 +29,7 @@
     com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext
     com.franciaflex.faxtomail.persistence.entities.Attachment
=20
+    jaxx.runtime.swing.HidorButton
     jaxx.runtime.swing.editor.FileEditor
     jaxx.runtime.swing.model.JaxxDefaultListModel
=20
@@ -54,7 +55,30 @@
=20
         <JLabel id=3D'noAttachmentsLabel' constraints=3D"BorderLayout.NORTH"=
/>
=20
-        <JXTable id=3D'attachments' constraints=3D"BorderLayout.CENTER"/>
+        <Table fill=3D"both"
+               constraints=3D"BorderLayout.CENTER">
+
+          <row>
+            <cell weightx=3D"1.0">
+              <JXTable id=3D'attachments'/>
+            </cell>
+          </row>
+
+          <row>
+            <cell>
+              <HidorButton id=3D'junkAttachmentsLabel'
+                           target=3D"{junkAttachments}"
+                           targetVisible=3D"false"/>
+            </cell>
+          </row>
+
+          <row>
+            <cell>
+              <JXTable id=3D'junkAttachments'/>
+            </cell>
+          </row>
+
+        </Table>
=20
         <Table id=3D"formPanel" constraints=3D"BorderLayout.SOUTH">
           <row fill=3D'both'>
diff --git a/pom.xml b/pom.xml
index fb6dd56..3f007e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
     <h2Version>1.3.176</h2Version>
     <guavaVersion>18.0</guavaVersion>
=20
-    <jaxxVersion>2.24</jaxxVersion>
+    <jaxxVersion>2.25</jaxxVersion>
     <!-- do not upgrade to 1.6.5-1 -->
     <swingXVersion>1.6.4</swingXVersion>
     <xworkVersion>2.3.16.3</xworkVersion>

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============3132655025177300416==--


From scm@users.codelutin.com Wed Sep  2 15:49:36 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits]  02/08: ajout des attributs sur les attachments
 pour marquer les pj internes =?utf-8?q?=C3=A0?= l'email et les pj moins
 importantes pour l'utilisateur (refs #7421)
Date: Wed, 02 Sep 2015 15:49:37 +0200
Message-ID: <20150902134936.332D55D1880@goh.codelutin.com>
In-Reply-To: <20150902134935.5801.17968@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4393338303007799238=="

--===============4393338303007799238==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 =C3=
=A0 l'email et les pj moins importantes pour l'utilisateur (refs #7421)
---
 faxtomail-persistence/src/main/xmi/faxtomail.zargo  | Bin 32674 -> 32762 byt=
es
 .../services/service/ConfigurationServiceImpl.java  |   2 ++
 2 files changed, 2 insertions(+)

diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-p=
ersistence/src/main/xmi/faxtomail.zargo
index 0247562..ea071eb 100644
Binary files a/faxtomail-persistence/src/main/xmi/faxtomail.zargo and b/faxto=
mail-persistence/src/main/xmi/faxtomail.zargo differ
diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/servic=
es/service/ConfigurationServiceImpl.java b/faxtomail-service/src/main/java/co=
m/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java
index 78b5ab3..1f787cc 100644
--- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/serv=
ice/ConfigurationServiceImpl.java
+++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/serv=
ice/ConfigurationServiceImpl.java
@@ -187,6 +187,8 @@ public class ConfigurationServiceImpl extends FaxToMailSe=
rviceSupport implements
             Stamp currentStamp;
             if (StringUtils.isBlank(stamp.getTopiaId()) || stamp.getTopiaId(=
).startsWith("new_")) {
                 currentStamp =3D new StampImpl();
+                currentStamp.setSigning(false);
+
             } else {
                 currentStamp =3D allStampsIndex.remove(stamp.getTopiaId());
             }

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============4393338303007799238==--


From scm@users.codelutin.com Wed Sep  2 15:49:36 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] 03/08: migration #7421
Date: Wed, 02 Sep 2015 15:49:38 +0200
Message-ID: <20150902134936.747105D1878@goh.codelutin.com>
In-Reply-To: <20150902134935.5801.17968@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8188211662701417294=="

--===============8188211662701417294==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 55ff99356243391cef694189cf60b907069922da
Author: Kevin Morin <morin@codelutin.com>
Date:   Mon Aug 31 17:07:53 2015 +0200

    migration #7421
---
 ...V1_6_0_150831__add_attributes_for_less_important_attachments.sql | 5 +++++
 ...V1_6_0_150831__add_attributes_for_less_important_attachments.sql | 6 ++++=
++
 2 files changed, 11 insertions(+)

diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V1_6_0_1508=
31__add_attributes_for_less_important_attachments.sql b/faxtomail-service/src=
/main/resources/db/migration/h2/V1_6_0_150831__add_attributes_for_less_import=
ant_attachments.sql
new file mode 100644
index 0000000..097ae91
--- /dev/null
+++ b/faxtomail-service/src/main/resources/db/migration/h2/V1_6_0_150831__add=
_attributes_for_less_important_attachments.sql
@@ -0,0 +1,5 @@
+alter table attachment add inlineAttachment boolean;
+alter table attachment add lessImportant boolean;
+
+update attachment set inlineAttachment =3D 'f';
+update attachment set lessImportant =3D 'f';
\ No newline at end of file
diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_6=
_0_150831__add_attributes_for_less_important_attachments.sql b/faxtomail-serv=
ice/src/main/resources/db/migration/sqlserver/V1_6_0_150831__add_attributes_f=
or_less_important_attachments.sql
new file mode 100644
index 0000000..be4417c
--- /dev/null
+++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_6_0_1508=
31__add_attributes_for_less_important_attachments.sql
@@ -0,0 +1,6 @@
+alter table attachment add inlineAttachment bit;
+alter table attachment add lessImportant bit;
+GO
+
+update attachment set inlineAttachment =3D 0;
+update attachment set lessImportant =3D 0;
\ No newline at end of file

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============8188211662701417294==--


From scm@users.codelutin.com Wed Sep  2 15:49:36 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] branch develop updated (a6a9df8 -> 5e85d64)
Date: Wed, 02 Sep 2015 15:49:35 +0200
Message-ID: <20150902134935.5801.17968@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5047073994418266444=="

--===============5047073994418266444==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New change to branch develop in repository faxtomail.

See http://git.codelutin.com/faxtomail.git

      from  a6a9df8   [jgitflow-maven-plugin]Updating develop poms back to pr=
e merge state
       new  3781652   ajout d'un bouton pour cacher ou afficher les pj moins =
importantes (refs #7421)
       new  171e9e2   ajout des attributs sur les attachments pour marquer le=
s pj internes =C3=A0 l'email et les pj moins importantes pour l'utilisateur (=
refs #7421)
       new  55ff993   migration #7421
       new  7ab85c3   ui pour marque les pj comme non importantes (refs #7421)
       new  b6b6713   Affichage des pj inline dans une liste s=C3=A9par=C3=A9=
e, affcih=C3=A9e ou non gr=C3=A2ce =C3=A0 un bouton (refs #7421)
       new  a0d223a   d=C3=A9termination de la propri=C3=A9t=C3=A9 inline des=
 pj =C3=A0 la r=C3=A9ception (refs #7421)
       new  99c2c9d   fixes #7421 gestion des pj internes =C3=A0 l'email
       new  5e85d64   correction orthographe et conjugaison dans la doc

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit 5e85d649d99cb3cbe5b0a23f309c3483b9dcb183
Author: Kevin Morin <morin@codelutin.com>
Date:   Wed Sep 2 15:49:17 2015 +0200

    correction orthographe et conjugaison dans la doc

commit 99c2c9d5f858cd89fcfc4c01de5af3887b8d94d5
Merge: a6a9df8 a0d223a
Author: Kevin Morin <morin@codelutin.com>
Date:   Wed Sep 2 15:44:22 2015 +0200

    fixes #7421 gestion des pj internes =C3=A0 l'email

commit a0d223a85bb25ad5391a519da66808a28757dae3
Author: Kevin Morin <morin@codelutin.com>
Date:   Wed Sep 2 15:32:16 2015 +0200

    d=C3=A9termination de la propri=C3=A9t=C3=A9 inline des pj =C3=A0 la r=C3=
=A9ception (refs #7421)

commit b6b6713a243f59b48dc138a315d2e7324d611d05
Author: Kevin Morin <morin@codelutin.com>
Date:   Mon Aug 31 18:12:36 2015 +0200

    Affichage des pj inline dans une liste s=C3=A9par=C3=A9e, affcih=C3=A9e o=
u non gr=C3=A2ce =C3=A0 un bouton (refs #7421)

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)

commit 55ff99356243391cef694189cf60b907069922da
Author: Kevin Morin <morin@codelutin.com>
Date:   Mon Aug 31 17:07:53 2015 +0200

    migration #7421

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 =C3=
=A0 l'email et les pj moins importantes pour l'utilisateur (refs #7421)

commit 3781652a643c2062f755b1f1468444c4023e2507
Author: Kevin Morin <morin@codelutin.com>
Date:   Fri Aug 28 13:32:38 2015 +0200

    ajout d'un bouton pour cacher ou afficher les pj moins importantes (refs =
#7421)

Summary of changes:
 faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32674 -> 32762 bytes
 .../services/service/ConfigurationServiceImpl.java |   2 +
 .../services/service/EmailServiceImpl.java         |   4 +-
 ...d_attributes_for_less_important_attachments.sql |   5 ++
 ...d_attributes_for_less_important_attachments.sql |   6 ++
 .../content/attachment/AttachmentEditorUI.css      |  32 ++++++++
 .../content/attachment/AttachmentEditorUI.jaxx     |  34 ++++++++-
 .../attachment/AttachmentEditorUIHandler.java      |  52 ++++++++++++-
 .../attachment/AttachmentEditorUIModel.java        |  81 +++++++++++++++++++=
+-
 .../ui/swing/content/attachment/AttachmentItem.css |   1 +
 .../swing/content/attachment/AttachmentItem.jaxx   |   3 +
 .../ui/swing/content/demande/DemandeUIModel.java   |   2 +-
 .../i18n/faxtomail-ui-swing_fr_FR.properties       |   7 ++
 .../src/main/resources/icons/action-important.png  | Bin 0 -> 672 bytes
 .../main/resources/icons/action-not-important.png  | Bin 0 -> 671 bytes
 pom.xml                                            |   2 +-
 src/site/rst/import.rst                            |  14 ++--
 src/site/rst/index.rst                             |   2 +-
 src/site/rst/install.rst                           |   2 +-
 19 files changed, 229 insertions(+), 20 deletions(-)
 create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V1_6=
_0_150831__add_attributes_for_less_important_attachments.sql
 create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserv=
er/V1_6_0_150831__add_attributes_for_less_important_attachments.sql
 create mode 100644 faxtomail-ui-swing/src/main/resources/icons/action-import=
ant.png
 create mode 100644 faxtomail-ui-swing/src/main/resources/icons/action-not-im=
portant.png

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============5047073994418266444==--


From scm@users.codelutin.com Wed Sep  2 15:49:37 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] 04/08: ui pour marque les pj comme non
	importantes (refs #7421)
Date: Wed, 02 Sep 2015 15:49:39 +0200
Message-ID: <20150902134936.AFD475CFB15@goh.codelutin.com>
In-Reply-To: <20150902134935.5801.17968@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6249385038540830987=="

--===============6249385038540830987==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/sw=
ing/content/attachment/AttachmentEditorUI.css b/faxtomail-ui-swing/src/main/j=
ava/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/con=
tent/attachment/AttachmentEditorUI.css
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUI.css
@@ -25,6 +25,20 @@
   minimumSize: { new java.awt.Dimension(250, 0) };
 }
=20
+#markItemAsLessImportantMenu {
+  actionIcon: not-important;
+  text: "faxtomail.attachmentEditor.action.markItemAsLessImportant";
+  toolTipText: "faxtomail.attachmentEditor.action.markItemAsLessImportant.ti=
p";
+  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 };
 }
=20
 #formPanel {
diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/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/con=
tent/attachment/AttachmentEditorUI.jaxx
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUI.jaxx
@@ -35,7 +35,9 @@
=20
     org.jdesktop.swingx.JXTable
     org.jdesktop.swingx.JXTitledPanel
+
     javax.swing.JComponent
+    javax.swing.ListSelectionModel
   </import>
=20
   <script><![CDATA[
@@ -49,6 +51,13 @@
   <AttachmentEditorUIModel id=3D'model'
                             initializer=3D'new AttachmentEditorUIModel()'/>
=20
+  <JPopupMenu id=3D'attachmentsPopup'>
+    <JMenuItem id=3D'markItemAsLessImportantMenu'
+               onActionPerformed=3D'handler.markItemAsLessImportant()'/>
+    <JMenuItem id=3D'unmarkItemAsLessImportantMenu'
+               onActionPerformed=3D'handler.unmarkItemAsLessImportant()'/>
+  </JPopupMenu>
+
   <JXTitledPanel id=3D'body'>
     <JScrollPane id=3D'attachmentBodyScrollPane'>
       <JPanel id=3D'mainPanel' layout=3D"{new BorderLayout()}">
@@ -60,7 +69,8 @@
=20
           <row>
             <cell weightx=3D"1.0">
-              <JXTable id=3D'attachments'/>
+              <JXTable id=3D'attachments'
+                       onMouseClicked=3D'handler.autoSelectRowInTable(event,=
 attachmentsPopup)'/>
             </cell>
           </row>
=20
diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/content/attachment/AttachmentEditorUIHandler.java b/faxtomail-ui-swing/sr=
c/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentE=
ditorUIHandler.java
index 7c4f642..3ef6f6f 100644
--- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUIHandler.java
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/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;
=20
@@ -59,6 +61,11 @@ import static org.nuiton.i18n.I18n.t;
  */
 public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<A=
ttachmentEditorUIModel, AttachmentEditorUI> {
=20
+    /**
+     * Logger.
+     */
+    private static final Log log =3D LogFactory.getLog(AttachmentEditorUIHan=
dler.class);
+
     @Override
     public void afterInit(AttachmentEditorUI ui) {
=20
@@ -186,6 +193,30 @@ public class AttachmentEditorUIHandler extends AbstractT=
oolbarPopupHandler<Attac
         return attachment !=3D null && attachment.getTopiaId() =3D=3D null;
     }
=20
+    @Override
+    protected void beforeOpenPopup(int modelRowIndex, int modelColumnIndex) {
+        super.beforeOpenPopup(modelRowIndex, modelColumnIndex);
+        AttachmentEditorUIModel model =3D getModel();
+        Attachment attachment =3D model.getAttachment().get(modelRowIndex);
+        model.setSelectedAttachment(attachment);
+    }
+
+    public void markItemAsLessImportant() {
+        setSelectedAttachmentLessImportant(true);
+    }
+
+    public void unmarkItemAsLessImportant() {
+        setSelectedAttachmentLessImportant(false);
+    }
+
+    protected void setSelectedAttachmentLessImportant(boolean lessImportant)=
 {
+        AttachmentEditorUIModel model =3D getModel();
+        Attachment selectedAttachment =3D model.getSelectedAttachment();
+        selectedAttachment.setLessImportant(lessImportant);
+        model.sortAttachments();
+        model.setSelectedAttachment(null);
+    }
+
     protected class AttachmentItemRenderer extends AttachmentItem implements=
 TableCellRenderer {
=20
         public AttachmentItemRenderer() {
diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/content/attachment/AttachmentEditorUIModel.java b/faxtomail-ui-swing/src/=
main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEdi=
torUIModel.java
index 4fda891..dd6c583 100644
--- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUIModel.java
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUIModel.java
@@ -26,10 +26,14 @@ package com.franciaflex.faxtomail.ui.swing.content.attach=
ment;
=20
 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;
=20
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
=20
 /**
@@ -40,12 +44,39 @@ public class AttachmentEditorUIModel extends AbstractFaxT=
oMailBeanUIModel<Attach
=20
     //public static final String PROPERTY_FILE =3D "file";
     public static final String PROPERTY_EDITABLE =3D "editable";
+    public static final String PROPERTY_SELECTED_ATTACHMENT =3D "selectedAtt=
achment";
+
+    public static final Comparator<Attachment> ATTACHMENT_COMPARATOR =3D new=
 Comparator<Attachment>() {
+        @Override
+        public int compare(Attachment o1, Attachment o2) {
+            if (o1 =3D=3D null) {
+
+                if (o2 =3D=3D null) {
+                    return 0;
+                }
+
+                return o2 =3D=3D null ? 0 : -1;
+            }
+            if (o2 =3D=3D null) {
+                return 1;
+            }
+
+            if (o1.isLessImportant() ^ o2.isLessImportant()) {
+                return o1.isLessImportant() ? 1 : -1;
+            }
+
+            return ObjectUtils.compare(StringUtils.lowerCase(o1.getOriginalF=
ileName()),
+                                       StringUtils.lowerCase(o2.getOriginalF=
ileName()));
+        }
+    };
=20
     //protected File file;
     protected boolean editable =3D true;
=20
     protected final List<Attachment> attachments =3D new ArrayList<Attachmen=
t>();
=20
+    protected Attachment selectedAttachment;
+
     protected List<AttachmentListener> openingListeners =3D new ArrayList<At=
tachmentListener>();
=20
     protected static Binder<AttachmentEditorUIModel, AttachmentModelAware> t=
oBeanBinder =3D
@@ -92,14 +123,29 @@ public class AttachmentEditorUIModel extends AbstractFax=
ToMailBeanUIModel<Attach
     }
=20
     public void setAttachment(List<Attachment> attachments) {
-        Object oldValue =3D new ArrayList<Attachment>(getAttachment());
+        Object oldValue =3D new ArrayList<>(getAttachment());
         this.attachments.clear();
         if (attachments !=3D null) {
             this.attachments.addAll(attachments);
+            sortAttachments();
         }
         firePropertyChange(AttachmentModelAware.PROPERTY_ATTACHMENT, oldValu=
e, this.attachments);
     }
=20
+    public void sortAttachments() {
+        Collections.sort(this.attachments, ATTACHMENT_COMPARATOR);
+    }
+
+    public Attachment getSelectedAttachment() {
+        return selectedAttachment;
+    }
+
+    public void setSelectedAttachment(Attachment selectedAttachment) {
+        Object oldValue =3D getSelectedAttachment();
+        this.selectedAttachment =3D selectedAttachment;
+        firePropertyChange(PROPERTY_SELECTED_ATTACHMENT, oldValue, selectedA=
ttachment);
+    }
+
     @Override
     protected AttachmentModelAware newEntity() {
         return null;
diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/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/con=
tent/attachment/AttachmentItem.css
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentItem.css
@@ -27,6 +27,7 @@
=20
 #attachmentNameLabel {
   text: { attachment !=3D null ? getAttachment().getOriginalFileName() : nul=
l };
+  foreground: { attachment !=3D null && getAttachment().isLessImportant() ? =
Color.LIGHT_GRAY : Color.BLACK };
 }
=20
 #toolbar {
diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/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/con=
tent/attachment/AttachmentItem.jaxx
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentItem.jaxx
@@ -25,6 +25,9 @@
=20
   <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-swin=
g_fr_FR.properties
index 7ca77d6..dffb827 100644
--- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.pro=
perties
+++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.pro=
perties
@@ -57,10 +57,14 @@ faxtomail.attachmentCellRenderer.text=3D(%s)
 faxtomail.attachmentEditor.action.add.tip=3DAjouter une pi=C3=A8ce jointe
 faxtomail.attachmentEditor.action.closeAttachment.tip=3DFermer la fen=C3=AAt=
re des pi=C3=A8ces-jointes
 faxtomail.attachmentEditor.action.edit.tip=3DEditer la pi=C3=A8ce jointe
+faxtomail.attachmentEditor.action.markItemAsLessImportant=3DNon important
+faxtomail.attachmentEditor.action.markItemAsLessImportant.tip=3DMarquer la p=
i=C3=A8ce jointe comme non important
 faxtomail.attachmentEditor.action.open.tip=3DOuvrir la pi=C3=A8ce jointe
 faxtomail.attachmentEditor.action.openedited.tip=3DOuvrir la pi=C3=A8ce join=
te =C3=A9dit=C3=A9e
 faxtomail.attachmentEditor.action.remove.tip=3DSupprimer la pi=C3=A8ce jointe
 faxtomail.attachmentEditor.action.tip=3DPi=C3=A8ces jointes
+faxtomail.attachmentEditor.action.unmarkItemAsLessImportant=3DImportant
+faxtomail.attachmentEditor.action.unmarkItemAsLessImportant.tip=3DMarquer la=
 pi=C3=A8ce jointe comme importante
 faxtomail.attachmentEditor.attachments.empty=3DAucune pi=C3=A8ce jointe
 faxtomail.attachmentEditor.deleteAttachment.message=3D=C3=8Ates-vous s=C3=BB=
r de vouloir supprimer la pi=C3=A8ce-jointe %s ?
 faxtomail.attachmentEditor.deleteAttachment.title=3DSuppression de pi=C3=A8c=
e-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/acti=
on-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/acti=
on-not-important.png differ

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============6249385038540830987==--


From scm@users.codelutin.com Wed Sep  2 15:49:37 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits]  05/08: Affichage des pj inline dans une liste 
 =?utf-8?q?s=C3=A9par=C3=A9e=2C?= =?utf-8?q?affcih=C3=A9e?= ou non 
 =?utf-8?q?gr=C3=A2ce?= =?utf-8?q?=C3=A0?= un bouton (refs #7421)
Date: Wed, 02 Sep 2015 15:49:40 +0200
Message-ID: <20150902134937.052135D1880@goh.codelutin.com>
In-Reply-To: <20150902134935.5801.17968@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3467448460484888970=="

--===============3467448460484888970==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 b6b6713a243f59b48dc138a315d2e7324d611d05
Author: Kevin Morin <morin@codelutin.com>
Date:   Mon Aug 31 18:12:36 2015 +0200

    Affichage des pj inline dans une liste s=C3=A9par=C3=A9e, affcih=C3=A9e o=
u non gr=C3=A2ce =C3=A0 un bouton (refs #7421)
---
 .../content/attachment/AttachmentEditorUI.css      | 16 ++++++++++
 .../content/attachment/AttachmentEditorUI.jaxx     |  6 ++--
 .../attachment/AttachmentEditorUIHandler.java      | 21 ++++++++++---
 .../attachment/AttachmentEditorUIModel.java        | 35 ++++++++++++++++++++=
--
 .../i18n/faxtomail-ui-swing_fr_FR.properties       |  4 +++
 5 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/content/attachment/AttachmentEditorUI.css b/faxtomail-ui-swing/src/main/j=
ava/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.=
css
index e1522bc..d17f400 100644
--- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUI.css
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUI.css
@@ -56,6 +56,22 @@
   selectionMode: { ListSelectionModel.SINGLE_SELECTION };
 }
=20
+#inlineAttachmentsHidor {
+  hideText: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.hideText=
", model.getInlineAttachments().size()) };
+  hideTip: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.hideTip",=
 model.getInlineAttachments().size()) };
+  showText: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.showText=
", model.getInlineAttachments().size()) };
+  showTip: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.showTip",=
 model.getInlineAttachments().size()) };
+  target: { inlineAttachments };
+  targetVisible: false;
+  visible: { !model.getInlineAttachments().isEmpty() };
+}
+
+#inlineAttachments {
+  editable: true;
+  visible: false;
+  selectionMode: { ListSelectionModel.SINGLE_SELECTION };
+}
+
 #formPanel {
   visible: { model.isEditable() };
 }
diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/content/attachment/AttachmentEditorUI.jaxx b/faxtomail-ui-swing/src/main/=
java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI=
.jaxx
index 4702a90..b355c84 100644
--- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUI.jaxx
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUI.jaxx
@@ -76,15 +76,13 @@
=20
           <row>
             <cell>
-              <HidorButton id=3D'junkAttachmentsLabel'
-                           target=3D"{junkAttachments}"
-                           targetVisible=3D"false"/>
+              <HidorButton id=3D'inlineAttachmentsHidor'/>
             </cell>
           </row>
=20
           <row>
             <cell>
-              <JXTable id=3D'junkAttachments'/>
+              <JXTable id=3D'inlineAttachments'/>
             </cell>
           </row>
=20
diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/content/attachment/AttachmentEditorUIHandler.java b/faxtomail-ui-swing/sr=
c/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentE=
ditorUIHandler.java
index 3ef6f6f..4b1811b 100644
--- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUIHandler.java
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUIHandler.java
@@ -31,6 +31,7 @@ import com.franciaflex.faxtomail.ui.swing.util.AbstractTool=
barPopupHandler;
 import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil;
 import com.google.common.collect.Iterables;
 import jaxx.runtime.SwingUtil;
+import jaxx.runtime.swing.HidorButton;
 import jaxx.runtime.validator.swing.SwingValidator;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.logging.Log;
@@ -53,6 +54,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.Collection;
=20
 import static org.nuiton.i18n.I18n.t;
=20
@@ -72,23 +74,34 @@ public class AttachmentEditorUIHandler extends AbstractTo=
olbarPopupHandler<Attac
         ui.getFile().setDialogOwner(ui);
         super.afterInit(ui);
=20
-        initTable(ui.getAttachments());
+        initTable(ui.getAttachments(), getModel().getAttachment());
+        initTable(ui.getInlineAttachments(), getModel().getInlineAttachments=
());
+
+        ui.getInlineAttachmentsHidor().addPropertyChangeListener(HidorButton=
.PROPERTY_TARGET_VISIBLE, new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                getUI().pack();
+            }
+        });
=20
         getModel().addPropertyChangeListener(AttachmentModelAware.PROPERTY_A=
TTACHMENT, new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 AbstractTableModel tableModel =3D (AbstractTableModel) getUI=
().getAttachments().getModel();
                 tableModel.fireTableDataChanged();
+                tableModel =3D (AbstractTableModel) getUI().getInlineAttachm=
ents().getModel();
+                tableModel.fireTableDataChanged();
             }
         });
+
     }
=20
-    protected void initTable(JXTable table) {
+    protected void initTable(JXTable table, final Collection<Attachment> att=
achmentList) {
=20
         TableModel attachmentTableModel =3D new AbstractTableModel() {
             @Override
             public int getRowCount() {
-                return CollectionUtils.size(getModel().getAttachment());
+                return CollectionUtils.size(attachmentList);
             }
=20
             @Override
@@ -98,7 +111,7 @@ public class AttachmentEditorUIHandler extends AbstractToo=
lbarPopupHandler<Attac
=20
             @Override
             public Object getValueAt(int rowIndex, int columnIndex) {
-                return Iterables.get(getModel().getAttachment(), rowIndex);
+                return Iterables.get(attachmentList, rowIndex);
             }
=20
             @Override
diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/content/attachment/AttachmentEditorUIModel.java b/faxtomail-ui-swing/src/=
main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEdi=
torUIModel.java
index dd6c583..7aabb5c 100644
--- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUIModel.java
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUIModel.java
@@ -26,6 +26,8 @@ package com.franciaflex.faxtomail.ui.swing.content.attachme=
nt;
=20
 import com.franciaflex.faxtomail.persistence.entities.Attachment;
 import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.nuiton.util.beans.Binder;
@@ -44,6 +46,7 @@ public class AttachmentEditorUIModel extends AbstractFaxToM=
ailBeanUIModel<Attach
=20
     //public static final String PROPERTY_FILE =3D "file";
     public static final String PROPERTY_EDITABLE =3D "editable";
+    public static final String PROPERTY_INLINE_ATTACHMENTS =3D "inlineAttach=
ments";
     public static final String PROPERTY_SELECTED_ATTACHMENT =3D "selectedAtt=
achment";
=20
     public static final Comparator<Attachment> ATTACHMENT_COMPARATOR =3D new=
 Comparator<Attachment>() {
@@ -74,6 +77,7 @@ public class AttachmentEditorUIModel extends AbstractFaxToM=
ailBeanUIModel<Attach
     protected boolean editable =3D true;
=20
     protected final List<Attachment> attachments =3D new ArrayList<Attachmen=
t>();
+    protected final List<Attachment> inlineAttachments =3D new ArrayList<Att=
achment>();
=20
     protected Attachment selectedAttachment;
=20
@@ -117,23 +121,48 @@ public class AttachmentEditorUIModel extends AbstractFa=
xToMailBeanUIModel<Attach
     }
=20
     public void removeAttachment(Attachment attachment) {
-        Object oldValue =3D new ArrayList<Attachment>(getAttachment());
+        Object oldValue =3D new ArrayList<>(getAttachment());
         attachments.remove(attachment);
         firePropertyChange(AttachmentModelAware.PROPERTY_ATTACHMENT, oldValu=
e, attachments);
     }
=20
     public void setAttachment(List<Attachment> attachments) {
-        Object oldValue =3D new ArrayList<>(getAttachment());
+        Object oldAttachmentsValue =3D new ArrayList<>(getAttachment());
+        Object oldInlineAttachmentsValue =3D new ArrayList<>(getInlineAttach=
ments());
         this.attachments.clear();
+        this.inlineAttachments.clear();
+
         if (attachments !=3D null) {
+
+            inlineAttachments.addAll(Collections2.filter(attachments, new Pr=
edicate<Attachment>() {
+                @Override
+                public boolean apply(Attachment input) {
+                    return input.isInlineAttachment();
+                }
+            }));
+
             this.attachments.addAll(attachments);
+
+            if (inlineAttachments.size() > 1) {
+                this.attachments.removeAll(inlineAttachments);
+
+            } else {
+                inlineAttachments.clear();
+            }
+
             sortAttachments();
         }
-        firePropertyChange(AttachmentModelAware.PROPERTY_ATTACHMENT, oldValu=
e, this.attachments);
+        firePropertyChange(AttachmentModelAware.PROPERTY_ATTACHMENT, oldAtta=
chmentsValue, this.attachments);
+        firePropertyChange(PROPERTY_INLINE_ATTACHMENTS, oldInlineAttachments=
Value, this.inlineAttachments);
+    }
+
+    public List<Attachment> getInlineAttachments() {
+        return inlineAttachments;
     }
=20
     public void sortAttachments() {
         Collections.sort(this.attachments, ATTACHMENT_COMPARATOR);
+        Collections.sort(this.inlineAttachments, ATTACHMENT_COMPARATOR);
     }
=20
     public Attachment getSelectedAttachment() {
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-swin=
g_fr_FR.properties
index dffb827..120785f 100644
--- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.pro=
perties
+++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.pro=
perties
@@ -69,6 +69,10 @@ faxtomail.attachmentEditor.attachments.empty=3DAucune pi=
=C3=A8ce jointe
 faxtomail.attachmentEditor.deleteAttachment.message=3D=C3=8Ates-vous s=C3=BB=
r de vouloir supprimer la pi=C3=A8ce-jointe %s ?
 faxtomail.attachmentEditor.deleteAttachment.title=3DSuppression de pi=C3=A8c=
e-jointe
 faxtomail.attachmentEditor.field.file=3DFichier
+faxtomail.attachmentEditor.inlineAttachments.hidor.hideText=3DDivers (%s)
+faxtomail.attachmentEditor.inlineAttachments.hidor.hideTip=3DCacher les fich=
iers divers (%s)
+faxtomail.attachmentEditor.inlineAttachments.hidor.showText=3DDivers (%s)
+faxtomail.attachmentEditor.inlineAttachments.hidor.showTip=3DAfficher les fi=
chiers divers (%s)
 faxtomail.attachmentEditor.none.tip=3DAucune pi=C3=A8ce-jointe
 faxtomail.attachmentEditor.text=3DPi=C3=A8ces jointes (%s)
 faxtomail.attachmentEditor.title=3DPi=C3=A8ces jointes

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============3467448460484888970==--


From scm@users.codelutin.com Wed Sep  2 15:49:37 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits]  06/08: =?utf-8?q?d=C3=A9termination_de_la_prop?=
 =?utf-8?q?ri=C3=A9t=C3=A9_inline_des_pj_=C3=A0_la_r=C3=A9ception?= (refs
 #7421)
Date: Wed, 02 Sep 2015 15:49:41 +0200
Message-ID: <20150902134937.8398B5D185F@goh.codelutin.com>
In-Reply-To: <20150902134935.5801.17968@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5205678480010228046=="

--===============5205678480010228046==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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=C3=A9termination de la propri=C3=A9t=C3=A9 inline des pj =C3=A0 la r=C3=
=A9ception (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/servic=
es/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franci=
aflex/faxtomail/services/service/EmailServiceImpl.java
index 5bc93e0..295f589 100644
--- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/serv=
ice/EmailServiceImpl.java
+++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/serv=
ice/EmailServiceImpl.java
@@ -1894,6 +1894,7 @@ public class EmailServiceImpl extends FaxToMailServiceS=
upport implements EmailSe
                             name =3D t("faxtomail.email.content.attachment.p=
lainFileName");
                         }
                         Attachment attachment =3D convertTextToPdf(content, =
name);
+                        attachment.setInlineAttachment(Part.INLINE.equals(di=
sposition));
                         attachments.add(attachment);
                     }
=20
@@ -1926,10 +1927,10 @@ public class EmailServiceImpl extends FaxToMailServic=
eSupport implements EmailSe
                     }
                 }
                 if (attachment !=3D null) {
+                    attachment.setInlineAttachment(Part.INLINE.equals(dispos=
ition));
                     attachments.add(attachment);
                 }
=20
-
                 // else, this is an attachment
             } else {
                 String fileName =3D bp.getFileName();
@@ -1972,6 +1973,7 @@ public class EmailServiceImpl extends FaxToMailServiceS=
upport implements EmailSe
                 attachmentFile.setFilename(fileName);
                 attachment.setOriginalFile(attachmentFile);
                 attachment.setContentId(contentID);
+                attachment.setInlineAttachment(Part.INLINE.equals(dispositio=
n));
=20
                 // convert attachment if defined by admin
                 convertIfNecessary(attachment);
diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/sw=
ing/content/attachment/AttachmentEditorUI.css b/faxtomail-ui-swing/src/main/j=
ava/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/con=
tent/attachment/AttachmentEditorUI.css
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/attachment/AttachmentEditorUI.css
@@ -57,9 +57,10 @@
 }
=20
 #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", m=
odel.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", m=
odel.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/sw=
ing/content/demande/DemandeUIModel.java b/faxtomail-ui-swing/src/main/java/co=
m/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java
index b411796..21a3a08 100644
--- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/demande/DemandeUIModel.java
+++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/con=
tent/demande/DemandeUIModel.java
@@ -967,7 +967,7 @@ public class DemandeUIModel extends AbstractFaxToMailBean=
UIModel<Email, DemandeU
         for (int j =3D 0; j < multiPartCount; j++) {
             BodyPart bp =3D mimeMultipart.getBodyPart(j);
=20
-            // 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 =3D bp.getDisposition();
             if (bp.isMimeType("text/*") && !Part.ATTACHMENT.equals(dispositi=
on)) {
                 Charset charset =3D 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-swin=
g_fr_FR.properties
index 120785f..2d1647b 100644
--- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.pro=
perties
+++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.pro=
perties
@@ -69,10 +69,9 @@ faxtomail.attachmentEditor.attachments.empty=3DAucune pi=
=C3=A8ce jointe
 faxtomail.attachmentEditor.deleteAttachment.message=3D=C3=8Ates-vous s=C3=BB=
r de vouloir supprimer la pi=C3=A8ce-jointe %s ?
 faxtomail.attachmentEditor.deleteAttachment.title=3DSuppression de pi=C3=A8c=
e-jointe
 faxtomail.attachmentEditor.field.file=3DFichier
-faxtomail.attachmentEditor.inlineAttachments.hidor.hideText=3DDivers (%s)
 faxtomail.attachmentEditor.inlineAttachments.hidor.hideTip=3DCacher les fich=
iers divers (%s)
-faxtomail.attachmentEditor.inlineAttachments.hidor.showText=3DDivers (%s)
 faxtomail.attachmentEditor.inlineAttachments.hidor.showTip=3DAfficher les fi=
chiers divers (%s)
+faxtomail.attachmentEditor.inlineAttachments.hidor.text=3DDivers (%s)
 faxtomail.attachmentEditor.none.tip=3DAucune pi=C3=A8ce-jointe
 faxtomail.attachmentEditor.text=3DPi=C3=A8ces jointes (%s)
 faxtomail.attachmentEditor.title=3DPi=C3=A8ces jointes

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============5205678480010228046==--


From scm@users.codelutin.com Wed Sep  2 15:49:38 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits]  07/08: fixes #7421 gestion des pj internes 
 =?utf-8?q?=C3=A0?= l'email
Date: Wed, 02 Sep 2015 15:49:42 +0200
Message-ID: <20150902134937.CD5485D1878@goh.codelutin.com>
In-Reply-To: <20150902134935.5801.17968@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4462093614898969153=="

--===============4462093614898969153==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 99c2c9d5f858cd89fcfc4c01de5af3887b8d94d5
Merge: a6a9df8 a0d223a
Author: Kevin Morin <morin@codelutin.com>
Date:   Wed Sep 2 15:44:22 2015 +0200

    fixes #7421 gestion des pj internes =C3=A0 l'email

 faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32674 -> 32762 bytes
 .../services/service/ConfigurationServiceImpl.java |   2 +
 .../services/service/EmailServiceImpl.java         |   4 +-
 ...d_attributes_for_less_important_attachments.sql |   5 ++
 ...d_attributes_for_less_important_attachments.sql |   6 ++
 .../content/attachment/AttachmentEditorUI.css      |  32 ++++++++
 .../content/attachment/AttachmentEditorUI.jaxx     |  34 ++++++++-
 .../attachment/AttachmentEditorUIHandler.java      |  52 ++++++++++++-
 .../attachment/AttachmentEditorUIModel.java        |  81 +++++++++++++++++++=
+-
 .../ui/swing/content/attachment/AttachmentItem.css |   1 +
 .../swing/content/attachment/AttachmentItem.jaxx   |   3 +
 .../ui/swing/content/demande/DemandeUIModel.java   |   2 +-
 .../i18n/faxtomail-ui-swing_fr_FR.properties       |   7 ++
 .../src/main/resources/icons/action-important.png  | Bin 0 -> 672 bytes
 .../main/resources/icons/action-not-important.png  | Bin 0 -> 671 bytes
 pom.xml                                            |   2 +-
 16 files changed, 220 insertions(+), 11 deletions(-)

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============4462093614898969153==--


From scm@users.codelutin.com Wed Sep  2 15:49:38 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: faxtomail-commits@list.forge.codelutin.com
Subject:
 [Faxtomail-commits] 08/08: correction orthographe et conjugaison	dans la doc
Date: Wed, 02 Sep 2015 15:49:43 +0200
Message-ID: <20150902134938.56CD05CFB15@goh.codelutin.com>
In-Reply-To: <20150902134935.5801.17968@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4112371318913941841=="

--===============4112371318913941841==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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%
 .. -
=20
-Import par fichier CSV
+Import par fichiers CSV
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=20
 Format
 ------
=20
-Les fichiers d'import doivent =C3=AAtre formater suivant le standart CSV (Co=
mma-separated values) et
+Les fichiers d'import doivent =C3=AAtre format=C3=A9s suivant le standard CS=
V (Comma-separated values) et
 utiliser le s=C3=A9parateur ``;``.
=20
 Exemple avec le fichier d'import des =C3=89tats 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@c=
ode.com;99154
   253242;FX;Ella Elli;NULL;38 LA;NULL;04 98 87 76 65;NULL;99184
=20
-Ce fichier comporte 9 colonnes s=C3=A9par=C3=A9e par le s=C3=A9parateur ``;`=
`. Il comporte une ligne d'entete et
+Ce fichier comporte 9 colonnes s=C3=A9par=C3=A9es par le s=C3=A9parateur ``;=
``. Il comporte une ligne d'ent=C3=AAte et
 3 lignes de donn=C3=A9es.
=20
=20
 Encodage
 --------
=20
-Il est tr=C3=A8s difficile de d=C3=A9termin=C3=A9 le format d'encodage du fi=
chier texte (CSV). L'application FaxToMail
+Il est tr=C3=A8s difficile de d=C3=A9terminer le format d'encodage du fichie=
r texte (CSV). L'application FaxToMail
 impose donc l'utilisation du format d'encodage standardis=C3=A9 unicode (UTF=
-8).
=20
-Cependant, certains syst=C3=A8me d'exploitation, comme Windows, n'utilisent =
pas ce standard.
+Cependant, certains syst=C3=A8mes d'exploitation, comme Windows, n'utilisent=
 pas ce standard.
=20
 Il faut donc sp=C3=A9cifier lors de l'enregistrement du fichier:
   * l'encodage des caract=C3=A8res =C3=A0 utiliser
@@ -67,7 +67,7 @@ notepad++
 ~~~~~~~~~
=20
 Pour =C3=A9diter un fichier au format texte, le logiciel `notepad++`_ est pl=
us =C3=A9volu=C3=A9 que les outils
-basique mis =C3=A0 la disposition par d=C3=A9faut par Windows. Il dispose de=
 plus d'une option pour sp=C3=A9cifier
+basiques mis =C3=A0 la disposition par d=C3=A9faut par Windows. Il dispose, =
de plus, d'une option pour sp=C3=A9cifier
 le format d'encodage lors de la sauvegarde.
=20
 .. _notepad++: http://notepad-plus-plus.org/
@@ -77,7 +77,7 @@ le format d'encodage lors de la sauvegarde.
 Openoffice/Libreoffice
 ~~~~~~~~~~~~~~~~~~~~~~
=20
-Openoffice et Libreoffice sont deux equivalents libre de la suite bureautiqu=
e Microsoft Office. Ce
+Openoffice et Libreoffice sont deux equivalents libres de la suite bureautiq=
ue Microsoft Office. Ce
 logiciel propose plus facilement les options d'encodage lors de l'enregistre=
ment du fichier CSV.
=20
 Il s'agit d'une simple option =C3=A0 s=C3=A9lection dans la fen=C3=AAtre 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
 =3D=3D=3D=3D=3D=3D=3D
=20
-Bienvenue sur le site de FaxToMail. Il contient certaines documentation util=
isateur et technique
+Bienvenue sur le site de FaxToMail. Il contient certaines documentations uti=
lisateur 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
 ------
=20
 * T=C3=A9l=C3=A9charger le war depuis l'adresse : http://forge.codelutin.com=
/projects/faxtomail/files
-* Enregistrez le dans le dossier ''C:\Program Files\Apache Software Foundati=
on\Tomcat 7.0\webapps\'' avec le nom ''ROOT.war'' (supprimer le dossier ROOT)
+* Enregistrer le dans le dossier ''C:\Program Files\Apache Software Foundati=
on\Tomcat 7.0\webapps\'' avec le nom ''ROOT.war'' (supprimer le dossier ROOT)
 * Cr=C3=A9er le fichier ''C:\Windows\System32\faxToMail.properties'' avec en=
 contenu
=20
 ::

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============4112371318913941841==--