branch develop updated (ee3eb79 -> 527c570)
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 ee3eb79 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new b4da6f1 fixes #7641 les fenêtres portent le même nom « détail » alors qu’il faut pouvoir les identifier en inscrivant l’objet de l’élément new 340943d fixes #7642 POP-UP « GROUPAGE » trop rapide 15 secondes new 527c570 fixes #7643 Popup "Groupage " : le mot « GROUPAGE » est excentré et sort à moitié de l’écran d’affichage …il faut le baisser, trop haut The 3 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 527c5703fc7b6b40f6822b3feb65cdef75e0a737 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 11:41:46 2015 +0200 fixes #7643 Popup "Groupage " : le mot « GROUPAGE » est excentré et sort à moitié de l’écran d’affichage …il faut le baisser, trop haut commit 340943d6302d74a33baf7e928d808abcc4144497 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 11:16:23 2015 +0200 fixes #7642 POP-UP « GROUPAGE » trop rapide 15 secondes commit b4da6f1202aadf99048f5864a02661535adaba2f Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 11:09:36 2015 +0200 fixes #7641 les fenêtres portent le même nom « détail » alors qu’il faut pouvoir les identifier en inscrivant l’objet de l’élément Summary of changes: .../faxtomail/FaxToMailConfigurationOption.java | 2 +- .../ui/swing/actions/ShowDemandeAction.java | 3 +- .../ui/swing/content/demande/DemandeUIHandler.java | 5 +++ .../demandgroup/DemandGroupHighlightDialog.java | 39 ++++++++++++++-------- 4 files changed, 33 insertions(+), 16 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 b4da6f1202aadf99048f5864a02661535adaba2f Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 11:09:36 2015 +0200 fixes #7641 les fenêtres portent le même nom « détail » alors qu’il faut pouvoir les identifier en inscrivant l’objet de l’élément --- .../franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java | 3 ++- .../faxtomail/ui/swing/content/demande/DemandeUIHandler.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index 31e5f66..d592b1a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -196,11 +196,12 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { if (frame == null) { final DemandesUI screenUI = new DemandesUI(getUI()); - String screenTitle = t("faxtomail.demand.title"); + String screenTitle = screenUI.getModel().getCurrentDemand().getTitle(); ImageIcon icon = JAXXWidgetUtil.createActionIcon("email-group"); screenUI.getDemandsPanel().setLeftDecoration(new JLabel(icon)); frame = getHandler().openFrame(screenUI, screenTitle, new Dimension(800, 600)); + getContext().setFrameForDemande(currentEmail, frame); for (DemandeUIModel demande : currentEmail.getGroupedDemandes()) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 85009ae..71d12ed 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -40,6 +40,7 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeAct import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.Sets; +import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; @@ -567,6 +568,10 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, @Override public void onShowTab(int currentIndex, int newIndex) { registerValidators(getValidator()); + JFrame frame = SwingUtil.getParentContainer(getUI(), JFrame.class); + if (frame != null) { + frame.setTitle(getModel().getTitle()); + } } @Override -- 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 340943d6302d74a33baf7e928d808abcc4144497 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 11:16:23 2015 +0200 fixes #7642 POP-UP « GROUPAGE » trop rapide 15 secondes --- .../faxtomail/FaxToMailConfigurationOption.java | 2 +- .../demandgroup/DemandGroupHighlightDialog.java | 25 ++++++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java index e2ce9fa..ab3515c 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java @@ -290,7 +290,7 @@ defaults.put("Table.alternateRowColor", new Color(217, 217, 217)); DELAY_GROUPED_DEMAND_WARNING_DIALOG("faxtomail.ui.delay.groupedDemandWarningDialog", n("faxtomail.ui.delay.groupedDemandWarningDialog.description"), - "10000", + "0", Integer.class ), diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java index 4dff1ea..2c9af23 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java @@ -52,11 +52,19 @@ public class DemandGroupHighlightDialog extends JDialog { this.buttonEmailGroup = buttonEmailGroup; - timer = new Timer(context.getConfig().getDelayGroupedDemandWarningDialog(), new ActionListener() { - public void actionPerformed(ActionEvent e) { - dispose(); - } - }); + int delayGroupedDemandWarningDialog = context.getConfig().getDelayGroupedDemandWarningDialog(); + + if (delayGroupedDemandWarningDialog > 0) { + + timer = new Timer(delayGroupedDemandWarningDialog, new ActionListener() { + public void actionPerformed(ActionEvent e) { + dispose(); + } + }); + + } else { + timer = null; + } init(context.getConfig().getColorGroupedDemandWarningDialog(), context.getConfig().getFontSizeGroupedDemandWarningDialog()); @@ -117,9 +125,12 @@ public class DemandGroupHighlightDialog extends JDialog { public void setVisible(boolean b) { if (!isVisible() && b) { place(); - timer.start(); - } else if (!b) { + if (timer != null) { + timer.start(); + } + + } else if (!b && timer != null) { timer.stop(); } -- 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 527c5703fc7b6b40f6822b3feb65cdef75e0a737 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 11:41:46 2015 +0200 fixes #7643 Popup "Groupage " : le mot « GROUPAGE » est excentré et sort à moitié de l’écran d’affichage …il faut le baisser, trop haut --- .../demande/demandgroup/DemandGroupHighlightDialog.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java index 2c9af23..d642b9d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java @@ -92,7 +92,7 @@ public class DemandGroupHighlightDialog extends JDialog { getContentPane().add(messagePanel, BorderLayout.CENTER); - getContentPane().add(new ArrowPanel(bgColor), BorderLayout.SOUTH); + getContentPane().add(new ArrowPanel(bgColor), BorderLayout.EAST); pack(); @@ -117,7 +117,7 @@ public class DemandGroupHighlightDialog extends JDialog { protected void place() { Point point = new Point(buttonEmailGroup.getLocationOnScreen()); - point.translate(- getWidth() + buttonEmailGroup.getWidth(), - getHeight() - 5); + point.translate(- getWidth() - 5, (buttonEmailGroup.getHeight() - getHeight()) / 2); setLocation(point.getLocation()); } @@ -139,8 +139,8 @@ public class DemandGroupHighlightDialog extends JDialog { } private class ArrowPanel extends JPanel { - private final int width = 10; - private final int height = 5; + private final int width = 5; + private final int height = 10; private final Color arrowColor; ArrowPanel(Color color) { @@ -159,9 +159,9 @@ public class DemandGroupHighlightDialog extends JDialog { @Override public void paint(Graphics g) { - Point point1 = new Point(getWidth() - 10, 0); - Point point2 = new Point(point1.x - width, point1.y); - Point point3 = new Point(point1.x - width / 2, point1.y + height); + Point point1 = new Point(0, (getHeight() + height) / 2 ); + Point point2 = new Point(point1.x, point1.y - height); + Point point3 = new Point(point1.x + width, point1.y - height / 2); g.setColor(arrowColor); g.drawLine(point1.x, point1.y, point2.x, point2.y); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm