Author: kmorin Date: 2014-08-14 12:49:00 +0200 (Thu, 14 Aug 2014) New Revision: 559 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/559 Log: refs #5380 La taille de la police est mauvaise quand on g?\195?\169n?\195?\168re apr?\195?\168s un zoom fix lazy Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-14 10:49:00 UTC (rev 559) @@ -129,25 +129,25 @@ String text = note.getText(); String[] rows = text.split("\n"); - int rowHeight = textArea.getHeight() / rows.length; + int rowHeight = (int) ((textArea.getHeight() / rows.length) / zoom); int xxx = x; int yyy = y; if (rotation == 0) { xxx += insets.left; - yyy += height - rowHeight - insets.top; + yyy += height - rowHeight - insets.top / zoom; } else if (rotation == 90) { - xxx += rowHeight + insets.top; + xxx += rowHeight + insets.top / zoom; yyy += insets.left; } else if (rotation == 180) { - xxx += width - insets.right; - yyy += rowHeight - insets.top; + xxx += width - insets.right / zoom; + yyy += rowHeight - insets.top / zoom; } else if (rotation == 270) { - xxx += width - rowHeight - insets.left; - yyy += height - insets.top; + xxx += width - rowHeight - insets.left / zoom; + yyy += height - insets.top / zoom; } showTextAligned(cb, note.getTitle(), xxx, yyy, rotation, font, fontSize); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-08-14 10:49:00 UTC (rev 559) @@ -30,13 +30,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Set; import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; import com.franciaflex.faxtomail.persistence.entities.MailField; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-08-14 10:49:00 UTC (rev 559) @@ -34,6 +34,7 @@ import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; @@ -121,7 +122,7 @@ context.getCurrentUser(), new Date(), filename); - model.fromEntity(email); + model.fromEntityIncluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY)); } } @@ -134,7 +135,7 @@ context.getCurrentUser(), new Date(), FaxToMailUIUtil.getEditedFileName(attachment.getOriginalFileName())); - model.fromEntity(email); + model.fromEntityIncluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY)); } }; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-08-14 10:49:00 UTC (rev 559) @@ -32,7 +32,7 @@ #noteTitle { font: { Font.decode(BaseFont.HELVETICA).deriveFont(Font.ITALIC) }; - font-size: { (int)(DEFAULT_FONT_SIZE * getZoom()) }; + font-size: { (float)(DEFAULT_FONT_SIZE * getZoom() / getOriginalZoom()) }; text: { getTitle() }; } @@ -49,7 +49,7 @@ opaque : { false }; background: { null }; font: { Font.decode(BaseFont.HELVETICA) }; - font-size: { (int)(DEFAULT_FONT_SIZE * getZoom()) }; + font-size: { (float)(DEFAULT_FONT_SIZE * getZoom() / getOriginalZoom()) }; lineWrap: { false }; wrapStyleWord: { false }; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-08-14 10:49:00 UTC (rev 559) @@ -60,6 +60,7 @@ <String id="title" javaBean="null"/> <String id="text" javaBean=""/> + <Float id="originalZoom" javaBean="1.0f"/> <Float id="zoom" javaBean="1.0f"/> <JPanel id="noteHeader" Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-14 10:49:00 UTC (rev 559) @@ -30,6 +30,8 @@ import java.awt.event.ContainerEvent; import java.awt.event.ContainerListener; import java.awt.event.MouseEvent; +import java.awt.event.MouseWheelEvent; +import java.awt.event.MouseWheelListener; import java.awt.geom.Rectangle2D; import java.awt.image.RenderedImage; import java.beans.PropertyChangeEvent; @@ -289,6 +291,8 @@ public void addNote(int x, int y) { PDFEditorNoteUI note = new PDFEditorNoteUI(); + note.setOriginalZoom(getModel().getZoom()); + note.setZoom(getModel().getZoom()); String title = decorate(new Date()) + " - " + getContext().getCurrentUser().getTrigraph(); note.setTitle(title); addPanel(note, x, y);