branch develop updated (405cf00 -> 58f1ff1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 405cf00 Fixes #8142 Merge branch 'feature/8142' into develop adds 8c2b127 - suppression des boutons pour afficher la popup de l'editeur de nombres - ajout de la formule en haut de la popup fixes #8141 new a1319dd Ajout couleur pour faire resortir encore plus la formule (See #8141) new 58f1ff1 Fixes #8141 Merge branch 'feature/8141' into develop 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 58f1ff1838ee0481a92fcdbab3546795f5281d3a Merge: 405cf00 a1319dd Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 18 11:54:13 2016 +0100 Fixes #8141 Merge branch 'feature/8141' into develop commit a1319dd0a1e9acb28520081310cf84fac471a377 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 18 11:54:07 2016 +0100 Ajout couleur pour faire resortir encore plus la formule (See #8141) Summary of changes: .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 123 +++++++++++---------- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 14 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 25 +++-- 4 files changed, 91 insertions(+), 72 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 tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit a1319dd0a1e9acb28520081310cf84fac471a377 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 18 11:54:07 2016 +0100 Ajout couleur pour faire resortir encore plus la formule (See #8141) --- .../fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 6 +++++- .../fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx index a2b5a47..903ab66 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx @@ -74,7 +74,11 @@ public void closeEditor() { handler.closeEditor(); } <JXTitledPanel id="bodyPanel" constraints='BorderLayout.CENTER'> <JPanel layout='{new BorderLayout()}'> - <JLabel id="rtpFormulaLabel" constraints='BorderLayout.NORTH'/> + <JPanel id='rtpFormulaLabelContainer' layout='{new BorderLayout(10, 10)}' + constraints='BorderLayout.NORTH'> + <JLabel id="rtpFormulaLabel" constraints='BorderLayout.CENTER'/> + </JPanel> + <JPanel layout="{new GridLayout(3, 1)}" constraints='BorderLayout.CENTER'> <JPanel id="malePanel" layout="{new GridLayout(2, 1)}" border='{new TitledBorder(t("tutti.editRtp.malePanel"))}'> <JPanel layout="{new GridLayout(1, 2)}"> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss index 2b3dc7a..4ee2e56 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss @@ -42,6 +42,10 @@ NumberEditor { _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.rtp.actions.EditNextRowAction.class}; } +#rtpFormulaLabelContainer { + background: {new java.awt.Color(245, 218, 88)}; +} + #rtpFormulaLabel { text: "tutti.editRtp.formula"; horizontalAlignment: "center"; -- 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 tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 58f1ff1838ee0481a92fcdbab3546795f5281d3a Merge: 405cf00 a1319dd Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 18 11:54:13 2016 +0100 Fixes #8141 Merge branch 'feature/8141' into develop .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 123 +++++++++++---------- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 14 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 25 +++-- 4 files changed, 91 insertions(+), 72 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm