Author: tchemit Date: 2008-02-12 01:35:04 +0000 (Tue, 12 Feb 2008) New Revision: 851 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx Log: suppression action inutile +mise en place des actions expandAll et collapseAll sur plusieurs arbres avec le m?\195?\170me code de base. le nom de l'action permet de savoir exactement sur quel arbre travailler + mise en place de l'onglet de syncho reste, ?\195?\160 appeler le service et faire le rafraichissement post service Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-12 01:28:41 UTC (rev 850) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-12 01:35:04 UTC (rev 851) @@ -20,8 +20,8 @@ </cell> <cell anchor="east"> <JToolBar> - <JButton id='collapseAll'/> - <JButton id='expandAll'/> + <JButton id='collapseAllDetail'/> + <JButton id='expandAllDetail'/> </JToolBar> </cell> </row> @@ -39,7 +39,7 @@ </cell> <cell anchor="east"> <JToolBar> - <JButton id='synchronizeElement'/> + <JButton id='showTab_synchronize'/> <JButton id='exportElement'/> <JButton id='downloadElement'/> <JButton id='deleteElement'/> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx 2008-02-12 01:28:41 UTC (rev 850) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx 2008-02-12 01:35:04 UTC (rev 851) @@ -7,7 +7,7 @@ <row> <cell fill='horizontal' insets='0,0,0,0'> <JPopupMenu id="tablePopupMenu" invoker='{table}' enabled='false'> - <JMenuItem id='synchronizeElement'/> + <JMenuItem id='showTab_synchronize'/> <JMenuItem id='exportElement'/> <JMenuItem id='downloadElement'/> <JMenuItem id='deleteElement'/> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx 2008-02-12 01:28:41 UTC (rev 850) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx 2008-02-12 01:35:04 UTC (rev 851) @@ -1,4 +1,4 @@ -<Table> +<Table insets='0,0,0,0'> <style source="common.css"/> <style> .border { @@ -8,14 +8,17 @@ </style> <script> import static org.codelutin.i18n.I18n._; + import static jaxx.runtime.UIHelper.createImageIcon; </script> <row> <cell> <Table id='toolbarNavigationLocal' styleClass='border' insets='0,0,0,0'> <row> - <cell weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='navigationHeaderLocal' text='{_("simexplorer.node.navigation")}'/> + <cell anchor='west' weightx="1" fill='horizontal'> + <JPanel> + <JLabel id='navigationHeaderLocal' + icon='{createImageIcon("action/local.png")}' + text='{_("simexplorer.node.navigation.local")}'/> </JPanel> </cell> <cell anchor="east"> @@ -32,9 +35,11 @@ <cell> <Table id='toolbarNavigationRemote' styleClass='border' insets='0,0,0,0'> <row> - <cell weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='navigationHeaderRemote' text='{_("simexplorer.node.navigation")}'/> + <cell anchor='west' weightx="1" fill='horizontal'> + <JPanel> + <JLabel id='navigationHeaderRemote' + icon='{createImageIcon("action/remote.png")}' + text='{_("simexplorer.node.navigation.remote")}'/> </JPanel> </cell> <cell anchor="east"> @@ -47,20 +52,38 @@ </Table> </cell> </row> - <row fill="both" weightx="1" weighty="1"> - <cell insets='0,0,0,0'> - <JScrollPane columnHeaderView='{toolbarNavigationLocal}'> + <row fill="both"> + <cell weightx="1" weighty="1"> + <JScrollPane columnHeaderView='{toolbarNavigationLocal}' horizontalScrollBarPolicy='horizontal_scrollbar_always' verticalScrollBarPolicy='vertical_scrollbar_always'> <JTree id='contentTreeLocal' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> </JScrollPane> </cell> - <cell fill='vertical' insets='0,0,0,0'> - <JToolBar> - <JButton id='exportElementToRemote'/> - <JButton id='exportElementToLocale'/> - </JToolBar> + <cell fill='vertical'> + <Table> + <row fill='both' weightx="1" weighty="1"> + <cell> + <JPanel/> + </cell> + </row> + <row> + <cell> + <JPanel> + <JToolBar orientation='{JToolBar.VERTICAL}'> + <JButton id='exportElementToRemote'/> + <JButton id='exportElementToLocal'/> + </JToolBar> + </JPanel> + </cell> + </row> + <row fill='both' weightx="1" weighty="1"> + <cell> + <JPanel/> + </cell> + </row> + </Table> </cell> - <cell insets='0,0,0,0' weightx="1" weighty="1"> - <JScrollPane columnHeaderView='{toolbarNavigationRemote}'> + <cell weightx="1" weighty="1"> + <JScrollPane columnHeaderView='{toolbarNavigationRemote}' horizontalScrollBarPolicy='horizontal_scrollbar_always' verticalScrollBarPolicy='vertical_scrollbar_always'> <JTree id='contentTreeRemote' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> </JScrollPane> </cell>