branch develop updated (72b17d4 -> 8d9b896)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 72b17d4 fixes #6793: [Modèle de catégorisation] Erreur lors de la suppression d'une catégorie - use SimpleAction instead of code in handlers - fix some issues with ErrorHandler (introduced by the refactor) new 8d9b896 fixes #6705: [CAPTURE] perte des boutons en bas d'écran capture 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 8d9b896285ff8597ef1deb2b2dae8cd864bc85c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 9 14:32:03 2015 +0100 fixes #6705: [CAPTURE] perte des boutons en bas d'écran capture Summary of changes: .../operation/catches/EditCatchesUIHandler.java | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 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 tutti. See http://git.codelutin.com/tutti.git commit 8d9b896285ff8597ef1deb2b2dae8cd864bc85c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 9 14:32:03 2015 +0100 fixes #6705: [CAPTURE] perte des boutons en bas d'écran capture --- .../operation/catches/EditCatchesUIHandler.java | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index 022acc4..20f044d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -268,12 +268,31 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi boolean result = super.onTabChanged(currentIndex, newIndex); if (result && currentIndex != newIndex) { + + boolean showMainActions; + if (currentIndex == 0) { editCatchesSvgHandler.clearSVG(); } - if (newIndex == 0 && getUI().isVisible()) { - editCatchesSvgHandler.initResumeSvg(); + if (newIndex == 0) { + + if (getUI().isVisible()) { + + editCatchesSvgHandler.initResumeSvg(); + } + showMainActions = true; + + } else { + + JComponent componentAt = (JComponent) getTabPanel().getComponentAt(newIndex); + CardLayout2Ext layout = (CardLayout2Ext) componentAt.getLayout(); + String selectedCard = layout.getSelected(); + showMainActions = selectedCard == null || MAIN_CARD.equals(selectedCard); + } + + getUI().getCreateFishingOperationActions().setVisible(showMainActions); + } return result; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm