Age | Commit message (Collapse) | Author |
|
MapItemView is the QML class that handles the "create map markers based
on a model". In this case the model is created as part of the
MapWidgetHelper, so here passing "mapHelper.model" to the "model"
property is enough.
The delegate receives coordinates from the model as "model.latitude",
"model.logitude" and converts them to QGeoCoordinate.
The "sourceItem" image for the delagete is just an image ATM and is
fetched from QRC.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
The idea here is that the QML code should be able to fetch a model
from the MapWidgetHelper instance which is instantiated inside the
QML code; fetch it in the lines of "mapHelper.model".
This way, updates at the backend would be reflected on the Map QML widget.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
When calling centerOnCoordinates() the map will now animate over a
period of 3 seconds the zoom level and over 2 seconds the center
of the map.
Can be tweaked and improved later on.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
This function can be called to center the map on a specific coordinates.
For the C++ version call it via QMetaObject::invokeMethod() in
centerOnDiveSite().
TODO: add QML property animations.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
MapWidget sould not handle any of the map backend.
Instead it should just pass calls to MapWidgetHelper.
Do that for centerOnDiveSite().
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
The idea here is that the Map object can be controlled from C++ via
the "m_map" private member. Also, for the mobile version, QML code can
call the same C++ methods (if marked as Q_INVOCABLE).
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
This is about to be used to reference the QML Map in the MapWidgetHelper
C++ class.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
This instance in the QML code itself will be accessed by both the
mobile and desktop version. That way, the map code between
the two Subsurface versions will be shared.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
The idea with this class is that it should be used by both the mobile
and desktop version.
TODO STEPS:
1) the class should be registered in both the mobile and desktop version
with qmlRegisterType<MapWidgetHelper>...
2) the MapWidget.qml should create an instance of this class.
3) this way the helper will be part of the QML and both the desktop and
mobile version can have access to it.
4) the desktop version as a first implementation can just use findChild()
in desktop-widgets/mapwidget.cpp.
5) desktop-widgets/mapwidget.cpp on the desktop should just translate
calls from the rest of the desktop-widgets to this helper class.
6) the mobile version access to this object would be easy but is off the
scope for now.
7) the idea, when implementing the desktop support is to make it so
that when implementing the mobile version later, no or only minimal
changes would be required to the MapWidgetHelper class.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
Add a local "enumeration" (object) for the two possibly map types
of interest: SATELLITE and STREET.
Use SATELLITE by default.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
The root element is now an Item and also doesn't have explicit
anchors and dimensions as these will be handled by the parent:
- on desktop: a QQuickWidget
- on mobile: any QML based QQuickItem
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
This new marker image is free for use in Subsurface. Custom made
in CorelDraw and Photoshop.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
This reverts commit d22f67925ef4893832c26deb44fef50589c6fff8.
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Like the subject says. We do not want the password to be made
visible, so a switch to show it, is useless and is therefore
removed. Futher, the entry mode is set to PasswordEchoOnEdit,
which causes the passwd to be visible (for easy entry), but
can't be made visible again after save/end edit.
Fixes: #512
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
Removed some unused alias defines.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
In commit e9503cfa3d1740 re-coloring of the status bar was
forgotten. Added here.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
The missing id line in our own button generates an error in log and makes the buttons to fat.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Use the ligther text color on the secondary row of text when a dive is selcted in the divelist
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>
|
|
Replace the generic buttons on the DC download page with our own.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Add out own styled button as resource.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
As per title, helps simplify theme modifications.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Add out own styled checkbox as resource.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
As per title, helps simplify theme modifications.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
This adds a switch styled for us, size is about the same as the material default.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Kirigami prevents us from altering the color of the gps icon in the action menu. So let's display an gps fix icon in the lower left corner of the drawer when the location services is running, colored to match the themes primary accent color.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
This adds colred versions of the Material ic_gps_fixed icon, in our primary blue and pink colors.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Independ of the settings, the threshold to reset the GPS data was
hard coded to 5 minutes. Now, honour the entered (and updated during
a session) time to refresh the GPS data in the location service.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
Display proper error message when cloud credentials are incorrect.
See #481
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
|
|
This makes much more sense than displaying "No dives"
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Not the lsit is much more compact and shows a lot more dives even on
smaller screens. And it's similar in style to the dive list.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Replace the theme checkboxes on the settings page
so that we get a unified UI.
These switches are linked and as such can only be activated
deactivation occurs when the user selects another theme.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Move the location services switch to the GPS menu, indicate both with icon and text if the service is active or not.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
The credential status has nothing to do with GPS functionality.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Simple typo on the overlay drawer.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Strangely, a click/tap anywhere else worked as expected, but if you hit
exactly on the checkbox, the status change wasn't propagated.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
We removed the action button for saving on the Settings page, so credentials
never got saved.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This isn't perfect, but at least it doesn't disclose a password that
isn't currently being edited.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
And remove line that's commented out.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
In stead of using the fixed 4 column code introduced in f2fcad89b0db9b164d8fd3f89218ad27ca362bd3 use percentages of page width to allow for a more flexible layout since no block really has 4 columns.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
As per title.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|