branch develop-4.4.x updated (5257452 -> 110648c)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from 5257452 Passage sur une branche de maintenance new 561738d Correction de la taille des boutons (See #7971) new f035b1e Correction d'un binding qui ne fonctionnait plus... new 110648c Fixes #7971 Merge branch 'feature/7971' into develop-4.4.x The 3 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 110648c628355da0c5ec373f8c1d6bcb6d969e50 Merge: 5257452 f035b1e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 8 16:51:00 2016 +0100 Fixes #7971 Merge branch 'feature/7971' into develop-4.4.x commit f035b1e44aa2801621255efe5545c97d0dd0be8e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 8 16:49:26 2016 +0100 Correction d'un binding qui ne fonctionnait plus... commit 561738d6ba3bbbc32e62705f9183ca99c7a64829 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 8 16:39:21 2016 +0100 Correction de la taille des boutons (See #7971) Summary of changes: .../ifremer/tutti/ui/swing/content/report/ReportUI.jaxx | 15 +++++++++++++-- .../ifremer/tutti/ui/swing/content/report/ReportUI.jcss | 4 ++-- 2 files changed, 15 insertions(+), 4 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 561738d6ba3bbbc32e62705f9183ca99c7a64829 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 8 16:39:21 2016 +0100 Correction de la taille des boutons (See #7971) --- .../ifremer/tutti/ui/swing/content/report/ReportUI.jaxx | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx index 58a4d20..09202f1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx @@ -56,6 +56,12 @@ <Table id='form' fill='both'> + <row> + <cell columns='2' weighty='0.3'> + <JPanel /> + </cell> + </row> + <!-- Select Fishing Operation (What) --> <row> <cell> @@ -80,8 +86,8 @@ </row> <!-- Actions --> - <row anchor='south'> - <cell columns='2'> + <row> + <cell columns='2' weighty='0.3'> <JPanel layout='{new GridLayout(0, 1)}' styleClass="buttonPanel"> <JButton id='generateButton'/> <JPanel layout='{new GridLayout(1, 0)}'> @@ -92,6 +98,11 @@ </JPanel> </cell> </row> + <row anchor='south'> + <cell columns='2' weighty='0.1'> + <JPanel /> + </cell> + </row> </Table> -- 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit f035b1e44aa2801621255efe5545c97d0dd0be8e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 8 16:49:26 2016 +0100 Correction d'un binding qui ne fonctionnait plus... --- .../main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jcss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jcss index f12b2d7..e85d157 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jcss @@ -94,7 +94,7 @@ FileEditor { toolTipText: "tutti.report.action.save.tip"; i18nMnemonic: "tutti.report.action.save.mnemonic"; _applicationAction: {fr.ifremer.tutti.ui.swing.content.report.actions.SaveReportAction.class}; - enabled: {model.isReportDone()}; + enabled: {model.isValid() && model.isReportDone()}; _help: {"tutti.report.action.save.help"}; } @@ -104,7 +104,7 @@ FileEditor { toolTipText: "tutti.report.action.openReport.tip"; i18nMnemonic: "tutti.report.action.openReport.mnemonic"; _simpleAction: {fr.ifremer.tutti.ui.swing.content.report.actions.OpenReportAction.class}; - enabled: {model.isReportDone()}; + enabled: {model.isValid() && model.isReportDone()}; _help: {"tutti.report.action.openReport.help"}; } -- 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 110648c628355da0c5ec373f8c1d6bcb6d969e50 Merge: 5257452 f035b1e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 8 16:51:00 2016 +0100 Fixes #7971 Merge branch 'feature/7971' into develop-4.4.x .../ifremer/tutti/ui/swing/content/report/ReportUI.jaxx | 15 +++++++++++++-- .../ifremer/tutti/ui/swing/content/report/ReportUI.jcss | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm