This is an automated email from the git hooks/post-receive script. New commit to branch feature/7459 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit ed81d117c0eeec51edff67a2ac9c0856816b0f15 Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 21 10:30:12 2016 +0200 affichage du port série écouté dans la barre de statut (refs #7459) --- .../src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jcss | 3 ++- .../ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jcss index ce1cee1..0041ff7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jcss @@ -340,7 +340,8 @@ JMenu { actionIcon: "bluetooth-up"; disabledIcon: {jaxx.runtime.SwingUtil.createActionIcon("bluetooth-down")}; enabled: {model.isCaliperConnected()}; - toolTipText: {handler.getCaliperStatusLabel(model.isCaliperConnected())}; + toolTipText: {handler.getCaliperStatusTip(model.isCaliperConnected())}; + text: {handler.getCaliperStatusLabel(model.isCaliperConnected())}; _help: {"tutti.main.status.caliper.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java index ddd0584..e0ea92c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java @@ -45,7 +45,7 @@ public class ConnectCaliperAction extends AbstractMainUITuttiAction { public void doAction() throws Exception { CaliperFeedReader caliperReader = new CaliperFeedReader(); - caliperReader.start(getConfig().getCaliperSerialPort().name()); + caliperReader.start(getConfig().getCaliperSerialPort()); getContext().setCaliperReader(caliperReader); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.