branch develop updated (3827e37 -> 1857d71)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 3827e37 Merge branch 'feature/7615-2' into develop new 1857d71 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) 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 1857d71fd16166422ca7ef1dc2bf3429b3102142 Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 17:43:05 2015 +0100 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) Summary of changes: .../src/main/java/fr/ird/observe/ui/ObserveMainUI.css | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 1857d71fd16166422ca7ef1dc2bf3429b3102142 Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 17:43:05 2015 +0100 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) --- .../src/main/java/fr/ird/observe/ui/ObserveMainUI.css | 1 + 1 file changed, 1 insertion(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css index 5e740ea..82ba5bc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css @@ -63,6 +63,7 @@ JSplitPane { #navigationCloseTripAction { text: "observe.navigationMenu.closeTripAction"; toolTipText: "observe.navigationMenu.closeTripAction"; + enabled: {!dataContext.isOpenRoute() && !dataContext.isOpenActivity()}; action: {new fr.ird.observe.ui.actions.shared.CloseOpenUIAction(this)}; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm