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> <!-- menu principal --> <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> <!-- menu config --> <JMenu text='{_("simexplorer.config.menu")}' mnemonic="{'C'}"> @@ -30,16 +29,15 @@ <!-- menu aide --> <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'> <!-- la barre des actions générales --> <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> <!-- la barre des actions de la liste --> <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 @@ <!-- la barre de pagination de la liste --> <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;