Commit graph

7551 commits

Author SHA1 Message Date
Dirk Hohndel
17195e44a5 Remove all margins from mainwindow.ui file
And adjust them in code instead. This seems to look nice.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02 22:24:50 -08:00
Dirk Hohndel
36ba5d3382 Give more layouts reasonable names
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-02 22:24:50 -08:00
Dirk Hohndel
57b49a7833 Fine tune some spacing
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-02 22:24:50 -08:00
Dirk Hohndel
66c2d3d9da Set up consistent margins in the various layouts
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-02 22:24:50 -08:00
Dirk Hohndel
a6a76fbffd Give layouts reasonable names
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-02 22:24:50 -08:00
Tomaz Canabrava
93f42418e6 Try to fix spacing between widgets.
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-02 22:24:50 -08:00
Dirk Hohndel
d1af75357d Partial revert of commit 6cf3787a0e
Commit 6cf3787a0e ("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-02 20:39:19 -08:00
Dirk Hohndel
cef150d7dc User survey: always wait a week
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-01 22:50:03 -08:00
Dirk Hohndel
864c4ce94d Automatic update check with an opt out
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-01 20:49:24 -08:00
Dirk Hohndel
4ce3c1e8b8 Remove the 32/64 bit warning in the Windows installer
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-01 16:45:24 -08:00
Dirk Hohndel
4c4bc71803 Make the moving mean depth line a less obnoxious color
The red made it stand out way too much.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01 16:43:30 -08:00
Dirk Hohndel
c4954d90a1 Whitespace cleanup
Quite a bit of wild white space going on...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01 16:28:37 -08:00
Krzysztof Arentowicz
b6f47883c3 Get rid of mean depth line
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-01 16:28:20 -08:00
Krzysztof Arentowicz
e3378e299a Plot mean depth data
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-01 16:23:22 -08:00
Krzysztof Arentowicz
ee1ef52330 Avoid divide by 0 error
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-01 16:14:01 -08:00
Dirk Hohndel
26c3dcbcb6 Update check: better message when running development version
This isn't an error. The server tells us what it knows.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01 12:13:27 -08:00
Dirk Hohndel
75af60f327 Use the canonical version when checking for updates
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-01 12:08:57 -08:00
Dirk Hohndel
3e6a721771 Always show the full git version when called with --version
This way we finally get the right version shown on Mac and Windows.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01 12:00:48 -08:00
Dirk Hohndel
9b247af3f6 Always show the full git version in the about screen
This way we finally get the right version shown on Mac and Windows.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01 11:58:04 -08:00
Dirk Hohndel
b5b26dc756 Try to bring some sanity into our version strings
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-01 11:57:28 -08:00
Miika Turkia
e5c3799270 Fix mean depth on info box
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-01 09:15:18 -08:00
Tim Wootton
ba72946b0c Happy New Year
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-01 09:08:56 -08:00
Dirk Hohndel
ac7d1f15c6 Add better icons for the filter dialog
These are from the public domain icon tango icon set at
http://tango.freedesktop.org/Tango_Icon_Library

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 23:53:28 -08:00
Dirk Hohndel
b8af46a33e Another tiny change for OBS
As expected, switching to subsurfacedaily as package name turned out to be a
massive PITA.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 12:24:16 -08:00
Miika Turkia
16c46ba2f8 Export only profile from first divecomputer
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 12:13:11 -08:00
Miika Turkia
77a7595cbd Imperial support for CSV profile export
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 12:13:04 -08:00
Miika Turkia
ed89febcbb Enable and disable unit selection
Unit selection is supported only for CSV exports, thus enabling the
selection only for those.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 12:12:59 -08:00
Miika Turkia
205c893fc3 Include cylinder description for imperial import
If the cylinder size seems to be in the form of ALxx, LPxx, or HPxx use
that as cylinder description.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 12:12:53 -08:00
Miika Turkia
48019a73d5 Imperial support for CSV details export
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 12:12:26 -08:00
Miika Turkia
5d68c7d4a1 Use unit selection for XSL transformation on CSV export
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 12:12:20 -08:00
Miika Turkia
c1d9055948 GUI change to accommodate unit selection on CSV export
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 12:12:05 -08:00
Dirk Hohndel
72a78f6c2d Next attempt to get the OBS subsurfacedaily naming right
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 11:41:06 -08:00
Dirk Hohndel
cbd7a5df95 Information overlay: include the moving mean depth
Apparently this is useful for some tech divers.
We urgently need an option to turn off the graph and this text, though, as
I am guessing that this is just distracting and annoying to 90+% of our
users.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 11:34:11 -08:00
Dirk Hohndel
1d39df0922 Add a new script to create cross built Windows installer
This script is based on the mxe package and builds everything from source
instead of using the mingw packages from Fedora as I did in the past.

I'm keeping the old script around for now, but eventually I should remove it as
this is the current way to create a working installer that supports both 32 and
64 bit Windows and is Qt5 based.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 10:20:28 -08:00
Dirk Hohndel
1169d7dd35 Add the current OBS spec file for daily builds
This is simply here for people to look at. It will age immediately and it makes
no sense to try to keep it current here as it is maintained in OBS. But I think
it might be a useful starting point for others who want to package daily builds
of Subsurface.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 10:05:28 -08:00
Dirk Hohndel
38278c9c71 Revert "Make the daily builds on OBS distinct from the releases"
This reverts commit 7a7ce2c5e0.

Shouldn't have pushed that one :-)

The fix was to modify the spec file, not the name of the directory and tar
file.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 10:03:47 -08:00
Dirk Hohndel
7a7ce2c5e0 Make the daily builds on OBS distinct from the releases
This way there should be less confusion

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 09:19:06 -08:00
Dirk Hohndel
c246432092 Remove some way way way outdated files
From the very earliest packaging attempts. Definitely not useful anymore.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 08:48:27 -08:00
Dirk Hohndel
cfcb0deb7d Allow overriding makensis program
For cross building Windows binaries

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 08:48:27 -08:00
Dirk Hohndel
f42a83f4b2 Linux package generation: integrate and automate OBS and Ubuntu PPA
This is still quite fragile and isn't enough for anyone to run it, but it
captures where I am in the automation process.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 08:48:27 -08:00
Miika Turkia
d70a6f23ed Change the XSLT to use the duration format instead of "logic"
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 08:35:36 -08:00
Miika Turkia
65ee482adb Add duration format to XSLT call
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 08:35:30 -08:00
Miika Turkia
a46cebd1ad GUI change to specify duration on CSV import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 08:35:24 -08:00
Dirk Hohndel
74bf5fc2b8 Fix typo in INSTALL file
Thanks Benjamin for catching this.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 08:20:44 -08:00
Miika Turkia
0f7c4ecd90 Treat duration as minutes if dive would be short
This will read duration from CSV in minutes if the dive would be less
than 10 minutes when treating the duration as seconds.

In practice, this means that free-divers cannot import dive duration
properly from CSV, but this should be sensible for scuba divers.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 08:19:19 -08:00
Miika Turkia
83ccf24e1e Support importing quoted multi-line notes field
This adds support for importing multi-line notes field on CSV import.
Naturally the notes filed must be quoted with " in this case.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 08:19:12 -08:00
Tomaz Canabrava
b3e3947b79 Make the moving mean depth line work
It's a bit jumpy, but works.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-30 16:14:53 -08:00
Tomaz Canabrava
d6fddcaadc Add a new signal to send the current time/depth of the mouse pos
As the explanation says. :)

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-30 16:14:40 -08:00
Tomaz Canabrava
3e239c7e3e Add the instantMeanDepth on Scene
But nothing is hoocked yet.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-30 16:13:41 -08:00
Tomaz Canabrava
4f4857f19f Move stuff to protected on DepthLine
I wanna use some of it on the InstantMeanDepthLine

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-30 16:13:09 -08:00