branch develop updated (2ff0b07 -> 2db8dc6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 2ff0b07 Merge branch 'feature/7926' into 'develop' new a3f0f40 Correction de l'icone d'ascenseur qui a disparu (fixes #7920) new 30823ec Alignement sur le haut pour les écrans de création (pour uniformiser avec les autres écrans de création) new 2db8dc6 Uniformisation des tailles des boutons dans les autres écrans (See #7926) 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 2db8dc67244e1bce30b8d1944d8ab13f365bd2d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 08:41:16 2016 +0100 Uniformisation des tailles des boutons dans les autres écrans (See #7926) commit 30823ecccc8bed1a8918c5edd8185251d1f857f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 08:41:00 2016 +0100 Alignement sur le haut pour les écrans de création (pour uniformiser avec les autres écrans de création) commit a3f0f4033160dbd03e02e63362c5ab5a2b603007 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 08:40:24 2016 +0100 Correction de l'icone d'ascenseur qui a disparu (fixes #7920) Summary of changes: .../main/java/fr/ifremer/tutti/ui/swing/RunTutti.java | 6 ++++-- .../ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx | 2 +- .../content/genericformat/GenericFormatExportUI.jaxx | 2 +- .../content/genericformat/GenericFormatImportUI.jaxx | 18 +++++++++--------- .../accidental/create/CreateAccidentalBatchUI.jaxx | 2 +- .../create/CreateIndividualObservationBatchUI.jaxx | 2 +- .../marinelitter/create/CreateMarineLitterBatchUI.jaxx | 2 +- 7 files changed, 18 insertions(+), 16 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 http://git.codelutin.com/tutti.git commit a3f0f4033160dbd03e02e63362c5ab5a2b603007 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 08:40:24 2016 +0100 Correction de l'icone d'ascenseur qui a disparu (fixes #7920) --- .../src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java index 624a77e..f80737a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java @@ -23,11 +23,11 @@ package fr.ifremer.tutti.ui.swing; */ import fr.ifremer.tutti.TuttiConfiguration; +import fr.ifremer.tutti.ui.swing.content.MainUI; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.content.actions.StartAction; import fr.ifremer.tutti.ui.swing.update.actions.UpdateApplicationAction; import fr.ifremer.tutti.ui.swing.update.actions.UpdateReportAction; -import fr.ifremer.tutti.ui.swing.content.MainUI; -import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiExceptionHandler; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; @@ -37,6 +37,7 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.plaf.BorderUIResource; import java.awt.Color; +import java.awt.Dimension; import java.util.Arrays; /** @@ -77,6 +78,7 @@ public class RunTutti { // Prepare ui look&feel and load ui properties try { SwingUtil.initNimbusLoookAndFeel(); + UIManager.getLookAndFeelDefaults().put("ScrollBar.minimumThumbSize", new Dimension(30, 30)); } catch (Exception e) { // could not find nimbus look-and-feel if (log.isWarnEnabled()) { -- 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 http://git.codelutin.com/tutti.git commit 30823ecccc8bed1a8918c5edd8185251d1f857f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 08:41:00 2016 +0100 Alignement sur le haut pour les écrans de création (pour uniformiser avec les autres écrans de création) --- .../operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx | 2 +- .../create/CreateIndividualObservationBatchUI.jaxx | 2 +- .../catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx index 1fd13f6..aa8c8e6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx @@ -68,7 +68,7 @@ public CreateAccidentalBatchUI(EditCatchesUI parentUI) { <TuttiHelpBroker id='broker' constructorParams='"tutti.createAccidentalBatch.help"'/> - <Table id='configurationPanel' constraints='BorderLayout.CENTER' fill='both'> + <Table id='configurationPanel' constraints='BorderLayout.NORTH' fill='both'> <!-- accidental species --> <row> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx index 6f0cfd6..2f6281b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx @@ -64,7 +64,7 @@ public CreateIndividualObservationBatchUI(EditCatchesUI parentUI) { <TuttiHelpBroker id='broker' constructorParams='"tutti.createIndividualObservationBatch.help"'/> - <Table id='configurationPanel' constraints='BorderLayout.CENTER' fill='both'> + <Table id='configurationPanel' constraints='BorderLayout.NORTH' fill='both'> <!-- IndividualObservation species --> <row> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx index 0c4334b..4f243bd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx @@ -59,7 +59,7 @@ public CreateMarineLitterBatchUI(EditCatchesUI parentUI) { <TuttiHelpBroker id='broker' constructorParams='"tutti.createMarineLitterBatch.help"'/> - <Table id='configurationPanel' constraints='BorderLayout.CENTER' fill='both'> + <Table id='configurationPanel' constraints='BorderLayout.NORTH' fill='both'> <!-- MarineLitterCategory --> <row> -- 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 http://git.codelutin.com/tutti.git commit 2db8dc67244e1bce30b8d1944d8ab13f365bd2d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 08:41:16 2016 +0100 Uniformisation des tailles des boutons dans les autres écrans (See #7926) --- .../ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx | 2 +- .../content/genericformat/GenericFormatExportUI.jaxx | 2 +- .../content/genericformat/GenericFormatImportUI.jaxx | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx index af93a14..370df72 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx @@ -55,7 +55,7 @@ <JPanel id='actions' layout='{new GridLayout(0, 1)}' constraints='BorderLayout.SOUTH'> <!--<JButton id='closeDbButton'/>--> - <JButton id='openDbButton'/> + <JButton id='openDbButton' styleClass="buttonPanel"/> <JButton id='installOrReinstallDbButton'/> <JButton id='importDbButton'/> <JButton id='upgradeDbButton'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx index 30702f5..a1cab5f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx @@ -100,7 +100,7 @@ <row> <cell fill='both' columns='2'> - <JPanel layout='{new GridLayout(1, 0)}'> + <JPanel layout='{new GridLayout(1, 0)}' styleClass="buttonPanel"> <JButton id='closeButton'/> <JButton id='exportButton'/> </JPanel> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx index ac4f3e2..f7ca1f0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx @@ -89,7 +89,7 @@ <!-- validate action --> <row> <cell columns='2'> - <JPanel layout='{new GridLayout(1, 0)}'> + <JPanel layout='{new GridLayout(1, 0)}' styleClass="buttonPanel"> <JButton id='validateButton'/> </JPanel> </cell> @@ -98,11 +98,11 @@ <!-- Validate result --> <row> <cell columns='2'> - <JPanel id='validateResultPanel' layout='{new BorderLayout()}'> + <JPanel id='validateResultPanel' layout='{new BorderLayout()}' styleClass="buttonPanel"> <JLabel id='validateResultText' constraints='BorderLayout.WEST'/> <JToolBar constraints='BorderLayout.EAST'> - <JButton id='openValidateReportButton'/> - <JButton id='saveValidateReportButton'/> + <JButton id='openValidateReportButton' styleClass="buttonPanel"/> + <JButton id='saveValidateReportButton' styleClass="buttonPanel"/> </JToolBar> </JPanel> </cell> @@ -151,7 +151,7 @@ <!-- Import actions --> <row anchor='south'> <cell> - <JPanel layout='{new GridLayout(1, 0)}'> + <JPanel layout='{new GridLayout(1, 0)}' styleClass="buttonPanel"> <JButton id='importButton'/> </JPanel> </cell> @@ -160,11 +160,11 @@ <!-- import result --> <row> <cell> - <JPanel id='importResultPanel' layout='{new BorderLayout()}'> + <JPanel id='importResultPanel' layout='{new BorderLayout()}' styleClass="buttonPanel"> <JLabel id='importResultText' constraints='BorderLayout.WEST'/> <JToolBar constraints='BorderLayout.EAST'> - <JButton id='openImportReportButton'/> - <JButton id='saveImportReportButton'/> + <JButton id='openImportReportButton' styleClass="buttonPanel"/> + <JButton id='saveImportReportButton' styleClass="buttonPanel"/> </JToolBar> </JPanel> </cell> @@ -175,7 +175,7 @@ <Table fill='both' constraints='BorderLayout.SOUTH'> <row> <cell fill='both' weightx="1"> - <JPanel layout='{new GridLayout(1, 0)}'> + <JPanel layout='{new GridLayout(1, 0)}' styleClass="buttonPanel"> <JButton id='closeButton'/> </JPanel> </cell> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm