Author: tchemit Date: 2008-01-21 04:41:46 +0000 (Mon, 21 Jan 2008) New Revision: 324 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx Log: suppression des derni?\195?\168res toolbar, int?\195?\169gration toolbar de pagination Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-01-21 01:17:49 UTC (rev 323) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-01-21 04:41:46 UTC (rev 324) @@ -39,11 +39,13 @@ </JMenu> </JMenuBar> - <Table> + <Table insets='0,0,0,0'> <!-- la barre des actions générales --> <row> <cell fill="both"> - <JToolBar id="toolbar" floatable='false'> + <JToolBar id="toolbar" floatable='false' margin='0,0,0,0' + opaque='true' + borderPainted='true'> <fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton id='toggleTab_local' enabled='false'/> <fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton id='toggleTab_remote' enabled='false'/> <fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton id='toggleTab_synchronize' enabled='false'/> Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-01-21 01:17:49 UTC (rev 323) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-01-21 04:41:46 UTC (rev 324) @@ -1,11 +1,14 @@ -<Table> - <script> - import static org.codelutin.i18n.I18n._; - import fr.cemagref.simexplorer.is.ui.swing.toolbar.JApplicationTreeToolbar; - - protected JApplicationTreeToolbar toolbar = new JApplicationTreeToolbar(); - $objectMap.put("toolbar",toolbar); - </script> +<Table> + <row> + <cell fill='both'> + <JToolBar id='toolbar' floatable='false' opaque='false' + margin='0,0,0,0' borderPainted='false'> + <JButton id='collapseAllApplication' enabled='false'/> + <JButton id='expandAllApplication' enabled='false'/> + <JButton id='exportApplication' enabled='false'/> + </JToolBar> + </cell> + </row> <row fill="both" weightx="1" weighty="1"> <cell> <JSplitPane orientation="horizontal" resizeWeight="0.5" oneTouchExpandable='true'> Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-01-21 01:17:49 UTC (rev 323) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-01-21 04:41:46 UTC (rev 324) @@ -1,40 +1,59 @@ <Table> <script> - import static org.codelutin.i18n.I18n._; + import static org.codelutin.i18n.I18n._; </script> <!-- la barre des actions de la liste --> <row> - <cell fill='both'> - <JToolBar id='toolbar' floatable='false'> + <cell fill='horizontal'> + <JToolBar id='toolbar' floatable='false' opaque='false' + borderPainted='false' margin='0,0,0,0'> <JButton id='importApplication' enabled='false' /> - <JLabel text='{_("simexplorer.action.application.searchText")}' visible='false' labelFor='{searchText}'/> + <JLabel text='{_("simexplorer.action.application.searchText")}' + visible='false' labelFor='{searchText}'/> - <JTextField id='searchText' toolTipText='{_("simexplorer.action.application.searchText.tooltip")}'/> + <JTextField id='searchText' + toolTipText='{_("simexplorer.action.application.searchText.tooltip")}'/> <JButton id='searchApplication' enabled='false'/> - <JButton id='resetSearchApplication' enabled='false'/> + <JButton id='advancedSearchApplication' enabled='false'/> - <JButton id='advancedSearchApplication' enabled='false'/> + <JComboBox id='changeSizor' enabled='false' font-size='9' + opaque='false' preferredSize='{new Dimension(50,5)}'> + <item value='5'/> + <item value='10'/> + <item value='20'/> + <item value='50'/> + <item value='100'/> + </JComboBox> </JToolBar> - <!--fr.cemagref.simexplorer.is.ui.swing.toolbar.JApplicationListToolbar id='toolbar'/--> </cell> </row> <row fill='both' weightx='1' weighty='1'> - <cell> + <cell insets='0,0,0,0'> <JScrollPane> - <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationTable id='table'/> + <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationTable + id='table'/> </JScrollPane> </cell> </row> <!-- la barre de pagination de la liste --> <row> - <cell fill='both'> - <JPanel id='pagination'> - <JLabel text='paginationPanel'/> - </JPanel> + <cell anchor='center' insets='0,0,0,0'> + <JToolBar floatable='false' opaque='false' borderPainted='false' + margin='0,0,0,0'> + <JButton id='goFirstPage' enabled='false'/> + <JButton id='goPreviousPage' enabled='false'/> + + <JComboBox id='goPage' enabled='false' font-size='9' + opaque='false' preferredSize='{new Dimension(50,5)}'/> + + <JButton id='goNextPage' enabled='false'/> + <JButton id='goLastPage' enabled='false'/> + + </JToolBar> </cell> </row> </Table> Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx 2008-01-21 01:17:49 UTC (rev 323) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx 2008-01-21 04:41:46 UTC (rev 324) @@ -1,14 +1,15 @@ -<Table> - <script> - import static org.codelutin.i18n.I18n._; - import fr.cemagref.simexplorer.is.ui.swing.toolbar.JApplicationsListToolbar; - - protected JApplicationsListToolbar toolbar = new fr.cemagref.simexplorer.is.ui.swing.toolbar.JApplicationsListToolbar(); - $objectMap.put("toolbar",toolbar); - </script> +<Table> + <row> + <cell fill='both'> + <JToolBar id='toolbar' floatable='false' opaque='false' + margin='0,0,0,0' borderPainted='false'> + <JButton id='launchSynchronize' enabled='false'/> + </JToolBar> + </cell> + </row> <row fill="both" weightx="1" weighty="1"> - <cell> - <JScrollPane columnHeaderView='{toolbar}'> + <cell insets='0,0,0,0'> + <JScrollPane > <JSplitPane orientation="horizontal" resizeWeight="0.5" oneTouchExpandable='true'> <JScrollPane horizontalScrollBarPolicy="horizontal_scrollbar_never"> <fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationsTreePanel id='contentLocal'/>