branch feature/7553_ajoute_un_widget_pour_les_arbres updated (6cc7137 -> ceac497)
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 omits 6cc7137 Add tree header in other places in application omits 1dc22bc Rename tree header id omits 396fd07 Be able to show or not actions (fold or select) of the tree header omits 2e10ca6 Optimize css omits b9d55aa merge i18n omits 69b37f6 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' omits 8b2e0c5 Ajoute le BeanTreeHeader au panneau de sélection des données omits c3f84f9 Ajoute des icones sur les boutons du BeanTreeHeader omits 80c8169 Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler omits 168834f Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur adds 564cc54 optimize dependencies (bis) new c96b601 Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur new a1edb9b Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler new e73f1bb Ajoute des icones sur les boutons du BeanTreeHeader new 654b8a6 Ajoute le BeanTreeHeader au panneau de sélection des données new b3fb781 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' new 24dad06 merge i18n new 408b37e Optimize css new abffbce Be able to show or not actions (fold or select) of the tree header new 1b3452f Rename tree header id new ceac497 Add tree header in other places in application This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6cc7137) \ N -- N -- N refs/heads/feature/7553_ajoute_un_widget_pour_les_arbres (ceac497) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 10 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 ceac497490e48eb3b71ca05f99df16142ec5c0c1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 13:11:51 2016 +0200 Add tree header in other places in application commit 1b3452f2f6dce263de8a7e59dd1f6fe2e12f3b7d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:55:38 2016 +0200 Rename tree header id commit abffbce9bb8463d3897c54fd383a75a15fa985c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:45:40 2016 +0200 Be able to show or not actions (fold or select) of the tree header commit 408b37e0e8dfa826a8af4577fc116ea996b5f5e7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:32:24 2016 +0200 Optimize css commit 24dad0694c1ae293d75a4eed0e1dc2ee0216117e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:32:11 2016 +0200 merge i18n commit b3fb7819005a95cf77b04d808e9b747fc395bdbd Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Aug 23 10:14:52 2016 +0200 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' refs #7553 commit 654b8a626edd0a40a7a0e9439cf68887cab3d0c1 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 23:24:52 2016 +0200 Ajoute le BeanTreeHeader au panneau de sélection des données commit e73f1bb01d4640f8b1a1a2015107e7e5ece0862d Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 23:20:15 2016 +0200 Ajoute des icones sur les boutons du BeanTreeHeader refs #7553 commit a1edb9b471073a8b2996f57bd49e914cb4d0cb3d Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 20:10:11 2016 +0200 Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler refs #7553 commit c96b601134811f93539b6fcaf676d105be93dd7a 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: observe-services-topia-validation/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) -- 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 a1edb9b471073a8b2996f57bd49e914cb4d0cb3d Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 20:10:11 2016 +0200 Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler refs #7553 --- observe-application-swing/pom.xml | 1 + .../ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 24 +++----- .../ui/util/tree/BeanTreeHeaderHandler.java | 68 ++++++++++++++++++++-- 3 files changed, 71 insertions(+), 22 deletions(-) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index ed97561..56611b8 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -52,6 +52,7 @@ ${project.basedir}/src/main/java/fr/ird/observe/ui/ObserveCommon.jcss </jaxx.commonCss> <jaxx.cssExtension>jcss</jaxx.cssExtension> + <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> <!-- main class in JAR --> <maven.jar.main.class>fr.ird.observe.ObserveAdminCLI</maven.jar.main.class> 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 index 6110ef1..4cf27ed 100644 --- 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 @@ -19,31 +19,21 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JPanel id="beanTreeHeader" - layout='{new BorderLayout()}'> +<JPanel layout='{new BorderLayout()}'> - <BeanTreeHeaderHandler id='handler' constructorParams='this'/> - - <script><![CDATA[ - -void $afterCompleteSetup() { - getHandler().initUI(); -} - -]]> - </script> + <JTree id='tree' javaBean='new JTree()'/> <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'/> + <JButton id='colapseAll' onActionPerformed='handler.collapseAll()'/> + <JButton id='expandAll' onActionPerformed='handler.expandAll()'/> - <!-- les boutons pour sélectionner/déselctionner tout l'arbre --> - <JButton id='selectAll'/> - <JButton id='deselectAll'/> + <!-- les boutons pour sélectionner/déselectionner tout l'arbre --> + <JButton id='selectAll' onActionPerformed='handler.selectAll()'/> + <JButton id='deselectAll' onActionPerformed='handler.deselectAll()'/> </JToolBar> 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 index e9d09a4..5dc51b8 100644 --- 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 @@ -22,24 +22,82 @@ package fr.ird.observe.ui.util.tree; * #L% */ +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JTree; +import javax.swing.tree.TreePath; +import javax.swing.tree.TreeSelectionModel; + /** * @author Samuel Maisonneuve- maisonneuve@codelutin.com */ -public class BeanTreeHeaderHandler { +public class BeanTreeHeaderHandler implements UIHandler<BeanTreeHeader> { private static final Log log = LogFactory.getLog(BeanTreeHeaderHandler.class); - private final BeanTreeHeader ui; + public BeanTreeHeader getUi() { + return ui; + } + + private BeanTreeHeader ui; + + private JTree getTree() { + return getUi().getTree(); + } + + @Override + public void beforeInit(BeanTreeHeader beanTreeHeader) { + this.ui = beanTreeHeader; + } + + @Override + public void afterInit(BeanTreeHeader beanTreeHeader) {} - public BeanTreeHeaderHandler(BeanTreeHeader ui) { - this.ui = ui; + public void collapseAll() { + // Let's deselect the nodes before collapsing them + deselectAll(); + + JTree tree = getTree(); + for (int i = 0; i < tree.getRowCount(); i++) { + tree.collapseRow(i); + } + } + + public void expandAll() { + JTree tree = getTree(); + for (int i = 0; i < tree.getRowCount(); i++) { + tree.expandRow(i); + } } - public void initUI() { + public void selectAll() { + // To be selected, nodes need to be expanded + expandAll(); + + JTree tree = getTree(); + TreeSelectionModel selectionModel = tree.getSelectionModel(); + for (int i = 0, l = tree.getRowCount(); i < l; i++) { + + TreePath path = tree.getPathForRow(i); + if (!selectionModel.isPathSelected(path)) { + tree.setSelectionPath(path); + } + } } + public void deselectAll() { + JTree tree = getTree(); + TreeSelectionModel selectionModel = tree.getSelectionModel(); + + for (int i = 0, l = tree.getRowCount(); i < l; i++) { + + TreePath path = tree.getPathForRow(i); + if (selectionModel.isPathSelected(path)) { + tree.setSelectionPath(path); + } + } + } } -- 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 e73f1bb01d4640f8b1a1a2015107e7e5ece0862d Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 23:20:15 2016 +0200 Ajoute des icones sur les boutons du BeanTreeHeader refs #7553 --- .../src/main/filters/observe-ui.properties | 5 +++++ .../java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 2 +- .../java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss | 12 ++++++------ .../ird/observe/ui/util/tree/BeanTreeHeaderHandler.java | 6 +++--- .../i18n/observe-application-swing_en_GB.properties | 2 +- .../i18n/observe-application-swing_es_ES.properties | 2 +- .../i18n/observe-application-swing_fr_FR.properties | 2 +- .../src/main/resources/icons/action-collapse.png | Bin 0 -> 372 bytes .../src/main/resources/icons/action-expand.png | Bin 0 -> 371 bytes .../src/main/resources/icons/action-select.png | Bin 0 -> 392 bytes .../src/main/resources/icons/action-unselect.png | Bin 0 -> 311 bytes 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/observe-application-swing/src/main/filters/observe-ui.properties b/observe-application-swing/src/main/filters/observe-ui.properties index 84c9f1c..308e53a 100644 --- a/observe-application-swing/src/main/filters/observe-ui.properties +++ b/observe-application-swing/src/main/filters/observe-ui.properties @@ -190,6 +190,11 @@ icon.action.generate=action-generate.png icon.action.insert-before=action-insert-before.png icon.action.insert-after=action-insert-after.png +icon.action.expand=action-expand.png +icon.action.collapse=action-collapse.png +icon.action.select=action-select.png +icon.action.unselect=action-unselect.png + icon.action.wizard-state-pending=action-wizard-state-pending-16.png icon.action.wizard-state-running=action-wizard-state-running-16.png icon.action.wizard-state-need_fix=action-wizard-state-need_fix-16.png 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 index 4cf27ed..4579ce1 100644 --- 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 @@ -33,7 +33,7 @@ <!-- les boutons pour sélectionner/déselectionner tout l'arbre --> <JButton id='selectAll' onActionPerformed='handler.selectAll()'/> - <JButton id='deselectAll' onActionPerformed='handler.deselectAll()'/> + <JButton id='unselectAll' onActionPerformed='handler.unselectAll()'/> </JToolBar> 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 index 8b8c11d..06d1a49 100644 --- 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 @@ -31,7 +31,7 @@ } #colapseAll { - actionIcon:"combobox-reset"; + actionIcon:"collapse"; toolTipText:"observe.tree.action.collapseAll.tip"; focusable:false; focusPainted:false; @@ -40,7 +40,7 @@ } #expandAll { - actionIcon:"add"; + actionIcon:"expand"; toolTipText:"observe.tree.action.expandAll.tip"; focusable:false; focusPainted:false; @@ -49,7 +49,7 @@ } #selectAll { - actionIcon:"add"; + actionIcon:"select"; toolTipText:"observe.tree.action.selectAll.tip"; focusable:false; focusPainted:false; @@ -57,9 +57,9 @@ enabled:{true}; } -#deselectAll { - actionIcon:"combobox-reset"; - toolTipText:"observe.tree.action.deselectAll.tip"; +#unselectAll { + actionIcon:"unselect"; + toolTipText:"observe.tree.action.unselectAll.tip"; focusable:false; focusPainted:false; visible:{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 index 5dc51b8..97016be 100644 --- 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 @@ -56,8 +56,8 @@ public class BeanTreeHeaderHandler implements UIHandler<BeanTreeHeader> { public void afterInit(BeanTreeHeader beanTreeHeader) {} public void collapseAll() { - // Let's deselect the nodes before collapsing them - deselectAll(); + // Let's unselect the nodes before collapsing them + unselectAll(); JTree tree = getTree(); for (int i = 0; i < tree.getRowCount(); i++) { @@ -88,7 +88,7 @@ public class BeanTreeHeaderHandler implements UIHandler<BeanTreeHeader> { } } - public void deselectAll() { + public void unselectAll() { JTree tree = getTree(); TreeSelectionModel selectionModel = tree.getSelectionModel(); 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 37f022f..0f60c6e 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 @@ -2118,9 +2118,9 @@ 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.action.unselectAll.tip=Unselect 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 27110cd..2732801 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 @@ -2118,9 +2118,9 @@ 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.action.unselectAll.tip=Deseleccionar 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 ef8ba97..3ebf942 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 @@ -2117,9 +2117,9 @@ observe.title.technical.informations=Informations techniques du référentiel %1 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.action.unselectAll.tip=Tout désélectionner observe.tree.activityLongline=Activités observe.tree.activityLongline.unsaved=Nouvelle activité observe.tree.activitySeine=Activités diff --git a/observe-application-swing/src/main/resources/icons/action-collapse.png b/observe-application-swing/src/main/resources/icons/action-collapse.png new file mode 100644 index 0000000..f88a24a Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-collapse.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-expand.png b/observe-application-swing/src/main/resources/icons/action-expand.png new file mode 100644 index 0000000..3c19e48 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-expand.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-select.png b/observe-application-swing/src/main/resources/icons/action-select.png new file mode 100644 index 0000000..bbee129 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-select.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-unselect.png b/observe-application-swing/src/main/resources/icons/action-unselect.png new file mode 100644 index 0000000..3b49008 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-unselect.png differ -- 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 654b8a626edd0a40a7a0e9439cf68887cab3d0c1 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 23:24:52 2016 +0200 Ajoute le BeanTreeHeader au panneau de sélection des données --- .../main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx index d6e5b71..cfe9a52 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx @@ -35,6 +35,8 @@ fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel fr.ird.observe.ui.storage.tabs.DataSelectionModel + fr.ird.observe.ui.util.tree.BeanTreeHeader + jaxx.runtime.SwingUtil javax.swing.tree.TreeSelectionModel @@ -76,11 +78,15 @@ public void destroy() { <JPanel id='PENDING_content'> <JScrollPane id='selectTreePane' constraints='BorderLayout.CENTER' - decorator='boxed'> + decorator='boxed' columnHeaderView='{treeHeader}'> <!-- arbre de selection des exports --> <JTree id='selectTree'/> + + <BeanTreeHeader id='treeHeader' tree='{selectTree}'/> + </JScrollPane> + </JPanel> -- 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 b3fb7819005a95cf77b04d808e9b747fc395bdbd Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Aug 23 10:14:52 2016 +0200 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' refs #7553 --- .../src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 4 ++++ .../src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 index 4579ce1..9419d8e 100644 --- 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 @@ -21,8 +21,12 @@ --> <JPanel layout='{new BorderLayout()}'> + <!-- label --> + <String id='labelText' javaBean='null'/> + <!-- tree --> <JTree id='tree' javaBean='new JTree()'/> + <JLabel id="label" constraints='BorderLayout.CENTER'/> <JToolBar id='toolbar' constraints='BorderLayout.EAST'> 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 index 06d1a49..3b253f6 100644 --- 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 @@ -22,7 +22,7 @@ #label { opaque:false; - text:{""}; + text:{SwingUtil.getStringValue(getLabelText())}; } #toolbar { -- 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 24dad0694c1ae293d75a4eed0e1dc2ee0216117e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:32:11 2016 +0200 merge i18n --- .../src/main/resources/i18n/observe-application-swing_en_GB.properties | 1 + .../src/main/resources/i18n/observe-application-swing_es_ES.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 0f60c6e..c41c73c 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 @@ -603,6 +603,7 @@ 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= 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 2732801..9aed392 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 @@ -340,7 +340,6 @@ 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 @@ -603,6 +602,7 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= +observe.config.name=Configuración de ObServe 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 -- 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 408b37e0e8dfa826a8af4577fc116ea996b5f5e7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:32:24 2016 +0200 Optimize css --- .../ird/observe/ui/util/tree/BeanTreeHeader.jcss | 35 +++++++--------------- 1 file changed, 10 insertions(+), 25 deletions(-) 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 index 3b253f6..46d0bdf 100644 --- 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 @@ -21,47 +21,32 @@ */ #label { - opaque:false; - text:{SwingUtil.getStringValue(getLabelText())}; + text:{getLabelText()}; } -#toolbar { - floatable:false; - borderPainted:false; +JButton { + focusable:false; + focusPainted:false; + visible:true; + enabled:true; } #colapseAll { - actionIcon:"collapse"; + actionIcon:collapse; toolTipText:"observe.tree.action.collapseAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } #expandAll { - actionIcon:"expand"; + actionIcon:expand; toolTipText:"observe.tree.action.expandAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } #selectAll { - actionIcon:"select"; + actionIcon:select; toolTipText:"observe.tree.action.selectAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } #unselectAll { - actionIcon:"unselect"; + actionIcon:unselect; toolTipText:"observe.tree.action.unselectAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } -- 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 abffbce9bb8463d3897c54fd383a75a15fa985c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:45:40 2016 +0200 Be able to show or not actions (fold or select) of the tree header --- .../main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 11 +++++++---- .../main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss | 10 ++++++++-- 2 files changed, 15 insertions(+), 6 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 index 9419d8e..eb502c5 100644 --- 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 @@ -23,6 +23,9 @@ <!-- label --> <String id='labelText' javaBean='null'/> + <Boolean id='showFoldActions' javaBean='true'/> + <Boolean id='showSelectActions' javaBean='true'/> + <!-- tree --> <JTree id='tree' javaBean='new JTree()'/> @@ -32,12 +35,12 @@ <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <!-- les boutons pour grouper/déplier tout l'arbre --> - <JButton id='colapseAll' onActionPerformed='handler.collapseAll()'/> - <JButton id='expandAll' onActionPerformed='handler.expandAll()'/> + <JButton id='colapseAll' styleClass='showFoldActions' onActionPerformed='handler.collapseAll()'/> + <JButton id='expandAll' styleClass='showFoldActions' onActionPerformed='handler.expandAll()'/> <!-- les boutons pour sélectionner/déselectionner tout l'arbre --> - <JButton id='selectAll' onActionPerformed='handler.selectAll()'/> - <JButton id='unselectAll' onActionPerformed='handler.unselectAll()'/> + <JButton id='selectAll' styleClass='showSelectActions' onActionPerformed='handler.selectAll()'/> + <JButton id='unselectAll' styleClass='showSelectActions' onActionPerformed='handler.unselectAll()'/> </JToolBar> 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 index 46d0bdf..267aee1 100644 --- 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 @@ -27,8 +27,14 @@ JButton { focusable:false; focusPainted:false; - visible:true; - enabled:true; +} + +.showFoldActions { + visible:{isShowFoldActions()}; +} + +.showSelectActions { + visible:{isShowSelectActions()}; } #colapseAll { -- 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 1b3452f2f6dce263de8a7e59dd1f6fe2e12f3b7d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:55:38 2016 +0200 Rename tree header id --- .../src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx index cfe9a52..ab0da89 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx @@ -78,12 +78,12 @@ public void destroy() { <JPanel id='PENDING_content'> <JScrollPane id='selectTreePane' constraints='BorderLayout.CENTER' - decorator='boxed' columnHeaderView='{treeHeader}'> + decorator='boxed' columnHeaderView='{selectTreeHeader}'> <!-- arbre de selection des exports --> <JTree id='selectTree'/> - <BeanTreeHeader id='treeHeader' tree='{selectTree}'/> + <BeanTreeHeader id='selectTreeHeader' tree='{selectTree}'/> </JScrollPane> -- 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 ceac497490e48eb3b71ca05f99df16142ec5c0c1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 13:11:51 2016 +0200 Add tree header in other places in application --- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 4 +++- .../main/java/fr/ird/observe/ui/ObserveMainUI.jcss | 24 +++++++++++++--------- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 7 +++++-- .../referential/ng/ReferentialSynchroUI.jaxx | 7 +++++-- 4 files changed, 27 insertions(+), 15 deletions(-) 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 4aad01d..53bcefc 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 @@ -46,6 +46,7 @@ fr.ird.observe.ui.content.ContentUIManager fr.ird.observe.ui.tree.ObserveTreeHelper fr.ird.observe.ui.tree.NavigationTreeCellRenderer + fr.ird.observe.ui.util.tree.BeanTreeHeader jaxx.runtime.swing.CardLayout2 jaxx.runtime.swing.CardLayout2Ext @@ -255,8 +256,9 @@ void $afterCompleteSetup() { <!-- left : navigation --> <JXTitledPanel id='navigationView'> - <JScrollPane id='navigationScrollPane'> + <JScrollPane id='navigationScrollPane' columnHeaderView='{navigationTreeHeader}'> <JTree id="navigation"/> + <BeanTreeHeader id='navigationTreeHeader' tree='{navigation}'/> </JScrollPane> </JXTitledPanel> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss index d9bed5c..1acfc0b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss @@ -361,16 +361,6 @@ JSplitPane { acceptedComponentNames: {UIHelper.ACCEPTABLE_COMPONENTS}; } -#navigation { - rootVisible: false; - largeModel: true; - minimumSize: {UIHelper.newMinDimension()}; - font-size:11; - model: {getTreeHelper().getModel()}; - selectionModel: {getTreeHelper().newNavigationSelectionModel()}; - cellRenderer: {new NavigationTreeCellRenderer()}; -} - #splitpane { orientation: {JSplitPane.HORIZONTAL_SPLIT}; resizeWeight: 1.0; @@ -389,6 +379,20 @@ JSplitPane { title: "observe.view.navigation"; } +#navigation { + rootVisible: false; + largeModel: true; + minimumSize: {UIHelper.newMinDimension()}; + font-size:11; + model: {getTreeHelper().getModel()}; + selectionModel: {getTreeHelper().newNavigationSelectionModel()}; + cellRenderer: {new NavigationTreeCellRenderer()}; +} + +#navigationTreeHeader { + showSelectActions: false; +} + #messageView { title: "observe.view.message"; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx index 014ed8c..b7222a5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx @@ -34,6 +34,7 @@ fr.ird.observe.ui.tree.DataSelectionTreeCellRenderer fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel fr.ird.observe.ui.storage.tabs.DataSelectionModel + fr.ird.observe.ui.util.tree.BeanTreeHeader jaxx.runtime.SwingUtil @@ -94,8 +95,9 @@ public void destroy() { <Table id='contentNorth' fill="both" weighty="1"> <row> <cell weightx="0.45"> - <JScrollPane id='leftTreePane' decorator='boxed'> + <JScrollPane id='leftTreePane' decorator='boxed' columnHeaderView='{leftTreeHeader}'> <JTree id='leftTree'/> + <BeanTreeHeader id='leftTreeHeader' tree='{leftTree}'/> </JScrollPane> </cell> <cell weightx="0.1"> @@ -109,8 +111,9 @@ public void destroy() { </JPanel> </cell> <cell weightx="0.45"> - <JScrollPane id='rightTreePane' decorator='boxed'> + <JScrollPane id='rightTreePane' decorator='boxed' columnHeaderView='{rightTreeHeader}'> <JTree id='rightTree'/> + <BeanTreeHeader id='rightTreeHeader' tree='{rightTree}'/> </JScrollPane> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx index 2c08573..28296b9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx @@ -39,6 +39,7 @@ fr.ird.observe.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel fr.ird.observe.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeCellRenderer fr.ird.observe.ui.tree.ObserveTreeHelper + fr.ird.observe.ui.util.tree.BeanTreeHeader javax.swing.ListSelectionModel @@ -92,8 +93,9 @@ public void destroy() { <Table id='contentNorth' fill="both" weighty="1"> <row> <cell weightx="0.5"> - <JScrollPane id='leftTreePane'> + <JScrollPane id='leftTreePane' columnHeaderView='{leftTreeHeader}'> <JTree id='leftTree'/> + <BeanTreeHeader id='leftTreeHeader' tree='{leftTree}'/> </JScrollPane> </cell> <cell> @@ -115,8 +117,9 @@ public void destroy() { </JPanel> </cell> <cell weightx="0.5"> - <JScrollPane id='rightTreePane'> + <JScrollPane id='rightTreePane' columnHeaderView='{rightTreeHeader}'> <JTree id='rightTree'/> + <BeanTreeHeader id='rightTreeHeader' tree='{rightTree}'/> </JScrollPane> </cell> </row> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm