From c055cf54834e2e5c32276b5b354e777ee8a828c1 Mon Sep 17 00:00:00 2001 From: activityworkshop Date: Sun, 24 Apr 2016 12:35:44 +0200 Subject: [PATCH] Version 18.4, April 2016 --- README.md | 2 +- tim/prune/GpsPrune.java | 6 +-- tim/prune/function/AboutScreen.java | 2 +- tim/prune/function/browser/UrlGenerator.java | 19 ---------- tim/prune/gui/MenuManager.java | 4 -- tim/prune/lang/prune-texts_af.properties | 2 - tim/prune/lang/prune-texts_cz.properties | 3 +- tim/prune/lang/prune-texts_de.properties | 2 - tim/prune/lang/prune-texts_de_CH.properties | 4 +- tim/prune/lang/prune-texts_en.properties | 2 - tim/prune/lang/prune-texts_es.properties | 11 +++++- tim/prune/lang/prune-texts_fr.properties | 2 - tim/prune/lang/prune-texts_hu.properties | 4 +- tim/prune/lang/prune-texts_it.properties | 5 ++- tim/prune/lang/prune-texts_nl.properties | 2 - tim/prune/lang/prune-texts_pl.properties | 9 ++++- tim/prune/lang/prune-texts_pt.properties | 2 - tim/prune/lang/prune-texts_ro.properties | 2 - tim/prune/lang/prune-texts_ru.properties | 5 ++- tim/prune/load/BabelFileFormats.java | 35 ++++++------------ tim/prune/readme.txt | 12 ++++-- tim/prune/save/GpsSaver.java | 39 ++++++++++++++++++++ 22 files changed, 92 insertions(+), 82 deletions(-) diff --git a/README.md b/README.md index 0c5eb63..c409f9e 100644 --- a/README.md +++ b/README.md @@ -3,5 +3,5 @@ GpsPrune is a map-based application for viewing, editing and converting coordina It's a cross-platform java application, and its home page is at http://gpsprune.activityworkshop.net . -Here on github you'll find all the sources from version 1 to the current version 18.3, and in the wiki at https://github.com/activityworkshop/GpsPrune/wiki there's the beginning of a translation effort for anyone to contribute. +Here on github you'll find all the sources from version 1 to the current version 18.4, and in the wiki at https://github.com/activityworkshop/GpsPrune/wiki there's the beginning of a translation effort for anyone to contribute. Currently just the Spanish translations are online, to see whether it's a workable idea or not. Please help with this if you can. diff --git a/tim/prune/GpsPrune.java b/tim/prune/GpsPrune.java index 2708fc0..606e61c 100644 --- a/tim/prune/GpsPrune.java +++ b/tim/prune/GpsPrune.java @@ -29,16 +29,16 @@ import tim.prune.gui.profile.ProfileChart; /** * GpsPrune is a tool to visualize, edit, convert and prune GPS data * Please see the included readme.txt or http://activityworkshop.net - * This software is copyright activityworkshop.net 2006-2015 and made available through the Gnu GPL version 2. + * This software is copyright activityworkshop.net 2006-2016 and made available through the Gnu GPL version 2. * For license details please see the included license.txt. * GpsPrune is the main entry point to the application, including initialisation and launch */ public class GpsPrune { /** Version number of application, used in about screen and for version check */ - public static final String VERSION_NUMBER = "18.3"; + public static final String VERSION_NUMBER = "18.4"; /** Build number, just used for about screen */ - public static final String BUILD_NUMBER = "336b"; + public static final String BUILD_NUMBER = "340"; /** Static reference to App object */ private static App APP = null; diff --git a/tim/prune/function/AboutScreen.java b/tim/prune/function/AboutScreen.java index 4c104a0..c6bd759 100644 --- a/tim/prune/function/AboutScreen.java +++ b/tim/prune/function/AboutScreen.java @@ -98,7 +98,7 @@ public class AboutScreen extends GenericFunction descBuffer.append("

").append(I18nManager.getText("dialog.about.summarytext3")).append("

"); descBuffer.append("

").append(I18nManager.getText("dialog.about.languages")).append(" : ") .append("afrikaans, \u010de\u0161tina, deutsch, english, espa\u00F1ol, fran\u00E7ais, italiano,
" + - " magyar,nederlands, polski, portugu\u00EAs, rom\u00E2n\u0103, \u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian), \u4e2d\u6587 (chinese),
" + + " magyar, nederlands, polski, portugu\u00EAs, rom\u00E2n\u0103, \u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian), \u4e2d\u6587 (chinese),
" + " \u65E5\u672C\u8A9E (japanese), \uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean), schwiizerd\u00FC\u00FCtsch, t\u00FCrk\u00E7e, ukrainian

"); descBuffer.append("

").append(I18nManager.getText("dialog.about.translatedby")).append("

"); JEditorPane descPane = new JEditorPane("text/html", descBuffer.toString()); diff --git a/tim/prune/function/browser/UrlGenerator.java b/tim/prune/function/browser/UrlGenerator.java index a0100b1..faca5a2 100644 --- a/tim/prune/function/browser/UrlGenerator.java +++ b/tim/prune/function/browser/UrlGenerator.java @@ -32,7 +32,6 @@ public abstract class UrlGenerator MAP_SOURCE_PEAKFINDER, /* PeakFinder */ MAP_SOURCE_GEOHACK, /* Geohack */ MAP_SOURCE_PANORAMIO, /* Panoramio */ - MAP_SOURCE_OPENCACHINGCOM, /* Opencaching.com */ } /** @@ -56,7 +55,6 @@ public abstract class UrlGenerator case MAP_SOURCE_PEAKFINDER: case MAP_SOURCE_GEOHACK: case MAP_SOURCE_PANORAMIO: - case MAP_SOURCE_OPENCACHINGCOM: return generateUrlForPoint(inSource, inTrackInfo); case MAP_SOURCE_OSM: default: @@ -213,8 +211,6 @@ public abstract class UrlGenerator return generateGeohackUrl(currPoint); case MAP_SOURCE_PANORAMIO: return generatePanoramioUrl(currPoint); - case MAP_SOURCE_OPENCACHINGCOM: - return generateOpencachingComUrl(currPoint); default: return null; } @@ -256,21 +252,6 @@ public abstract class UrlGenerator } - /** - * Generate a url for OpenCaching.com - * @param inPoint current point, not null - * @return URL - */ - private static String generateOpencachingComUrl(DataPoint inPoint) - { - final String occLang = I18nManager.getText("webservice.opencachingcom.lang"); - final String url = "http://www.opencaching.com/" + occLang - + "/#find?&loc=" + FIVE_DP.format(inPoint.getLatitude().getDouble()) - + "," + FIVE_DP.format(inPoint.getLongitude().getDouble()); - return url; - } - - /** * Get the median value from the given lat/long range * @param inRange range of values diff --git a/tim/prune/gui/MenuManager.java b/tim/prune/gui/MenuManager.java index f664f4b..38ed02b 100644 --- a/tim/prune/gui/MenuManager.java +++ b/tim/prune/gui/MenuManager.java @@ -97,7 +97,6 @@ public class MenuManager implements DataSubscriber private JMenuItem _showPeakfinderItem = null; private JMenuItem _showGeohackItem = null; private JMenuItem _showPanoramioItem = null; - private JMenuItem _showOpencachingComItem = null; private JMenuItem _searchOpencachingDeItem = null; private JMenuItem _searchMapillaryItem = null; private JMenuItem _downloadOsmItem = null; @@ -296,8 +295,6 @@ public class MenuManager implements DataSubscriber onlineMenu.add(_showGeohackItem); _showPanoramioItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_PANORAMIO, "webservice.panoramio"), false); onlineMenu.add(_showPanoramioItem); - _showOpencachingComItem = makeMenuItem(new WebMapFunction(_app, UrlGenerator.WebService.MAP_SOURCE_OPENCACHINGCOM, "webservice.opencachingcom"), false); - onlineMenu.add(_showOpencachingComItem); onlineMenu.addSeparator(); _searchOpencachingDeItem = makeMenuItem(new SearchOpenCachingDeFunction(_app), false); @@ -917,7 +914,6 @@ public class MenuManager implements DataSubscriber _showPeakfinderItem.setEnabled(hasPoint); _showGeohackItem.setEnabled(hasPoint); _showPanoramioItem.setEnabled(hasPoint); - _showOpencachingComItem.setEnabled(hasPoint); _searchOpencachingDeItem.setEnabled(hasPoint); _searchMapillaryItem.setEnabled(hasPoint); // is it a waypoint? diff --git a/tim/prune/lang/prune-texts_af.properties b/tim/prune/lang/prune-texts_af.properties index ef735f7..063f494 100644 --- a/tim/prune/lang/prune-texts_af.properties +++ b/tim/prune/lang/prune-texts_af.properties @@ -787,8 +787,6 @@ openweathermap.lang=en webservice.peakfinder=Open Peakfinder.org webservice.geohack=Open Geohack bladsy webservice.panoramio=Open Panoramio kaart -webservice.opencachingcom=Open Opencaching.com -webservice.opencachingcom.lang=en ## Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_cz.properties b/tim/prune/lang/prune-texts_cz.properties index 60b7b22..0d8c177 100644 --- a/tim/prune/lang/prune-texts_cz.properties +++ b/tim/prune/lang/prune-texts_cz.properties @@ -559,6 +559,8 @@ dialog.weather.day.thursday=\u010ctvrtek dialog.weather.day.friday=P\u00e1tek dialog.weather.day.saturday=Sobota dialog.weather.day.sunday=Ned\u011ble +dialog.weather.temp=Teplota +dialog.weather.humidity=Vlhkost dialog.weather.creditnotice=Data poskytuje slu\u017eba openweathermap.org, v\u00edce informac\u00ed na t\u00e9to adrese. # 3d window @@ -767,7 +769,6 @@ logic.or=nebo url.googlemaps=maps.google.cz wikipedia.lang=cs openweathermap.lang=en -webservice.opencachingcom.lang=cs # Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_de.properties b/tim/prune/lang/prune-texts_de.properties index d9c50b4..26a3df3 100644 --- a/tim/prune/lang/prune-texts_de.properties +++ b/tim/prune/lang/prune-texts_de.properties @@ -807,8 +807,6 @@ openweathermap.lang=de webservice.peakfinder=Peakfinder.org \u00f6ffnen webservice.geohack=Geohack-Seite \u00f6ffnen webservice.panoramio=Panoramio Karte \u00f6ffnen -webservice.opencachingcom=Opencaching.com \u00f6ffnen -webservice.opencachingcom.lang=de # Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_de_CH.properties b/tim/prune/lang/prune-texts_de_CH.properties index 1dbd0fd..9697e39 100644 --- a/tim/prune/lang/prune-texts_de_CH.properties +++ b/tim/prune/lang/prune-texts_de_CH.properties @@ -382,7 +382,7 @@ dialog.wikipedia.column.name=Artikelname dialog.wikipedia.column.distance=Entf\u00e4rnig dialog.wikipedia.nonefound=Kei Wiki-Iitr\u00e4ge gfunde dialog.wikipedia.gallery=Fotis -dialog.geocaching.nonefound=Kei Cäches gfunde +dialog.geocaching.nonefound=Kei C\u00e4ches gfunde dialog.correlate.notimestamps=Es h\u00e4t kei Ziitst\u00e4mpel inem Track inn\u00e4, so s'isch n\u00f6d m\u00f6glech die F\u00f6telis zu korrelier\u00e4. dialog.correlate.nouncorrelatedphotos=Alle F\u00f6telis sin scho korreliert.\nWend Sie trotzdem fortsetz\u00e4? dialog.correlate.nouncorrelatedaudios=Alle Audios sin scho korreliert.\nWend Sie trotzdem fortsetz\u00e4? @@ -802,8 +802,6 @@ openweathermap.lang=de webservice.peakfinder=Peakfinder.org \u00f6ffne webservice.geohack=Geohack-Siite \u00f6ffne webservice.panoramio=Panoramio Karte \u00f6ffne -webservice.opencachingcom=Opencaching.com \u00f6ffne -webservice.opencachingcom.lang=de # Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_en.properties b/tim/prune/lang/prune-texts_en.properties index 0d74cf1..489b5c6 100644 --- a/tim/prune/lang/prune-texts_en.properties +++ b/tim/prune/lang/prune-texts_en.properties @@ -813,8 +813,6 @@ openweathermap.lang=en webservice.peakfinder=Open Peakfinder.org webservice.geohack=Open Geohack page webservice.panoramio=Open Panoramio map -webservice.opencachingcom=Open Opencaching.com -webservice.opencachingcom.lang=en # Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_es.properties b/tim/prune/lang/prune-texts_es.properties index a8be199..f5d6214 100644 --- a/tim/prune/lang/prune-texts_es.properties +++ b/tim/prune/lang/prune-texts_es.properties @@ -104,6 +104,7 @@ function.distances=Distancias function.fullrangedetails=Detalles adicionales de rango function.estimatetime=Estimar duraci\u00f3n function.learnestimationparams=Apprender parametros por la estimaci\u00f3n del tiempo +function.autoplay=Jugar track function.setmapbg=Configurar fondo de mapa function.setpaths=Configurar rutas del programas function.selectsegment=Seleccionar segmento actual @@ -336,6 +337,8 @@ dialog.distances.column.to=Al punto dialog.distances.currentpoint=Punto actual dialog.distances.toofewpoints=Esta funcion necesita "waypoints" para poder calcular las distancias entre ellos dialog.fullrangedetails.intro=Aqui estan los detalles para la selecci\u00f3n de rangos +dialog.fullrangedetails.coltotal=Incluyendo brechas +dialog.fullrangedetails.colsegments=Solo segmentos dialog.estimatetime.details=Detalles dialog.estimatetime.gentle=Inclinaci\u00f3n peque\u00f1a dialog.estimatetime.steep=Inclinaci\u00f3n grande @@ -383,6 +386,8 @@ dialog.mapillary.nonefound=No se encontraron fotos dialog.wikipedia.column.name=Nombre del art\u00edculo dialog.wikipedia.column.distance=Distancia dialog.wikipedia.nonefound=No se encontraron puntos +dialog.wikipedia.gallery=Galeria +dialog.geocaching.nonefound=No se encontraron tesoros dialog.correlate.notimestamps=No hay informaci\u00f3n de tiempo para los puntos, as\u00ed que no hay nada que correlacionar con las fotos. dialog.correlate.nouncorrelatedphotos=No hay fotos no correlacionadas.\n\u00bfEst\u00e1 seguro de que desea continuar? dialog.correlate.nouncorrelatedaudios=No hay audios no correlacionadas.\n\u00bfEst\u00e1 seguro de que desea continuar? @@ -587,6 +592,10 @@ dialog.deletebydate.nodate=Sin marcas de tiempo dialog.deletebydate.column.keep=Mantener dialog.deletebydate.column.delete=Eliminar dialog.autoplay.duration=Duraci\u00f3n (seg) +dialog.autoplay.usetimestamps=Usar informaci\u00f3n de tiempo +dialog.autoplay.rewind=Rebobinar +dialog.autoplay.pause=Pausar +dialog.autoplay.play=Jugar ## 3d window dialog.3d.title=GpsPrune vista 3-D @@ -792,8 +801,6 @@ openweathermap.lang=sp webservice.peakfinder=Abrir Peakfinder.org webservice.geohack=Abrir Geohack webservice.panoramio=Abrir mapa Panoramio -webservice.opencachingcom=Abrir Opencaching.com -webservice.opencachingcom.lang=es ## Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_fr.properties b/tim/prune/lang/prune-texts_fr.properties index 6c0f2a2..2618ea7 100644 --- a/tim/prune/lang/prune-texts_fr.properties +++ b/tim/prune/lang/prune-texts_fr.properties @@ -793,8 +793,6 @@ openweathermap.lang=fr webservice.peakfinder=Ouvrir Peakfinder.org webservice.geohack=Ouvrir la page Geohack webservice.panoramio=Ouvrir la carte Panoramio -webservice.opencachingcom=Ouvrir Opencaching.com -webservice.opencachingcom.lang=fr # Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_hu.properties b/tim/prune/lang/prune-texts_hu.properties index 0cdc442..b949500 100644 --- a/tim/prune/lang/prune-texts_hu.properties +++ b/tim/prune/lang/prune-texts_hu.properties @@ -387,7 +387,7 @@ dialog.mapillary.nonefound=Nem tal\u00e1lhat\u00f3k f\u00e9nyk\u00e9pek dialog.wikipedia.column.name=Sz\u00f3cikk neve dialog.wikipedia.column.distance=T\u00e1vols\u00e1g dialog.wikipedia.nonefound=Nem tal\u00e1lhat\u00f3 Wikip\u00e9dia sz\u00f3cikk -dialog.wikipedia.gallery=Galéria +dialog.wikipedia.gallery=Gal\u00e9ria dialog.correlate.notimestamps=Nincsenek id\u0151b\u00e9lyegek az adatpontokon, \u00edgy nem feleltethet\u0151 meg semmi a f\u00e9nyk\u00e9pekkel. dialog.correlate.nouncorrelatedphotos=Nincsenek megfeleltetlen f\u00e9nyk\u00e9pek.\nBiztos benne, hogy folytatja? dialog.correlate.nouncorrelatedaudios=Nincsenek megfeleltetlen hangok.\nBiztos benne, hogy folytatja? @@ -813,8 +813,6 @@ openweathermap.lang=en webservice.peakfinder=Peakfinder.org megnyit\u00e1sa webservice.geohack=A geohack lap nyit\u00e1sa webservice.panoramio=Panoramio t\u00e9rk\u00e9p nyit\u00e1sa -webservice.opencachingcom=Opencaching.com nyit\u00e1sa -webservice.opencachingcom.lang=en # Cardinals for 3d plots cardinal.n=\u00c9 diff --git a/tim/prune/lang/prune-texts_it.properties b/tim/prune/lang/prune-texts_it.properties index f8fe203..d8e6895 100644 --- a/tim/prune/lang/prune-texts_it.properties +++ b/tim/prune/lang/prune-texts_it.properties @@ -87,6 +87,7 @@ function.exportsvg=Esporta in SVG function.exportimage=Esporta come immagine function.editwaypointname=Modifica nome waypoint function.compress=Comprimi la traccia +function.marklifts=Marca seggiovie function.deleterange=Cancella la serie function.croptrack=Cima la traccia function.interpolate=Interpola i punti @@ -385,6 +386,8 @@ dialog.mapillary.nonefound=Nessuna foto trovata dialog.wikipedia.column.name=Titolo articolo dialog.wikipedia.column.distance=Distanza dialog.wikipedia.nonefound=Nessuna punti trovata +dialog.wikipedia.gallery=Immagine +dialog.geocaching.nonefound=Nessuna punti trovata dialog.correlate.notimestamps=Non ci sono informazioni temporali tra i dati dei punti, non c'\u00e8 niente per collegarli con le foto. dialog.correlate.nouncorrelatedphotos=Non ci sono foto non correlate.\nSei sicuro di voler continuare? dialog.correlate.nouncorrelatedaudios=Non ci sono audio non correlati. \nSei sicuro di voler continuare? @@ -810,8 +813,6 @@ openweathermap.lang=it webservice.peakfinder=Apri Peakfinder.org webservice.geohack=Apri la pagina Geohack webservice.panoramio=Apri la mappa Panoramio -webservice.opencachingcom=Apri Opencaching.com -webservice.opencachingcom.lang=it # Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_nl.properties b/tim/prune/lang/prune-texts_nl.properties index a9d4bc3..47b9601 100644 --- a/tim/prune/lang/prune-texts_nl.properties +++ b/tim/prune/lang/prune-texts_nl.properties @@ -812,8 +812,6 @@ openweathermap.lang=nl webservice.peakfinder=Open Peakfinder.org webservice.geohack=Open Geohack pagina webservice.panoramio=Open Panoramio kaart -webservice.opencachingcom=Open Opencaching.com -webservice.opencachingcom.lang=nl # Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_pl.properties b/tim/prune/lang/prune-texts_pl.properties index a3d0662..405c594 100644 --- a/tim/prune/lang/prune-texts_pl.properties +++ b/tim/prune/lang/prune-texts_pl.properties @@ -38,6 +38,7 @@ menu.view.browser.yahoo=Mapy Yahoo menu.view.browser.bing=Mapy Bing menu.settings=Ustawienia menu.settings.onlinemode=\u0141aduj mapy z sieci +menu.settings.antialias=U\u017Cyj antyaliasingu menu.settings.autosave=Autozapis ustawie\u0144 przy wyj\u015bciu menu.help=Pomoc # Popup menu for map @@ -85,6 +86,7 @@ function.exportsvg=Eksportuj jako SVG function.exportimage=Eksportuj jako obraz function.editwaypointname=Zmie\u0144 nazw\u0119 punktu po\u015bredniego function.compress=Kompresuj \u015bcie\u017ck\u0119 +function.marklifts=Zaznaczenie wyci\u0105g narciarski function.deleterange=Usu\u0144 zakres function.croptrack=Przytnij \u015bcie\u017ck\u0119 function.interpolate=Wstaw pomi\u0119dzy punkty @@ -102,6 +104,7 @@ function.distances=Odleg\u0142o\u015bci function.fullrangedetails=Wszystkie detale function.estimatetime=Przewidywany czas function.learnestimationparams=Skoryguj wsp\u00f3\u0142czynniki szacowania czasu +function.autoplay=Gra\u0107 \u015bcie\u017ck\u0119 function.setmapbg=Wybierz map\u0119 t\u0142a function.setpaths=Ustaw \u015bcie\u017cki do program\u00f3w function.selectsegment=Wybierz bie\u017c\u0105cy fragment @@ -379,10 +382,12 @@ dialog.gpsies.activity.motorbiking=Wycieczka motocyklowa dialog.gpsies.activity.snowshoe=Snowshoeing dialog.gpsies.activity.sailing=\u017beglarstwo dialog.gpsies.activity.skating=Wrotki/rolki +dialog.mapillary.nonefound=Nic nie zosta\u0142o znalezione dialog.wikipedia.column.name=Tytu\u0142 artyku\u0142u dialog.wikipedia.column.distance=Odleg\u0142o\u015b\u0107 dialog.wikipedia.nonefound=Brak wpis\u00f3w w wikipedii dialog.wikipedia.gallery=Galeria +dialog.geocaching.nonefound=Nic nie zosta\u0142o znalezione dialog.correlate.notimestamps=Punkty nie maj\u0105 znacznik\u00f3w czasu, nie mo\u017cna ich powi\u0105za\u0107 ze zdj\u0119ciami. dialog.correlate.nouncorrelatedphotos=Nie ma nie powi\u0105zanych zdj\u0119\u0107.\nCzy na pewno chcesz kontynuowa\u0107? dialog.correlate.nouncorrelatedaudios=Nie ma nie powi\u0105zanych plik\u00f3w audio.\nCzy na pewno chcesz kontynuowa\u0107? @@ -592,6 +597,8 @@ dialog.deletebydate.column.delete=Usu\u0144 dialog.setaltitudetolerance.text.metres=Limit (w metrach) poni\u017cej kt\u00f3rego, ma\u0142e spadki wzniosy b\u0119d\u0105 ignorowane dialog.setaltitudetolerance.text.feet=Limit (w stopach) poni\u017cej kt\u00f3rego, ma\u0142e spadki wzniosy b\u0119d\u0105 ignorowane dialog.autoplay.duration=Czas trwania (sek) +dialog.autoplay.usetimestamps=U\u017Cyj znaczników czasowych +dialog.autoplay.rewind=Przewin\u0105\u0107 dialog.autoplay.pause=Pauza dialog.autoplay.play=Graj @@ -806,8 +813,6 @@ openweathermap.lang=pl webservice.peakfinder=Otw\u00f3rz w Peakfinder.org webservice.geohack=Otw\u00f3rz w Geohack webservice.panoramio=Otw\u00f3rz w Panoramio.com -webservice.opencachingcom=Otw\u00f3rz w Opencaching.com -webservice.opencachingcom.lang=pl # Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_pt.properties b/tim/prune/lang/prune-texts_pt.properties index 8737cd3..a3875d6 100644 --- a/tim/prune/lang/prune-texts_pt.properties +++ b/tim/prune/lang/prune-texts_pt.properties @@ -786,8 +786,6 @@ openweathermap.lang=pt webservice.peakfinder=Abrir Peakfinder.org webservice.geohack=Abrir p\u00e1gina Geohack webservice.panoramio=Abrir mapa do Panoramio -webservice.opencachingcom=Abrir Opencaching.com -webservice.opencachingcom.lang=pt # Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_ro.properties b/tim/prune/lang/prune-texts_ro.properties index 45c62a7..46e0c58 100644 --- a/tim/prune/lang/prune-texts_ro.properties +++ b/tim/prune/lang/prune-texts_ro.properties @@ -814,8 +814,6 @@ openweathermap.lang=ro webservice.peakfinder=Deschide Peakfinder.org webservice.geohack=Deschide pagina Geohack webservice.panoramio=Deschide harta Panoramio -webservice.opencachingcom=Deschide Opencaching.com -webservice.opencachingcom.lang=en # Cardinals for 3d plots cardinal.n=N diff --git a/tim/prune/lang/prune-texts_ru.properties b/tim/prune/lang/prune-texts_ru.properties index ea96aa8..87a20b1 100644 --- a/tim/prune/lang/prune-texts_ru.properties +++ b/tim/prune/lang/prune-texts_ru.properties @@ -101,6 +101,7 @@ function.distances=\u0420\u0430\u0441\u0441\u0442\u043e\u044f\u043d\u0438\u044f function.fullrangedetails=\u0414\u0435\u0442\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u044f \u043f\u043e \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u0443 function.estimatetime=\u041f\u0440\u043e\u0433\u043d\u043e\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0440\u0435\u043c\u044f function.learnestimationparams=\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0434\u043b\u044f \u043f\u0440\u043e\u0433\u043d\u043e\u0437\u0430 \u0432\u0440\u0435\u043c\u0435\u043d\u0438 +function.autoplay=\u0412\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0435 function.setmapbg=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u043a\u0430\u0440\u0442\u0443-\u043f\u043e\u0434\u043b\u043e\u0436\u043a\u0443 function.setpaths=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u0443\u0442\u0438 \u043a \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430\u043c function.splitsegments=\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0440\u0435\u043a \u043d\u0430 \u0441\u0435\u0433\u043c\u0435\u043d\u0442\u044b @@ -534,6 +535,9 @@ dialog.weather.wind=\u0412\u0435\u0442\u0435\u0440 dialog.weather.temp=\u0422\u00b0 dialog.weather.humidity=\u0412\u043b\u0430\u0436\u043d\u043e\u0441\u0442\u044c dialog.weather.creditnotice=\u0414\u043B\u044F \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0439 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0438 \u043E\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044C \u043F\u043E openweathermap.org. +dialog.autoplay.rewind=\u041d\u0430\u0437\u0430\u0434 +dialog.autoplay.pause=\u0414\u0435\u0301\u043b\u0430\u0442\u044c \u043f\u0430\u0301\u0443\u0437\u0443 +dialog.autoplay.play=\u0412\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 # 3d window dialog.3d.title=GpsPrune 3D-\u0432\u0438\u0434 @@ -738,7 +742,6 @@ logic.or=\u0438\u043b\u0438 url.googlemaps=maps.google.ru wikipedia.lang=ru openweathermap.lang=ru -webservice.opencachingcom.lang=ru # Cardinals for 3d plots cardinal.n=\u0421\u0435\u0432\u0435\u0440 diff --git a/tim/prune/load/BabelFileFormats.java b/tim/prune/load/BabelFileFormats.java index 39359c1..5c54dfb 100644 --- a/tim/prune/load/BabelFileFormats.java +++ b/tim/prune/load/BabelFileFormats.java @@ -62,14 +62,10 @@ public abstract class BabelFileFormats "Bushnell GPS Waypoint file", "bushnell", null, "Cambridge/Winpilot glider software", "cambridge", null, "CarteSurTable data file", "cst", null, - "Cetus for Palm/OS", "cetus", null, - "CoastalExplorer XML", "coastexp", null, "Columbus/Visiontac V900 files", "v900", ".csv", "CompeGPS data files", "compegps", ".wpt/.trk/.rte", - "CoPilot Flight Planner for Palm/OS", "copilot", null, - "cotoGPS for Palm/OS", "coto", null, "Data Logger iBlue747 csv", "iblue747", null, - "Dell Axim Navigation System file format", "axim_gpb", ".gpb", + "Data Logger iBlue757 csv", "iblue757", null, "DeLorme .an1 (drawing) file", "an1", null, "DeLorme GPL", "gpl", null, "DeLorme PN-20/PN-30/PN-40 USB protocol", "delbin", null, @@ -82,36 +78,37 @@ public abstract class BabelFileFormats "Destinator Points of Interest", "destinator_poi", ".dat", "Destinator TrackLogs", "destinator_trl", ".dat", "EasyGPS binary format", "easygps", null, + "Energym training watch", "energympro", null, "Enigma binary waypoint file", "enigma", ".ert", + "F90G log file", "f90g", null, "FAI/IGC Flight Recorder Data Format", "igc", null, + "FlySight", "flysight", null, "Franson GPSGate Simulation", "gpssim", null, "Fugawi", "fugawi", null, "G7ToWin data files", "g7towin", ".g7t", "Garmin 301 Custom position and heartrate", "garmin301", null, + "Garmin FIT activity file", "garmin_fit", ".fit", "Garmin Logbook XML", "glogbook", null, "Garmin MapSource - gdb", "gdb", null, "Garmin MapSource - mps", "mapsource", null, + "Garmin Mobile XT Track files", "garmin_xt", null, "Garmin PCX5", "pcx", null, "Garmin POI database", "garmin_poi", null, "Garmin Points of Interest", "garmin_gpi", ".gpi", - "Garmin Training Center", "gtrnctr", null, "Garmin Training Center", "gtrnctr", ".tcx", "Geocaching.com .loc", "geo", null, "GeocachingDB for Palm/OS", "gcdb", null, "Geogrid-Viewer ascii overlay file", "ggv_ovl", ".ovl", "Geogrid-Viewer tracklogs", "ggv_log", ".log", "GEOnet Names Server (GNS)", "geonet", null, - "GeoNiche .pdb", "geoniche", null, - "GlobalSat DG-100/BT-335 Download", "dg-100", null, + "GlobalSat DG-100/BT-335", "dg-100", null, + "GlobalSat DG-200", "dg-200", null, + "Google Directions", "googledir", null, "Google Maps XML", "google", null, "Google Navigator Tracklines", "gnav_trl", ".trl", "GoPal GPS track log", "gopal", ".trk", - "GpilotS", "gpilots", null, "GPS TrackMaker", "gtm", null, - "GpsDrive Format", "gpsdrive", null, - "GpsDrive Format for Tracks", "gpsdrivetrack", null, "GPSman", "gpsman", null, - "GPSPilot Tracker for Palm/OS", "gpspilot", null, "gpsutil", "gpsutil", null, "GPX", "gpx", ".gpx", "HikeTech", "hiketech", null, @@ -119,7 +116,6 @@ public abstract class BabelFileFormats "Holux M-241 (MTK based) Binary File Format", "m241-bin", null, "Holux M-241 (MTK based) download", "m241", null, "Honda/Acura Navigation System VP Log File Format", "vpl", null, - "HSA Endeavour Navigator export File", "hsandv", null, "Humminbird tracks", "humminbird_ht", ".ht", "Humminbird waypoints and routes", "humminbird", ".hwr", "IGN Rando track files", "ignrando", null, @@ -127,33 +123,28 @@ public abstract class BabelFileFormats "IGO8 .trk", "igo8", null, "Jelbert GeoTagger data file", "jtr", null, "Jogmap.de XML format", "jogmap", null, - "Kartex 5 Track File", "ktf2", null, - "Kartex 5 Waypoint File", "kwf2", null, "Kompass (DAV) Track", "kompass_tk", ".tk", "Kompass (DAV) Waypoints", "kompass_wp", ".wp", "KuDaTa PsiTrex text", "psitrex", null, "Lowrance USR", "lowranceusr", null, + "Lowrance USR version 4", "lowranceusr4", null, "Magellan Explorist Geocaching", "maggeo", null, "Magellan Mapsend", "mapsend", null, - "Magellan NAV Companion for Palm/OS", "magnav", null, "Magellan SD files (as for eXplorist)", "magellanx", null, "Magellan SD files (as for Meridian)", "magellan", null, "Magellan serial protocol", "magellan", null, "MagicMaps IK3D project file", "ik3d", ".ikt", "Map&Guide 'TourExchangeFormat' XML", "tef", null, - "Map&Guide to Palm/OS exported files", "mag_pdb", ".pdb", "MapAsia track file", "mapasia_tr7", ".tr7", "Mapopolis.com Mapconverter CSV", "mapconverter", null, "MapTech Exchange Format", "mxf", null, + "MediaTek Locus", "mtk_locus", null, "Memory-Map Navigator overlay files", "mmo", ".mmo", - "Microsoft AutoRoute 2002 (pin/route reader)", "msroute", null, - "Microsoft Streets and Trips (pin/route reader)", "msroute", null, "Microsoft Streets and Trips 2002-2007", "s_and_t", null, - "Mobile Garmin XT Track files", "garmin_xt", null, "Motorrad Routenplaner (Map&Guide) .bcr files", "bcr", null, - "MS PocketStreets 2002 Pushpin", "psp", null, "MTK Logger (iBlue 747,...) Binary File Format", "mtk-bin", null, "MTK Logger (iBlue 747,Qstarz BT-1000,...) download", "mtk", null, + "MyNav TRC format", "mynav", null, "National Geographic Topo .tpg (waypoints)", "tpg", null, "National Geographic Topo 2.x .tpo", "tpo2", null, "National Geographic Topo 3.x/4.x .tpo", "tpo3", null, @@ -171,8 +162,6 @@ public abstract class BabelFileFormats "Nokia Landmark Exchange", "lmx", null, "OpenStreetMap data files", "osm", ".osm", "OziExplorer", "ozi", null, - "PalmDoc Output", "palmdoc", null, - "PathAway Database for Palm/OS", "pathaway", null, "PocketFMS breadcrumbs", "pocketfms_bc", null, "PocketFMS flightplan", "pocketfms_fp", ".xml", "PocketFMS waypoints", "pocketfms_wp", ".txt", diff --git a/tim/prune/readme.txt b/tim/prune/readme.txt index e507292..d4996f7 100644 --- a/tim/prune/readme.txt +++ b/tim/prune/readme.txt @@ -1,4 +1,4 @@ -GpsPrune version 18.3 +GpsPrune version 18.4 ===================== GpsPrune is an application for viewing, editing and managing coordinate data from GPS systems, @@ -17,7 +17,7 @@ Running ======= To run GpsPrune from the jar file, simply call it from a command prompt or shell: - java -jar gpsprune_18.3.jar + java -jar gpsprune_18.4.jar If the jar file is saved in a different directory, you will need to include the path. Depending on your system settings, you may be able to click or double-click on the jar file @@ -25,9 +25,15 @@ in a file manager window to execute it. A shortcut, menu item, alias, desktop i or other link can of course be made should you wish. To specify a language other than the default, use an additional parameter, eg: - java -jar gpsprune_18.3.jar --lang=DE + java -jar gpsprune_18.4.jar --lang=DE +New with version 18.4 +===================== +The following fixes and additions were made since version 18.3: + - Updated GPSBabel format descriptions (thanks, Juergen!) + - Removed calls to the retired opencaching.com site (thanks, Garmin!) + New with version 18.3 ===================== The following fixes and additions were made since version 18.2: diff --git a/tim/prune/save/GpsSaver.java b/tim/prune/save/GpsSaver.java index 672234f..3fa66c3 100644 --- a/tim/prune/save/GpsSaver.java +++ b/tim/prune/save/GpsSaver.java @@ -42,6 +42,7 @@ public class GpsSaver extends GenericFunction implements Runnable private JTextField _deviceField = null, _formatField = null; private JTextField _trackNameField = null; private JCheckBox _waypointCheckbox = null, _trackCheckbox = null; + private boolean _switchedWaypointsOff = false, _switchedTrackpointsOff = false; private JButton _okButton = null; private JProgressBar _progressBar = null; private boolean _cancelled = false; @@ -84,8 +85,10 @@ public class GpsSaver extends GenericFunction implements Runnable _dialog.pack(); } // Initialise progress bars, buttons + enableCheckboxes(); enableOkButton(); setupProgressBar(true); + _trackNameField.requestFocus(); _dialog.setVisible(true); } } @@ -197,6 +200,42 @@ public class GpsSaver extends GenericFunction implements Runnable _progressBar.setValue(0); } + /** + * Enable or disable the waypoints and trackpoints checkboxes + */ + private void enableCheckboxes() + { + // Enable or disable waypoints checkbox depending on whether data is available + if (_waypointCheckbox.isSelected()) + { + if (!_app.getTrackInfo().getTrack().hasWaypoints()) + { + _waypointCheckbox.setSelected(false); + _switchedWaypointsOff = true; + } + else _switchedWaypointsOff = false; + } + else if (_app.getTrackInfo().getTrack().hasWaypoints() && _switchedWaypointsOff) + { + _waypointCheckbox.setSelected(true); + _switchedWaypointsOff = false; + } + // ... and the same for track points + if (_trackCheckbox.isSelected()) + { + if (!_app.getTrackInfo().getTrack().hasTrackPoints()) + { + _trackCheckbox.setSelected(false); + _switchedTrackpointsOff = true; + } + else _switchedTrackpointsOff = false; + } + else if (_app.getTrackInfo().getTrack().hasTrackPoints() && _switchedTrackpointsOff) + { + _trackCheckbox.setSelected(true); + _switchedTrackpointsOff = false; + } + } /** * Enable or disable the ok button -- 2.43.0