branch develop updated (8fde3ab -> 5fc477c)
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 8fde3ab fixes #7125: [IMPORT/EXPORT] Erreur lors de l'import d'observations individuelles Merge branch 'feature/7125' into develop new 2b0ead9 changement de libelle + grossir les boutons d'action (refs #7061) new 49a5894 fixes #7061: [ERGO] modifier le libellé vers "Saisir les traits et les captures" Merge branch 'feature/7061' into develop new afe49ff correction label (refs #7083) new 5fc477c fixes #7083: [PROTOCOLE] modification d elibellés Merge branch 'feature/7083' into develop The 4 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 5fc477c825b1c9593f908f755fc5e9fdcaa0f9c3 Merge: 49a5894 afe49ff Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jun 11 11:40:30 2015 +0200 fixes #7083: [PROTOCOLE] modification d elibellés Merge branch 'feature/7083' into develop commit afe49ff187845ee63755b7a1e8734a5fea6de713 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jun 11 11:40:28 2015 +0200 correction label (refs #7083) commit 49a5894f9b64e429ec41ffbb324c713855abcbd7 Merge: 8fde3ab 2b0ead9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jun 11 11:36:34 2015 +0200 fixes #7061: [ERGO] modifier le libellé vers "Saisir les traits et les captures" Merge branch 'feature/7061' into develop 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) Summary of changes: .../tutti/ui/swing/content/home/SelectCruiseUI.jaxx | 15 ++++++++++++--- .../ui/swing/content/home/SelectCruiseUIHandler.java | 5 +++++ .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 12 ++++++------ 3 files changed, 23 insertions(+), 9 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 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>.
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 49a5894f9b64e429ec41ffbb324c713855abcbd7 Merge: 8fde3ab 2b0ead9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jun 11 11:36:34 2015 +0200 fixes #7061: [ERGO] modifier le libellé vers "Saisir les traits et les captures" Merge branch 'feature/7061' into develop .../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(-) -- 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 afe49ff187845ee63755b7a1e8734a5fea6de713 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jun 11 11:40:28 2015 +0200 correction label (refs #7083) --- .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 8bd0036..cfaae03 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 @@ -951,11 +951,11 @@ tutti.editProtocol.action.exportProtocolSpeciesFile=Exporter tutti.editProtocol.action.exportPupitri=Export Pupitri tutti.editProtocol.action.exportPupitri.mnemonic=p tutti.editProtocol.action.exportPupitri.tip=Exporter les espèces au format Pupitri -tutti.editProtocol.action.importProtocolBenthos=Importer les benthos +tutti.editProtocol.action.importProtocolBenthos=Importer les espèces du benthos tutti.editProtocol.action.importProtocolBenthos.mnemonic=i tutti.editProtocol.action.importProtocolBenthos.speciesInSpecies=Les espèces suivantes n'ont pas été importées car elles sont déjà présentes dans les espèces \:<ul>%s</ul> tutti.editProtocol.action.importProtocolBenthos.speciesInSpecies.title=Espèces non importées -tutti.editProtocol.action.importProtocolBenthos.tip=Importer les benthos dans le protocole +tutti.editProtocol.action.importProtocolBenthos.tip=Importer les espèces du benthos dans le protocole tutti.editProtocol.action.importProtocolBenthosFile=Importer tutti.editProtocol.action.importProtocolCaracteristic=Importer les caractéristiques tutti.editProtocol.action.importProtocolCaracteristic.mnemonic=i -- 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 5fc477c825b1c9593f908f755fc5e9fdcaa0f9c3 Merge: 49a5894 afe49ff Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jun 11 11:40:30 2015 +0200 fixes #7083: [PROTOCOLE] modification d elibellés Merge branch 'feature/7083' into develop .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm