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 2b0ead95da9d0ad000a4c300ac3164297c24ade9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jun 11 11:36:32 2015 +0200 changement de libelle + grossir les boutons d'action (refs #7061) --- .../tutti/ui/swing/content/home/SelectCruiseUI.jaxx | 15 ++++++++++++--- .../ui/swing/content/home/SelectCruiseUIHandler.java | 5 +++++ .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 8 ++++---- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx index d621ad6..0e049d5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx @@ -75,6 +75,13 @@ <Table fill='both' constraints='BorderLayout.CENTER'> <row> + <cell columns="3" weighty="0.2"> + <JPanel layout='{new BorderLayout()}'> + <JLabel constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + <row> <cell columns="3"> <JPanel id='warningContainer' layout='{new BorderLayout(10, 10)}'> <JLabel id='warningLabel' constraints='BorderLayout.CENTER'/> @@ -123,11 +130,13 @@ </JPanel> </cell> </row> - <row> - <cell columns='3'> - <JPanel layout='{new GridLayout(1,0)}'> + <row rows='2'> + <cell columns='3' weighty='0.3'> + <JPanel layout='{new GridLayout(2,0)}'> <JButton id='editCatchesButton'/> <JButton id='validateCatchesButton'/> + <JLabel/> + <JLabel/> </JPanel> </cell> </row> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java index 0ea449d..23ee88b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java @@ -35,6 +35,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; +import java.awt.Font; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -125,6 +126,10 @@ public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUI initUI(ui); + Font font = ui.getEditCatchesButton().getFont(); + ui.getEditCatchesButton().setFont(font.deriveFont(Font.BOLD,14)); + ui.getValidateCatchesButton().setFont(font.deriveFont(Font.BOLD,14)); + SelectCruiseUIModel model = getModel(); initBeanFilterableComboBox(ui.getProgramCombobox(), model.getPrograms(), model.getProgram()); diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 107bde0..8bd0036 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1587,9 +1587,9 @@ tutti.main.action.connectIchtyometer.tip=Se connecter à un ichtyomètre tutti.main.action.disconnectIchtyometer=Déconnexion Ichtyomètre tutti.main.action.disconnectIchtyometer.mnemonic=y tutti.main.action.disconnectIchtyometer.tip=Se déconnecter de l'ichtyomètre -tutti.main.action.editCatches=Saisir les captures +tutti.main.action.editCatches=Éditer les traits et les captures tutti.main.action.editCatches.mnemonic=S -tutti.main.action.editCatches.tip=Éditer les captures +tutti.main.action.editCatches.tip=Éditer les traits et les captures tutti.main.action.editProgram.tip=Éditer la série de campagne tutti.main.action.editSampleCategoryModel=Configurer les catégorisations tutti.main.action.editSampleCategoryModel.mnemonic=o @@ -1854,9 +1854,9 @@ tutti.selectCruise.action.deleteProtocol=Supprimer tutti.selectCruise.action.deleteProtocol.message=Vous êtes sur le point de supprimer le protocole <strong>%s</strong> tutti.selectCruise.action.deleteProtocol.tip=Supprimer le protocole sélectionné tutti.selectCruise.action.deleteProtocol.title=Supprimer le protocole sélectionné -tutti.selectCruise.action.editCatches=Saisir les captures +tutti.selectCruise.action.editCatches=Saisir les traits et les captures tutti.selectCruise.action.editCatches.mnemonic=S -tutti.selectCruise.action.editCatches.tip=Ouvrir les écrans de saisie des captures +tutti.selectCruise.action.editCatches.tip=Ouvrir les écrans de saisie des traits et des captures tutti.selectCruise.action.editCruise=Éditer tutti.selectCruise.action.editCruise.tip=Éditer la campagne sélectionnée tutti.selectCruise.action.editProgram=Éditer -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.