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 3ce195b24f65ec9d7034dd2e7159ec3aff84d8ee 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 33d1d5d..5c95b4a 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 @@ -256,8 +257,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>.