[Tutti-commits] r223 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/config java/fr/ifremer/tutti/ui/swing/content/cruise java/fr/ifremer/tutti/ui/swing/content/home resources/i18n

Author: tchemit Date: 2013-01-18 15:55:04 +0100 (Fri, 18 Jan 2013) New Revision: 223 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/223 Log: refs #1852: [ERGO] - Barre de progression pour les actions longues Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/SelectCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ValidateSelectedCruiseCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -24,7 +24,6 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; @@ -32,10 +31,21 @@ import org.jdesktop.beans.AbstractBean; import javax.swing.AbstractAction; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import java.awt.BorderLayout; import java.awt.event.ActionEvent; import java.util.Timer; import java.util.TimerTask; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import static org.nuiton.i18n.I18n._; + /** * TODO * @@ -51,61 +61,62 @@ private static final Timer t = new Timer(); + private static final ExecutorService executorService = + Executors.newSingleThreadExecutor(); + private final H handler; + private final boolean hideBody; + protected abstract void doAction(ActionEvent event); - public AbstractTuttiAction(H handler, - String name, - String icon, - String text, - String tip) { + protected AbstractTuttiAction(H handler, + String name, + String icon, + String text, + String tip, + boolean hideBody) { this.handler = handler; + this.hideBody = hideBody; + putValue(SMALL_ICON, SwingUtil.createActionIcon(icon)); putValue(LARGE_ICON_KEY, SwingUtil.createActionIcon(icon)); putValue(ACTION_COMMAND_KEY, name); putValue(NAME, text); putValue(SHORT_DESCRIPTION, tip); } + protected String getActionName() { + return (String) getValue(NAME); + } + @Override - public final void actionPerformed(ActionEvent event) { + public final void actionPerformed(final ActionEvent event) { if (log.isInfoEnabled()) { log.info("Will starts action: " + this); } - TimerTask timer = new TimerTask() { + + executorService.submit(new Runnable() { @Override public void run() { - if (log.isInfoEnabled()) { - log.info("Task [" + AbstractTuttiAction.this + "] is started since 1 second!!!"); - } - TuttiUIUtil.updateBusyState(getContext().getMainUI(), true); - } + TimerTask timer = new ActionTimerTask(); - @Override - public boolean cancel() { - if (log.isInfoEnabled()) { - log.info("Task [" + AbstractTuttiAction.this + "] canceled."); + t.schedule(timer, 500); + try { + + doAction(event); + } catch (Exception e) { + ErrorDialogUI.showError(e); + timer.cancel(); + } finally { + if (log.isInfoEnabled()) { + log.info("After action: " + this); + } + timer.cancel(); } - TuttiUIUtil.updateBusyState(getContext().getMainUI(), false); - boolean cancel = super.cancel(); - return cancel; } - }; - - try { - - t.schedule(timer, 500); - doAction(event); - } catch (Exception e) { - ErrorDialogUI.showError(e); - } finally { - if (log.isInfoEnabled()) { - log.info("After action: " + this); - } - timer.cancel(); - } + }); } public TuttiUIContext getContext() { @@ -123,4 +134,70 @@ protected void setMnemonic(int key) { putValue(MNEMONIC_KEY, key); } + + protected class ActionTimerTask extends TimerTask { + JDialog d; + + @Override + public void run() { + + MainUI ui = getContext().getMainUI(); + + + updateBusyState(ui, true); + + if (log.isDebugEnabled()) { + log.debug("Task [" + AbstractTuttiAction.this + "] is started, show waiting dialog"); + } + + JPanel panel = new JPanel(new BorderLayout()); + panel.setBorder(new TitledBorder((String) null)); + JLabel label = new JLabel(); + EmptyBorder border = new EmptyBorder(5, 5, 5, 5); + label.setBorder(border); + label.setText(_("tutti.message.action.running", getActionName())); + panel.add(label, BorderLayout.CENTER); + JProgressBar progressBar = new JProgressBar(); + progressBar.setBorder(border); + progressBar.setIndeterminate(true); + panel.add(progressBar, BorderLayout.SOUTH); + + d = new JDialog(ui, true); + d.setUndecorated(true); +// d.setSize(300, 200); + d.add(panel); + d.pack(); + SwingUtil.center(ui, d); + d.setVisible(true); + } + + @Override + public boolean cancel() { + if (log.isDebugEnabled()) { + log.debug("Task [" + AbstractTuttiAction.this + "] canceled."); + } + updateBusyState(getContext().getMainUI(), false); + + if (d != null) { + d.setVisible(false); + } + boolean cancel = super.cancel(); + return cancel; + } + + protected void updateBusyState(MainUI ui, boolean busy) { + + if (busy) { + // ui bloquee + if (hideBody) { + ui.getBody().setVisible(false); + } + } else { + // ui debloquee + if (hideBody) { + ui.getBody().setVisible(true); + } + } + } + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-01-18 14:55:04 UTC (rev 223) @@ -55,6 +55,7 @@ import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JList; +import javax.swing.JMenuItem; import javax.swing.JRootPane; import javax.swing.KeyStroke; import javax.swing.ListCellRenderer; @@ -242,9 +243,15 @@ } jLabel.setText("<html>" + text + "</strong>"); } + } - - } +// else if (component instanceof JMenuItem) { +// JMenuItem jMenuItem = (JMenuItem) component; +// if (jMenuItem.getAction()!=null) { +// jMenuItem.setIcon(); +// } +// +// } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -50,7 +50,9 @@ "editCruise", "edit", _("tutti.action.editCruise"), - _("tutti.action.editCruise.tip")); + _("tutti.action.editCruise.tip"), + true + ); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseCatchesAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedCruiseCatchesAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -45,7 +45,8 @@ "editCatches", "edit", _("tutti.action.editCatches"), - _("tutti.action.editCatches.tip") + _("tutti.action.editCatches.tip"), + true ); setMnemonic('C'); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProgramAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProgramAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -50,7 +50,9 @@ "editProgram", "edit", _("tutti.action.editProgram"), - _("tutti.action.editProgram.tip")); + _("tutti.action.editProgram.tip"), + true + ); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProtocolAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/EditSelectedProtocolAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -50,7 +50,9 @@ "editProtocol", "edit", _("tutti.action.editProtocol"), - _("tutti.action.editProtocol.tip")); + _("tutti.action.editProtocol.tip"), + true + ); setMnemonic('P'); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.css 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.css 2013-01-18 14:55:04 UTC (rev 223) @@ -22,6 +22,10 @@ * #L% */ +#actionBlockerLayer { + canClick: false; + blockingColor: {model.getConfig().getColorBlockingLayer()}; +} #mainFrame { title: "tutti.application.name"; defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; @@ -145,4 +149,4 @@ #validatorMessageWidget { focusPainted: false; -} \ No newline at end of file +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx 2013-01-18 14:55:04 UTC (rev 223) @@ -39,6 +39,7 @@ <MainUIHandler id='handler' initializer='getContextValue(MainUIHandler.class)'/> + <BlockingLayerUI2 id='actionBlockerLayer'/> <SelectCruiseAction id='selectCruiseAction' constructorParams='handler'/> <EditSelectedProtocolAction id='editProtocolAction' constructorParams='handler'/> <EditSelectedProgramAction id='editProgramAction' constructorParams='handler'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-01-18 14:55:04 UTC (rev 223) @@ -85,7 +85,7 @@ UIManager.put("Table.focusCellHighlightBorder", new BorderUIResource.LineBorderUIResource(Color.BLACK)); - UIManager.put("BlockingLayerUI.blockingColor", new Color(50, 50, 50)); + //UIManager.put("BlockingLayerUI.blockingColor", new Color(50, 50, 50)); startTutti(context); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/SelectCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/SelectCruiseAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/SelectCruiseAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -43,7 +43,8 @@ "selectCruise", "home", _("tutti.action.selectCruise"), - _("tutti.action.selectCruise.tip") + _("tutti.action.selectCruise.tip"), + true ); setMnemonic('S'); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ValidateSelectedCruiseCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ValidateSelectedCruiseCatchesAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ValidateSelectedCruiseCatchesAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -45,7 +45,8 @@ "validateCatches", "validate", _("tutti.action.validateCatches"), - _("tutti.action.validateCatches.tip") + _("tutti.action.validateCatches.tip"), + true ); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java 2013-01-18 14:55:04 UTC (rev 223) @@ -156,6 +156,10 @@ return applicationConfig.getOptionAsColor(TuttiConfigOption.COLOR_ROW_READ_ONLY.getKey()); } + public Color getColorBlockingLayer() { + return applicationConfig.getOptionAsColor(TuttiConfigOption.COLOR_BLOCKING_LAYER.getKey()); + } + public KeyStroke getShortcutClosePopup() { return applicationConfig.getOptionAsKeyStroke(TuttiConfigOption.SHORTCUT_CLOSE_POPUP.getKey()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java 2013-01-18 14:55:04 UTC (rev 223) @@ -82,6 +82,13 @@ Boolean.class ), + COLOR_BLOCKING_LAYER( + "tutti.ui.color.blockingLayer", + n_("tutti.config.ui.color.blockingLayer"), + new Color(50, 50, 50).toString(), + Color.class + ), + COLOR_ROW_READ_ONLY( "tutti.ui.color.rowReadOnly", n_("tutti.config.ui.color.rowReadOnly"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-01-18 14:55:04 UTC (rev 223) @@ -106,6 +106,7 @@ helper.addCategory(n_("tutti.config.category.ui"), n_("tutti.config.category.ui.description"), CALLBACK_UI) + .addOption(TuttiConfigOption.COLOR_BLOCKING_LAYER) .addOption(TuttiConfigOption.COLOR_ROW_INVALID) .addOption(TuttiConfigOption.COLOR_ROW_READ_ONLY) .addOption(TuttiConfigOption.USE_SEXAGECIMAL_EDITOR); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-01-18 14:55:04 UTC (rev 223) @@ -88,7 +88,7 @@ <field name='gear' component='gearList'/> <field name='headOfMission' component='headOfMissionList'/> <field name='headOfSortRoom' component='headOfSortRoomList'/> - <field name='comment' component='commentField'/> + <field name='comment' component='commentPane'/> </BeanValidator> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -53,7 +53,9 @@ "cloneProtocol", "copy", _("tutti.action.clone"), - _("tutti.action.clone.protocol.tip")); + _("tutti.action.clone.protocol.tip"), + true + ); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -48,7 +48,8 @@ "editCatches", "edit", _("tutti.action.editCatches"), - _("tutti.action.editCatches.tip") + _("tutti.action.editCatches.tip"), + true ); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -48,7 +48,8 @@ "editCruise", "edit", _("tutti.action.edit"), - _("tutti.action.editCruise.tip") + _("tutti.action.editCruise.tip"), + true ); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -48,7 +48,8 @@ "editProgram", "edit", _("tutti.action.edit"), - _("tutti.action.editProgram.tip") + _("tutti.action.editProgram.tip"), + true ); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -53,7 +53,9 @@ "editProtocol", "edit", _("tutti.action.edit"), - _("tutti.action.edit.protocol.tip")); + _("tutti.action.edit.protocol.tip"), + true + ); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -53,7 +53,9 @@ "exportProtocol", "export", _("tutti.action.export"), - _("tutti.action.export.protocol.tip")); + _("tutti.action.export.protocol.tip"), + true + ); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -51,7 +51,9 @@ "importProtocol", "import", _("tutti.action.import"), - _("tutti.action.import.protocol.tip")); + _("tutti.action.import.protocol.tip"), + true + ); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -46,7 +46,8 @@ "newCruise", "add", _("tutti.action.new"), - _("tutti.action.newCruise.tip") + _("tutti.action.newCruise.tip"), + true ); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -46,7 +46,8 @@ "newProgram", "add", _("tutti.action.new"), - _("tutti.action.newProgram.tip") + _("tutti.action.newProgram.tip"), + true ); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -51,7 +51,9 @@ "newProtocol", "add", _("tutti.action.new"), - _("tutti.action.new.protocol.tip")); + _("tutti.action.new.protocol.tip"), + true + ); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java 2013-01-18 14:55:04 UTC (rev 223) @@ -48,7 +48,8 @@ "validateCatches", "validate", _("tutti.action.validateCatches"), - _("tutti.action.validateCatches.tip") + _("tutti.action.validateCatches.tip"), + true ); } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-18 12:40:25 UTC (rev 222) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-18 14:55:04 UTC (rev 223) @@ -66,6 +66,7 @@ tutti.config.programId=Identifiant de la dernière série de campagne utilisée tutti.config.protocolId=Identifiant du dernier protocole utilisé tutti.config.ui.autoPopupNumberEditor=Toujours afficher le pavé numérique lors de l'édition d'un nombre +tutti.config.ui.color.blockingLayer= tutti.config.ui.color.rowInvalid=Ligne invalide tutti.config.ui.color.rowReadOnly=Cellule non éditable tutti.config.ui.config=Chemin du fichier de configuration des interfaces graphiques @@ -214,6 +215,7 @@ tutti.menu.synchronisationImport.tip=Effectuer des imports tutti.menu.synchronisations=Synchronisation tutti.menu.synchronisations.tip=Import/Export +tutti.message.action.running=<html>Action <strong>%s</strong> en cours d'execution...<br/><hr/>Merci de bien vouloir patienter.</html> tutti.sampleCategoryType.age=Age tutti.sampleCategoryType.maturity=Maturité tutti.sampleCategoryType.sex=Sexe @@ -303,6 +305,7 @@ tutti.title.selectedProtocol=Protocol %s tutti.title.splitBatch=Catégoriser un lot tutti.title.validate.operations=Validation des opérations de pêches (%s) +tutti.title.waitingBar=Action en cours... tutti.to.be.done=< A FAIRE > tutti.tooltip.attachment.none=Pas de pièce-jointes tutti.tooltip.comment.none=Pas de commentaire