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 aba3d82acb8e41984ffb9b16801c1937b2ccf86d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 16 09:59:48 2015 +0100 add generic format import --- .../filtered-resources/tutti-help-fr.properties | 26 ++-------------------- .../ImportGenericFormatProgramCruisesAction.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 2 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index 1fa9eb7..2fce70a 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,28 +1,5 @@ -### -# #%L -# Tutti :: UI -# $Id:$ -# $HeadURL:$ -# %% -# Copyright (C) 2012 - 2014 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Mon Dec 08 18:37:45 CET 2014 +#Mon Feb 16 09:45:58 CET 2015 \ "tutti.editProtocol.action.addCaracteristicMapping.help"\ = tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -415,6 +392,7 @@ tutti.selectCruise.action.exportCruiseForSumatraV2.help=selectCruise.html\#actio tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.generateCruiseReport.help=selectCruise.html\#actions +tutti.selectCruise.action.importProgram.help=selectCruise.html\#actions tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java index de785a3..4a2a2d0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java @@ -40,7 +40,7 @@ public class ImportGenericFormatProgramCruisesAction extends AbstractTuttiAction // choose file to import file = chooseFile( - t("tutti.selectCruise.title.choose.importFile"), + t("tutti.selectCruise.title.choose.importGenericFormatFile"), t("tutti.selectCruise.action.importGenericformat"), "^.+\\.zip$", t("tutti.common.file.genericFormat") ); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css index d3d1adf..1bb3650 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css @@ -56,7 +56,7 @@ BeanFilterableComboBox { } #editProgramComboBox { - model: {SwingUtil.newComboModel(editProgramButton, exportProgramButton)}; + model: {SwingUtil.newComboModel(editProgramButton, exportProgramButton, importProgramButton)}; enabled: {model.isProgramFound()}; renderer: {new ActionListCellRenderer()}; } 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 baf33f8..0f42f3c 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 @@ -63,6 +63,7 @@ <JButton id='editProgramButton'/> <JButton id='exportProgramButton'/> + <JButton id='importProgramButton'/> <JButton id='editCruiseButton'/> <JButton id='exportCruiseButton'/> <JButton id='sendCruiseReportButton'/> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.