Author: kmorin Date: 2014-09-29 11:34:03 +0200 (Mon, 29 Sep 2014) New Revision: 647 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/647 Log: - correction plusieurs popup de sauvegarde quand on quitte l'editeur de pdf - agrandissement de la taille des popups de filtre - correction libell?\195?\169 action "null" quand on quitte un ?\195?\169l?\195?\169ment 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/content/demande/DemandeListTableFilter.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java trunk/pom.xml 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-09-26 17:17:17 UTC (rev 646) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-09-29 09:34:03 UTC (rev 647) @@ -71,7 +71,6 @@ @Override public boolean prepareAction() throws Exception { - DemandeListUIModel model = getModel(); MailFolder folder = model.getSelectedFolder(); final JXTable dataTable = getUI().getDataTable(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-26 17:17:17 UTC (rev 646) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-29 09:34:03 UTC (rev 647) @@ -58,6 +58,8 @@ import java.util.HashSet; import java.util.Set; +import static org.nuiton.i18n.I18n.t; + /** * @author Kevin Morin (Code Lutin) * @since x.x @@ -216,6 +218,7 @@ case Email.PROPERTY_ATTACHMENT: case Email.PROPERTY_REPLIES: + case Email.PROPERTY_EMAIL_GROUP: return null; default: Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-09-26 17:17:17 UTC (rev 646) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-09-29 09:34:03 UTC (rev 647) @@ -333,6 +333,7 @@ .searchable(true) .searchDecorator(decorator) .useTableRenderers(true) + .setPopupDefaultSize(new Dimension(250, 290)) .apply(); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css 2014-09-26 17:17:17 UTC (rev 646) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css 2014-09-29 09:34:03 UTC (rev 647) @@ -30,6 +30,7 @@ #backButton { text: "faxtomail.demande.back.button.label"; actionIcon: cancel; + toolTipText: "faxtomail.action.goto.previousScreen.tip"; _applicationAction: { com.franciaflex.faxtomail.ui.swing.actions.GoToPreviousScreenAction.class }; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-09-26 17:17:17 UTC (rev 646) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-09-29 09:34:03 UTC (rev 647) @@ -32,6 +32,7 @@ import javax.swing.JComponent; import javax.swing.JTabbedPane; +import com.franciaflex.faxtomail.ui.swing.actions.GoToPreviousScreenAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenChooseAttachmentToPrintAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenMailFolderChooserAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenReplyFormAction; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-09-26 17:17:17 UTC (rev 646) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-09-29 09:34:03 UTC (rev 647) @@ -163,6 +163,7 @@ sendAction.putValue(Action.LARGE_ICON_KEY, actionIcon); sendAction.putValue(Action.NAME, "send"); sendAction.putValue(Action.SHORT_DESCRIPTION, t("faxtomail.demande.history.action.send.tip")); + JButton sendButton = new JButton(sendAction); sendButton.setText(null); sendButton.setFocusPainted(false); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-26 17:17:17 UTC (rev 646) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-29 09:34:03 UTC (rev 647) @@ -33,6 +33,7 @@ import java.awt.event.KeyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; @@ -239,12 +240,9 @@ public void openFrame(ApplicationUI dialogContent, String title, Dimension dim) { - JFrame result = getContext().getSecondaryFrame(); - if (result == null) { - result = new JFrame(); - result.setResizable(true); - getContext().setSecondaryFrame(result); - } + JFrame result = new JFrame(); + result.setResizable(true); + getContext().setSecondaryFrame(result); result.setTitle(title); result.setContentPane((Container) dialogContent); @@ -279,12 +277,9 @@ * Open frame and disable parent frame */ public JFrame openModalFrame(final ApplicationUI dialogContent, String title, Dimension dim) { - JFrame result = getContext().getSecondaryFrame(); - if (result == null) { - result = new JFrame(); - result.setResizable(true); - getContext().setSecondaryFrame(result); - } + JFrame result = new JFrame(); + result.setResizable(true); + getContext().setSecondaryFrame(result); final JFrame parentContainer = getParentContainer(JFrame.class); parentContainer.setEnabled(false); @@ -309,7 +304,7 @@ @Override public void actionPerformed(ActionEvent e) { - ((org.nuiton.jaxx.application.swing.util.Cancelable) handler).cancel(); + ((Cancelable) handler).cancel(); } }); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-26 17:17:17 UTC (rev 646) +++ trunk/pom.xml 2014-09-29 09:34:03 UTC (rev 647) @@ -110,7 +110,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.13-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.14-SNAPSHOT</jaxxVersion> <!-- do not upgrade to 1.6.5-1 --> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion>