r671 - in trunk/lutinvcs/ui/jaxx/src/main: resources/i18n uimodel/org/codelutin/vcs/ui - Buix-commits

17 May 2008

Author: tchemit
Date: 2008-05-17 11:32:03 +0000 (Sat, 17 May 2008)
New Revision: 671

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/JaxxConnexionConfigUI.jaxx
   trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx
   trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css
Log:
ajout modulePath dans la config

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-05-15 07:56:26 UTC (rev 670)
+++ trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-en_GB.properties	2008-05-17 11:32:03 UTC (rev 671)
@@ -8,7 +8,11 @@
 lutinvcs.config.generate=Generate
 lutinvcs.config.lastName=
 lutinvcs.config.message=
+lutinvcs.config.modulePath=
 lutinvcs.config.pass=
+lutinvcs.config.remoteURL=
+lutinvcs.config.rootConfig=
+lutinvcs.config.rootConfigHead=
 lutinvcs.config.server.authenticationMethod=
 lutinvcs.config.server.login=
 lutinvcs.config.server.passphrase=

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-05-15 07:56:26 UTC (rev 670)
+++ trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-fr_FR.properties	2008-05-17 11:32:03 UTC (rev 671)
@@ -8,8 +8,12 @@
 lutinvcs.config.generate=G\u00E9n\u00E9rer
 lutinvcs.config.lastName=Nom
 lutinvcs.config.message=Configuration de la connexion
+lutinvcs.config.modulePath=Module path
 lutinvcs.config.pass=password
-lutinvcs.config.server.authenticationMethod=Connexion
+lutinvcs.config.remoteURL=URL
+lutinvcs.config.rootConfig=Repository
+lutinvcs.config.rootConfigHead=Serveur distant
+lutinvcs.config.server.authenticationMethod=Authentification
 lutinvcs.config.server.login=Login
 lutinvcs.config.server.passphrase=passe-phrase
 lutinvcs.config.server.password=Mot de passe

Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConnexionConfigUI.jaxx
===================================================================
--- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConnexionConfigUI.jaxx	2008-05-15 07:56:26 UTC (rev 670)
+++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConnexionConfigUI.jaxx	2008-05-17 11:32:03 UTC (rev 671)
@@ -77,7 +77,6 @@
             </row>
         </Table>
         <JButton id='reset' action='{newAction(org.codelutin.ui.config.ResetAction.class,false)}' borderPainted='false'/>
-        <!--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>
@@ -92,9 +91,20 @@
                 <cell fill='both'/>
             </row>
         </Table>
-        <JButton id='generateKey' icon='{createActionIcon("generatekey")}' onActionPerformed="generateKey()"
-                 borderPainted='false'/>
+        <JButton id='generateKey' icon='{createActionIcon("generatekey")}' onActionPerformed="generateKey()" borderPainted='false'/>
     </JToolBar>
+
+    <JToolBar id='remoteHead' opaque='false' height='26'>
+        <JLabel id='rootConfigHeadLabel'/>
+        <Table fill='both' insets='0,0,0,0'>
+            <row>
+                <cell fill='both'/>
+            </row>
+        </Table>
+        <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()"/>    
+    </JToolBar>
     
     <Table fill='both' insets="1,1,1,1">
         <row fill='horizontal'>
@@ -106,13 +116,22 @@
         </row>
         <row fill='horizontal'>
             <cell columns="2" fill='both'>
-                <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>        
+                <JScrollPane columnHeaderView='{remoteHead}' styleClass='connexionScroll'>
+                <Table insets="2,2,2,2" fill='horizontal'>
+                    <row fill='horizontal'>
+                        <cell><JLabel id='rootConfigLabel'/></cell>
+                        <cell><JComboBox id='rootsList'/></cell>
+                    </row>
+                    <row fill='horizontal'>
+                        <cell><JLabel id='modulePathLabel'/></cell>
+                        <cell><JTextField id='modulePath' onKeyReleased="doCheck(VCSConnexionConfigProperty.modulePath)"/></cell>
+                    </row>
+                    <row fill='horizontal'>
+                        <cell><JLabel id='remoteURLLabel'/></cell>
+                        <cell><JTextField id='remoteURL' enabled='false'/></cell>
+                    </row>
+                </Table>
+                </JScrollPane>
             </cell>
         </row>
         <row fill='horizontal'>

Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx
===================================================================
--- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx	2008-05-15 07:56:26 UTC (rev 670)
+++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx	2008-05-17 11:32:03 UTC (rev 671)
@@ -15,7 +15,7 @@
         <row fill='horizontal'>
             <cell columns="2" fill='both'>
                 <JScrollPane columnHeaderView='{identityHead}' styleClass='connexionScroll'>
-                    <Table>
+                    <Table fill='horizontal'>
                         <row fill='horizontal'>
                             <cell>
                                 <JLabel id='firstNameLabel'/>

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-05-15 07:56:26 UTC (rev 670)
+++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css	2008-05-17 11:32:03 UTC (rev 671)
@@ -77,6 +77,19 @@
     text: "lutinvcs.config.workingCopyFile";
 }
 
+#modulePathLabel {
+    text: "lutinvcs.config.modulePath";
+}
+#rootConfigLabel {
+    text: "lutinvcs.config.rootConfig";
+}
+#rootConfigHeadLabel {
+    text: "lutinvcs.config.rootConfigHead";
+}
+#remoteURLLabel {
+    text: "lutinvcs.config.remoteURL";
+}
+
 #changePrivateKeyFile {
     toolTipText: "lutinvcs.config.server.ssh.key.change";
     opaque:false;
@@ -123,6 +136,8 @@
 }
 
 .connexionScroll{
-    verticalScrollBarPolicy: 20;
+    verticalScrollBarPolicy: 21;
     horizontalScrollBarPolicy: 31;
+    height:110;
+    width:400;
 }
\ No newline at end of file

    

r671 - in trunk/lutinvcs/ui/jaxx/src/main: resources/i18n uimodel/org/codelutin/vcs/ui

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)