aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-01-04Initialize edit hack variableGravatar Miika Turkia
The accepting mode variable must be initialized to false to allow editing of dive data. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Do not add uninitialized setpoint or ndlGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Fix CapitalizationGravatar Joseph W. Joshua
Capitalize the word Facebook in 2 occurences in socialnetworks.cpp Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Update strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Close two compiler warnings about reorderingGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Fix spelling errorGravatar Joseph W. Joshua
Fix small spelling error in configure dive computer dialog. Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Make sure we do not fall back to edit mode on acceptGravatar Miika Turkia
On Ubuntu 14.04 the edit mode does not exit successfully when applying the changes. It instead jumps back to edit mode (even though hiding the option to apply/discard changes again). So let's just have a flag to prevent faulty behavior. Fixes #786 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04The margin between toolbar and profile looked strangeGravatar Dirk Hohndel
Especially on Mac where there is already a lot of padding around the action buttons. Also made the spelling of the zeroMargins variable more consistent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Latest strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Fix incorrect name for layoutGravatar Dirk Hohndel
If I want to use the names to make more sense out of the layouts, I might as well name them correctly... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Make text in user survey follow our capitalization conventionsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Attempt to move the more frequently used toolbar actions to the topGravatar Dirk Hohndel
This is highly dependent on the user, I guess. So I may be totally off here. But the previous order was pretty much random (and even tried to push one button in there twice in a row)... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Fix toolbar icon size issueGravatar Dirk Hohndel
Instead of messing with the margin (which didn't work, anyway), we need to set the size of the icons. Apparently on Linux this was implicitly done, but on Mac it didn't scale the icons and provided space for the largest one (and we have a couple that are twice as big as the others). What we really need are scalable icons that allow us to set the icon size relative to the font size. But for now this solves the ugliness on Mac. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Trip editing: zero out potential previous editsGravatar Dirk Hohndel
This was silly; if we rely on this to be zero to indicate no change then we better zero it out when we start editing. Fixes #805 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Layout fine-tuning: remove the outermost margin around the windowGravatar Dirk Hohndel
That added visual distraction on some desktop themes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Extend SAMPLE_EVENT_GASCHANGE2 to have cylinder index in 'flags' fieldGravatar Linus Torvalds
A value of zero (which is the normal legacy one) remains "unknown", but the divecomputer backend can now give both gasmix and cylinder number this way. Currently only the EON Steel backend does that, but it should be easy enough to extend others too. Also, fix the user-visible cylinder numbering in the cylinder change tooltip to use a human-friendlier one-based numbering (ie first cylinder is "cyl 1", not "cyl 0") Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Latest strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03When editing trip data, only copy actual changesGravatar Dirk Hohndel
We zero out the displayedTrip and only copy changed data into it; so a NULL value is not deleted text, it means there was no change. Fixes #805 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Fix the update check logicGravatar Dirk Hohndel
Oops. That was supposed to do the opposite of what it ended up doing. The goal was to NOT check for two weeks when the user updates to a new version. Instead it always checked when the user updated to a new version. This mostly would hit developers... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Fix cross references in user manualGravatar Miika Turkia
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Interpolate running depth when necessaryGravatar Miika Turkia
The running depth must be interpolated when sample interval is more than 10 seconds. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Fix gaschange tooltip informationGravatar Linus Torvalds
The code tried to look up the cylinder index from the Qt data models, which was not only horribly confusing, but was also buggy. I think the index ends up being off by one when the first cylinder change is hidden (because it's at the beginning of the dive), but I can't make heads or tails of that crazy code, so there might be something else going on. Just remove all the crazy code, and use the event data directly. Which gas the gasmix and the (potential) explicit cylinder index already. It's much more straightforward, and it just automatically gets the right end result whether some other event is hidden or not. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Fix a crash when dive date is epochGravatar Miika Turkia
With a dive that's date is 1970-01-01, starting at 00:00 the assert causes subsurface to crash when performing auto grouping. This happens to be a perfectly valid date, and we might end up getting such dates when importing dives from other software, so removing the assert. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02git save format: Don't save redunant temperature sample dataGravatar Linus Torvalds
The git sample loader will fill in temperature data from the previous entry anyway, so saving repeated temperatures is just wasteful. It turns out that commit 6cf3787a0ed1 ("Remove code that zeroes out duplicate oxygen sensor and temperature values") removed the explicit redundant temperature removal in the dive fixup, which had hidden this issue. Cc: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Small tweaks to the Mac package making scriptsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Zero out the margins instead of just not changing themGravatar Dirk Hohndel
At least on the Mac some objects appear to have generous default margins. This creates a somewhat less wasteful layout. Still we have those massive margins around the toolbar buttons. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Layout fine tuning. Exclude a few more layouts.Gravatar Dirk Hohndel
The goal is to have things look as consistent as possible - so if some elements have another nested level of layouts, their margins need to be zero. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Remove margins from maintab.ui fileGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Remove all margins from mainwindow.ui fileGravatar Dirk Hohndel
And adjust them in code instead. This seems to look nice. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Give more layouts reasonable namesGravatar Dirk Hohndel
This time for the mainwindow. This includes an adjustment in the C++ code where we actually referenced one of those weird generic names. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Fine tune some spacingGravatar Dirk Hohndel
Now that we set the margins everywhere, the manual corrections here aren't needed. At the same time, the spacing for the labels looks better if it is a tiny bit more generous. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Set up consistent margins in the various layoutsGravatar Dirk Hohndel
The hard coded margins were random and inconsistent and generally ended up with a rather unbalanced look. This was worse on Mac than on other platforms, as there the margins get exaggerated for some reason. This code is a bit of a hack and a bit brute force, but it seems to work to create a much more pleasing appearance. It may need some fine tuning (depending on OS or DE (under Linux)), but it definitely seems like a massive improvement. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Give layouts reasonable namesGravatar Dirk Hohndel
I should do this for the other .ui files as well, but for now this was enough to get me going. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Try to fix spacing between widgets.Gravatar Tomaz Canabrava
We had two internal layouts, each of them using 6 of spacing, wich accounted for 24 of spacing if we took into account items side by side. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Partial revert of commit 6cf3787a0ed1Gravatar Dirk Hohndel
Commit 6cf3787a0ed1 ("Remove code that zeroes out duplicate oxygen sensor and temperature values") incorrectly removes the code that zeroes out the temperatures. Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01User survey: always wait a weekGravatar Dirk Hohndel
I can't remember why I decided to show the survey immediately if someone was running a development version. Seems silly to me in retrospect. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Automatic update check with an opt outGravatar Dirk Hohndel
Store the last version used, the next time we can check, and the decision if the user does or does not want these checks in the settings. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Remove the 32/64 bit warning in the Windows installerGravatar Dirk Hohndel
We now have perfectly fine 32bit binaries with Qt5 so no more reason to steer people towards 64bit binaries. Actually, I don't plan to make 64bit binaries for the next release. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Make the moving mean depth line a less obnoxious colorGravatar Dirk Hohndel
The red made it stand out way too much. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Whitespace cleanupGravatar Dirk Hohndel
Quite a bit of wild white space going on... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Get rid of mean depth lineGravatar Krzysztof Arentowicz
Flat mean depth line (whole dive, not the instant one) is redundant as we now have a much more useful mean depth graph. Signed-off-by: Krzysztof Arentowicz <k.arentowicz@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Plot mean depth dataGravatar Krzysztof Arentowicz
As we already have running depth sum values for each sample why don't just plot running average depth graph. Signed-off-by: Krzysztof Arentowicz <k.arentowicz@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Avoid divide by 0 errorGravatar Krzysztof Arentowicz
Avoid crash when moving mouse to left side of the plot when showing mean depth Signed-off-by: Krzysztof Arentowicz <k.arentowicz@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Update check: better message when running development versionGravatar Dirk Hohndel
This isn't an error. The server tells us what it knows. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Use the canonical version when checking for updatesGravatar Dirk Hohndel
This is in the form major.minor.subminor.commit_nr and makes it easy for the backend process on the server to figure out what to do. This changes the query argument from ver to version so the backend knows that this is now a canonical version. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Always show the full git version when called with --versionGravatar Dirk Hohndel
This way we finally get the right version shown on Mac and Windows. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Always show the full git version in the about screenGravatar Dirk Hohndel
This way we finally get the right version shown on Mac and Windows. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Try to bring some sanity into our version stringsGravatar Dirk Hohndel
VERSION_STRING is the one most appropriate for the target OS GIT_VERSION_STRING is the full version string with the git hash CANONICAL_VERSION_STRING is major.minor.submior.number_of_commits Mac allows only three components to the version Windows allows four Linux doesn't care This way we always know the full git hash (unless tagged or from tar) AND we can always have a version that can be easily compared / sorted. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Fix mean depth on info boxGravatar Miika Turkia
The running depth must be divided by current time to get the average depth. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01Happy New YearGravatar Tim Wootton
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>