Author: tchemit Date: 2008-02-14 07:44:15 +0000 (Thu, 14 Feb 2008) New Revision: 951 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx Log: simplification ui de l'onglet detail : toutes les actions sur la partie detail sont dans la toolbar du haut (sauf pour le chargement des fichiers attach?\195?\169s), cela offre plus de place pour les descriptors et fichiers attaches, de plus cela est plus intuitif ajout de la provenance du LE, suppression de l'affichage des donn?\195?\169es en double (nom + version) 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-14 06:33:41 UTC (rev 950) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-14 07:44:15 UTC (rev 951) @@ -4,12 +4,18 @@ <cell fill='horizontal'> <Table id='toolbarNavigation' styleClass='border' insets='0,0,0,0'> <row> + <cell anchor='west'> + <JPanel opaque='false'> + <JLabel id='detailHeaderFromLocal' opaque='false' visible='false' icon='{createImageIcon("action/local.png")}'/> + <JLabel id='detailHeaderFromRemote' opaque='false' visible='false' icon='{createImageIcon("action/remote.png")}'/> + </JPanel> + </cell> <cell weightx="1" fill='horizontal'> <JPanel opaque='false' > <JLabel id='navigationHeader' text='simexplorer.node.navigation'/> </JPanel> </cell> - <cell anchor="east"> + <cell anchor="east" insets='0,0,0,0'> <JToolBar> <JButton id='historyPrevious'/> <JButton id='historyNext'/> @@ -25,6 +31,11 @@ <cell> <Table id='toolbarDetail' styleClass='border' background='{Color.WHITE}' insets='0,0,0,0'> <row> + <cell anchor='west'> + <JToolBar> + <JButton id='detailToTree'/> + </JToolBar> + </cell> <cell weightx="1" fill='horizontal'> <JPanel opaque='false' > <JLabel id='detailHeader' opaque='false' /> @@ -32,6 +43,7 @@ </cell> <cell anchor="east"> <JToolBar> + <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> <JButton id='showTab_synchronize'/> <JButton id='exportElement'/> <JButton id='downloadElement'/> @@ -50,14 +62,14 @@ </JScrollPane> <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'> + <!--row fill='vertical'> <cell anchor='west'> <JLabel text='simexplorer.common.name'/> </cell> <cell weightx="1" anchor='west'> <JLabel id='detailName'/> </cell> - </row> + </row--> <row fill='vertical'> <cell anchor='west'> <JLabel text='simexplorer.common.type'/> @@ -66,7 +78,7 @@ <JLabel id='detailType'/> </cell> </row> - <row> + <!--row> <cell anchor='west'> <JLabel text='simexplorer.common.version'/> </cell> @@ -86,9 +98,8 @@ </cell> </row> </Table> - </cell> - </row> + </row--> <row fill='vertical'> <cell anchor='west'> <JLabel text='simexplorer.common.description'/> @@ -106,7 +117,7 @@ </cell> </row> <row> - <cell fill='horizontal' columns="2" insets='5,0,0,1'> + <cell fill='horizontal' columns="2" insets='3,0,0,1'> <JPanel styleClass='border'> <JLabel id='detailDescriptorsHeader'/> </JPanel> @@ -120,7 +131,7 @@ </cell> </row> <row> - <cell fill="horizontal" columns="2" insets='5,0,0,1' > + <cell fill="horizontal" columns="2" insets='3,0,0,1' > <Table id='toolbarAttachment' styleClass='border' insets='0,0,0,0'> <row fill='both'> <cell weightx="1" fill='horizontal'>