This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2bfe0f1a222c4c58bc004dd84cbc42536259d4c0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 8 11:25:13 2016 +0100 Redimensionnement de l'assistant connexion (Fixes #8851) --- .../swing/ui/storage/tabs/ConfigUI.jaxx | 322 ++++++++++----------- .../swing/ui/storage/tabs/ConfigUI.jcss | 4 +- 2 files changed, 162 insertions(+), 164 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx index e66ce8d..d992cb1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx @@ -49,168 +49,166 @@ <CardLayout id='configLayout'/> <JPanel id='content' layout='{new BorderLayout()}'> - <Table fill='both' weightx='1' constraints='BorderLayout.CENTER'> - <row> - <cell anchor='north'> - <JPanel id='configContent'> - - <!-- configurer creation base locale a partir d'une sauvegarde --> - <Table id='IMPORT_EXTERNAL_DUMP' constraints='"IMPORT_EXTERNAL_DUMP"'> - <row> - <cell> - <JLabel text='observe.storage.importExternalDump.config'/> - </cell> - </row> - <row weighty='1'> - <cell weightx='1' fill="horizontal"> - <JTextField id="dumpFile" - onKeyReleased='getModel().setDumpFile(new File(((JTextField)event.getSource()).getText()))'/> - </cell> - <cell anchor="east"> - <JButton id="fileChooserAction" onActionPerformed="handler.chooseDumpFile()"/> - </cell> - </row> - </Table> - - <!-- configurer creation base locale et import referentiel depuis base distante --> - <Table id='IMPORT_REMOTE_STORAGE' fill="both" constraints='"IMPORT_REMOTE_STORAGE"'> - <row> - <cell> - <JLabel text='observe.storage.importRemoteStorage.config'/> - </cell> - </row> - <row> - <cell weighty='1' weightx='1'> - <JPanel id='IMPORT_REMOTE_STORAGE_content'/> - </cell> - </row> - - </Table> - - <!-- configurer creation base locale et import referentiel depuis un server distant --> - <Table id='IMPORT_SERVER_STORAGE' fill="both" constraints='"IMPORT_SERVER_STORAGE"'> - <row> - <cell> - <JLabel text='observe.storage.importServerStorage.config'/> - </cell> - </row> - <row> - <cell weighty='1' weightx='1'> - <JPanel id='IMPORT_SERVER_STORAGE_content'/> - </cell> - </row> - - </Table> - - <!-- configurer connexion a base distante --> - <Table id='USE_REMOTE' constraints='"USE_REMOTE"' fill='both'> - <row> - <cell> - <JLabel text='observe.storage.useRemoteStorage.config'/> - </cell> - </row> - <row> - <cell weighty='1' weightx='1'> - <JPanel id='USE_REMOTE_content' minimumSize='{new Dimension(20,300)}'/> - </cell> - </row> - </Table> - - <!-- configurer connexion au server base distante --> - <Table id='USE_SERVER' constraints='"USE_SERVER"' fill='both'> - <row> - <cell> - <JLabel text='observe.storage.useServerStorage.config'/> - </cell> - </row> - <row> - <cell weighty='1' weightx='1'> - <JPanel id='USE_SERVER_content' minimumSize='{new Dimension(20,300)}'/> - </cell> - </row> - </Table> - - <JPanel constraints='"$$hideme$$"' visible='false'> - <JPanel id='remoteConfig'> - <Table constraints='BorderLayout.CENTER' fill="both"> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.url'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteUrl" - onKeyReleased='getModel().setRemoteUrl(((JTextField)event.getSource()).getText())'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.login'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteLogin" - onKeyReleased='getModel().setRemoteLogin(((JTextField)event.getSource()).getText())'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='observe.storage.remote.password'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JPasswordField id="remotePassword" - onKeyReleased='getModel().setRemotePassword(((JPasswordField)event.getSource()).getPassword())'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id="serverDataBaseLabel" text='observe.storage.server.dataBase'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverDataBase" - onKeyReleased='getModel().setServerDatabase(((JTextField)event.getSource()).getText())'/> - </cell> - </row> - <row> - <cell columns='2'> - <JCheckBox id="remoteUseSsl" - onActionPerformed='getModel().setUseSsl(((JCheckBox)event.getSource()).isSelected())'/> - </cell> - </row> - - <!-- sauver dans la configuration --> - <row> - <cell columns='2'> - <JCheckBox id="storeRemoteConfig" - onActionPerformed='getModel().setStoreRemoteConfig(((JCheckBox)event.getSource()).isSelected())'/> - </cell> - </row> - <!-- tester la connexion --> - <row> - <cell columns='2'> - <JButton id="testRemoteAction" onActionPerformed='getModel().testRemote()'/> - </cell> - </row> - </Table> - <!-- résumé du test de connexion --> - <Table constraints='BorderLayout.SOUTH' fill='both' insets='0'> - <row> - <cell weightx='1' weighty='1'> - <JScrollPane id="connexionStatusPanel"> - <JTextPane id='connexionStatus'/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id="connexionStatusLabel"/> - </cell> - </row> - </Table> - </JPanel> - </JPanel> - </JPanel> - </cell> - </row> - </Table> + <JPanel id='configContent' constraints='BorderLayout.CENTER'> + + <!-- configurer creation base locale a partir d'une sauvegarde --> + <Table id='IMPORT_EXTERNAL_DUMP' constraints='"IMPORT_EXTERNAL_DUMP"'> + <row> + <cell> + <JLabel text='observe.storage.importExternalDump.config'/> + </cell> + </row> + <row weighty='1'> + <cell weightx='1' fill="horizontal"> + <JTextField id="dumpFile" + onKeyReleased='getModel().setDumpFile(new File(((JTextField)event.getSource()).getText()))'/> + </cell> + <cell anchor="east"> + <JButton id="fileChooserAction" onActionPerformed="handler.chooseDumpFile()"/> + </cell> + </row> + </Table> + + <!-- configurer creation base locale et import referentiel depuis base distante --> + <Table id='IMPORT_REMOTE_STORAGE' fill="both" constraints='"IMPORT_REMOTE_STORAGE"'> + <row> + <cell> + <JLabel text='observe.storage.importRemoteStorage.config'/> + </cell> + </row> + <row> + <cell weighty='1' weightx='1'> + <JPanel id='IMPORT_REMOTE_STORAGE_content'/> + </cell> + </row> + + </Table> + + <!-- configurer creation base locale et import referentiel depuis un server distant --> + <Table id='IMPORT_SERVER_STORAGE' + fill="both" + constraints='"IMPORT_SERVER_STORAGE"'> + <row> + <cell> + <JLabel text='observe.storage.importServerStorage.config'/> + </cell> + </row> + <row> + <cell weighty='1' weightx='1'> + <JPanel id='IMPORT_SERVER_STORAGE_content'/> + </cell> + </row> + + </Table> + + <!-- configurer connexion a base distante --> + <Table id='USE_REMOTE' + constraints='"USE_REMOTE"' fill='both'> + <row> + <cell> + <JLabel text='observe.storage.useRemoteStorage.config'/> + </cell> + </row> + <row> + <cell weighty='1' weightx='1'> + <JPanel id='USE_REMOTE_content' + minimumSize='{new Dimension(20,300)}'/> + </cell> + </row> + </Table> + + <!-- configurer connexion au server base distante --> + <Table id='USE_SERVER' + constraints='"USE_SERVER"' fill='both'> + <row> + <cell> + <JLabel text='observe.storage.useServerStorage.config'/> + </cell> + </row> + <row> + <cell weighty='1' weightx='1'> + <JPanel id='USE_SERVER_content' + minimumSize='{new Dimension(20,300)}'/> + </cell> + </row> + </Table> + + <JPanel constraints='"$$hideme$$"' visible='false'> + <JPanel id='remoteConfig'> + <Table constraints='BorderLayout.NORTH' fill="both"> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.url'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="remoteUrl" + onKeyReleased='getModel().setRemoteUrl(((JTextField)event.getSource()).getText())'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.login'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="remoteLogin" + onKeyReleased='getModel().setRemoteLogin(((JTextField)event.getSource()).getText())'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='observe.storage.remote.password'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JPasswordField id="remotePassword" + onKeyReleased='getModel().setRemotePassword(((JPasswordField)event.getSource()).getPassword())'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id="serverDataBaseLabel" + text='observe.storage.server.dataBase'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="serverDataBase" + onKeyReleased='getModel().setServerDatabase(((JTextField)event.getSource()).getText())'/> + </cell> + </row> + <row> + <cell columns='2'> + <JCheckBox id="remoteUseSsl" + onActionPerformed='getModel().setUseSsl(((JCheckBox)event.getSource()).isSelected())'/> + </cell> + </row> + + <!-- sauver dans la configuration --> + <row> + <cell columns='2'> + <JCheckBox id="storeRemoteConfig" + onActionPerformed='getModel().setStoreRemoteConfig(((JCheckBox)event.getSource()).isSelected())'/> + </cell> + </row> + <!-- tester la connexion --> + <row> + <cell columns='2'> + <JButton id="testRemoteAction" + onActionPerformed='getModel().testRemote()'/> + </cell> + </row> + </Table> + <!-- résumé du test de connexion --> + <Table constraints='BorderLayout.CENTER' fill='both' insets='0'> + <row> + <cell weightx='1' weighty='1'> + <JScrollPane id="connexionStatusPanel" columnHeaderView="{connexionStatusLabel}"> + <JTextPane id='connexionStatus'/> + <JLabel id="connexionStatusLabel"/> + </JScrollPane> + </cell> + </row> + </Table> + </JPanel> + </JPanel> + </JPanel> </JPanel> </StorageTabUI> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss index f69a574..75a2b01 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss @@ -57,7 +57,7 @@ } #USE_REMOTE_content { - layout:{new GridLayout()}; + layout:{new BorderLayout()}; } #USE_SERVER { @@ -65,7 +65,7 @@ } #USE_SERVER_content { - layout:{new GridLayout()}; + layout:{new BorderLayout()}; } #remoteConfig { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.