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 1ed5b9c02d29405505ad81bebac1db04d70d6860 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 a6a3dbd..96e06b9 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 bd5b92d..836f6b9 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 @@ -2128,9 +2128,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 d28ec1a..2b14faa 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 @@ -2128,9 +2128,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 26c2a39..c13187a 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 @@ -2127,9 +2127,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>.