aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-07-14Merge branch 'qml_test' of https://github.com/janiversen/subsurfaceGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-13Update CHANGELOG.mdGravatar Berthold Stoeger
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-13Dive pictures: don't update all images on drag&drop to profileGravatar Berthold Stoeger
Gracefully handle drag & drop to the profile, which changes the offset of the pictures. To do this, keep the pictures in the DivePictureModel and the ProfileWidget2 sorted by offset and re-arrange if needed to keep the list sorted. This needs some code reshuffling. Introduce a helper-function that moves ranges in arrays. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-13Dive pictures: update thumbnail positions on deletionGravatar Berthold Stoeger
If pictures were deleted, the remaining thumbails where staying at their positions. Only when switching between dives, the new positions were recalculated. Do the recalculation immediately. More precisely: the x-coordinate, which is determined by the timestamp, stays identical. Only the y-coordinate is recalculated such that overlapping of thumbnails is avoided. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-13Prepare README and ReleaseNotes for 4.8.1v4.8.1Gravatar Dirk Hohndel
And clear out CHANGELOG. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-13Update to latest libdcGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-13Latest translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-13Disable the WindowContextHelpButtonHint for Qt >=5.10Gravatar Stefan Fuchs
Disables the WindowContextHelpButtonHint by default on Qt::Sheet and Qt::Dialog widgets. This hides the ? button on Windows, which only makes sense if you use QWhatsThis functionality. This value has been added in Qt 5.10. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2018-07-13Update CHANGELOG.mdGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-13Update CHANGELOG.mdGravatar Stefan Fuchs
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2018-07-13Fix dive mode drop-down in planner for re-planned diveGravatar Stefan Fuchs
Also populate the DiveTypeSelectionModel with values for re-planned dive. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2018-07-13Code cleanup in diveplanner.cppGravatar Stefan Fuchs
Move a variable declaration and added some initialization. Added missing spaces. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2018-07-13In planner notes don't show dive mode for first data pointGravatar Stefan Fuchs
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2018-07-13Add three missing translations for divemode_text_ui in plannernotes.cGravatar Stefan Fuchs
Added three missing translations which were forgotten here: fcf6b819d9cf337714fb542497cffc6effafe2ca Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2018-07-13Make sure our libdivecomputer custom IO interfaces have sleep functionsGravatar Linus Torvalds
When I switched over from our own custom IO implementation to the new upstream custom IO model in libdivecomputer, I completely missed the fact that the libdivecomputer custom IO model also does a custom _sleep_ function. I'm not entirely sure what the point was, and it broke things even in libdivecopmputer itself when some of the new sleep functions were broken. Anyway, we didn't export any sleep functions at all for the bluetooth, BLE and FTDI cases, the the libdivecomputer code didn't fall back to any sane default sleep implementation either, so the end result was no sleeping at all. Which didn't matter for most divecomputers. But it seems like at least some OSTC dive computers did care, at least in certain situations, and both Miika and Anton had trouble downloading with their OSTC Sport dive computers. Using the serial line protocol and the legacy /dev/rfcomm model worked fine, because then it used the sleeping functions in the POSIX serial code inside libdivecomputer. This just adds trivial sleeping functions for the affected download protocols. Maybe I should have just made libdivecomputer have a sane default instead, but this wasn't hard either (the hard part was trying to figure out why the downloads worked for some people and not for others). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2018-07-13Fix configure bluetooth ostc'sGravatar Anton Lundin
When we introduced the whole check for supported transports code, no one noticed that it broke configuring all ostc's over bluetooth. The configure code just used a placeholder model of OSTC 3 to get the right backend code. With the new supported transports model it errored out if you where trying to connect to a bluetooth enabled device, just because the original OSTC 3's wasn't bluetooth enabled. This switches the placeholder model over to a OSTC Plus which is both bluetooth, serial and ble capable, so the code works again. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-07-13Derek: enable label and milestone managementGravatar Dirk Hohndel
Allow Derek to modify labels and milestones and add a few more of our contributors to the list of people allowed to give Derek commands. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-13[user-manual] Update SmartTrak import informationGravatar Salvador Cuñat
The information on how to build smtk2ssrf was pretty outdated. Update this information and point to subsurface downloads repo for windows installer and linux appimage. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2018-07-13map-widget: fix chronology of QML class registrationGravatar Lubomir I. Ivanov
The QML types needs to be registered before the MainWindow instance is created on the desktop version, otherwise the MapWidget instance will be created and it will fail with a missing QML namespace. In subsurface-helper.cpp, move register_qml_types() from run_ui() to init_ui(), as later in init_ui(), MainWindow is instantiated for the first time in the desktop version. Ref #1500 Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2018-07-12tests: update testqml to use shared register_qml_types()Gravatar jan Iversen
add subsurface-helper.cpp to TestQML target remove local qmlRegisterType() and add register_qml_types() instead Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12ssrf: prepare subsurface_helper.cpp to be used by testqmlGravatar jan Iversen
add test for SUBSURFACE_TEST_DATA to exclude functions not used when testing Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12tests: add .gitignore to ignore qmlc filesGravatar jan Iversen
With Qt 5.11 the qml compiler is included and qmlc files created in the same directory as the qml file (at least for the qml test harness). ignore *.qmlc Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12tests: make qml test harnessGravatar jan Iversen
build a qml test runner that includes ssrf interface The qml test runner allows having qml test files. Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12ssrf: add QuickTest to test libraries.Gravatar jan Iversen
QuickTest enables QML TestCase which are used for qml testing Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12ssrf: move functions from mobile-helper to mobile-mainGravatar jan Iversen
Move few mobile only functions from mobile-helper to mobile-main remove subsurface-mobile-helper file structure is now subsurface-*-main.cpp + subsurface-helper.cpp Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12ssrf: combine subsurface-*-helper into subsurface-helperGravatar jan Iversen
combine shared functions like init_ui and run_ui in one file Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12desktop-widget: move qmlRegister from mapwidget to shared helperGravatar jan Iversen
Remove qmlRegister in desktop-widgets/mapwidget in order to have a shared registration in subsurface-helper.cpp Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12ssrf: add shared helper fileGravatar jan Iversen
add subsurface-helper.cpp to share functions between mobile and desktop move mobile qml registrations to a shared function (avoiding differences in registrations) Target is to replace current subsurface-desktop-main + subsurface-desktop-helper and subsurface-mobile-main + subsurface-mobile-helper with subsurface-*-main + subsurface-helper Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12Add comment to get-dep-lib.shGravatar Jocke
Add a comment so we remember to change the version number in versions.sh also. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-12Match openssl versionsGravatar Jocke
The versions for openSSL in variables.sh and get-dep-lib.sh needs to match or we end up recloning the repo on every build. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-12Add comment to variables.shGravatar Jocke
Add a comment to the variables.sh file so we don't forget to update qt version in the qt-installer-nontineractive file as well. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-12Update non-interactive qt installationGravatar Jocke
With commit c62ce43 the Qt version where updated to 5.11.1, this updates the qt install script to match the versions of the Qt parts we want. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-12Don't show decimals on pressuresGravatar Jocke
As per discussion in #1460 there is no point in showing decimal values for pressures in the equipment tab on desktop or in the dive edit view on mobile. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-12Dive media: add ".mov" to list of known video extensionsGravatar Berthold Stoeger
This was an oversight in b28dba6087f0433af8ece176b64fcac54ca370a4. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-11Travis: add Qt 5.9 testingGravatar Dirk Hohndel
This is done via Fedora 27 which seemed the easiest way to get a 5.9 based distro. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-11Travis: add Qt 5.7 testingGravatar Dirk Hohndel
This is done via Fedora 26 which seemed the easiest way to get a 5.7 based distro. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-11Update mailmapGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-11core: remove clang warning in divesite.cGravatar jan Iversen
Add () in complex condition to avoid clang warning. Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-10Travis: add Qt 5.6 testingGravatar Dirk Hohndel
This is done via OpenSUSE Leap/42.3 which seemed the easiest way to get a 5.6 based distro. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-10build-system: we always require QtQuick and QtLocationGravatar Dirk Hohndel
No point in listing them twice as extra components. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-10core: add version variables to qPref and make it qml loadableGravatar jan Iversen
add canonical_version and mobile_version to qPref Having a property in qPref, allows the use in qml, and prepare the interface for qml testing. Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-10ssrf: mobile-helper, check return code from qmlRegisterTypeGravatar jan Iversen
add check for return code in qmlRegisterType calls, and log a message if failed There are a lot of name restrictions (e.g. must start with a capital letter). Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-10core: make qPref::cloud_status the only version of the enumGravatar jan Iversen
add enum to qPref and remove elsewhere update source core to reference qPref. the enum cannot be in pref.h because it is to be used in qml and Q_ENUM need the enum to be defined as part of the class Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-10UDDF import: add support for decimal comma for depthGravatar Miika Turkia
Depth values might apparently contain decimal comma instead of decimal point with some locale settings. Thus add support for both of them. Fixes #1485 Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-07-09Travis: build Android against Qt 5.11.1Gravatar Dirk Hohndel
Instead of dealing with the challenges of downloading and installing the official package (which really prefers to be run interactively and frequently caused Travis failures) we get the pre-packed bits from our cache instead. Less data to transfer, quicker install. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-09Android: update to use Qt5.11.1Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-09Latest translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-09Travis: build iOS against Qt 5.11.1Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-09Travis: build macOS against Qt 5.11.1Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-09Travis: install from Homebrew instead of using a cacheGravatar Dirk Hohndel
Clearly something has changed here. When I first tried to use Homebrew on Travis the update would take often so long that the build would time out. Now it is nice and fast. So instead of wasting time with the cache let's just use Homebrew directly. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>