aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-02-25Update translation source stringsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-25Fix trailing '\r' test failure on WindowsGravatar Jeremie Guichard
Windows implementation of fwrite changes \n to \r\n for files opened in text mode. It caused failures in TestMerge and TestParse when comparing written files against reference data. Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25Improve install and test rules for Windows test executionGravatar Jeremie Guichard
Update install rules to create a staging_tests folder for easy deployment to test target. Update test rules for compile time testing when wine is available on build machine. Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25Fix dlllist.cmake not to use hard coded path to link.txtGravatar Jeremie Guichard
The utility could be used for other targets, path should therefore depend on the inputted target parameter Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25Move CMake variables printing into a utility macroGravatar Jeremie Guichard
Added cmake_variables_helper.cmake providing 2 helpers - print_variable - print_all_variables Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25smtk-import: Fix freeing unallocated memoryGravatar Salvador Cuñat
hdr_buffer pointer was not always allocated (just on dc dives), but was always freed. This should cause a crash while processing a manually added dive (or a dive whose dc model couldn't be stablished), but not always does, crashes only if the pointed memory hasn't been previously allocated. In most cases causes memory corruption, which goes easily unnoticed as it is correctly freed in next parse run. This means, obviously, I have some work TODO fixing leaks with valgrind. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-02-25Add 4 file types op file-open logbook menu filter, consistencyGravatar Jan Mulder
4 file types (that are very rarely used), did showup in the import-import dive logs menu (e.g. the file filter), but were missing from file-open logbook file type filter. Just added them to the file-open part to be more consistent. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-02-25Correct file list in file-open filter boxGravatar Jan Mulder
Some missing ;; caused the filter on filetypes in open-open logbook to be garbled. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-02-24First pass at ReleaseNotes for 4.6.3Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-24Add subsurface_stat for MacGravatar Dirk Hohndel
Which is also used on iOS. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-24Fix "Load/Save to cloudstorage" for non-ASCII user namesGravatar Jeremie Guichard
On Windows that would fail because stat() doesn't deal well with our utf8 strings. Added new subsurface_stat() portability function to replace stat(). Added Windows implementation of subsurface_stat() using wstat(), with conversion to ut16 of the inputed path. Other platform implementations (linux, android) make use of the normal stat(). Added non ASCII test case in TestGitStorage::testGitStorageLocal() Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-24Make TestGitStorage::testGitStorageLocal parametrizableGravatar Jeremie Guichard
Make use of QTest "Data Driven Testing", allowing to test multiple repo base path values. Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-24Replace pPrintable with qUtf8Printable in TestGitStorageGravatar Jeremie Guichard
Update TestGitStorage to use qUtf8Printable instead of pPrintable. This ensures that non-ASCII chars are utf8 encoded before calling internal functions. In windows case pPrintable returns other codepoint that depends on system settings. Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-24Use SUBSURFACE_TEST_DATA definition to point to test data dirGravatar Jeremie Guichard
Update tests with a (compile time) option SUBSURFACE_TEST_DATA, pointing to test data base path. It is needed for cross compilation cases. SUBSURFACE_TEST_DATA is set to SUBSURFACE_SOURCE by default, or configurable via cmake option -DSUBSURFACE_TEST_DATA="...". Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-24Bring back style sheet HTML for planner outputGravatar Dirk Hohndel
This is a partial revert of commit 4f2a7dc972cc ("Remove default stylesheet from planner output"). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-23Update translation source stringsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-23Menu keyboard shortcuts in translationsGravatar Robert C. Helling
It seems that in the .ui file, keyboard shortcut strings need the notr="true" attribute to make them appear also in translations. I found this on http://www.qtcentre.org/threads/62774-Translation-of-Shortcuts Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-02-21Dive merge: don't pick an empty dive siteGravatar Dirk Hohndel
When merging, we should treat an empty dive site (which will be deleted on save) the same as not having a dive site. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-21Simple test case for merging divesGravatar Dirk Hohndel
We do some merging in a couple of the other tests as well, but the idea is to have specific test cases that exercise our merge logic. This one starts simple. Merge a dive with some valid info with a second one that has less data filled. And then try it in both possible orders. It shows a few potential problems. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-21Test for basic image handlingGravatar Robert C. Helling
This tests adding image files to dives including hashing and evaluating exif data. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-02-21Many filenames are const stringsGravatar Robert C. Helling
So we can use string constants for those Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-02-21Add units and nicer formating for items in profile info boxGravatar Stefan Fuchs
"SP change" info format in info box: Added/changed formating and add "bar" unit. "waypoint above ceiling" event in info box: Added formating, depth conversation to ft/m and depth unit. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-02-21Translate names of additional dive events and nicer format info box textGravatar Stefan Fuchs
Enable translation for a few additional internal dive events. Ensure that all event names in datatrak.c are collected for translation. Ensure that for gaschange in profile info box the "cyl." string is also translated. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-02-21Fixes cylinder table headers not translatedGravatar Jan Mulder
The cylinder table was constructed very ealy from the contructor of the planner, so early that the tr() functions are not registered. This fix instantiates the cylinderModel from the maintab (as it is done with, for example, the weightsModel) and lets the planner user this instantiated (and proper translating) cylinderModel. Fixes: #206 Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-02-21facebook > FacebookGravatar Martin Měřinský
2017-02-21Remove space from the beginning of the line.Gravatar Martin Měřinský
2017-02-21Remove space before colon.Gravatar Martin Měřinský
2017-02-21missing dotGravatar Martin Měřinský
2017-02-21Unknow > UnknownGravatar Martin Měřinský
2017-02-21remainint > remainingGravatar Martin Měřinský
2017-02-20Remove default stylesheet from planner outputGravatar Stefan Fuchs
Remove the default stylesheet ("Courier" 13pt) from the planner output QTextEdit. Remove the content of the html property of the QTextEdit because we overwrite it when doing setHtml. After printing copy the original dive notes string displayed_dive.notes back to the QTextEdit Advantages: Display is according to font settings. ctrl - mousewheel for zoom always works. Drawbacks: Printing font is same as display font but can be adjusted by zooming before. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-02-20fix: Unable to locate package libqt5declarative5Gravatar Martin Měřinský
2017-02-20Add latest translations, add Catalan languageGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-19Fix dive site string mergingGravatar Linus Torvalds
If the second dive site doesn't have a particular string, but the first one does, we did the wrong thing and created a result string like (first dive site string) or ((null)) which is not useful. We should just use the first dive site string as-is. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-02-19Preference icons from Material Design Icon packGravatar Sergey Starosek
Make sure we take icons from Material Design Icon pack prior v3.0. Originally they were published under GPL friendly CC BY 4.0 license, but later switched to Apache 2.0 license. Here's mapping of our icons to MD icon pack: defaults.png -> action/ic_settings.png georeference.png -> communication/ic_location.png graph.png -> action/ic_timeline.png Those icons were not modified, just renamed them.
2017-02-19Add/update preference screen iconsGravatar Sergey Starosek
Defaults and language icons were missing, and graph/profile icon was not readable. All icons except "language.png" were taken from Google's Material Design Icon pack which is distributed under Apache 2.0 license (see https://github.com/google/material-design-icons) Language icon is from http://languageicon.org site. If their license isn't permissive enough, then we can switch to a language icon from Material Design pack (globe). Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com>
2017-02-19Fix typo in saturation/desatureation ratesGravatar Robert C. Helling
This patch eliminates the difference between the saturation and desaturation rates. This was probably once meant as a conservative measure but the desaturation rate was increased rather than the saturation rate (which is probably a typo, as reported by Stefan). Since there is no good basis for this anyway, this patch sets both factors to 1.0 (and if accepted the whole factor business should be removed). This makes our deco times slightly longer. But in the past, we had introduced a 1.2% fudge factor in the critical radius calculation to add conservatism and match the benchmark better. Removing this fudge factor brings us close to the benchmarks. Expected test values updated. Reported-by: Stefan <sjti@gmx.net> Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-02-19Update exif.cpp from upstreamGravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-02-19Properly handle dive sites loaded from XMLGravatar Linus Torvalds
We used to always create a new dive site structure when loading dive site data from XML. That is completely bogus, because it can (and does) create duplicate dive sites with the same UUID. Which makes the whole UUID pointless. So instead, look up the existing dive site associated with the UUID loaded from the XML, and try to merge the data properly if we already had dive site information for that UUID. Reported-by: Alessandro Volpi <volpial@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-02-19dive merging: merge water temperature too, not just air temperatureGravatar Linus Torvalds
I have no idea why we only merged air temperatures. But it was very explicit (even the function doing the merging was named "merge_airtemp()"), and water temperatures were left alone. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-02-19Add Greek as supported translationv4.6.2Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-19Latest translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-18Update README and ReleaseNotes for 4.6.2Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-18Update translation source stringsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-18About dialog: hook up Credits buttonGravatar Dirk Hohndel
2017-02-18About dialog: add Credits buttonGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-18Add geolocation to divelogs.de exportGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-02-18Include geolocation info on export XML (divelogs.de)Gravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-02-17Handle negative dates (before the epoch) betterGravatar Linus Torvalds
The Qt model sorting for the dive date was using a unsigned number, which doesn't work for dates before 1970. Also, the dive date parsing got the year 1900 wrong. Not that we really care, because other parts of date handling will screw up with any date before the year 1904. So if you claim to be diving before 1904, you get basically random behavior. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-02-16Pull latest translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>