branch develop updated (df5ead2 -> 6fd8dce)
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 df5ead2 fixes #7417 [Liste des demandes] Erreur quand on clique sur une cellule de pj, puis ailleurs new 6fd8dce fixes #7418 Ouverture de l'éditeur de PJ sur le même écran que lors du dernier traitement The 1 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 6fd8dce94ed8fe1f169cf8ca209c11936d9fd0e0 Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 11 12:01:42 2015 +0200 fixes #7418 Ouverture de l'éditeur de PJ sur le même écran que lors du dernier traitement Summary of changes: .../ui/swing/util/AbstractFaxToMailUIHandler.java | 19 +++++++++++----- .../faxtomail/ui/swing/util/ReloadableListUI.java | 26 +++++++++++++++++++++- 2 files changed, 39 insertions(+), 6 deletions(-) -- 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 6fd8dce94ed8fe1f169cf8ca209c11936d9fd0e0 Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 11 12:01:42 2015 +0200 fixes #7418 Ouverture de l'éditeur de PJ sur le même écran que lors du dernier traitement --- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 19 +++++++++++----- .../faxtomail/ui/swing/util/ReloadableListUI.java | 26 +++++++++++++++++++++- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java index 792bcda..bcac8f5 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java @@ -232,11 +232,10 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> result.setResizable(true); getContext().setSecondaryFrame(result); + result.setName(dialogContent.getClass().getName()); result.setTitle(title); result.setContentPane((Container) dialogContent); - result.setSize(dim); - final AbstractApplicationUIHandler handler = dialogContent.getHandler(); if (handler instanceof Cancelable) { @@ -257,6 +256,8 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> } }); } + + result.setSize(dim); SwingUtil.center(getContext().getMainUI(), result); result.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); @@ -272,10 +273,14 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> if (log.isDebugEnabled()) { log.debug("Destroy ui " + ui); } + getContext().getSwingSession().updateState(); JAXXUtil.destroy(ui); } + }); + getContext().getSwingSession().add(result, true); + result.setVisible(true); return result; @@ -293,6 +298,7 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> parentContainer.setEnabled(false); parentContainer.setFocusableWindowState(false); + result.setName(dialogContent.getClass().getName()); result.setTitle(title); result.setContentPane((Container) dialogContent); @@ -317,7 +323,8 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> }); } - SwingUtil.center(getContext().getMainUI(), result); + result.setSize(dim); + SwingUtil.center(parentContainer, result); result.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); result.addWindowListener(new WindowAdapter() { @@ -332,6 +339,8 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> parentContainer.setFocusableWindowState(true); parentContainer.toFront(); + getContext().getSwingSession().updateState(); + Component ui = (Component) e.getSource(); if (log.isDebugEnabled()) { log.debug("Destroy ui " + ui); @@ -340,8 +349,8 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> } }); - result.setSize(dim); - SwingUtil.center(parentContainer, result); + getContext().getSwingSession().add(result, true); + result.setVisible(true); return result; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/ReloadableListUI.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/ReloadableListUI.java index 530568b..60d1739 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/ReloadableListUI.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/ReloadableListUI.java @@ -1,8 +1,32 @@ package com.franciaflex.faxtomail.ui.swing.util; +/* + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Kevin Morin (Code Lutin) - * @since x.x + * @since 1.4 */ public interface ReloadableListUI { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm