This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit e10604196f027d38e4f62f707498a4575fd86028 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 23 17:34:59 2015 +0200 add some icons to popup menu + add NPG in filter (refs #6944) --- observe-swing/src/main/filters/observe-ui.properties | 1 + .../java/fr/ird/observe/ui/util/tripMap/TripMapUI.css | 2 ++ .../fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java | 6 +++--- .../main/resources/i18n/observe-swing_en_GB.properties | 3 +++ .../main/resources/i18n/observe-swing_es_ES.properties | 3 +++ .../main/resources/i18n/observe-swing_fr_FR.properties | 4 ++-- observe-swing/src/main/resources/icons/action-center.png | Bin 0 -> 797 bytes pom.xml | 2 +- 8 files changed, 15 insertions(+), 6 deletions(-) diff --git a/observe-swing/src/main/filters/observe-ui.properties b/observe-swing/src/main/filters/observe-ui.properties index c773355..8657e04 100644 --- a/observe-swing/src/main/filters/observe-ui.properties +++ b/observe-swing/src/main/filters/observe-ui.properties @@ -91,6 +91,7 @@ icon.action.data-observe=action-data-observe.png icon.action.data-calcule=action-data-calcule.png icon.action.numbereditor-reset=action-numbereditor-reset.png icon.action.numbereditor-calculator=action-numbereditor-calculator.png +icon.action.center=action-center.png icon.action.config=action-config.png icon.action.consolidate=action-data-calcule.png icon.action.connected=action-connected.png diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css index 532970b..dad9934 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css @@ -2,9 +2,11 @@ #zoomIt { text: "observe.map.action.zoomIt"; toolTipText: "observe.map.action.zoomIt.tip"; + actionIcon: center; } #exportPng { text: "observe.map.action.exportPng"; toolTipText: "observe.map.action.exportPng.tip"; + actionIcon: save; } \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java index d1d7a66..ce9ab4f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java @@ -18,9 +18,9 @@ import fr.ird.observe.db.DataSourceException; import fr.ird.observe.tripMap.TripMapPoint; import fr.ird.observe.tripMap.TripMapPointType; import fr.ird.observe.ui.UIHelper; -import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.geotools.data.FileDataStore; @@ -162,7 +162,7 @@ public class TripMapUIHandler { t("observe.map.export.chooseFile.title"), t("observe.map.export.chooseFile.ok"), null, - "^.+\\.png$", + "^.+\\.png|.+\\.PNG$", t("observe.map.export.chooseFile.png")); boolean write = true; @@ -187,7 +187,7 @@ public class TripMapUIHandler { throw new ObserveTechnicalException("unable to export map ", e); } - UIHelper.displayInfo(t("observe.map.export.success")); + UIHelper.displayInfo(t("observe.map.export.success", file)); } } diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index 15d7146..af6200b 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -1263,6 +1263,8 @@ observe.longlineGlobalComposition.tab.floatlinesComposition=Floatines observe.longlineGlobalComposition.tab.hooksComposition=Hooks observe.longlineGlobalComposition.tab.mitigationType=Mitigation observe.longlineGlobalComposition.title=Global composition +observe.map.action.exportAsImage= +observe.map.action.exportAsImage.tip= observe.map.action.exportPng= observe.map.action.exportPng.tip= observe.map.action.zoomIt= @@ -1270,6 +1272,7 @@ observe.map.action.zoomIt.tip= observe.map.east= observe.map.export.choose.export.ok= observe.map.export.choose.export.title= +observe.map.export.chooseFile.image= observe.map.export.chooseFile.ok= observe.map.export.chooseFile.overwrite= observe.map.export.chooseFile.overwrite.cancel= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index b64d09a..1807b53 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1265,6 +1265,8 @@ observe.longlineGlobalComposition.tab.floatlinesComposition= observe.longlineGlobalComposition.tab.hooksComposition= observe.longlineGlobalComposition.tab.mitigationType= observe.longlineGlobalComposition.title= +observe.map.action.exportAsImage= +observe.map.action.exportAsImage.tip= observe.map.action.exportPng= observe.map.action.exportPng.tip= observe.map.action.zoomIt= @@ -1272,6 +1274,7 @@ observe.map.action.zoomIt.tip= observe.map.east= observe.map.export.choose.export.ok= observe.map.export.choose.export.title= +observe.map.export.chooseFile.image= observe.map.export.chooseFile.ok= observe.map.export.chooseFile.overwrite= observe.map.export.chooseFile.overwrite.cancel= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index cd6ed89..4434fd3 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -1264,7 +1264,7 @@ observe.longlineGlobalComposition.tab.hooksComposition=Hameçons observe.longlineGlobalComposition.tab.mitigationType=Atténuations observe.longlineGlobalComposition.title=Composition globale de la palangre observe.map.action.exportPng=Exporter -observe.map.action.exportPng.tip=Exporter la carte +observe.map.action.exportPng.tip=Exporter la carte au format PNG observe.map.action.zoomIt=Centrer observe.map.action.zoomIt.tip=Centrer la carte sur la marée observe.map.east=Est @@ -1275,7 +1275,7 @@ observe.map.export.overwrite=Le fichier existe déjà. Voulez-vous le remplacer observe.map.export.overwrite.cancel=Annuler observe.map.export.overwrite.ok=Remplacer observe.map.export.overwrite.title=Attention -observe.map.export.success=Carte Exportée +observe.map.export.success=Carte exportée (%s) observe.map.legend.tripBetweenTwoDays=Trajet entre deux jours observe.map.legend.tripDay=Trajet d'une journée observe.map.miles=milles diff --git a/observe-swing/src/main/resources/icons/action-center.png b/observe-swing/src/main/resources/icons/action-center.png new file mode 100644 index 0000000..7184c9d Binary files /dev/null and b/observe-swing/src/main/resources/icons/action-center.png differ diff --git a/pom.xml b/pom.xml index 68dc6e4..79804b5 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <eugenePluginVersion>2.14</eugenePluginVersion> - <topiaVersion>2.10-SNAPSHOT</topiaVersion> + <topiaVersion>2.9.5.3</topiaVersion> <jaxxVersion>2.24</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.