From scm@users.codelutin.com Tue Aug 23 15:22:25 2016 From: "codelutin.com scm" To: observe-commits@list.forge.codelutin.com Subject: [Observe-commits] 01/10: =?utf-8?q?Cr=C3=A9e?= le composant BeanTreeHeader visant =?utf-8?q?=C3=A0?= offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur Date: Tue, 23 Aug 2016 15:22:25 +0200 Message-ID: <20160823132225.33A7D5C3569@goh.codelutin.com> In-Reply-To: <20160823132224.16936.85388@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0252947112925705426==" --===============0252947112925705426== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in reposit= ory observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c96b601134811f93539b6fcaf676d105be93dd7a Author: Samuel Maisonneuve Date: Sun Aug 21 23:45:16 2016 +0200 Cr=C3=A9e le composant BeanTreeHeader visant =C3=A0 offrir un group d'act= ions facilitant l'utilisation des composants arbre par l'utilisateur =20 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/t= ree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/obse= rve/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/Bea= nTreeHeader.jaxx @@ -0,0 +1,50 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/t= ree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/obse= rve/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/Bea= nTreeHeader.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 + * . + * #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/t= ree/BeanTreeHeaderHandler.java b/observe-application-swing/src/main/java/fr/i= rd/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/Bea= nTreeHeaderHandler.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. + *=20 + * 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. + *=20 + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * . + * #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 =3D LogFactory.getLog(BeanTreeHeaderHandler= .class); + + private final BeanTreeHeader ui; + + public BeanTreeHeaderHandler(BeanTreeHeader ui) { + this.ui =3D ui; + } + + public void initUI() { + + } + +} diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic= ation-swing_en_GB.properties b/observe-application-swing/src/main/resources/i= 18n/observe-application-swing_en_GB.properties index 7ccf536..37f022f 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-s= wing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-s= wing_en_GB.properties @@ -340,6 +340,7 @@ observe.admin.resume.operation.failed=3D observe.admin.resume.operation.need.fix=3D observe.admin.resume.operation.not.started=3D observe.admin.resume.operation.running=3D +observe.application.config=3DObServe Configuration observe.catchAcquisitionModeEnum.GROUPED=3DBatch observe.catchAcquisitionModeEnum.INDIVIDUAL=3DIndividual observe.choice.cancel=3DCancel @@ -602,7 +603,6 @@ observe.config.map.layer7.description=3D observe.config.map.layer8.description=3D observe.config.map.layer9.description=3D observe.config.map.style.description=3D -observe.config.name=3D observe.config.observation.activitysDetaillees=3D observe.config.observation.fauneAssociee=3D observe.config.observation.floatingObject=3D @@ -639,6 +639,7 @@ observe.config.ui.showNumberEditorButton=3DFlag sets to t= rue to show button to inv observe.config.ui.showTimeEditorSlider=3DShow timer slider observe.config.ui.storeRemoteStorage=3DFlag sets to true to store in config = a remote connexion (except passwords) observe.config.ui.treeOpenNodes=3D +observe.configuration.description=3D observe.content.action.activity=3DCreate a new activity observe.content.action.activity.tip=3DCreate a new activity observe.content.action.baitHaulingStatus.create.tip=3D @@ -2116,10 +2117,10 @@ observe.title.storage.info=3DStorage details observe.title.technical.informations=3DTechnical information of %1$s observe.title.unique.key=3DUnique keys used in a referentiel observe.title.welcome.admin=3DObserve Admin -observe.tree.action.collapseAll.tip=3D -observe.tree.action.expandAll.tip=3D -observe.tree.action.selectAll.tip=3D -observe.tree.action.unselectAll.tip=3D +observe.tree.action.collapseAll.tip=3DCollapse all +observe.tree.action.deselectAll.tip=3DDeselect All +observe.tree.action.expandAll.tip=3DExpand all +observe.tree.action.selectAll.tip=3DSelect All observe.tree.activityLongline=3DActivity observe.tree.activityLongline.unsaved=3DNew activity observe.tree.activitySeine=3DActivity diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic= ation-swing_es_ES.properties b/observe-application-swing/src/main/resources/i= 18n/observe-application-swing_es_ES.properties index 35fc99f..27110cd 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-s= wing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-s= wing_es_ES.properties @@ -340,6 +340,7 @@ observe.admin.resume.operation.failed=3Dla operaci=C3=B3n= no realizada observe.admin.resume.operation.need.fix=3Dla operaci=C3=B3n nesista correcci= ones observe.admin.resume.operation.not.started=3Doperaci=C3=B3n no empezada observe.admin.resume.operation.running=3Doperaci=C3=B3n en curso... +observe.config.name=3DConfiguraci=C3=B3n de ObServe observe.catchAcquisitionModeEnum.GROUPED=3D observe.catchAcquisitionModeEnum.INDIVIDUAL=3D observe.choice.cancel=3DCancelar @@ -602,7 +603,6 @@ observe.config.map.layer7.description=3D observe.config.map.layer8.description=3D observe.config.map.layer9.description=3D observe.config.map.style.description=3D -observe.config.name=3D observe.config.observation.activitysDetaillees=3DObservaci=C3=B3n de activid= ades detalladas observe.config.observation.fauneAssociee=3DObservaci=C3=B3n de Fauna asociada observe.config.observation.floatingObject=3DObservaci=C3=B3n de objetos flot= antes @@ -639,6 +639,7 @@ observe.config.ui.showNumberEditorButton=3DPara mostrar e= l bot=C3=B3n que permite usar observe.config.ui.showTimeEditorSlider=3D observe.config.ui.storeRemoteStorage=3DPara activar la copia de seguridad de= la configuraci=C3=B3n del origen de datos remota observe.config.ui.treeOpenNodes=3D +observe.configuration.description=3D observe.content.action.activity=3DCrear una nueva actividad observe.content.action.activity.tip=3DCrear una nueva actividad para la ruta= actual observe.content.action.baitHaulingStatus.create.tip=3D @@ -2116,10 +2117,10 @@ observe.title.storage.info=3D observe.title.technical.informations=3D observe.title.unique.key=3D observe.title.welcome.admin=3D -observe.tree.action.collapseAll.tip=3D -observe.tree.action.expandAll.tip=3D -observe.tree.action.selectAll.tip=3D -observe.tree.action.unselectAll.tip=3D +observe.tree.action.collapseAll.tip=3DCerrar los nudos +observe.tree.action.deselectAll.tip=3DDeseleccionar todo +observe.tree.action.expandAll.tip=3DAbrir los nudos +observe.tree.action.selectAll.tip=3DSeleccionar todo observe.tree.activityLongline=3DActividad observe.tree.activityLongline.unsaved=3DNueva actividad observe.tree.activitySeine=3DActividad diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic= ation-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i= 18n/observe-application-swing_fr_FR.properties index 5348eda..ef8ba97 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-s= wing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-s= wing_fr_FR.properties @@ -2116,10 +2116,10 @@ observe.title.storage.info=3DInformation sur la sourc= e de donn=C3=A9es observe.title.technical.informations=3DInformations techniques du r=C3=A9f= =C3=A9rentiel %1$s observe.title.unique.key=3DClefs m=C3=A9tier du r=C3=A9f=C3=A9rentiel %1$s observe.title.welcome.admin=3DObserve Administrateur -observe.tree.action.collapseAll.tip=3D -observe.tree.action.expandAll.tip=3D -observe.tree.action.selectAll.tip=3D -observe.tree.action.unselectAll.tip=3D +observe.tree.action.collapseAll.tip=3DTout grouper +observe.tree.action.deselectAll.tip=3DTout d=C3=A9s=C3=A9lectionner +observe.tree.action.expandAll.tip=3DTout d=C3=A9plier +observe.tree.action.selectAll.tip=3DTout s=C3=A9lectionner observe.tree.activityLongline=3DActivit=C3=A9s observe.tree.activityLongline.unsaved=3DNouvelle activit=C3=A9 observe.tree.activitySeine=3DActivit=C3=A9s --=20 To stop receiving notification emails like this one, please contact codelutin.com SCM administrator . --===============0252947112925705426==--