Author: tchemit Date: 2008-04-19 09:19:22 +0000 (Sat, 19 Apr 2008) New Revision: 592 Added: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx Modified: trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-en_GB.properties trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-fr_FR.properties 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: continue generateSshKey ui Modified: trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-en_GB.properties =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-en_GB.properties 2008-04-19 09:19:08 UTC (rev 591) +++ trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-en_GB.properties 2008-04-19 09:19:22 UTC (rev 592) @@ -4,8 +4,10 @@ lutinvcs.changelog.title=Changelog UI lutinvcs.commit.message=Please fill a message for your commit lutinvcs.config.anonymous= +lutinvcs.config.change.dir=Change dir lutinvcs.config.email= lutinvcs.config.firstname= +lutinvcs.config.generate=Generate lutinvcs.config.identiy= lutinvcs.config.lastname= lutinvcs.config.message= @@ -25,6 +27,8 @@ lutinvcs.config.title= lutinvcs.confirm.title=Confirm UI lutinvcs.diff.title=Diff UI +lutinvcs.generateSshKey.message=Generate +lutinvcs.generateSskKey.title=Generate ssh keys lutinvcs.no.config= lutinvcs.reset= lutinvcs.synch.title=Synch UI Modified: trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-fr_FR.properties =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-fr_FR.properties 2008-04-19 09:19:08 UTC (rev 591) +++ trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-fr_FR.properties 2008-04-19 09:19:22 UTC (rev 592) @@ -4,8 +4,10 @@ lutinvcs.changelog.title=Changelog UI lutinvcs.commit.message=Renseigner le message de publication lutinvcs.config.anonymous=anonyme +lutinvcs.config.change.dir=Changer le r\u00E9pertoire contenant les clef ssh g\u00E9n\u00E9r\u00E9es lutinvcs.config.email=Courriel lutinvcs.config.firstname=Pr\u00E9nom +lutinvcs.config.generate=G\u00E9n\u00E9rer lutinvcs.config.identiy=Identit\u00E9 lutinvcs.config.lastname=Nom lutinvcs.config.message=Configuration de la connexion @@ -25,6 +27,8 @@ lutinvcs.config.title=Config UI lutinvcs.confirm.title=Confirm UI lutinvcs.diff.title=Diff UI +lutinvcs.generateSshKey.message=G\u00E9n\u00E9rer +lutinvcs.generateSskKey.title=G\u00E9n\u00E9rer la paire de clef ssh lutinvcs.no.config=< Pas de configuration > lutinvcs.reset=R\u00E9initialiser lutinvcs.synch.title=Synch UI Copied: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx (from rev 540, trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx) =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx (rev 0) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx 2008-04-19 09:19:22 UTC (rev 592) @@ -0,0 +1,102 @@ +<GenerateSshKeyUI title='lutinvcs.generateSskKey.title'> + <!--ConfigUI title='lutinvcs.config.title' resizable='false'--> + <style source="config.css"/> + <script> + import static org.codelutin.vcs.ui.util.UIHelper.createActionIcon; + + public String getElementValue(Element element) { + JComponent o = getElement(element); + if (o instanceof JPasswordField) { + return Arrays.toString(((JPasswordField) o).getPassword()); + } + if (o instanceof JTextField) { + return ((JTextField) o).getText(); + } + if (o instanceof JRadioButton) { + return String.valueOf(((JRadioButton) o).isSelected()); + } + if (o instanceof JCheckBox) { + return String.valueOf(((JCheckBox) o).isSelected()); + } + return ""; + } + + public JLabel getElementLabel(Element element) { + return (JLabel) $objectMap.get(element.name() + "Label"); + } + + public JComponent getElement(Element element) { + return (JComponent) $objectMap.get(element.name()); + } + </script> + + <JToolBar id='top'> + <JLabel text='lutinvcs.generateSshKey.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='help' action='{createHelpAction()}' borderPainted='false'/> + </JToolBar> + <Table fill='both' insets="1,1,1,1"> + <row fill='horizontal'> + <cell columns="2" fill='both'> + <JScrollPane columnHeaderView='{top}' styleClass='connexionScroll'> + <Table id='sshPanel' opaque="false" insets='2,2,2,2'> + <row fill='horizontal'> + <cell> + <JLabel id='loginLabel'/> + </cell> + <cell> + <JTextField id='login' onKeyReleased="doCheck(Element.login)"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='passphraseLabel'/> + </cell> + <cell> + <JToolBar opaque='false' borderPainted='false' height="24"> + <JCheckBox id='noPassPhrase' onKeyReleased="doCheck(Element.nopassphrase)"/> + <JPasswordField id='passphrase' onKeyReleased="doCheck(Element.passphrase)" + enabled='{!noPassPhrase.isSelected()}'/> + </JToolBar> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='keyNameLabel'/> + </cell> + <cell> + <JTextField id='keyName' onKeyReleased="doCheck(Element.keyName)"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='dirLabel'/> + </cell> + <cell> + <JToolBar opaque='false' borderPainted='false' height="24"> + <JTextField id='dir' onKeyReleased="doCheck(Element.dir)"/> + <JButton id='changeDir' icon='{createActionIcon("filechooser")}' + onActionPerformed="changeDir()"/> + </JToolBar> + </cell> + </row> + </Table> + </JScrollPane> + </cell> + </row> + <row fill='horizontal'> + <cell weightx='1'> + <JButton id='generate' icon='{createActionIcon("generatekey")}' onActionPerformed="generateKey()"/> + </cell> + <cell weightx='1'> + <JButton id='cancel' onActionPerformed="dispose()"/> + </cell> + </row> + </Table> + +</GenerateSshKeyUI> 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-19 09:19:08 UTC (rev 591) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIProvider.java 2008-04-19 09:19:22 UTC (rev 592) @@ -18,6 +18,6 @@ public class JaxxVCSUIProvider extends VCSUIProvider { public JaxxVCSUIProvider() { - super("jaxx", JaxxSynchUI.class, JaxxDiffUI.class, JaxxChangelogUI.class,JaxxConfirmUI.class,JaxxConfigUI.class); + super("jaxx", JaxxSynchUI.class, JaxxDiffUI.class, JaxxChangelogUI.class,JaxxConfirmUI.class,JaxxConfigUI.class,JaxxGenerateSshKeyUI.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-19 09:19:08 UTC (rev 591) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css 2008-04-19 09:19:22 UTC (rev 592) @@ -78,6 +78,21 @@ margin:0; } +#changeDir { + toolTipText: "lutinvcs.config.change.dir"; + opaque:false; + borderPainted:false; + margin:0; +} + +#generate { + toolTipText: "lutinvcs.config.server.ssh.key.generate"; + text: "lutinvcs.config.generate"; + opaque:false; + borderPainted:false; + margin:0; +} + #generateKey { toolTipText: "lutinvcs.config.server.ssh.key.generate"; }