| Age | Commit message (Collapse) | Author |
|---|
|
We use 'Dive details' as page title, everywhere else we use
'<unnamed dive site>'.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Since we are accessing the model, this is the variable we should use.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
By getting a DiveObjectHelper and then dereferencing that we ended up
creating hundres and hundreds of these objects, only to immediately
destroy them after using a tiny part of the data.
Instead make those data available directly from the model, without
having to create a DiveObjectHelper forst.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Paul Buxton <paulbuxton.mail@googlemail.com>
|
|
There is already a role to do that. Query the model directly to
avoid creating a full DiveHelperObject.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
|
|
Replace UUIDs by pointers to dive-site in mobile code. In both
cases, the value is transported via a QVariant. The function
getCoordinatesForUUID(), which was only used from mobile, can
be replaced by a getCoordinatesFor() function taking a variant
supposed to contain a dive-site pointer. Likewise, the variant
of the centerOnDiveSite function is now supposed to wrap a
pointer-to-divesite.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
|
|
Primarily for reasens of keeping up with upstream. And hopefully
bugfixes and added functionality.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
Display all used cylinders as a comma separated list.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
The commit secured that plotDive was not called before actually being used.
However our (rather fragile) C++ qml interface did not work correctly (ony sometimes).
Revert the previous commit.
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
Check in profile if visible before calling plotDive
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
Not sure why this has worked in the past - it was simply wrong.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
showMap() uses a location to open Google Maps in a browser.
Make showMap() a generic function to push the mapPage on the view
stack.
Update the calls to this function from child widgets and pages.
Also either call mapPage.centerOnLocation()
or mapPage.centerOnDiveSiteUUID() depending if the caller
wants the map to center on a dive site or on map coordinates.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
And again, no visual changes.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
Tested fine without visual changes.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
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>
|
|
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>
|
|
As in a525fff1125, also the dive details top data was not nicely positioned
any more due to the deprecated and removed Kirigami.Label.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
Commit 8f6827ab122 brought a new SHA for Kirigami, but that introduces
a very noisy logging of "Kirigami.Label is deprecated. Use
QtQuickControls2.Label instead".
So, thats what done here.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
Display rating and visibility stars on the dive details page. See #495
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
In most places we wrongly used the darker primary color instead of the primary color.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Replace the "map it" button implementation with our own button.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
This hides the text for the map it button if ther are no coordinates for a dive. Needed as for the dark theme the map it text was still visible.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Change the accent colors in the dive details view
to match the theme colors.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Make the "map it" button follow the theme color.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
This color is used for more than just the dive list.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
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>
|
|
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>
|
|
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>
|
|
Visible doesn't even make sense...
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This is a different take that seems to deal much better with different
width and font size combinations.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Spending more time reading the documentation, we need to set the
Layout.maximumWidth, not the width.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Completely adapt to the api changes of OverlaySheet in Kirigami2
in order to achieve the same look and behavior for the dive
edits that had with kirigami1
Port most components to QtQuickContrls2, except comboboxes
in the dive edit sheet that will need a new control type
Signed-off-by: Marco Martin <notmart@gmail.com>
|
|
Sending nicely readable formatted coordinates to Google Maps does not
result in a correctly positioned map. Google likes unreadable
decimal format.
Little hacky solution. Added a gps_decimal attribute, populate that
with the standard function for format a coordinate to string, but
reset the preferences value temporarly so that it always converts it
to decimal style.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
|
|
This reverts commit a842e44b685dbb7e34df317a8beacff747cee6bd.
|
|
But of course this doesn't work, yet.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This prevents label text from overlapping.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Splitting the bottomlayout in two leads to columns in the grid not lining up.
It was a workaround that hopefully isn't needed any longer.
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
The QML manual advises against setting width property of gridLayout children
directly, and recommends setting preferred, min and/or max width instead,
letting QML do the work to determine the optimum width. But we've found
letting QML determine gridLayout widths leads to infinite loops in too many
situations, so we're forcing a width. It's better to force a width by setting
it directly, rather than setting minimum = maximum.
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
I did this semi-automatically: I used the script from
the previous patch and then did some manual corrections.
This marks only title: and text: tags, there might be others
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
The grid layout had each column fixed to a width
taken as a portion of the grid width, but since
the grid has a columnSpacing defined as well,
the computation doesn't add up, helping in causing
an infinite recursion problem in the attempt of
sizing and positioning all the children of the layout
[Dirk Hohndel: heavily modified, but the basic idea remains]
Signed-off-by: Marco Martin <notmart@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
if the text in every column can wrap anywhre,
we don't have a stable way to know how large the columns
themselves may be. This can cause an infinite recursion
while trying to figure out the width of the items, as
the sizeHint(Qt::ImplicitSize) of those labels
(Buddy, Cylinder etc) will not be stable as it will once
return the size of the text wrapped and once the size of
the text not wrapped.
Signed-off-by: Marco Martin <notmart@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Since the big layout causes an infinite recursion in the Qt/QML layout
engine.
Also remove a no longer accurate comment.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
Dirk Hohndel
Paul Buxton
Berthold Stoeger
Jan Mulder
Jocke
jan Iversen
jan Iversen
Lubomir I. Ivanov
Marco Martin
Martin Měřinský
Robert C. Helling
Rick Walsh