Commit graph

3772 commits

Author SHA1 Message Date
Sergey Starosek
2742d59b36 Fix "Select tags" dialog behavior
* Apply filter only when OK button pressed
* Restore tags selection from dive mask when Cancel button pressed
* Fix selection logic when selected or all dives are filtered out (hide
  profile, tooltips, etc.)

Not sure whether call to repaint_dive() is required.

Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-17 08:34:45 -07:00
Miika Turkia
e07072f10a Do not add unnecessary / at end of location on divelogs import
The check if both location and site exist was flawed causing an extra
slash on location name when the SITE was empty. Thus resulting in
multiple location candidates when exporting to divelogs.de and
re-importing to Subsurface.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-17 06:50:50 -07:00
Tomaz Canabrava
4098922b55 Adds preliminary support for Marble Widget
Adds preliminary support for marble widget, alongside with the
dive list. my idea is to let the view stay there at the left of the
dive list since we got a lot of unused space and a globe is something
nice to have - so you can look around where did you dived, the
dives near the one that's currectly selected, and so on.

I'm not using OpenStreetMaps right now, but a good thing about
marble is that it is skinnable - so for instance, a dive school
could present a dive lesson using subsurface with a globe from the
1600, to make it feel like 'history'.

This version will only compile to Qt4.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-17 08:14:10 -03:00
Dirk Hohndel
59a0c5cdcd Documentation: update divelogs.de export explanation
Thanks to commit 347019272a57 ("Hide user password in Upload to
divelogs.de dialog") we no longer show the password on screen.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-16 17:49:01 -07:00
Tomaz Canabrava
2f35c94026 Fix loading a dive via command line.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-16 21:25:31 -03:00
Thiago Macieira
3024b2b83c Don't deleteLater a null pointer
When the application launches, the oldModel is null.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-16 14:13:22 -07:00
Thiago Macieira
18e5155ba5 Get the name of moc,uic,rcc from the .pc files in Qt 4
Just in case some crazy distributions also rename the binaries.

Renaming the binaries is not supported in Qt 5 and should never be
done. Besides, the binary names are missing from Qt 5.0.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-16 12:26:23 -07:00
Thiago Macieira
2ba236e288 Search both qmake and qmake-qt4
Some Linux distributions do not ship a "qmake" binary, despite
recommendations from the Qt Project. We need to cope with that, so we
search for qmake-qt4 if qmake fails.

We use "qmake -query QT_VERSION" instead of qmake -v because that is
known to produce an error for Qt 3's qmake.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-16 12:26:20 -07:00
Tomaz Canabrava
d39b1aedcd Fix loading a second dive, after the first file was loaded.
This patch fixes loading a second dive-file after the first
one had been loaded. it simply clears some information and
makes sure that the current selected dive is invalid when
the file closes. I also did a bit of code cleanup on this one
to make things simpler in the future.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-16 12:23:38 -07:00
Tomaz Canabrava
e3cb36498d Fixed the loading of some maps
On some maps, the lack of setting up the dc before plotting
the dive-computer nick caused a division by zero, breaking
the correct visualization of the dive.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-16 15:43:38 -03:00
Tomaz Canabrava
30297ebd4b Correctly set the unselected dive.
The selected dive was being set to zero when the program
started, but zero is actually the first dive. There
were workarounds on the gtk code for that probably

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-16 15:42:20 -03:00
Dirk Hohndel
1ba901fed6 Initialize / reset selected_dive to -1
The value of 0 that we used is actually a valid value and could cause
confusion.

Suggested-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-16 09:10:11 -07:00
Sergey Starosek
69da208080 Hide user password in Upload to divelogs.de dialog
Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-16 08:39:05 -07:00
Sergey Starosek
b202b5a2ac "Enter" button activates default OK response.
Implemented for the following dialogs: Preferences,
Select Tags, Select Events, Renumber, Upload to divelogs.de

Not shure whether this is appropriare for Print and Planner
dialogs.

Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-16 08:38:58 -07:00
Dirk Hohndel
d6f279a415 Documentation: more tweaks/additions to "Viewing and Completing Your Logs"
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 22:39:19 -07:00
Dirk Hohndel
4e1b66414e Add missing widget title for manual dive entry / edit
Buffer was used uninitialized instead.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 22:32:08 -07:00
Dirk Hohndel
63c0c7921b Avoid reading an uninitialized variable when adding new cylinders
If mbar = 0 then *p would not be set, but the variable was then used in
the calling function.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 22:32:08 -07:00
Dirk Hohndel
3a37554f35 Documentation: describe trips in the dive list
Both autogroup and manual creation of trips is explained. Once the user
looks at manual creation, the other trip manipulation options should be
fairly self-explanatory.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 22:31:56 -07:00
Dirk Hohndel
5b97344b83 Documentation: multiple small corrections and improvements
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 22:22:20 -07:00
Dirk Hohndel
19750ed15a Adjust test dives to comply with the current trip syntax
Otherwise the tests fail - we no longer support the old format.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-16 00:36:34 -04:00
Dirk Hohndel
6766c56220 Documentation: add explanation on editing events in the dive profile
Context menu to remove events or add bookmarks or gas change events.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 21:33:26 -04:00
Dirk Hohndel
aa5b7c7523 Update Swiss-German and Dutch translations
Swiss German is now fully translated.

The Dutch translation had one message string containing a few "\\n"
symbols - those happen when translators explicitly enter "\n" in the
Transifex web interface (instead of just hitting return).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 20:37:49 -04:00
Lubomir I. Ivanov
72636deee3 Windows installer: append the package version to registry
On installation, set the "DisplayVersion" registry value
to ${SUBSURFACE_VERSION}, so that a version is displayed
when browsing the list of installed programs.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 17:35:52 -04:00
Henrik Brautaset Aronsen
19bebeeb3a Disable OK button in download dialog when downloading
The button was active while downloading, and that was
confusing.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 17:08:13 -04:00
Thomas Maisl
ac82837a68 Addition / change to the user manual
- give an introduction to the dive list and explain some behaviour of dive
  list to new users
- a small clarification regarding the used Buhlmann-algorithm

Signed-off-by: Thomas Maisl <exp-122004@maisl.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 16:53:03 -04:00
Dirk Hohndel
b6ec313096 Edit depth/duration dialog incorrectly always used metric
The label changed, but when the value was pre-set, it was always set as
metric (but then "correctly" interpreted as ft when reading it back - i.e.
it was incorrectly devided by 3.3).

Reported-by: Thomas Maisl <tom@maisl.net>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 13:08:40 -04:00
Dirk Hohndel
ac16444544 Update for Russian and Bulgarian translations
Translations of the "deco" tag.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 07:24:14 -04:00
Miika Turkia
97594ffd23 Fix DM4 dive time
DM4 stores the divetime in local time. The conversion from seconds since
year 1 was 2 hours off. (So there is no timezones involved, which is
good for us!)

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 01:22:11 -04:00
Dirk Hohndel
935273c9e7 Documentation: update reference to 6m stop in dive planner
Thanks to Miika we have an updated screenshot

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 01:20:55 -04:00
Miika Turkia
f330942804 New dive planning screenshot with 6m stop in it
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-15 01:15:51 -04:00
Dirk Hohndel
22e3f5aa91 Add translations for 'deco' tag
These were done by me through the advanced linguistic process known as
"pattern matching". I doubt that this is right in all the languages...

For some reason two new Swiss-German translations snuck in as well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 22:01:35 -04:00
Dirk Hohndel
d00c16d4ee Add tag for deco dives
Fixes #85

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 21:52:55 -04:00
Dirk Hohndel
bba99277a8 Suunto DM4 import should fill the divecomputer fields
Writing to the dive fields for maxdepth, surface pressure, airtemp and
watertemp is not correct. In the case of duration the longer time should
go into the dive, the shorter time into the divecomputer.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 21:37:35 -04:00
Dirk Hohndel
6dfd16a1f5 When editing a manually entered dive, make sure divelist is updated
Editing a manually entered dive allows the user to edit duration, max
depth and mean depth. These values are stored in the first (and only)
divecomputer and the duration, maxdepth and meandepth fields of the dive
are populated in fixup_dive() after the dive was initially parsed.

In order for this to work we need to clear out the existing fields (so
that values can get smaller) and rerun fixup_dive().

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 21:22:03 -04:00
Dirk Hohndel
41a97bc1ae Consistently end the list of map providers with Yahoo streetmaps
The other map providers don't appear to work at all, regardless from where
I connect to the network.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 20:30:17 -04:00
Dirk Hohndel
4893d77d27 Update the German translation
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 19:56:57 -04:00
Dirk Hohndel
04c69c9eb2 Documentation: update regarding dive computer device drop down list
This reflects the change made in commit bf34940bc5e4 ("Conditionally
enable the device combo box.").

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 19:52:55 -04:00
Jef Driesen
e3b8d8ee70 Conditionally enable the device combo box.
The device combo box is only necessary for the Uemis Zurich, and dive
computers using serial communication. For dive computers using IrDA or
USB communication, this combo box causes only confusion for the users.
Starting with libdivecomputer version 0.4, there is an api to query the
transport type, which can be used to enable/disable the device combo box
based on the selected model.

Signed-off-by: Jef Driesen <jefdriesen@telenet.be>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 14:59:03 -04:00
Lubomir I. Ivanov
41373e467a Windows installer: add an "Add/Remove Programs" entry
The NSIS script on installation will write a key to the registry
that will be shown to the user as a "Subsurface" entry (with icon)
in the list of installed programs that can be uninstalled
(e.g. in the Control Panel).
On uninstall, said registry key will be removed.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 13:32:06 -04:00
Dirk Hohndel
b047f17c13 Disable https connection for cross builds using mingw32
Not my preferred solution, but better than disabling divelogs.de uploads
for people using the Windows binary.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 11:04:42 -04:00
Dirk Hohndel
8e18c860a9 Arrange tags in a table for dive edit dialog
This makes things look nicer and also reduces vertical size of the edit
dialog - which should now fit on a 600px display again.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 10:56:42 -04:00
Henrik Brautaset Aronsen
a55a2e5d88 Don't add half a kilo/pound when adding weights
The weight management widget added 500 grams / 0.5 lbs
when a new entry was added.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 09:26:45 -04:00
Tomaz Canabrava
c5590f835a Fix the focus issues, load a profile when load a file.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-14 08:34:16 -03:00
Dirk Hohndel
2f862c8f8d Pick the old translations for the updated string
Since this was just a fix for a typo, Transifex allowed me to simply pick
the existing translations for the previous string.

Also fixed a newline vs '\\n' bug in the Dutch translation.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 07:26:37 -04:00
Tomaz Canabrava
b0374047dd code to show profile again
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-14 08:18:26 -03:00
Dirk Hohndel
ef25421930 Update .po files after pushing new string
I was too slow, so this also includes the Russian, Bulgarian and German
translation for this string plus a couple more Danish updates.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 07:08:14 -04:00
Dirk Hohndel
76a8560a68 Updates to Norwegian and Dutch translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 06:38:29 -04:00
Dirk Hohndel
ce06ec3d17 Fix typo in user visible string
Sadly that means "new translations are needed"

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 06:30:49 -04:00
Dirk Hohndel
ce46a60caf Fix Windows cross build
commit 59294029f3d1 ("Capitalize package name and add capitalized tar-ball
prefix") had an unintended side effect: the cross build for Windows on
Linux no longer worked (as it set NAME=subsurface.exe).

Fixed this by introducing a TARGET variable that is derived from $(NAME).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 06:27:45 -04:00
Dirk Hohndel
ff417cb140 Hardware updates for README, ReleaseNotes.txt and user-manual
Decided to split OSTC3 and Petrel in the ReleaseNotes (as the Petrel was
already supported in 3.0) and added the Suunto DX as well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 05:44:28 -04:00