branch develop updated (bd8edb8 -> 76c51a4)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from bd8edb8 Corrige une tipo new 014ac30 Remove dead code new 76c51a4 Test d'ajout de raccourcis clavier The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 76c51a4510a25b305a39aba5e4a227ca954d491f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 8 17:47:27 2016 +0200 Test d'ajout de raccourcis clavier commit 014ac300177756b8dda81e00c6026d98c43215f4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 8 15:58:51 2016 +0200 Remove dead code Summary of changes: .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 4 -- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 66 +++++++++++++++++++++- 2 files changed, 64 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 014ac300177756b8dda81e00c6026d98c43215f4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 8 15:58:51 2016 +0200 Remove dead code --- .../application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx index dcecde9..86eb01f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx @@ -54,10 +54,6 @@ <DataSelectionModel id='rightSelectDataModel' initializer='getModel().getDataSynchroModel().getRightSelectionDataModel()'/> <DataSelectionTreeSelectionModel id='rightSelectionModel'/> - <JPanel id='invisiblePanel'> - <DataSelectionTreeCellRenderer id='leftSelectionRenderer'/> - <DataSelectionTreeCellRenderer id='rightSelectionRenderer'/> - </JPanel> <script><![CDATA[ public DataSynchroUI(AdminUI parentContext) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 76c51a4510a25b305a39aba5e4a227ca954d491f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 8 17:47:27 2016 +0200 Test d'ajout de raccourcis clavier --- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 66 +++++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java index 5fc8650..b834dbd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java @@ -39,6 +39,7 @@ import jaxx.runtime.swing.editor.MyDefaultCellEditor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.AbstractAction; import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JLabel; @@ -46,15 +47,20 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JTable; import javax.swing.JTree; +import javax.swing.KeyStroke; import javax.swing.table.DefaultTableCellRenderer; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Window; +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.util.Date; +import static javax.swing.JComponent.WHEN_IN_FOCUSED_WINDOW; import static org.nuiton.i18n.I18n.t; /** @@ -108,7 +114,7 @@ public class StorageTabUIHandler { ui.setDescriptionText(t(ui.getStep().getDescription())); } - public void initUI(final ConfigUI ui) { + public void initUI(ConfigUI ui) { PropertyChangeListener listener = evt -> { StorageUIModel model = (StorageUIModel) evt.getSource(); @@ -131,6 +137,32 @@ public class StorageTabUIHandler { } }; ui.getModel().addPropertyChangeListener(listener); + + ui.getActionMap().put("doChooseFile", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getFileChooserAction().doClick(); + } + }); + KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(keyStroke, "doChooseFile"); + + ui.getActionMap().put("doUseSsl", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getRemoteUseSsl().doClick(); + } + }); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK), "doUseSsl"); + + ui.getActionMap().put("doKeepConfiguration", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getStoreRemoteConfig().doClick(); + } + }); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK), "doKeepConfiguration"); + } public void initUI(final ConfigReferentielUI ui) { @@ -146,6 +178,21 @@ public class StorageTabUIHandler { }; ui.getModel().addPropertyChangeListener(listener); ui.getModel().setReferentielImportMode(CreationMode.IMPORT_EXTERNAL_DUMP); + + ui.getActionMap().put("doConfigureRemoteSource", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getConfigureCentralSource().doClick(); + } + }); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK), "doConfigureRemoteSource"); + ui.getActionMap().put("doConfigureRemoteServer", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getConfigureCentralSourceServer().doClick(); + } + }); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK), "doConfigureRemoteServer"); } } @@ -170,7 +217,7 @@ public class StorageTabUIHandler { } } - public void initUI(final RolesUI ui) { + public void initUI(RolesUI ui) { if (ui.getStep() != null) { ui.setDescriptionText(t(ui.getStep().getDescription())); } @@ -231,6 +278,21 @@ public class StorageTabUIHandler { public void initUI(BackupUI ui) { if (ui.getStep() != null) { ui.setDescriptionText(t(ui.getStep().getDescription())); + + ui.getActionMap().put("doBackup", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getDoBackup().doClick(); + } + }); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK), "doBackup"); + ui.getActionMap().put("doChooseDirectory", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getChooseFileAction().doClick(); + } + }); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK), "doChooseDirectory"); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm