branch feature/7553_ajoute_un_widget_pour_les_arbres updated (4994349 -> d6f48d4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 4994349 utilisation version stable de ToPIA new d6f48d4 Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur 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 d6f48d4586bc251e3e9fa9606209864d66253a76 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 Summary of changes: .../TripMapUI.jaxx => tree/BeanTreeHeader.jaxx} | 33 ++++++------- .../tree/BeanTreeHeader.jcss} | 57 ++++++++++++++-------- .../tree/BeanTreeHeaderHandler.java} | 35 +++++++------ .../observe-application-swing_en_GB.properties | 4 ++ .../observe-application-swing_es_ES.properties | 4 ++ .../observe-application-swing_fr_FR.properties | 4 ++ 6 files changed, 83 insertions(+), 54 deletions(-) copy observe-application-swing/src/main/java/fr/ird/observe/ui/util/{tripMap/TripMapUI.jaxx => tree/BeanTreeHeader.jaxx} (58%) copy observe-application-swing/src/main/java/fr/ird/observe/ui/{content/table/CommonTable.jcss => util/tree/BeanTreeHeader.jcss} (50%) copy observe-application-swing/src/main/java/fr/ird/observe/ui/{content/ref/impl/GearCaracteristicUI.jcss => util/tree/BeanTreeHeaderHandler.java} (62%) -- 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 feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d6f48d4586bc251e3e9fa9606209864d66253a76 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 | 4 ++ .../observe-application-swing_es_ES.properties | 4 ++ .../observe-application-swing_fr_FR.properties | 4 ++ 6 files changed, 174 insertions(+) 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 75b2e23..99aeeb3 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 @@ -2130,6 +2130,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=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 1afbe82..dc47ddc 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 @@ -2130,6 +2130,10 @@ observe.title.storage.info= observe.title.technical.informations= observe.title.unique.key= observe.title.welcome.admin= +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 e32dfff..d56bf6f 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 @@ -2130,6 +2130,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=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>.
participants (1)
-
codelutin.com scm