From kmorin@users.forge.codelutin.com Wed Apr  2 17:46:05 2014
From: kmorin@users.forge.codelutin.com
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] r25 - in trunk/faxtomail-ui-swing/src/main:
	java/com/franciaflex/faxtomail/ui/swing/util/attachment
	java/com/franciaflex/faxtomail/ui/swing/util/history	resources/i18n
 resources/icons
Date: Wed, 02 Apr 2014 17:46:05 +0200
Message-ID: <20140402154605.9D79D1814B9@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0792968069485426275=="

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

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D (Attachment) value;
             attachmentItem.setAttachment(attachment);
+
+            if (attachment !=3D null) {
+                JLabel label =3D attachmentItem.getAttachmentNameLabel();
+                String actionIconName =3D Boolean.TRUE.equals(attachment.get=
AddedByUser()) ? "user" : "email";
+                Icon icon =3D SwingUtil.createActionIcon(actionIconName);
+                label.setIcon(icon);
+            }
+
             return attachmentItem;
         }
=20

Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui=
/swing/util/attachment/PDFEditorCrossUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
=20
   <script><![CDATA[
=20
-    public static final String CROSS_IMAGE_FILE =3D "cross.png";
+    public static final String CROSS_IMAGE_FILE =3D "cross_blue.png";
=20
     public PDFEditorCrossUI() {
-        setImage(SwingUtil.createImageIcon("cross.png").getImage());
+        setImage(SwingUtil.createImageIcon(CROSS_IMAGE_FILE).getImage());
     }
=20
     protected void removeCross() {

Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui=
/swing/util/history/HistoryItem.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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) };
 }
=20
-#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";
 }
=20
-#fields {
-  text : { handler.decorateFields(model.getFields()) };
+#typeLabel {
+  text : ":";
+  font-style: "italic";
 }
=20
-#data {
-  opaque: false;
+#type {
+  text : { JAXXUtil.getStringValue(model.getType().getLabel()) };
+  font-weight: "bold";
 }
=20
 #userLabel {
@@ -24,11 +35,6 @@
   text : { handler.decorateUser(model.getFaxToMailUser(), true) };
 }
=20
-#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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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>
=20
-  <JLabel id=3D'type'/>
-
-  <JLabel id=3D'fields'/>
-
   <JPanel id=3D"data"
           layout=3D"{new FlowLayout(FlowLayout.LEADING)}">
+
+    <JLabel id=3D'dateLabel'/>
+    <JLabel id=3D'date'/>
+    <JLabel id=3D'typeLabel'/>
+    <JLabel id=3D'type'/>
     <JLabel id=3D'userLabel'/>
     <JLabel id=3D'user'/>
-    <JLabel id=3D'dateLabel'/>
-    <JLabel id=3D'date'/>
   </JPanel>
=20
+  <JLabel id=3D'fields'/>
+
 </JPanel>
\ No newline at end of file

Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing=
_en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
 \ |\ =3D
 1\ -\ Volets\ roulants=3D
+\:=3D
 Ajouter=3D
 Derni\\u00e8re\ modification\ par\ Utilisateur\ 1\ le\ 14/01/2014\ \\u00e0\ =
08\:42=3D
 Editer=3D

Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing=
_fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
 \ |\ =3D
+\:=3D
 X=3D
 application.action.create.error=3D
 application.error.ui.business.warning=3D

Modified: trunk/faxtomail-ui-swing/src/main/resources/icons/action-cross.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


--===============0792968069485426275==--