summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-06-21Flag more minified javascript as binaryGravatar Anton Lundin
This is so that crap doesn't show up when doing ex. git grep Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-06-22smtk-import: partially revert and complete 6963b52dGravatar Salvador Cuñat
6963b52d introduced a cmake option, COMMANDLINE to enable building a pure command line version of smtk2ssrf importer, but then the #define COMMANDLINE=1 forces building CLI mode. This patch allows building GUI or CLI versions depending on selection of the COMMANDLINE option. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-06-22Preserve VPM-B state in profile displayGravatar Robert C. Helling
This fixes a but reported by Willem in the display of VPMB ceilings for logged dives. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-06-22Translate the strings "planned dive" and "manually added dive" in the profileGravatar Stefan Fuchs
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-06-21QML UI: DiveDetails: add more space at bottomGravatar Dirk Hohndel
This way the user can scroll up the page to see all of the notes without having them covered by the action button. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: don't access dive without modelDataGravatar Dirk Hohndel
Occasionally I see errors in the log where we would access modelData.dive with modelData = null. This patch addresses a couple of the spaces where this happens, but also simplifies the code by using the existing alias. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: DiveList: implement pull down to refreshGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: attempt to add dark themeGravatar Dirk Hohndel
This isn't great, yet, but a first step to show that this is possible (and in doing so I found quite a few spots where the colors weren't correctly propagating, yet). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: simple attempt to allow color scheme switchingGravatar Dirk Hohndel
By making the assignments to the Kirigami Theme colors Qt bindings things get correctly updated when switching. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: Linus requested Hot Pink as color schemeGravatar Dirk Hohndel
He started the project, he gets to have his color preference. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: don't reduce opacity for background of selected diveGravatar Dirk Hohndel
Now that we have distinct colors for trip header and selected dive, this is actually counter productive. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: DiveList: always show current trip at the topGravatar Dirk Hohndel
This is especially nice for very long dive trips. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: redo all the colorsGravatar Dirk Hohndel
Naming them the same way Davide named them in his emails and assigning the color values he proposed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: DiveList: fix position of delete buttonGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: DiveList: turn the color blob into a thin lineGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: make title bar taller again on AndroidGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: DiveList distinguish trip and selected diveGravatar Dirk Hohndel
Making the selected dive's background less opaque prevents confusion. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: use Android palette colorsGravatar Dirk Hohndel
These were picked from https://material.io/guidelines/style/color.html#color-color-system One could argue that we should use different colors for iOS. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: remove files we no longer useGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: playing with different colorsGravatar Dirk Hohndel
Make the accent color much lighter, don't have a solid bar on the left for dives that are part of a trip. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: disable the MouseAreaGravatar Dirk Hohndel
Visible doesn't even make sense... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveDetailsView add button for mapGravatar Dirk Hohndel
Implementing another suggestion from Davide. A button to get the map (as well as just tapping on the location name). Fixes #431 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveDetailsView: make key dive info consistent with dive listGravatar Dirk Hohndel
Remove the grid layout and replace it with code that is derived from the delegate that we use in the dive list. In order to look proportional I ended up using a larger font for the location and therefore decided to allow that text to wrap instead of forcing single line. This implements a good chunk of another one of Davide's great suggestions. See #431 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveDetailsView: make the lower section less busyGravatar Dirk Hohndel
This removes fairly redundant text (yes, we know those are the Dive Details) and makes the label for the Notes consistent with all the other labels. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveDetailsView: move profile into bottom layoutGravatar Dirk Hohndel
Then we can remove the main layout and create a similar look as we now have in the dive list. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveDetailsView: don't underline locationGravatar Dirk Hohndel
Davide points out that this is not a commonly understood way in an app to indicate that a text is also a link. So let's just remove that (but tapping on the location will still work to get you to the map if there is GPS information available). See #431 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: log the font in useGravatar Dirk Hohndel
This shows that we are, indeed, using Roboto on Android. Which means I can close the first of Davide's design issues: Fixes #427 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: some fine tuning of sizes and spacingGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: remove space below trip headingGravatar Dirk Hohndel
That made sense before we had the shaded background, now it just looks terrible. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: don't show empty trip heading for dives without tripGravatar Dirk Hohndel
We need to hide the left bar and background rectangle as well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: show left bar on dives that are part of a tripGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: add blue bar on the left to trip headingGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: re-indent DiveList codeGravatar Dirk Hohndel
No actual changes besides whitespace. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: add background color to trip headingGravatar Dirk Hohndel
In order to make it easier to see the changes, the code hasn't been re-indented. This will be in the next commit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: turn DiveList heading into labelGravatar Dirk Hohndel
This way it will render in the same font as the location of a dive. This will look like crap until the next commit adds a rectangle with color around it, but this way it's much easier to see the individual changes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-18QML UI: make the dive list heading slightly smallerGravatar Dirk Hohndel
Again, the goal is to make this list look better and be more space efficient. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-18QML UI: use the short date formatGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-18QML UI: less whitespace around dive list entriesGravatar Dirk Hohndel
This way we get to show a few more dives per screen. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-18QML UI: improve the dive list layoutGravatar Dirk Hohndel
Based on Davide's ideas, but with a few tweaks: I really like the dive number on the far right; that gives a clean consistent look. I tried it with date on the left and depth/duration in the middle and liked the result. This doesn't change the font, just addresses the layout and bold heading vs smaller sub-heading. See #427 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-18Desktop UI: reset cloud storage progress 'percentage'Gravatar Dirk Hohndel
The fake percentage needs to at least start at 0 for every cloud interaction. Yes, the file global variable is ugly. So sue me. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-18Clean up git storage update messagesGravatar Dirk Hohndel
Translate all of them, but also remove some redundant or possibly misleading messages. These are now seen by users, not just developers trying to debug the code. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-17QML UI: show debug output in the App LogGravatar Dirk Hohndel
We have unified the debug output to the console and to the App Log, let's use it consistently everywhere. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-17QML UI: redesign the user notificationGravatar Dirk Hohndel
The old system of cloud access updates with fake percentages just wasn't helpful. Even worse, it hid a lot important information from the user. This should be more useful (but it will require that we localize the messages sent from the git progress notifications and make them more 'user ready'). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-17Set default cloud timeout to ten seconds for mobile appGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-17QML UI: explicitly reference parent idGravatar Dirk Hohndel
Otherwise we get an odd 'TypeError: Cannot read property of null' error message. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-16QML UI: better App LogGravatar Dirk Hohndel
This should actually scroll and be much simple. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-16QML UI: clear the previous list when downloadingGravatar Dirk Hohndel
When you start a new session with Download from DC, clear out the table from the last attempt before adding the page. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-15tankinfomodel.cpp: clamp row index to [0 - MAX_TANK_INFO]Gravatar Lubomir I. Ivanov
MAX_TANK_INFO is a new macro in dive.h to define the maximum number of tank_info_t objects. TankInfoModel's data() and setData() now check for valid row indexes before accessing the tank_info[] array directly. Without this patch TankInfoMode::data() can cause a SIGSEGV. Reported-by: Pedro Neves <nevesdiver@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-15Fix buffer overrun and primary sensor id issues in Liquivision importGravatar Robert Bodily
This changeset fixes 5 issues specific to importing from Liquivision dive logs: Issue #1: Buffer overrun causes segmentation fault. At the end of a dive record, untranslatable data is skipped and the file is scanned for the start of the next dive. This scan was implemented without regard to buffer size and so the scan ran over the buffer boundary when trying to scan for the next record after importing the last record in the file. Issue #2: Incorrect identification of the primary sensor. The primary tank pressure transmitter was being identified by using the sensor ID reported in the first pressure event record encountered. When diving with multiple transmitters (buddy, student, or group transmitters), this is often not the case and results in the buddy or other group transmitter's pressure data being imported instead of the primary's. Through empirical observation of several multi-sensor logs, I identified a previously unhandled event code (0x10) as marking a sensor identification event record. Parsing this record allows the primary and other sensors to be definitively identified regardless of which one sends the first pressure event. Issue #3: Sensor values added to the sample collection regardless of sensor ID. When processing events, the code previously dropped through to create a sample for every pressure event record, regardless of which sensor ID that event is associated with. Pressure events for sensors other than the primary are now ignored and omitted from the sample collection. Issue #4: Duplicate samples when pressure event time syncs with sample time. The sample index (d) was not incremented in this specific case resulting in a duplicate sample (for the same sample time) being created when processing the next pressure event record. Issue #5: Unsigned time difference results in erroneous interpolated samples. When interpolating/extrapolating depth and temperature values for a between- samples pressure event, a signed time value is subtracted from an unsigned time value, resulting in an unsigned term. This term is used as a scaling factor and should be signed to allow for a negative value. Currently, negative values are instead treated as large unsigned values which result in erroneous scaled depth and temperature values. Signed-off-by: Robert Bodily <robert@bodily.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-16code cleanup: one more unused includeGravatar Jan Mulder
See c7a35098008b2. A forgotten include is now removed as well. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>