r1208 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/util/action resources/i18n
Author: tchemit Date: 2013-09-23 15:14:53 +0200 (Mon, 23 Sep 2013) New Revision: 1208 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1208 Log: improve action progress bar Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.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/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-09-23 13:00:24 UTC (rev 1207) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-09-23 13:14:53 UTC (rev 1208) @@ -305,8 +305,10 @@ @Override public void showInformationMessage(String message) { - if (log.isInfoEnabled()) { - log.info(message); + if (StringUtils.isNotBlank(message)) { + if (log.isInfoEnabled()) { + log.info(message); + } } } }; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-09-23 13:00:24 UTC (rev 1207) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-09-23 13:14:53 UTC (rev 1208) @@ -67,7 +67,9 @@ if (ProgressionModel.PROPERTY_MESSAGE.equals(propertyName)) { // change message - ui.getTaskActionLabel().setText((String) evt.getNewValue()); + String newMessage = (String) evt.getNewValue(); + ui.getTaskActionLabel().setText("<html><body>" + newMessage + "</body></html>"); + ui.pack(); } else if (ProgressionModel.PROPERTY_TOTAL.equals(propertyName)) { // change total progressbar max 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-09-23 13:00:24 UTC (rev 1207) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-23 13:14:53 UTC (rev 1208) @@ -1226,7 +1226,7 @@ tutti.multiPostImportLog.totalWeight=Poids total \: %s kg tutti.openDb.step.check.dbContext=Vérification du context de saisie tutti.openDb.step.checkSchemaVersion=Vérification de la compatibilité de la base -tutti.openDb.step.open=Ouverture de la base %s +tutti.openDb.step.open=Ouverture de la base <strong>%s</strong> tutti.openDb.step.will.migrateSchema=Démarrage de la mise à jour du schéma de la base depuis la version %s vers la version %s tutti.option.cancel=Annuler tutti.option.cleanAndClone=Nettoyer et Cloner
participants (1)
-
tchemit@users.forge.codelutin.com