This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5c3df7ed8d2db3543ccbf83d6079e2e86b874a49 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Sun Aug 21 23:45:16 2016 +0200 Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur refs #7553 --- .../ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 50 ++++++++++++++++ .../ird/observe/ui/util/tree/BeanTreeHeader.jcss | 67 ++++++++++++++++++++++ .../ui/util/tree/BeanTreeHeaderHandler.java | 45 +++++++++++++++ .../observe-application-swing_en_GB.properties | 11 ++-- .../observe-application-swing_es_ES.properties | 11 ++-- .../observe-application-swing_fr_FR.properties | 8 +-- 6 files changed, 178 insertions(+), 14 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx new file mode 100644 index 0000000..6110ef1 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx @@ -0,0 +1,50 @@ +<!-- + #%L + ObServe :: Swing + %% + Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + %% + 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% + --> +<JPanel id="beanTreeHeader" + layout='{new BorderLayout()}'> + + <BeanTreeHeaderHandler id='handler' constructorParams='this'/> + + <script><![CDATA[ + +void $afterCompleteSetup() { + getHandler().initUI(); +} + +]]> + </script> + + <JLabel id="label" constraints='BorderLayout.CENTER'/> + + <JToolBar id='toolbar' constraints='BorderLayout.EAST'> + + <!-- les boutons pour grouper/déplier tout l'arbre --> + <JButton id='colapseAll'/> + <JButton id='expandAll'/> + + <!-- les boutons pour sélectionner/déselctionner tout l'arbre --> + <JButton id='selectAll'/> + <JButton id='deselectAll'/> + + </JToolBar> + +</JPanel> \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss new file mode 100644 index 0000000..8b8c11d --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss @@ -0,0 +1,67 @@ +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * 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% + */ + +#label { + opaque:false; + text:{""}; +} + +#toolbar { + floatable:false; + borderPainted:false; +} + +#colapseAll { + actionIcon:"combobox-reset"; + toolTipText:"observe.tree.action.collapseAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} + +#expandAll { + actionIcon:"add"; + toolTipText:"observe.tree.action.expandAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} + +#selectAll { + actionIcon:"add"; + toolTipText:"observe.tree.action.selectAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} + +#deselectAll { + actionIcon:"combobox-reset"; + toolTipText:"observe.tree.action.deselectAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java new file mode 100644 index 0000000..e9d09a4 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java @@ -0,0 +1,45 @@ +package fr.ird.observe.ui.util.tree; + +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * 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% + */ + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @author Samuel Maisonneuve- maisonneuve@codelutin.com + */ +public class BeanTreeHeaderHandler { + + private static final Log log = LogFactory.getLog(BeanTreeHeaderHandler.class); + + private final BeanTreeHeader ui; + + public BeanTreeHeaderHandler(BeanTreeHeader ui) { + this.ui = ui; + } + + public void initUI() { + + } + +} 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 ddda428..bd5b92d 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 @@ -350,6 +350,7 @@ observe.admin.resume.operation.failed= observe.admin.resume.operation.need.fix= observe.admin.resume.operation.not.started= observe.admin.resume.operation.running= +observe.application.config=ObServe Configuration observe.catchAcquisitionModeEnum.GROUPED=Batch observe.catchAcquisitionModeEnum.INDIVIDUAL=Individual observe.choice.cancel=Cancel @@ -612,7 +613,6 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= -observe.config.name= observe.config.observation.activitysDetaillees= observe.config.observation.fauneAssociee= observe.config.observation.floatingObject= @@ -649,6 +649,7 @@ observe.config.ui.showNumberEditorButton=Flag sets to true to show button to inv observe.config.ui.showTimeEditorSlider=Show timer slider observe.config.ui.storeRemoteStorage=Flag sets to true to store in config a remote connexion (except passwords) observe.config.ui.treeOpenNodes= +observe.configuration.description= observe.content.action.activity=Create a new activity observe.content.action.activity.tip=Create a new activity observe.content.action.baitHaulingStatus.create.tip= @@ -2126,10 +2127,10 @@ observe.title.storage.info=Storage details observe.title.technical.informations=Technical information of %1$s observe.title.unique.key=Unique keys used in a referentiel observe.title.welcome.admin=Observe Admin -observe.tree.action.collapseAll.tip= -observe.tree.action.expandAll.tip= -observe.tree.action.selectAll.tip= -observe.tree.action.unselectAll.tip= +observe.tree.action.collapseAll.tip=Collapse all +observe.tree.action.deselectAll.tip=Deselect All +observe.tree.action.expandAll.tip=Expand all +observe.tree.action.selectAll.tip=Select All observe.tree.activityLongline=Activity observe.tree.activityLongline.unsaved=New activity observe.tree.activitySeine=Activity 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 d5c9503..d28ec1a 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 @@ -350,6 +350,7 @@ observe.admin.resume.operation.failed=la operación no realizada observe.admin.resume.operation.need.fix=la operación nesista correcciones observe.admin.resume.operation.not.started=operación no empezada observe.admin.resume.operation.running=operación en curso... +observe.config.name=Configuración de ObServe observe.catchAcquisitionModeEnum.GROUPED= observe.catchAcquisitionModeEnum.INDIVIDUAL= observe.choice.cancel=Cancelar @@ -612,7 +613,6 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= -observe.config.name= observe.config.observation.activitysDetaillees=Observación de actividades detalladas observe.config.observation.fauneAssociee=Observación de Fauna asociada observe.config.observation.floatingObject=Observación de objetos flotantes @@ -649,6 +649,7 @@ observe.config.ui.showNumberEditorButton=Para mostrar el botón que permite usar observe.config.ui.showTimeEditorSlider= observe.config.ui.storeRemoteStorage=Para activar la copia de seguridad de la configuración del origen de datos remota observe.config.ui.treeOpenNodes= +observe.configuration.description= observe.content.action.activity=Crear una nueva actividad observe.content.action.activity.tip=Crear una nueva actividad para la ruta actual observe.content.action.baitHaulingStatus.create.tip= @@ -2126,10 +2127,10 @@ observe.title.storage.info= observe.title.technical.informations= observe.title.unique.key= observe.title.welcome.admin= -observe.tree.action.collapseAll.tip= -observe.tree.action.expandAll.tip= -observe.tree.action.selectAll.tip= -observe.tree.action.unselectAll.tip= +observe.tree.action.collapseAll.tip=Cerrar los nudos +observe.tree.action.deselectAll.tip=Deseleccionar todo +observe.tree.action.expandAll.tip=Abrir los nudos +observe.tree.action.selectAll.tip=Seleccionar todo observe.tree.activityLongline=Actividad observe.tree.activityLongline.unsaved=Nueva actividad observe.tree.activitySeine=Actividad 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 d9a98a5..26c2a39 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 @@ -2126,10 +2126,10 @@ observe.title.storage.info=Information sur la source de données observe.title.technical.informations=Informations techniques du référentiel %1$s observe.title.unique.key=Clefs métier du référentiel %1$s observe.title.welcome.admin=Observe Administrateur -observe.tree.action.collapseAll.tip= -observe.tree.action.expandAll.tip= -observe.tree.action.selectAll.tip= -observe.tree.action.unselectAll.tip= +observe.tree.action.collapseAll.tip=Tout grouper +observe.tree.action.deselectAll.tip=Tout désélectionner +observe.tree.action.expandAll.tip=Tout déplier +observe.tree.action.selectAll.tip=Tout sélectionner observe.tree.activityLongline=Activités observe.tree.activityLongline.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.