Author: tchemit Date: 2008-04-27 08:27:04 +0000 (Sun, 27 Apr 2008) New Revision: 625 Added: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxTestUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/test.css Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIProvider.java trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css Log: introduction ui Identity (pour les param?\195?\168tre perso de l'utilisateur (nom prenom email) suppression de l'ui de config debut de l'ui de configuration des VCSRoots introduction ui de test Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx 2008-04-27 08:25:42 UTC (rev 624) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx 2008-04-27 08:27:04 UTC (rev 625) @@ -68,17 +68,19 @@ </Table> </java.awt.CardLayout> - <JToolBar id='top'> + <JToolBar id='top' height='26'> <JLabel text='lutinvcs.config.message'/> <Table fill='both' insets='0,0,0,0'> <row> <cell fill='both'/> </row> </Table> + <JButton id='reset' onActionPerformed="reset()" icon='{createActionIcon("revert")}' borderPainted='false'/> + <JButton id='testConnection' action='{newAction(TestConnexionAction.class)}' borderPainted='false'/> <JButton id='help' action='{newAction(HelpAction.class)}' borderPainted='false'/> </JToolBar> - <JToolBar id='connexionHead' opaque='false' height='30'> + <JToolBar id='connexionHead' opaque='false' height='26'> <JLabel id='connexionModeLabel'/> <JRadioButton id='connexionModeAnonymous' onActionPerformed="changeAutheticationMode(ANONYMOUS)"/> <JRadioButton id='connexionModePassword' onActionPerformed="changeAutheticationMode(PASSWORD)"/> @@ -90,13 +92,8 @@ </Table> <JButton id='generateKey' icon='{createActionIcon("generatekey")}' onActionPerformed="generateKey()" borderPainted='false'/> - <JButton id='reset' onActionPerformed="reset()" icon='{createActionIcon("revert")}' borderPainted='false'/> - <JButton id='testConnection' action='{newAction(TestConnexionAction.class)}' borderPainted='false'/> </JToolBar> - - <JToolBar id='identityHead' opaque='false'> - <JLabel id='identityLabel'/> - </JToolBar> + <Table fill='both' insets="1,1,1,1"> <row fill='horizontal'> <cell columns='2'> @@ -107,34 +104,13 @@ </row> <row fill='horizontal'> <cell columns="2" fill='both'> - <JScrollPane columnHeaderView='{identityHead}' styleClass='connexionScroll' id='identityScroll'> - <Table id="identityContent"> - <row fill='horizontal'> - <cell> - <JLabel id='firstnameLabel'/> - </cell> - <cell> - <JTextField id='firstname' onKeyReleased="doCheck(Element.firstname)"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='lastnameLabel'/> - </cell> - <cell> - <JTextField id='lastname' onKeyReleased="doCheck(Element.lastname)"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='emailLabel'/> - </cell> - <cell> - <JTextField id='email' onKeyReleased="doCheck(Element.email)"/> - </cell> - </row> - </Table> - </JScrollPane> + <JToolBar id='rootHead' opaque='false' height='26'> + <JComboBox id='rootsList' /> + <JButton id='editRoot' icon='{createActionIcon("editroot")}' borderPainted='false' onActionPerformed="editRoot()"/> + <JButton id='addRoot' icon='{createActionIcon("addroot")}' borderPainted='false' onActionPerformed="addRoot()"/> + <JButton id='deleteRoot' icon='{createActionIcon("deleteroot")}' borderPainted='false' onActionPerformed="deleteRoot()"/> + <!--JSeparator orientation="vertical"/--> + </JToolBar> </cell> </row> <row fill='horizontal'> Copied: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx (from rev 613, trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx) =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx (rev 0) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx 2008-04-27 08:27:04 UTC (rev 625) @@ -0,0 +1,56 @@ +<IdentityUI modal='true' resizable='false'> + <style source="config.css"/> + <JToolBar id='identityHead' opaque='false'> + <JLabel text='lutinvcs.identity.message'/> + <Table fill='both' insets='0,0,0,0'> + <row> + <cell fill='both'/> + </row> + </Table> + <JButton id='reset' icon='{org.codelutin.ui.UIHelper.createActionIcon("revert")}' onActionPerformed="reset()" borderPainted='false'/> + <JButton id='help' action='{newAction(org.codelutin.vcs.ui.action.HelpAction.class)}' borderPainted='false'/> + </JToolBar> + <Table fill='both' insets="1,1,1,1"> + <row fill='horizontal'> + <cell columns="2" fill='both'> + <JScrollPane columnHeaderView='{identityHead}' styleClass='connexionScroll'> + <Table> + <row fill='horizontal'> + <cell> + <JLabel id='firstnameLabel'/> + </cell> + <cell> + <JTextField id='firstname' onKeyReleased="doCheck(Element.firstname)"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='lastnameLabel'/> + </cell> + <cell> + <JTextField id='lastname' onKeyReleased="doCheck(Element.lastname)"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='emailLabel'/> + </cell> + <cell> + <JTextField id='email' onKeyReleased="doCheck(Element.email)"/> + </cell> + </row> + </Table> + </JScrollPane> + </cell> + </row> + <row fill='horizontal'> + <cell weightx='1'> + <JButton id='ok' onActionPerformed="save()"/> + </cell> + <cell weightx='1'> + <JButton id='cancel' onActionPerformed="dispose()"/> + </cell> + </row> + </Table> + +</IdentityUI> Added: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxTestUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxTestUI.jaxx (rev 0) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxTestUI.jaxx 2008-04-27 08:27:04 UTC (rev 625) @@ -0,0 +1,15 @@ +<TestUI resizable='false'> + <style source="test.css"/> + <script>import static org.codelutin.vcs.ui.VCSUIFactory.*;</script> + <JToolBar> + <JButton id='showFirstLaunch' onActionPerformed="showUI(IDENTITY_UI)"/> + <JButton id='showConfig' onActionPerformed="showUI(CONFIG_UI)" /> + <JButton id='showSynch' onActionPerformed="showUI(SYNCH_UI)"/> + <Table fill='both' insets='0,0,0,0'> + <row> + <cell fill='both'/> + </row> + </Table> + <JButton id='help' action='{newAction(org.codelutin.vcs.ui.action.HelpAction.class)}'/> + </JToolBar> +</TestUI> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIProvider.java =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIProvider.java 2008-04-27 08:25:42 UTC (rev 624) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIProvider.java 2008-04-27 08:27:04 UTC (rev 625) @@ -24,6 +24,8 @@ JaxxChangelogUI.class, JaxxConfirmUI.class, JaxxConfigUI.class, - JaxxGenerateSshKeyUI.class); + JaxxGenerateSshKeyUI.class, + JaxxIdentityUI.class, + JaxxTestUI.class); } } \ No newline at end of file Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css 2008-04-27 08:25:42 UTC (rev 624) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css 2008-04-27 08:27:04 UTC (rev 625) @@ -31,7 +31,9 @@ #emailLabel { text: "lutinvcs.config.email"; } - +#rootLabel{ + text: "lutinvcs.config.choose.root"; +} #connexionModeLabel { text: "lutinvcs.config.server.authenticationMethod"; } Copied: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/test.css (from rev 613, trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css) =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/test.css (rev 0) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/test.css 2008-04-27 08:27:04 UTC (rev 625) @@ -0,0 +1,11 @@ +JToolBar { + floatable: false; + focusable: false; + margin: 0; +} + +JButton { + margin: 0; /*font-size:10;*/ + borderPainted: false; + opaque: false; +}