summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-11-19QML UI: QtQuick.Controls to version 2.2Gravatar Jan Mulder
Tested fine without visual changes. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-11-19QML UI: QtQuick to 2.6Gravatar Jan Mulder
Upgrade QtQuick to 2.6. Seeing a small artifact in the application header, lets see what happens when upgrading more includes. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-11-19QML UI: Kirigami to 2.2Gravatar Jan Mulder
When first tested this commit, especially the dive list was looking terrible. However, after including newer SHA's from libkirigami, and correcting lots of spacing/margin issue, a retest of this commit shows no strange artifact any more, and the amount of warnings in the log output is reduced significantly. So now, it appears save to upgrade. Notice that main.qml still uses Kirigami 2.0. and is not updated in this commit. With version 2.2, there is a new way of theming, that is not (yet) compatible with our current code. Blindly upgrading to 2.2 leads to a almost black dive list, wrong button colors, and runtime errors in the log, due to the fact the direct setting from QML Kirigami's Theme colors is not allowed any more. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-11-19Remove dead codeGravatar Jan Mulder
While investigating Qt 5.9.2 problems, I found this unused code. Just remove it. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-11-19Fix indentationGravatar Berthold Stoeger
Fix an indentation issue in qt-models/diveplannermodel.cpp. An if was indented as if it were part of an outer if. Correct indentation confirmed by Stefan Fuchs <sfuchs@gmx.de>. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2017-11-19Trivial: fix indentationGravatar Berthold Stoeger
Fix an obvious indentation bug where one line more than intended was indented. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2017-11-18Constify strings in pref.hGravatar Berthold Stoeger
Make all char * pointers in pref.h const to make it clear that these strings are not mutable. This meant adding a number of (void *) casts in calls to free(). Apart from being the right thing to do, this commit makes the code more consistent, as many of the strings in pref.h were already const. While touching core/qthelper.cpp turn three instances of (void*) into (void *). Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2017-11-18Prevent signed/unsigned comparison warningGravatar Berthold Stoeger
Change an unsigned integer to a signed integer in profilewidget2.cpp, because commit 1f8506c changed the definition of duration_t from unsigned to signed. Since this value represents the number of seconds since a dive started, there is no possible chance of overflow problems. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2017-11-18Prevent annoying signed/unsigned comparison warningGravatar Berthold Stoeger
Commit d6c013f303 introduced a cast to avoid a signed/unsigned comparison warning for all translation units that included core/dive.h. Commit 1f8506ce64 then changed the definition of duration_t from unsigned to signed, inverting the effect of d6c013f303. Thus, revert d6c013f303 to allow compilation with -Wall without flooding. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2017-11-18build.sh: fix comparisonGravatar Dirk Hohndel
This prevented googlemaps from building in some circumstances. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-18Switch back to upstream uploadtoolGravatar Dirk Hohndel
In commit e643589233 ("Travis: setup up the desired release message right away") we temproarily switched to my fork of uploadtool to take advantage of a new feature that I had implemented there. This has already been merged upstream, so let's switch back to upstream. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-18Travis: setup up the desired release message right awayGravatar Dirk Hohndel
Instead of using the default release message and then trying to fix it up in the after_success section of one of the builds that we test, let's just always use the message that we want, regardless which build finishes first. This currently requires my fork of the uploadtool - the changes have been submitted upstream and I hope they'll get merged there so we can switch back to the upstream version of uploadtool. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-18Travis: include the symlink in the zip of Mac .appGravatar Dirk Hohndel
Don't try to follow the (recursive) symlink. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-17Release notes: Cleanup, pressure graphs, VPM-B ceilingGravatar Stefan Fuchs
Remove old 4.7.2 headline. Add pressure graphs improvement. Add VPM-B ceiling improvement. Suggested-by: Rick Walsh <rickmwalsh@gmail.com> Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-11-17Travis: update the release messageGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-17Travis: don't edit Release info if this is a PRGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-17mobile: black and white backgrounds on startingGravatar Jan Mulder
This very simple commit has a long story. See the mailing list subject "mobile: android splash screen (and issue 513) opacity weirdness". There is even more. I found the following deccription on Internet: https://falsinsoft.blogspot.nl/2017/07/qml-show-android-native-splash-screen.html and tried to implement this with the potentially nice Qt functionality (since 5.8) to manually get rid of the splash screen. Unfortunately, this does not work. Notice that there are subtile differences in the here found internet page, and the method originally implemented in commit 04e994b575. This fix is as mimimalistic as it can be. Just do not set black but white for the initial background. Unfortunately, there is still a small position change of the icon. It is known why, but solving is left as an exercise to the reader. Fixes: #513 Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-11-17Fix memory leaks in SettingsObjectWrapper.cppGravatar Berthold Stoeger
Free a bunch of C-style strings before assigning newly copied strings. One case was particularly buggy: prefs.locale.use_system_language = copy_string(qPrintable(value)); Note that prefs.locale.use_system_language is a bool, which of course always evaluates to true! Probably nobody noticed because a restart is required when changing locale. Moreover remove a few double-semicolons.
2017-11-17Fix typo: LENGHT -> LENGTHGravatar Berthold Stoeger
2017-11-17Don't show cylinder pressures for other dive computersGravatar Linus Torvalds
Stefan Fuchs points out that sometimes you get cylinder duplication when you merge dives, particularly with a planned dive. For example, if we had different manual pressures in the two different dives, the cylinders will be kept separate. But that also means that we don't want to plot the pressures from those other cylinders that came from another dive and are now associated with another dive computer. Change the "seen" logic for the cylinder to ignore cylinders that are only mentioned by other dive computers than the active one. Reported-by: Stefan Fuchs <sfuchs@gmx.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-11-17Properly declare 'has_gaschange_event()' functionGravatar Linus Torvalds
It's already used in core/gaspressures.c where it was declared privately, and we'll have a new user in the profile code, so just declare it in a proper header file like it should have been. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-11-17Clean up confusing code in setup_gas_sensor_pressure()Gravatar Linus Torvalds
The "prev" cylinder can never be negative since commit 56c206d19fba ("For more manual gas pressure details"), so remove stale code that checks for a case that cannot happen any more. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-11-17Show all autocompletes after entry of comma in tag listGravatar Jan Mulder
The almost 3 year old commit e1db5f21b15b2 introduced the behavior that you need to type at least 1 character for a tag to show any autocompleted data. While this went unnoticed for years, there is always a user that notices this changed behavior. The solution is rather simple. Do allow the 0 lenght string to act as seed for autocompletion instead of just returning, and doing no autocomplete at all. As the afore mentioned commit was explicitly meant to prevent over active firing of the tag list autocompleter, this (simple) change is carefully tested on this, and no adverse effects are visible. Fixes: #605 (wrt the 1 character issue) Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-11-16In maintab disable correct label when dive trip selectedGravatar Stefan Fuchs
Until now accidentally the dateLabel was disabled and the timeLabel was enabled. Changed this the other (correct) way round. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-11-16github: update PR template with 'documentation-change'Gravatar Lubomir I. Ivanov
Add a 'Documentation change' section to the PR body. This instructs the PR submitter to edit the section with notes for the team editing the documentation. If a PR has such notes, a maintainer should then apply the needs-documentation-change label, so that the documentation team can easily filter such PRs by label. Suggested-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-16android: Add android build on travis-ciGravatar Anton Lundin
This adds a android-apk-build which runs on travis-ci. This is using a quite ugly trick, building in a docker container, basically just to get a newer cmake. The cmake in trusty is way to old to work with android builds. A good side-effect is that this is a complete copy-paste for anyone who would like to build android-binaries them self on Linux. All the uglyness is hidden away in a docker container. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Don't re-clone subsurface in android-build-wrapper.shGravatar Anton Lundin
Just use the source tree you where called from instead. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Correct path to Qt binariesGravatar Anton Lundin
Back in 6451adfec11262c3522878e700cb6794df8ee3d2, the path to the qt binaries was changed. The current binaries are back on the old urls, so this reverts half of 6451adfec11262c3522878e700cb6794df8ee3d2. The other half is still true. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Remove unneeded extra argument parsingGravatar Anton Lundin
This is handled by build.sh, which handles it correctly for running with set -u. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Install android sdk on a different wayGravatar Anton Lundin
This way we can auto-accept all the licenses. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Terminate build.sh on unknown argumentsGravatar Anton Lundin
Previous code ended up in a eternal loop on unknown arguments. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Ensure rm exits zeroGravatar Anton Lundin
This is to comply with set -e Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Remove unset variable VERSIONGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Increase BUILDNR with zero exit statusGravatar Anton Lundin
This increases BUILDNR in a way that keeps exit status as zero, so the script doesn't abort due to set -e. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Allow Qt install in headless modeGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: make android-build-wrapper.sh executableGravatar Anton Lundin
2017-11-16ReleaseNotes: update about the new combo-box is BT dialogGravatar Lubomir I. Ivanov
from PR #809 Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-16Introduce mode field in Bluetooth device selection dialogGravatar Berthold Stoeger
Some BT devices support both, classical and LE, modes. Users could choose either by prepending or removing "LE:" in the device address field. After commit d23bd46a1be2dfb25293639abcf06b5b4d4b94df, the device field is always disabled in Bluetooth mode. Therefore, add a mode combo box to the Bluetooth device selection dialog. In the default mode (auto), the old code path (based on the Qt device flags) is used. The two other modes (force LE, force classical) allow the user to force the preferred behavior. This feature is meant as a stop-gap measure until a more refined transport choice is implemented. Therefore, the value of the new combo box is not saved in the settings, to avoid cluttering of the preferences with soon to be obsolete entries. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2017-11-16ReleaseNotes: update about the Win32 logging fixesGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-16subsurface-startup: expose print_version() in the headerGravatar Lubomir I. Ivanov
The Windows auto-verbose + log file creation if starting from a non-terminal has the problem that the print_version() call is never made becase 'verbose' is updated programatically in windows.c and not by the user (by passing -v). To work around the issue: - move the windows console creation call before *everything* else - then immediatelly install the message handler - then see if 'verbose' is set and explicitly call print_version() print_version() now also has a flag (version_printed), to avoid printing the version multiple times, if the user decided to add an extra -v to the Desktop shortcut. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-16dekstop-main.cpp: install a message handlerGravatar Lubomir I. Ivanov
This way the Windows binaries can properly write to log files. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-16windows.c: enable verbose level 1 for desktop usageGravatar Lubomir I. Ivanov
If the user has not started Subsurface from a terminal make sure that verbosity is enabled (verbose = 1), so that the log files are populated with information useful for debugging. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-16github: improve the issue templateGravatar Lubomir I. Ivanov
1) Add new description types: - 'Code cleanup' - 'Build system change' 2) Add a 'Release note' section: The idea with this is that if you make a change which is worthy of a release note in ReleaseNotes.txt, it would be best to outline it here but also in the .txt. This basically means that the PR should also touch ReleaseNotes.txt with an extra patch. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-16During DC import reset cns, ndl, other values inbetween divesGravatar Stefan Fuchs
Reset cns and heartbeat to 0 Reset ndl and bearing to -1 Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-11-16For surface samples init ndl and compass bearing from prev sampleGravatar Stefan Fuchs
This avoids printing useless info to the XML file. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-11-16libdivecomputer.c init sticky values for samples for current sampleGravatar Stefan Fuchs
When filling samples with values during DC import fill sticky values like CNS, NDL, stoptime,... immediately into current sample. Otherwise we will not fill the sticky values into the last sample created. Add two new sticky values: heartbeat and bearing Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-11-15cmake: make sure to only handle objcopy from MXEGravatar Lubomir I. Ivanov
The native Windows build does not use the MXE tools and call such as `i686-w64-mingw32.shared-objcopy` can fail. Attempt to first find if the program exists using `find_program()` and only then call it. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-15MXE: move the objcopy calls to cmakelists.txtGravatar Lubomir I. Ivanov
The objcopy calls to strip the debug symbols out of subsurface.exe need to happen before the installer is created (staged). Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-14Travis: test more variations of the buildGravatar Dirk Hohndel
On Linux we want to test both desktop and mobile, and both the full feature set as well as a build without BT and without WebKit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-14Travis: use the correct version in release announcementGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>