summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-02-28Add Portuguese translationGravatar Eduardo Ramalho
Most of the translated phrases have more characters than in english. But I verified the Subsurface user interface, and there are no strange side effects. I had just a doubt about "trip" translation. I used portuguese word equivalent to "expedition". Some of the diving related words we don't translate. Even "buddy" is the word used on local diving boats! Signed-off-by: Eduardo Ramalho <eduardo.ramalho@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-28Revert "Add Portuguese translation"Gravatar Dirk Hohndel
This reverts commit af9ba96da444f76794e3c46cf5189b027cb7e120. I had applied this to directory with work-in-progress code that was now mixed up with Eduardo's translation work. I'll re-apply just his translation instead. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-28Svedish translation glitchGravatar Robert C. Helling
This patch fixes a Unicode mishap in the Svedish localization that breaks the build process. Signed-off-by: Robert Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-28Documentation: Add Mac related info to the bluetooth sectionGravatar Jan Schubert
Signed-off-by: Jan Schubert <Jan.Schubert@GMX.li> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27README: fix typoGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Spelling fixes for sv_SEGravatar Fredrik Steen
Fixed a spelling error. Signed-off-by: Fredrik Steen <fredrik@ppo2.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Update the READMEGravatar Dirk Hohndel
We can now build on Debian Squeeze again. We also point to both the stable version and the latest development sources in the README file. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Add Portuguese translationGravatar Eduardo Ramalho
Most of the translated phrases have more characters than in english. But I verified the Subsurface user interface, and there are no strange side effects. I had just a doubt about "trip" translation. I used portuguese word equivalent to "expedition". Some of the diving related words we don't translate. Even "buddy" is the word used on local diving boats! Signed-off-by: Eduardo Ramalho <eduardo.ramalho@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Added back support for versions of GTK pre 2.24Gravatar Lubomir I. Ivanov
Some functions in combo_box_with_model_and_entry() are only available to GTK 2.24 and newer. This patch adds only one #if branch, but probably adds support to a number of outdated distributions, such as Debian 6.0.4 and Ubuntu 10.04. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27When manually adding a dive allow user to set avg depth as wellGravatar Dirk Hohndel
So far we only allowed setting the max depth. This changes the layout of the entry widget and makes our helper function create_date_time_widget return the hbox in which it positions the time entry. I plan to reuse this later when allowing to edit the duration as well as the start date and time under certain circumstances. This is a small part of a feature request; see #75 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Add all dive computers to the device_info_listGravatar Dirk Hohndel
Calling set_dc_nickname() only added a new entry if there was a conflict with an existing one - which works fine if we are reading a file saved by Subsurface, as there the device_info_list is populated at parse time, but fails for data imported from other sources. Fixes #74 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Preparation for color printingGravatar Amit Chaudhuri
this patch adds a 3rd column to the media array of rgba so we now have one each for screen, b/w & color printing. I have defaulted to using the same color printing & screen, but this can be altered anytime. I have checked that the application still compiles and prints. The print out (colour option selected) shows the deco ceiling steps in pink but everything else appears grey scale. Further work will be required to apply the colours to the print out, although I'm not yet sure what that involves. Signed-off-by: Amit Chaudhuri <amit.k.chaudhuri@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Parse ISO 8601 time formatGravatar Miika Turkia
This is an XSLT implementation of a function to parse the ISO 8601 datetime format used in uddf. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Planner: don't use the planned dive for relative start timeGravatar Dirk Hohndel
The existing code has an embarrassing error in its logic. It picked the last dive in the table and made sure that the relative start time was either N minutes after 'now' or N minutes after the last dive ends, whichever is later. But once the planned dive has been added to the dive list (so once we have a first depth and time entry, that last dive now is the planned dive. And every time focus left the start time field the start time would be recalculated relative to the end of the dive we are currently planning. With this patch we instead simply remember the number of the last dive just as we create the dive plan and use that to look up the end time of previous dive. I could have just stored that end time but I figured maybe there could be other reasons to go back to the last dive before the planned dive, so this seemed cleaner. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Planner: use time.h and utc_mktime() to retrive the current time (no TZ)Gravatar Lubomir I. Ivanov
This should do the same as the GTimeZone variant. Also works on Windows. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Handle one more date/time format for UDDF importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27MacDive import improvementGravatar Miika Turkia
MacDive reports non-existent values as zero and in Imperial units it would be 32F. This patch will try to make an educated guess whether we have the proper temperature and pressure readings and ignore the zero fields if it seems that there are no real samples from the dive computer. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Ensure all strings stored in XML are escaped correctlyGravatar Linus Torvalds
This does escaping / quoting for everything I found. Some of it was safe (the divecomputer model is supplied from libdivecomputer, and none of them have single quotes _yet_, afaik), but with this there are no '%s' strings left except for the ones used by the helper functions (for "pre" and "post" strings). It also takes some of our existing uses of show_utf8(), and removes the redundant "check if the string is NULL or empty". show_utf8() does that internally. Fixes #73 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Suppress the "/bin/sh: 1: cannot open version.h: No such file" noise.Gravatar Cristian Ionescu-Idbohrn
Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Add target `all' to avoid "target order is important" confusion.Gravatar Cristian Ionescu-Idbohrn
Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Unused variable warning when building without libosmgpsmap.Gravatar Cristian Ionescu-Idbohrn
info.c: In function 'dive_info_widget': info.c:759:48: warning: unused variable 'image' [-Wunused-variable] Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Small typo correction.Gravatar Cristian Ionescu-Idbohrn
One 'r' removed. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-27Fix MacDive import to convert Imperial temperatureGravatar Miika Turkia
MacDive import needs to convert temperatures to Celcius. However, it seems that MacDive reports no reading as 32F (and probably 0C when using Metric). There is no way of knowing whether we have no reading or the temperature is actually zero, so we use the given temperature currently as 0C is a valid temperature... Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Update ReleaseNotes for 3.0.1v3.0.1Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Documentation: fixed some typos in bluettoth part of user manualGravatar Jan Schubert
[Dirk Hohndel: some fixes of the fixes...] Signed-off-by: Jan Schubert <Jan.Schubert@GMX.li> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Update versions to 3.0.1Gravatar Dirk Hohndel
almost forgot Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Documentation: add pictures for Bluetooth setupGravatar Jan Schubert
Signed-off-by: Jan Schubert <Jan.Schubert@GMX.li> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Documentation: update formattingGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26extend user manual for setting up bluetooth communication.Gravatar Jan Schubert
This extends the user manual for setting up bluetooth communication. Signed-off-by: Jan Schubert <Jan.Schubert@GMX.li> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26French translations updateGravatar Kévin Raymond
Signed-off-by: Kévin Raymond <shaiton@fedoraproject.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Get make to rebuild Subsurface by default againGravatar Dirk Hohndel
To quote Linus: Move the rule for the new version thing down. Plain "make" will try to make the first target in the Makefile. Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26DivingLog import: keep the dive computer name aroundGravatar Dirk Hohndel
We simply set up the model attribute. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26For divecomputers without samples don't lose other data for profileGravatar Dirk Hohndel
We create a fake divecomputer in order to draw a reasonable profile, but when setting that up we used an empty divecomputer instead of starting with the one that we have. This lost data (e.g., the model name of the dc). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Another update to DivingLog importGravatar Dirk Hohndel
This fixes two bugs: - we overwrote the max depth that we read from an XML file with 0 if there are no samples - we didn't parse the DepthAvg tag in the DivingLog XML Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Generate/update a version.h header file.Gravatar Cristian Ionescu-Idbohrn
This is dedicated to Lubomir ;) Should work (tm). Not sure though if you want target 'gen_version_file' as a pre-requisite to $(NAME) or some other target. [Dirk Hohndel: minor adjustments to make it work with gtk-gui.c] Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26UDCF importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Documentation: add information for Bluetooth connected devicesGravatar Jan Schubert
[Dirk Hohndel: did some reformatting and rewriting] Signed-off-by: Jan Schubert <Jan.Schubert@GMX.li> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Documentation: DivingLog needs to be set to Metric prior to exportGravatar Dirk Hohndel
Since their XML file gives us no information as to the measurement system used we need to ask the user to explicitly set it to metric before they create the XML file. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Test divesGravatar Miika Turkia
On Tue, Feb 26, 2013 at 6:19 PM, Dirk Hohndel <dirk@hohndel.org> wrote: > Miika Turkia <miika.turkia@gmail.com> writes: > >> On Tue, Feb 26, 2013 at 5:54 PM, Dirk Hohndel <dirk@hohndel.org> wrote: >>> Miika Turkia <miika.turkia@gmail.com> writes: >>> >>>> On Tue, Feb 26, 2013 at 6:45 AM, Dirk Hohndel <dirk@hohndel.org> wrote: >>>>> I added a few test dives exported from other software (Dm3, DiveLog 5.08, >>>>> JDiveLog 10.2 from Mac - last one doesn't parse because of encoding... Also >>>>> a composed XML zip file from DiveLog isn't supported, yet) >>>>> Find them under dives >>>> >>>> Now this gets interesting. Is there ANY logic in the units in the >>>> dives/TestDiveDiveLog5.08.xml? It seems that some of the temperatures >>>> are in C (Airtemp and Watertemp) and some in F (samples). Otherwise I >>>> would guess we are talking metric here, but I do not see any specs >>>> (another log I have seen from DivingLog had all the units in metric, >>>> as far as I could guess). BTW is the Weight in kg or lb? >>> >>> I have purchased DivingLog and should be able to create any combination >>> of data for the test file that we could possibly want. I'll do a set in >>> a moment that describe what SHOULD be there in their notes, maybe that >>> will clear things up. >>> >>> That said, I really want to release 3.0.1 in the next couple of hours, >>> so this may have to wait for 3.0.2 (if we end up needing that) or 3.1. >>> >>>> The divelogs.de UDCF format looks like it shouldn't take long to write >>>> support for. I'll look into it this evening. >>> >>> It is evening for you, right? No pressure, just making sure I understand >>> what may be coming in in patches in the next hour or two >> >> I currently have one version of the DivingLog XSLT. So a bit of >> verification and that could possibly be used as is. However, this >> could use a bit more testing than a new support to make sure things >> are not going to be any worse than they currently are. >> >> I have not started with the UDCF yet, but that could be reasonably >> fast to implement. However, no guarantees. (And yes, it is evening for >> me) > > I can hold off 3.0.1 a couple hours longer if that is a realistic thing > to do. I don't see the UDCF as that important since we have a different > format from them that we support. So I think the best possible DivingLog > support would be my preference. > > I'll add a few more exported dives from DivingLog next (and fix the > naming of the existing ones). In that case, here is the DivingLog XSLT if anyone can give it a test. miika From 4a62058f4f6fd4780f04bce6e1fe45e20abcf33f Mon Sep 17 00:00:00 2001 From: Miika Turkia <miika.turkia@gmail.com> Date: Tue, 26 Feb 2013 17:46:53 +0200 Subject: [PATCH] XSLT for DivingLog Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Update DivingLog 5.08 export filesGravatar Dirk Hohndel
Two XML files, one all imperial, one all metric Quick inspection shows that there is no indication whatsoever on metric vs imperial in the file. That is of course completely moronic and makes automated import more or less impossible. I also added a different zip file from DivingLog - quick analysis shows that this is simply the corresponding xml file, wrapped in a zip container. So this should be trivial to add. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Updated Slovakian translationGravatar Jozef Ivanecký
Signed-off-by: Jozef Ivanecký <dodo.sk@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Spanish update traslation of User ManualGravatar Salvador Cuñat
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Update to the Dutch translationGravatar Reinout Hoornweg
Signed-off-by: Reinout Hoornweg <reinout@xs4all.nl> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26Added missing translation for "User Manual" in bg_BGGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-26New translated strings for sv_SEGravatar Fredrik Steen
Signed-off-by: Fredrik Steen <fredrik@ppo2.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-25Latest addition to fi_FIGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-25Add two more versions of this dive from divelogs.deGravatar Dirk Hohndel
The DLD is imported perfectly, the udcf is not. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-25Add the same test dive in a number of different formatsGravatar Dirk Hohndel
Suuntu DM3 DiveLog 5.08 XML DiveLog 5.08 UDDF DiveLog 5.08 UDCF DiveLog 5.08 compressed zip (we don't support that) JDiveLig 10.2 from Mac (fails because of ecoding) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-25Update German and Swiss-German translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-25Update PO files. AGAIN.Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>