This is an automated email from the git hooks/post-receive script. New commit to branch feature/7622 in repository observe. See http://git.codelutin.com/observe.git commit 5eefa4766140764f3fbe6d263720384407da3172 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 16 16:33:53 2015 +0100 ajout des menus pour les routes (refs #7622) --- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 42 ++++++++++++++++++---- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 6 ++++ .../observe-application-swing_en_GB.properties | 4 +++ .../observe-application-swing_es_ES.properties | 4 +++ .../observe-application-swing_fr_FR.properties | 4 +++ 5 files changed, 54 insertions(+), 6 deletions(-) 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 82ba5bc..1ce09bd 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 @@ -41,18 +41,20 @@ JSplitPane { enabled: {!isBusy()}; } -#navigationMoveTripAction { - text: "observe.navigationMenu.moveTrip"; - toolTipText: "observe.navigationMenu.moveTrip"; - actionIcon: "move-trips"; -} - #navigationNoAction { text: "observe.navigationMenu.noAction"; toolTipText: "observe.navigationMenu.noAction"; enabled: false; } +// trip menu + +#navigationMoveTripAction { + text: "observe.navigationMenu.moveTrip"; + toolTipText: "observe.navigationMenu.moveTrip"; + actionIcon: "move-trips"; +} + #navigationOpenTripAction { text: "observe.navigationMenu.openTripAction"; toolTipText: "observe.navigationMenu.openTripAction"; @@ -73,6 +75,34 @@ JSplitPane { action: {new fr.ird.observe.ui.actions.shared.DeleteDataUIAction(this)}; } +// route menu + +#navigationMoveRouteAction { + text: "observe.navigationMenu.moveRoute"; + toolTipText: "observe.navigationMenu.moveRoute"; + //actionIcon: "move-routes"; +} + +#navigationOpenRouteAction { + text: "observe.navigationMenu.openRouteAction"; + toolTipText: "observe.navigationMenu.openRouteAction"; + enabled: {!dataContext.isOpenRoute()}; + action: {new fr.ird.observe.ui.actions.shared.ReOpenUIAction(this)}; +} + +#navigationCloseRouteAction { + text: "observe.navigationMenu.closeRouteAction"; + toolTipText: "observe.navigationMenu.closeRouteAction"; + enabled: {!dataContext.isOpenActivity()}; + action: {new fr.ird.observe.ui.actions.shared.CloseOpenUIAction(this)}; +} + +#navigationDeleteRouteAction { + text: "observe.navigationMenu.deleteRouteAction"; + toolTipText: "observe.navigationMenu.deleteRouteAction"; + action: {new fr.ird.observe.ui.actions.shared.DeleteDataUIAction(this)}; +} + #menuFile { text: "observe.menu.file"; mnemonic: F; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx index 2c446ef..480b1e3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx @@ -84,10 +84,16 @@ <JPopupMenu id='scopeDownPopup'/> <JPopupMenu id='navigationPopup'> <JMenuItem id="navigationNoAction"/> + <!-- Trip menu --> <JMenu id="navigationMoveTripAction"/> <JMenuItem id="navigationOpenTripAction"/> <JMenuItem id="navigationCloseTripAction"/> <JMenuItem id="navigationDeleteTripAction"/> + <!-- Route menu --> + <JMenu id="navigationMoveRouteAction"/> + <JMenuItem id="navigationOpenRouteAction"/> + <JMenuItem id="navigationCloseRouteAction"/> + <JMenuItem id="navigationDeleteRouteAction"/> </JPopupMenu> <ObserveSwingApplicationConfig id='config' initializer='getContextValue(ObserveSwingApplicationConfig.class)'/> diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index d97fb75..c07a3b7 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1554,10 +1554,14 @@ observe.message.validation.start.referentiel= observe.message.validation.use.storage= observe.message.warning.will.be.delete= observe.model.version= +observe.navigationMenu.closeRouteAction= observe.navigationMenu.closeTripAction= +observe.navigationMenu.deleteRouteAction= observe.navigationMenu.deleteTripAction= +observe.navigationMenu.moveRoute= observe.navigationMenu.moveTrip=Change program observe.navigationMenu.noAction=< No action > +observe.navigationMenu.openRouteAction= observe.navigationMenu.openTripAction= observe.nonTargetCatch.message.table.will.delete.nonTargetSample= observe.nonTargetCatch.table.catchWeight= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index ff0694b..d17ed34 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1556,10 +1556,14 @@ observe.message.validation.start.referentiel=Validación del referencial de tipo observe.message.validation.use.storage=Se realizará la validación de %1$s observe.message.warning.will.be.delete=%1$s\n\nAtención, la exportación reemplazará la marea existente. observe.model.version= +observe.navigationMenu.closeRouteAction= observe.navigationMenu.closeTripAction= +observe.navigationMenu.deleteRouteAction= observe.navigationMenu.deleteTripAction= +observe.navigationMenu.moveRoute= observe.navigationMenu.moveTrip= observe.navigationMenu.noAction= +observe.navigationMenu.openRouteAction= observe.navigationMenu.openTripAction= observe.nonTargetCatch.message.table.will.delete.nonTargetSample=¡Confirmar la eliminación de los objetos de la copia de seguridad.\!\n\n Las especies siguientes no estarán disponibles en los muestreos\:\n%1$s\nComo consecuencia se suprimiràn los muestreos siguientes \:\n%2$s observe.nonTargetCatch.table.catchWeight=Peso diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 0ad8cf2..15af143 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1545,10 +1545,14 @@ observe.message.validation.start.referentiel=Validation du référentiel de type observe.message.validation.use.storage=La validation sera effectuée sur %1$s observe.message.warning.will.be.delete=%1$s\n\nAttention, l'export remplacera la marée existante. observe.model.version=Version du modèle de données +observe.navigationMenu.closeRouteAction= observe.navigationMenu.closeTripAction=Clôturer la marée +observe.navigationMenu.deleteRouteAction= observe.navigationMenu.deleteTripAction=Supprimer la marée +observe.navigationMenu.moveRoute= observe.navigationMenu.moveTrip=Réallocation du programme observe.navigationMenu.noAction=< Aucune action définie > +observe.navigationMenu.openRouteAction= observe.navigationMenu.openTripAction=Réouvrir la marée observe.nonTargetCatch.message.table.will.delete.nonTargetSample=En confirmant la sauvegarde des objets vont être supprimés\!\n\nLes espèces suivantes ne seront plus utilisables dans des échantillonages \:\n%1$s\nCela entrainera la suppression des échantillonages des ces espèces observe.nonTargetCatch.table.catchWeight=Poids -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.