February 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r775 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 23:42:07 +0000 (Fri, 08 Feb 2008) New Revision: 775 Removed: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css Log: inline css Deleted: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css 2008-02-08 23:41:53 UTC (rev 774) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css 2008-02-08 23:42:07 UTC (rev 775) @@ -1,4 +0,0 @@ -.border { - border:{javax.swing.border.LineBorder.createBlackLineBorder()}; - height:28; -}

1 0

r774 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 23:41:53 +0000 (Fri, 08 Feb 2008) New Revision: 774 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: inline css 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-02-08 23:28:40 UTC (rev 773) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-08 23:41:53 UTC (rev 774) @@ -1,6 +1,11 @@ <Table> <style source="/../common.css"/> - <style source="detailTab.css"/> + <style> + .border { + border:{javax.swing.border.LineBorder.createBlackLineBorder()}; + height:28; + } + </style> <script> import static org.codelutin.i18n.I18n._; </script>

1 0

r773 - trunk/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 23:28:40 +0000 (Fri, 08 Feb 2008) New Revision: 773 Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: suppression clef Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-08 23:28:26 UTC (rev 772) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-08 23:28:40 UTC (rev 773) @@ -33,7 +33,6 @@ simexplorer.action.application.search=search simexplorer.action.application.search.help= simexplorer.action.application.search.tooltip=Launch search -simexplorer.action.application.searchText=search text \: simexplorer.action.application.searchText.tooltip=Text to search in applications simexplorer.action.changeVersion.tooltip=Choose another version simexplorer.action.closeTab=close Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-08 23:28:26 UTC (rev 772) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-08 23:28:40 UTC (rev 773) @@ -33,7 +33,6 @@ simexplorer.action.application.search=chercher simexplorer.action.application.search.help= simexplorer.action.application.search.tooltip=Lancer la recherche -simexplorer.action.application.searchText=recherche \: simexplorer.action.application.searchText.tooltip=Le texte de recherche simexplorer.action.changeVersion.tooltip=Choisir une autre version simexplorer.action.closeTab=Fermer

1 0

r772 - in trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing: . tab
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 23:28:26 +0000 (Fri, 08 Feb 2008) New Revision: 772 Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/common.css Removed: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/mainUI.css 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 trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css Log: utilisation css commune 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-02-08 21:52:00 UTC (rev 771) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-02-08 23:28:26 UTC (rev 772) @@ -1,11 +1,10 @@ <JFrame name="mainFrame" title='{_("simexplorer.main.ui.title")}' defaultCloseOperation='DISPOSE_ON_CLOSE' width='700' height='536'> - <style source="mainUI.css"/> + <style source="/common.css"/> <script> import static org.codelutin.i18n.I18n._; import static jaxx.runtime.UIHelper.createImageIcon; </script> - <JMenuBar>  <JMenu text='{_("simexplorer.main.menu")}' mnemonic="{'M'}"> @@ -16,7 +15,7 @@ <JMenuItem id="showTab_remote"/> <JMenuItem id="showTab_synchronize"/> <JSeparator/> - <JMenuItem id="quit" enabled='false' /> + <JMenuItem id="quit"/> </JMenu>  <JMenu text='{_("simexplorer.config.menu")}' mnemonic="{'C'}"> @@ -30,16 +29,15 @@  <JMenu text='{_("simexplorer.help.menu")}' mnemonic="{'e'}"> <JMenuItem id="help"/> - <JMenuItem id="site" /> + <JMenuItem id="site"/> <JMenuItem id="about"/> </JMenu> </JMenuBar> - <Table insets='0,0,0,0'>  <row> - <cell fill="both"> - <JToolBar id="toolbar"> + <cell fill="horizontal"> + <JToolBar borderPainted='true'> <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_local'/> <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_remote'/> <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_synchronize'/> Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/common.css =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/common.css (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/common.css 2008-02-08 23:28:26 UTC (rev 772) @@ -0,0 +1,26 @@ +JToolBar { + floatable:false; + focusable:false; + opaque:false; + margin:0; + borderPainted:false; +} + +JButton { + opaque:false; + borderPainted:false; + enabled:false; +} + +JAXXToggleButton { + enabled:false; + focusPainted:false; +} + +JMenuItem { + enabled:false; +} + +JMenu { + enabled:true; +} Deleted: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/mainUI.css =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/mainUI.css 2008-02-08 21:52:00 UTC (rev 771) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/mainUI.css 2008-02-08 23:28:26 UTC (rev 772) @@ -1,18 +0,0 @@ -JToolBar { - floatable:false; - focusable:false; - opaque:false; - margin:0; - borderPainted:false; -} -JAXXToggleButton { - enabled:false; - focusPainted:false; -} -JMenuItem { - enabled:false; -} -JMenu { - enabled:true; -} - 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-02-08 21:52:00 UTC (rev 771) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-08 23:28:26 UTC (rev 772) @@ -1,4 +1,5 @@ <Table> + <style source="/../common.css"/> <style source="detailTab.css"/> <script> import static org.codelutin.i18n.I18n._; 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-02-08 21:52:00 UTC (rev 771) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-02-08 23:28:26 UTC (rev 772) @@ -1,27 +1,18 @@ <Table> + <style source="/../common.css"/> <script> import static org.codelutin.i18n.I18n._; </script>  <row> - <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}'/> - - <JTextField id='searchText' - toolTipText='{_("simexplorer.action.application.searchText.tooltip")}'/> - + <cell fill='horizontal' insets='0,0,0,0'> + <JToolBar> + <JButton id='importApplication'/> + <JTextField id='searchText' toolTipText='{_("simexplorer.action.application.searchText.tooltip")}'/> <JButton id='searchApplication'/> <JButton id='resetSearchApplication'/> - <JButton id='advancedSearchApplication' enabled='false'/> - - <JComboBox id='changeSizor' enabled='false' font-size='9' - opaque='false' preferredSize='{new Dimension(50,5)}'> + <JButton id='advancedSearchApplication'/> + <JComboBox id='changeSizor' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'> <item value='5'/> <item value='10'/> <item value='20'/> @@ -43,19 +34,15 @@  <row> <cell anchor='center' insets='0,0,0,0'> - <JToolBar floatable='false' opaque='false' borderPainted='false' - margin='0,0,0,0'> + <JToolBar> <JButton id='goFirstPage' enabled='{goPage.getSelectedIndex()>0}'/> <JButton id='goPreviousPage' enabled='{goPage.getSelectedIndex()>0}'/> <JPanel layout='{new GridLayout(0, 2, 0, 0)}'> - <JLabel id='currentPage' text='{_("simexplorer.action.pagination.currentPage")}' - labelFor="{goPage}" font-size='9'/> - <JComboBox id='goPage' enabled='false' font-size='9' - opaque='false' - preferredSize='{new Dimension(50,5)}'/> + <JLabel id='currentPage' text='{_("simexplorer.action.pagination.currentPage")}' labelFor="{goPage}" font-size='9'/> + <JComboBox id='goPage' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'/> </JPanel> - <JButton id='goNextPage' enabled='false'/> - <JButton id='goLastPage' enabled='false'/> + <JButton id='goNextPage'/> + <JButton id='goLastPage'/> </JToolBar> </cell> </row> 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-02-08 21:52:00 UTC (rev 771) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx 2008-02-08 23:28:26 UTC (rev 772) @@ -1,9 +1,9 @@ -<Table> +<Table> + <style source="/../common.css"/> <row> - <cell fill='both'> - <JToolBar id='toolbar' floatable='false' opaque='false' - margin='0,0,0,0' borderPainted='false'> - <JButton id='launchSynchronize' enabled='false'/> + <cell fill='horizontal' insets='0,0,0,0'> + <JToolBar> + <JButton id='launchSynchronize'/> </JToolBar> </cell> </row> Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css 2008-02-08 21:52:00 UTC (rev 771) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css 2008-02-08 23:28:26 UTC (rev 772) @@ -1,17 +1,3 @@ -JToolBar { - floatable:false; - focusable:false; - opaque:false; - margin:0; - borderPainted:false; -} - -JButton { - opaque:false; - borderPainted:false; - enabled:false; -} - .border { border:{javax.swing.border.LineBorder.createBlackLineBorder()}; height:28;

1 0

r771 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 21:52:00 +0000 (Fri, 08 Feb 2008) New Revision: 771 Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/mainUI.css Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx Log: utilisation de css jaxx :) 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-02-08 21:38:36 UTC (rev 770) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-02-08 21:52:00 UTC (rev 771) @@ -1,5 +1,6 @@ <JFrame name="mainFrame" title='{_("simexplorer.main.ui.title")}' defaultCloseOperation='DISPOSE_ON_CLOSE' width='700' height='536'> + <style source="mainUI.css"/> <script> import static org.codelutin.i18n.I18n._; import static jaxx.runtime.UIHelper.createImageIcon; @@ -8,12 +9,12 @@ <JMenuBar>  <JMenu text='{_("simexplorer.main.menu")}' mnemonic="{'M'}"> - <JMenuItem id="connect" enabled='false'/> - <JMenuItem id="unconnect" enabled='false'/> + <JMenuItem id="connect"/> + <JMenuItem id="unconnect"/> <JSeparator/> - <JMenuItem id="showTab_local" enabled='false' mnemonic="{'l'}"/> - <JMenuItem id="showTab_remote" enabled='false'/> - <JMenuItem id="showTab_synchronize" enabled='false'/> + <JMenuItem id="showTab_local" mnemonic="{'l'}"/> + <JMenuItem id="showTab_remote"/> + <JMenuItem id="showTab_synchronize"/> <JSeparator/> <JMenuItem id="quit" enabled='false' /> </JMenu> @@ -21,16 +22,16 @@ <JMenu text='{_("simexplorer.config.menu")}' mnemonic="{'C'}"> <JMenu text='{_("simexplorer.config.i18n.menu")}' mnemonic="{'L'}" icon='{createImageIcon("action/translate.png")}'> - <JMenuItem id="i18n_fr_FR" enabled='false'/> - <JMenuItem id="i18n_en_GB" enabled='false'/> + <JMenuItem id="i18n_fr_FR"/> + <JMenuItem id="i18n_en_GB"/> </JMenu> - <JMenuItem id="config" enabled='false'/> + <JMenuItem id="config"/> </JMenu>  <JMenu text='{_("simexplorer.help.menu")}' mnemonic="{'e'}"> - <JMenuItem id="help" enabled='false'/> - <JMenuItem id="site" enabled='false'/> - <JMenuItem id="about" enabled='false'/> + <JMenuItem id="help"/> + <JMenuItem id="site" /> + <JMenuItem id="about"/> </JMenu> </JMenuBar> @@ -38,12 +39,10 @@  <row> <cell fill="both"> - <JToolBar id="toolbar" floatable='false' margin='0,0,0,0' - opaque='true' - borderPainted='true'> - <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_local' enabled='false' focusPainted='false'/> - <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_remote' enabled='false' focusPainted='false'/> - <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_synchronize' enabled='false' focusPainted='false'/> + <JToolBar id="toolbar"> + <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_local'/> + <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_remote'/> + <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_synchronize'/> </JToolBar> </cell> </row> Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/mainUI.css =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/mainUI.css (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/mainUI.css 2008-02-08 21:52:00 UTC (rev 771) @@ -0,0 +1,18 @@ +JToolBar { + floatable:false; + focusable:false; + opaque:false; + margin:0; + borderPainted:false; +} +JAXXToggleButton { + enabled:false; + focusPainted:false; +} +JMenuItem { + enabled:false; +} +JMenu { + enabled:true; +} +

1 0

r770 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 21:38:36 +0000 (Fri, 08 Feb 2008) New Revision: 770 Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: utilisation de la premiere css jaxx :) 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-02-08 21:38:16 UTC (rev 769) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-08 21:38:36 UTC (rev 770) @@ -1,38 +1,41 @@ <Table> + <style source="detailTab.css"/> <script> import static org.codelutin.i18n.I18n._; </script> <row> - <cell fill='both'> - <Table insets='0,0,0,0' id='toolbar'> - <row fill='both'> - <cell fill='horizontal' anchor="west"> - <JToolBar floatable='false' opaque='false' margin='0,0,0,0' borderPainted='false'> - <JButton opaque='false' borderPainted='false' id='collapseAllApplication' enabled='false'/> - <JButton opaque='false' borderPainted='false' id='expandAllApplication' enabled='false'/> + <cell fill='horizontal'> + <Table id='toolbarNavigation' styleClass='border' insets='0,0,0,0'> + <row> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='navigationHeader' text='{_("simexplorer.node.navigation")}'/> + </JPanel> + </cell> + <cell anchor="east"> + <JToolBar> + <JButton id='collapseAllApplication'/> + <JButton id='expandAllApplication'/> </JToolBar> </cell> - <cell weightx="1" fill='horizontal' anchor="east"> - <JLabel id='navigationHeader' text='{_("simexplorer.node.navigation")}'/> - </cell> </row> </Table> </cell> </row> <row> - <cell fill="horizontal" columns="2"> - <Table insets='0,0,0,0' id='toolbarDetail' background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> - <row fill='both'> + <cell> + <Table id='toolbarDetail' styleClass='border' background='{Color.WHITE}' insets='0,0,0,0'> + <row> <cell weightx="1" fill='horizontal'> <JPanel opaque='false' > - <JLabel id='detailHeader' text='{_("simexplorer.node.nodetail")}' opaque='false' /> + <JLabel id='detailHeader' opaque='false' /> </JPanel> </cell> - <cell fill='horizontal' anchor="east"> - <JToolBar floatable='false' opaque='false' focusable='false' margin='0,0,0,0' borderPainted='false'> - <JButton opaque='false' borderPainted='false' id='exportApplication' enabled='false'/> - <JButton opaque='false' borderPainted='false' id='downloadLoggableElement' enabled='false'/> - <JButton opaque='false' borderPainted='false' id='delete' enabled='false'/> + <cell anchor="east"> + <JToolBar> + <JButton id='exportApplication'/> + <JButton id='downloadLoggableElement'/> + <JButton id='delete'/> </JToolBar> </cell> </row> @@ -42,7 +45,7 @@ <row fill="both" weightx="1" weighty="1"> <cell columns="2"> <JSplitPane id='splitOne' orientation="horizontal" resizeWeight="0.4" oneTouchExpandable='true'> - <JScrollPane columnHeaderView='{toolbar}'> + <JScrollPane columnHeaderView='{toolbarNavigation}'> <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}'/> </JScrollPane> <JScrollPane id="scrollPane" columnHeaderView='{toolbarDetail}' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_never' verticalScrollBarPolicy='vertical_scrollbar_never'> @@ -75,7 +78,7 @@ <cell anchor='west'> <JLabel text='{_("simexplorer.common.description")}'/> </cell> - <cell weightx="1" anchor='west'> + <cell fill='horizontal' weightx="2" anchor='west'> <JLabel id='detailDescription'/> </cell> </row> @@ -89,7 +92,7 @@ </row> <row> <cell fill='horizontal' columns="2" insets='5,0,0,1'> - <JPanel id='detailDescriptorsHeaderPanel' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> + <JPanel styleClass='border'> <JLabel id='detailDescriptorsHeader'/> </JPanel> </cell> @@ -103,16 +106,16 @@ </row> <row> <cell fill="horizontal" columns="2" insets='5,0,0,1' > - <Table insets='0,0,0,0' id='toolbarAttachment' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> + <Table id='toolbarAttachment' styleClass='border' insets='0,0,0,0'> <row fill='both'> <cell weightx="1" fill='horizontal'> <JPanel opaque='false'> - <JLabel id='detailAttachmentsHeader' text='{_("simexplorer.node.noattachments")}'/> + <JLabel id='detailAttachmentsHeader'/> </JPanel> </cell> <cell fill='horizontal' anchor="east"> - <JToolBar floatable='false' opaque='false' margin='0,0,0,0' borderPainted='false'> - <JButton opaque='false' borderPainted='false' id='downloadAttachment' enabled='false'/> + <JToolBar> + <JButton id='downloadAttachment'/> </JToolBar> </cell> </row> Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/detailTab.css 2008-02-08 21:38:36 UTC (rev 770) @@ -0,0 +1,18 @@ +JToolBar { + floatable:false; + focusable:false; + opaque:false; + margin:0; + borderPainted:false; +} + +JButton { + opaque:false; + borderPainted:false; + enabled:false; +} + +.border { + border:{javax.swing.border.LineBorder.createBlackLineBorder()}; + height:28; +}

1 0

r769 - trunk/simexplorer-is-service/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 21:38:16 +0000 (Fri, 08 Feb 2008) New Revision: 769 Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties Log: mieux vautpasser le plugin i18n avant de commiter pour transformer les accents Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties =================================================================== --- trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties 2008-02-08 20:02:39 UTC (rev 768) +++ trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties 2008-02-08 21:38:16 UTC (rev 769) @@ -1,4 +1,4 @@ -simexplorer.service.attachmentnotfund=Fichier non trouvé +simexplorer.service.attachmentnotfund=Fichier non trouv\u00E9 simexplorer.service.business.groupexist=Le groupe existe d\u00E9j\u00E0 simexplorer.service.business.userexist=L'utilisateur existe d\u00E9j\u00E0 simexplorer.service.invalidhash=Hash invalide pour un fichier

1 0

r768 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 20:02:39 +0000 (Fri, 08 Feb 2008) New Revision: 768 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java Log: ajout info nom Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-08 20:02:14 UTC (rev 767) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-08 20:02:39 UTC (rev 768) @@ -340,6 +340,7 @@ if (!s.equals(tooltip)) { ui.getDetailDescription().setToolTipText(tooltip); } + ui.getDetailName().setText(detail.getName()); ui.getDetailCreationDate().setText(DATE_FORMAT.format(detail.getCreationDate())); ui.getDetail().setVisible(true); JTable table = ui.getDetailTable();

1 0

r767 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 20:02:14 +0000 (Fri, 08 Feb 2008) New Revision: 767 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: les actions la ou il faut :) 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-02-08 20:01:44 UTC (rev 766) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-08 20:02:14 UTC (rev 767) @@ -2,29 +2,61 @@ <script> import static org.codelutin.i18n.I18n._; </script> - <row insets='2,2,0,0'> - <cell fill='horizontal'> - <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'/> - <JButton id='downloadLoggableElement' enabled='false'/> - <JButton id='downloadAttachment' enabled='false'/> - <JButton id='delete' enabled='false'/> - </JToolBar> + <row> + <cell fill='both'> + <Table insets='0,0,0,0' id='toolbar'> + <row fill='both'> + <cell fill='horizontal' anchor="west"> + <JToolBar floatable='false' opaque='false' margin='0,0,0,0' borderPainted='false'> + <JButton opaque='false' borderPainted='false' id='collapseAllApplication' enabled='false'/> + <JButton opaque='false' borderPainted='false' id='expandAllApplication' enabled='false'/> + </JToolBar> + </cell> + <cell weightx="1" fill='horizontal' anchor="east"> + <JLabel id='navigationHeader' text='{_("simexplorer.node.navigation")}'/> + </cell> + </row> + </Table> </cell> </row> + <row> + <cell fill="horizontal" columns="2"> + <Table insets='0,0,0,0' id='toolbarDetail' background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> + <row fill='both'> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='detailHeader' text='{_("simexplorer.node.nodetail")}' opaque='false' /> + </JPanel> + </cell> + <cell fill='horizontal' anchor="east"> + <JToolBar floatable='false' opaque='false' focusable='false' margin='0,0,0,0' borderPainted='false'> + <JButton opaque='false' borderPainted='false' id='exportApplication' enabled='false'/> + <JButton opaque='false' borderPainted='false' id='downloadLoggableElement' enabled='false'/> + <JButton opaque='false' borderPainted='false' id='delete' enabled='false'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> + </row> <row fill="both" weightx="1" weighty="1"> - <cell> + <cell columns="2"> <JSplitPane id='splitOne' orientation="horizontal" resizeWeight="0.4" oneTouchExpandable='true'> - <JScrollPane columnHeaderView='{navigationHeaderPanel}'> + <JScrollPane columnHeaderView='{toolbar}'> <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}'/> </JScrollPane> - <JScrollPane id="scrollPane" columnHeaderView='{detailHeaderPanel}' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_never' verticalScrollBarPolicy='vertical_scrollbar_never'> + <JScrollPane id="scrollPane" columnHeaderView='{toolbarDetail}' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_never' verticalScrollBarPolicy='vertical_scrollbar_never'> <Table id='detail' insets='2,2,2,1'> <row fill='vertical'> <cell anchor='west'> + <JLabel text='{_("simexplorer.common.name")}'/> + </cell> + <cell weightx="1" anchor='west'> + <JLabel id='detailName'/> + </cell> + </row> + <row fill='vertical'> + <cell anchor='west'> <JLabel text='{_("simexplorer.common.type")}'/> </cell> <cell weightx="1" anchor='west'> @@ -71,9 +103,20 @@ </row> <row> <cell fill="horizontal" columns="2" insets='5,0,0,1' > - <JPanel id='detailHeaderAttachmentsPanel' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> - <JLabel id='detailAttachmentsHeader' text='{_("simexplorer.node.noattachments")}'/> - </JPanel> + <Table insets='0,0,0,0' id='toolbarAttachment' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> + <row fill='both'> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false'> + <JLabel id='detailAttachmentsHeader' text='{_("simexplorer.node.noattachments")}'/> + </JPanel> + </cell> + <cell fill='horizontal' anchor="east"> + <JToolBar floatable='false' opaque='false' margin='0,0,0,0' borderPainted='false'> + <JButton opaque='false' borderPainted='false' id='downloadAttachment' enabled='false'/> + </JToolBar> + </cell> + </row> + </Table> </cell> </row> <row> @@ -90,20 +133,6 @@ </JPanel> </cell> </row> - <row> - <cell> - <JPanel id='detailHeaderPanel' background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> - <JLabel id='detailHeader' text='{_("simexplorer.node.nodetail")}'/> - </JPanel> - </cell> - </row> - <row> - <cell> - <JPanel id='navigationHeaderPanel' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> - <JLabel id='navigationHeader' text='{_("simexplorer.node.navigation")}'/> - </JPanel> - </cell> - </row> </Table> </JScrollPane> </JSplitPane>

1 0

r766 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org Feb. 8, 2008

Feb. 8, 2008

Author: tchemit Date: 2008-02-08 20:01:44 +0000 (Fri, 08 Feb 2008) New Revision: 766 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java Log: on donne le m?\195?\170me nom aux versions enfants Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-08 18:39:46 UTC (rev 765) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-08 20:01:44 UTC (rev 766) @@ -111,20 +111,20 @@ MetaData parentMetaData = parentEA.getMetaData(); parentMetaData.setVersion(versions[0].toString()); String uuid = parentMetaData.getUuid(); + String name = parentMetaData.getName(); List<ExplorationApplication> listSons = new ArrayList<ExplorationApplication>(nbSons); listSons.add(parentEA); for (int j = 0; j < nbSons; j++) { ExplorationApplication sonEA = elementGenerator.generateRandomEA(); sonEA.setParentData(parentEA); sonEA.getMetaData().setUuid(uuid); + sonEA.getMetaData().setName(name); sonEA.getMetaData().setVersion(versions[j + 1].toString()); listSons.add(sonEA); } registerEA(uuid, listSons.toArray(new ExplorationApplication[listSons.size()])); } - log.info("nb ExplorationApplications : "+eas.size()); - log.info("nb LoggableElements : "+loggableElements.size()); - log.info("nb MetaDatas : "+metadatas.size()); + log.info("nb ExplorationApplications/LoggableElement/MetaDatas : "+eas.size()+"/"+loggableElements.size()+"/"+metadatas.size()); } protected void registerEA(String uuid, ExplorationApplication... eas) throws Exception { @@ -148,6 +148,7 @@ // generate versions for the unique LE given LoggableElement loggableElement = loggableElements[0]; loggableElement.getMetaData().setLatest(false); + String name =loggableElement.getMetaData().getName(); Set<? extends LoggableElement> sons = elementGenerator.generateArray(loggableElement.getClass()); int nbSons = 1 + sons.size(); Version[] versions = versionGenerator.generateVersions(nbSons + 1); @@ -158,6 +159,7 @@ for (LoggableElement sonEA : sons) { sonEA.setParentData(loggableElement); sonEA.getMetaData().setUuid(uuid); + sonEA.getMetaData().setName(name); sonEA.getMetaData().setVersion(versions[++j].toString()); listSons.add(sonEA); }

1 0