2017-04-27 18:30:36 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2017-10-29 12:44:22 +00:00
|
|
|
import QtQuick 2.6
|
2017-03-31 14:15:14 +00:00
|
|
|
import QtQuick.Controls 2.0
|
2017-07-15 16:11:13 +00:00
|
|
|
import QtQuick.Controls.Material 2.1
|
2015-05-27 10:34:55 +00:00
|
|
|
import QtQuick.Window 2.2
|
2015-06-04 08:27:38 +00:00
|
|
|
import QtQuick.Dialogs 1.2
|
2017-10-30 10:26:47 +00:00
|
|
|
import QtQuick.Layouts 1.2
|
2015-07-30 06:17:09 +00:00
|
|
|
import QtQuick.Window 2.2
|
2015-06-04 10:36:36 +00:00
|
|
|
import org.subsurfacedivelog.mobile 1.0
|
2017-03-31 14:15:14 +00:00
|
|
|
import org.kde.kirigami 2.0 as Kirigami
|
2015-10-08 23:57:10 +00:00
|
|
|
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.ApplicationWindow {
|
2015-12-03 22:27:27 +00:00
|
|
|
id: rootItem
|
2016-01-01 17:34:32 +00:00
|
|
|
title: qsTr("Subsurface-mobile")
|
2017-06-28 13:50:11 +00:00
|
|
|
reachableModeEnabled: false // while it's a good idea, it seems to confuse more than help
|
QML UI: show divelist from the top
In commit bdf6dc78281bec2, we pulled in some changes from Kirigami.
I checked all the new commits and they seemed just fine, and a
test (on desktop) on both Qt 5.9.1. and 5.9.2 showed no obvious
problems.
However, some time later, working on something else, I compiled
from Android to test, and saw some strange behavior in the dive
list. The topmost dive is partially hidden behind the application
header on startup of the app, but can be pulled down. Not a big
deal, but is does not look right.
After tedious testing, bisecting, etc, I found commit
d0f3941a4d7f4d4c6 in Kirigami (obviosuly, it was not clear from
the start that it was in Kirigami, as I could well have been
some error in Subsurface, or even Qt). Mentioned commit is
trivial, and handles with the wideScreen property of the
application window. With wideScreen = false, the bug is
visible, when true the bug is gone.
This all said. Just set the wideScreen to true, which can
definitely be considered a workaround. I exspect that this
commit can be reverted later on when Kirigami is fixed.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-30 15:06:02 +00:00
|
|
|
wideScreen: true // workaround for probably Kirigami bug. See commit.
|
2016-04-22 16:12:15 +00:00
|
|
|
header: Kirigami.ApplicationHeader {
|
|
|
|
minimumHeight: 0
|
2017-06-21 16:19:24 +00:00
|
|
|
preferredHeight: Math.round(Kirigami.Units.gridUnit * (Qt.platform.os == "ios" ? 2 : 1.5))
|
2016-04-22 16:12:15 +00:00
|
|
|
maximumHeight: Kirigami.Units.gridUnit * 2
|
|
|
|
}
|
2016-04-06 18:42:38 +00:00
|
|
|
property alias oldStatus: manager.oldStatus
|
2017-06-18 06:22:37 +00:00
|
|
|
property alias notificationText: manager.notificationText
|
2016-04-04 01:33:40 +00:00
|
|
|
property alias syncToCloud: manager.syncToCloud
|
2017-07-23 07:38:40 +00:00
|
|
|
property alias locationServiceEnabled: manager.locationServiceEnabled
|
2016-06-13 23:42:36 +00:00
|
|
|
property alias showPin: manager.showPin
|
2017-06-18 06:22:37 +00:00
|
|
|
onNotificationTextChanged: {
|
|
|
|
if (notificationText != "") {
|
|
|
|
// there's a risk that we have a >5 second gap in update events;
|
|
|
|
// still, keep the timeout at 5s to avoid odd unchanging notifications
|
|
|
|
showPassiveNotification(notificationText, 5000)
|
2016-03-03 01:14:47 +00:00
|
|
|
} else {
|
2017-06-18 06:22:37 +00:00
|
|
|
// hiding the notification right away may be a mistake as it hides the last warning / error
|
2016-03-03 18:35:33 +00:00
|
|
|
hidePassiveNotification();
|
2016-03-03 01:14:47 +00:00
|
|
|
}
|
|
|
|
}
|
2015-11-29 16:43:56 +00:00
|
|
|
FontMetrics {
|
|
|
|
id: fontMetrics
|
2017-06-20 17:56:49 +00:00
|
|
|
Component.onCompleted: {
|
|
|
|
console.log("Using the following font: " + fontMetrics.font.family)
|
|
|
|
}
|
|
|
|
|
2017-04-14 20:05:01 +00:00
|
|
|
/* this shouldn't be needed anymore
|
2016-09-20 13:42:34 +00:00
|
|
|
Component.onCompleted: {
|
|
|
|
if (Math.round(rootItem.width / Kirigami.Units.gridUnit) < 20) {
|
|
|
|
fontMetrics.font.pointSize = fontMetrics.font.pointSize * 2 / 3
|
|
|
|
Kirigami.Theme.defaultFont.pointSize = fontMetrics.font.pointSize
|
|
|
|
console.log("Reduce font size for narrow screens: " + fontMetrics.font.pointSize)
|
|
|
|
}
|
|
|
|
}
|
2017-04-14 20:05:01 +00:00
|
|
|
*/
|
2015-11-29 16:43:56 +00:00
|
|
|
}
|
2016-01-19 20:42:58 +00:00
|
|
|
visible: false
|
2016-12-27 17:36:02 +00:00
|
|
|
|
|
|
|
// TODO: Verify where the opacity went to.
|
|
|
|
// opacity: 0
|
2015-06-04 08:27:38 +00:00
|
|
|
|
2016-02-11 05:47:09 +00:00
|
|
|
function returnTopPage() {
|
|
|
|
for (var i=stackView.depth; i>1; i--) {
|
|
|
|
stackView.pop()
|
|
|
|
}
|
|
|
|
detailsWindow.endEditMode()
|
|
|
|
}
|
|
|
|
|
2016-03-31 01:39:25 +00:00
|
|
|
function scrollToTop() {
|
|
|
|
diveList.scrollToTop()
|
|
|
|
}
|
|
|
|
|
2016-04-02 12:09:40 +00:00
|
|
|
function showMap(location) {
|
|
|
|
var urlPrefix = "https://www.google.com/maps/place/"
|
|
|
|
var locationPair = location + "/@" + location
|
|
|
|
var urlSuffix = ",5000m/data=!3m1!1e3!4m2!3m1!1s0x0:0x0"
|
|
|
|
Qt.openUrlExternally(urlPrefix + locationPair + urlSuffix)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2016-04-02 03:29:39 +00:00
|
|
|
function startAddDive() {
|
|
|
|
detailsWindow.state = "add"
|
|
|
|
detailsWindow.dive_id = manager.addDive();
|
|
|
|
detailsWindow.number = manager.getNumber(detailsWindow.dive_id)
|
|
|
|
detailsWindow.date = manager.getDate(detailsWindow.dive_id)
|
|
|
|
detailsWindow.airtemp = ""
|
|
|
|
detailsWindow.watertemp = ""
|
2016-05-20 16:48:36 +00:00
|
|
|
detailsWindow.buddyModel = manager.buddyInit
|
|
|
|
detailsWindow.buddyIndex = -1
|
2017-04-15 00:09:09 +00:00
|
|
|
detailsWindow.buddyText = ""
|
2016-04-02 03:29:39 +00:00
|
|
|
detailsWindow.depth = ""
|
2016-05-20 16:48:36 +00:00
|
|
|
detailsWindow.divemasterModel = manager.divemasterInit
|
|
|
|
detailsWindow.divemasterIndex = -1
|
2017-04-15 00:09:09 +00:00
|
|
|
detailsWindow.divemasterText = ""
|
2016-04-02 03:29:39 +00:00
|
|
|
detailsWindow.notes = ""
|
|
|
|
detailsWindow.location = ""
|
2016-04-15 12:17:39 +00:00
|
|
|
detailsWindow.gps = ""
|
2016-04-02 03:29:39 +00:00
|
|
|
detailsWindow.duration = ""
|
2016-05-20 16:48:36 +00:00
|
|
|
detailsWindow.suitModel = manager.suitInit
|
|
|
|
detailsWindow.suitIndex = -1
|
2017-04-15 00:09:09 +00:00
|
|
|
detailsWindow.suitText = ""
|
|
|
|
detailsWindow.cylinderModel = manager.cylinderInit
|
|
|
|
detailsWindow.cylinderIndex = -1
|
|
|
|
detailsWindow.cylinderText = ""
|
2016-04-02 03:29:39 +00:00
|
|
|
detailsWindow.weight = ""
|
|
|
|
detailsWindow.gasmix = ""
|
|
|
|
detailsWindow.startpressure = ""
|
|
|
|
detailsWindow.endpressure = ""
|
2016-04-15 12:17:39 +00:00
|
|
|
detailsWindow.gpsCheckbox = false
|
2016-04-02 03:29:39 +00:00
|
|
|
stackView.push(detailsWindow)
|
|
|
|
}
|
|
|
|
|
2016-03-08 20:26:54 +00:00
|
|
|
globalDrawer: Kirigami.GlobalDrawer {
|
2016-05-03 19:24:00 +00:00
|
|
|
title: qsTr("Subsurface")
|
2015-11-29 16:43:56 +00:00
|
|
|
titleIcon: "qrc:/qml/subsurface-mobile-icon.png"
|
2015-11-07 02:08:05 +00:00
|
|
|
|
2015-11-29 16:43:56 +00:00
|
|
|
bannerImageSource: "dive.jpg"
|
2016-06-12 19:09:49 +00:00
|
|
|
|
2017-04-13 17:57:22 +00:00
|
|
|
actions: [
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 14:46:27 +00:00
|
|
|
iconName: "icons/ic_home.svg"
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Dive list")
|
2015-12-03 23:26:45 +00:00
|
|
|
onTriggered: {
|
2016-03-27 04:35:35 +00:00
|
|
|
manager.appendTextToLog("requested dive list with credential status " + manager.credentialStatus)
|
2017-08-03 12:55:09 +00:00
|
|
|
if (manager.credentialStatus == QMLManager.CS_UNKNOWN) {
|
2016-03-13 18:41:09 +00:00
|
|
|
// the user has asked to change credentials - if the credentials before that
|
|
|
|
// were valid, go back to dive list
|
2017-08-03 12:55:09 +00:00
|
|
|
if (oldStatus == QMLManager.CS_VERIFIED) {
|
2016-03-13 18:41:09 +00:00
|
|
|
manager.credentialStatus = oldStatus
|
|
|
|
}
|
|
|
|
}
|
2016-02-11 05:47:09 +00:00
|
|
|
returnTopPage()
|
2016-03-03 23:12:09 +00:00
|
|
|
globalDrawer.close()
|
2015-12-03 23:26:45 +00:00
|
|
|
}
|
|
|
|
},
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 14:46:27 +00:00
|
|
|
iconName: "icons/ic_sync.svg"
|
2017-07-23 06:22:44 +00:00
|
|
|
text: qsTr("Dive management")
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 16:22:40 +00:00
|
|
|
iconName: "icons/ic_add.svg"
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Add dive manually")
|
2017-08-03 12:55:09 +00:00
|
|
|
enabled: manager.credentialStatus === QMLManager.CS_VERIFIED || manager.credentialStatus === QMLManager.CS_NOCLOUD
|
2015-12-08 01:33:11 +00:00
|
|
|
onTriggered: {
|
2016-04-02 16:04:44 +00:00
|
|
|
returnTopPage() // otherwise odd things happen with the page stack
|
2016-04-02 03:29:39 +00:00
|
|
|
startAddDive()
|
2015-12-08 01:33:11 +00:00
|
|
|
}
|
|
|
|
}
|
2017-05-11 10:47:54 +00:00
|
|
|
Kirigami.Action {
|
2017-10-05 00:06:18 +00:00
|
|
|
// this of course assumes a white background - theming means this needs to change again
|
|
|
|
iconName: "icons/downloadDC-black.svg"
|
2017-05-11 10:47:54 +00:00
|
|
|
text: qsTr("Download from DC")
|
|
|
|
enabled: true
|
|
|
|
onTriggered: {
|
2017-06-16 08:22:44 +00:00
|
|
|
downloadFromDc.dcImportModel.clearTable()
|
2017-05-11 10:47:54 +00:00
|
|
|
stackView.push(downloadFromDc)
|
|
|
|
}
|
|
|
|
}
|
2017-07-19 14:39:43 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 16:22:40 +00:00
|
|
|
iconName: "icons/ic_add_location.svg"
|
2017-07-19 14:39:43 +00:00
|
|
|
text: qsTr("Apply GPS Fixes")
|
|
|
|
onTriggered: {
|
|
|
|
manager.applyGpsData();
|
|
|
|
}
|
|
|
|
}
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 16:22:40 +00:00
|
|
|
iconName: "icons/cloud_sync.svg"
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Manual sync with cloud")
|
2017-08-03 12:55:09 +00:00
|
|
|
enabled: manager.credentialStatus === QMLManager.CS_VERIFIED || manager.credentialStatus === QMLManager.CS_NOCLOUD
|
2015-12-08 01:33:11 +00:00
|
|
|
onTriggered: {
|
2017-08-03 12:55:09 +00:00
|
|
|
if (manager.credentialStatus === QMLManager.CS_NOCLOUD) {
|
2016-04-22 12:21:26 +00:00
|
|
|
returnTopPage()
|
|
|
|
oldStatus = manager.credentialStatus
|
|
|
|
manager.startPageText = "Enter valid cloud storage credentials"
|
2017-08-03 12:55:09 +00:00
|
|
|
manager.credentialStatus = QMLManager.CS_UNKNOWN
|
2016-04-22 12:21:26 +00:00
|
|
|
globalDrawer.close()
|
|
|
|
} else {
|
|
|
|
globalDrawer.close()
|
|
|
|
detailsWindow.endEditMode()
|
|
|
|
manager.saveChangesCloud(true);
|
|
|
|
globalDrawer.close()
|
|
|
|
}
|
2015-12-08 01:33:11 +00:00
|
|
|
}
|
|
|
|
}
|
2016-04-02 01:40:12 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 16:22:40 +00:00
|
|
|
iconName: syncToCloud ? "icons/ic_cloud_off.svg" : "icons/ic_cloud_done.svg"
|
2016-05-03 19:24:00 +00:00
|
|
|
text: syncToCloud ? qsTr("Offline mode") : qsTr("Enable auto cloud sync")
|
2017-08-03 12:55:09 +00:00
|
|
|
enabled: manager.credentialStatus !== QMLManager.CS_NOCLOUD
|
2015-12-08 01:33:11 +00:00
|
|
|
onTriggered: {
|
2016-04-04 01:33:40 +00:00
|
|
|
syncToCloud = !syncToCloud
|
|
|
|
if (!syncToCloud) {
|
2017-06-24 20:09:38 +00:00
|
|
|
showPassiveNotification(qsTr("Turning off automatic sync to cloud causes all data to only be \
|
|
|
|
stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' \
|
|
|
|
if you have network connectivity and want to sync your data to cloud storage."), 10000)
|
2016-04-04 01:33:40 +00:00
|
|
|
}
|
2015-12-08 01:33:11 +00:00
|
|
|
}
|
2015-11-29 16:43:56 +00:00
|
|
|
}
|
2017-04-13 17:57:22 +00:00
|
|
|
},
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 14:46:27 +00:00
|
|
|
iconName: "icons/ic_place.svg"
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("GPS")
|
2017-04-13 17:57:22 +00:00
|
|
|
visible: (Qt.platform.os !== "ios")
|
2015-12-03 23:26:45 +00:00
|
|
|
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 16:42:12 +00:00
|
|
|
iconName: "icons/ic_cloud_upload.svg"
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Upload GPS data")
|
2015-12-03 23:26:45 +00:00
|
|
|
onTriggered: {
|
2015-12-08 01:33:11 +00:00
|
|
|
manager.sendGpsData();
|
2015-12-03 23:26:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 16:42:12 +00:00
|
|
|
iconName: "icons/ic_cloud_download.svg"
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Download GPS data")
|
2016-01-08 05:37:36 +00:00
|
|
|
onTriggered: {
|
|
|
|
manager.downloadGpsData();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 16:42:12 +00:00
|
|
|
iconName: "icons/ic_gps_fixed.svg"
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Show GPS fixes")
|
2016-01-08 05:40:15 +00:00
|
|
|
onTriggered: {
|
2016-04-02 16:04:44 +00:00
|
|
|
returnTopPage()
|
2016-01-08 05:40:15 +00:00
|
|
|
manager.populateGpsData();
|
|
|
|
stackView.push(gpsWindow)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 16:42:12 +00:00
|
|
|
iconName: "icons/ic_clear.svg"
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Clear GPS cache")
|
2015-12-03 23:26:45 +00:00
|
|
|
onTriggered: {
|
2015-12-08 01:33:11 +00:00
|
|
|
manager.clearGpsData();
|
2015-12-03 23:26:45 +00:00
|
|
|
}
|
|
|
|
}
|
2017-07-23 07:38:40 +00:00
|
|
|
|
|
|
|
Kirigami.Action {
|
|
|
|
iconName: locationServiceEnabled ? "icons/ic_location_off.svg" : "icons/ic_place.svg"
|
|
|
|
text: locationServiceEnabled ? qsTr("Disable location service") : qsTr("Run location service")
|
|
|
|
onTriggered: {
|
|
|
|
locationServiceEnabled = !locationServiceEnabled
|
|
|
|
}
|
|
|
|
}
|
2017-04-13 17:57:22 +00:00
|
|
|
},
|
2017-07-19 14:39:43 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 14:46:27 +00:00
|
|
|
iconName: "icons/ic_info_outline.svg"
|
2017-07-19 14:39:43 +00:00
|
|
|
text: qsTr("About")
|
|
|
|
onTriggered: {
|
|
|
|
stackView.push(aboutWindow)
|
|
|
|
detailsWindow.endEditMode()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
Kirigami.Action {
|
2017-07-19 14:46:27 +00:00
|
|
|
iconName: "icons/ic_settings.svg"
|
2017-07-19 14:39:43 +00:00
|
|
|
text: qsTr("Settings")
|
2017-10-05 00:06:18 +00:00
|
|
|
onTriggered: {
|
|
|
|
stackView.push(settingsWindow)
|
|
|
|
detailsWindow.endEditMode()
|
2017-07-19 14:39:43 +00:00
|
|
|
}
|
|
|
|
},
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 14:46:27 +00:00
|
|
|
iconName: "icons/ic_adb.svg"
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Developer")
|
2017-07-19 14:35:46 +00:00
|
|
|
visible: manager.developer
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("App log")
|
2015-12-08 01:33:11 +00:00
|
|
|
onTriggered: {
|
|
|
|
stackView.push(logWindow)
|
|
|
|
}
|
2015-11-29 16:43:56 +00:00
|
|
|
}
|
|
|
|
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Action {
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Theme information")
|
2015-12-08 01:33:11 +00:00
|
|
|
onTriggered: {
|
|
|
|
stackView.push(themetest)
|
|
|
|
}
|
2015-12-03 23:26:45 +00:00
|
|
|
}
|
2016-02-10 20:53:59 +00:00
|
|
|
},
|
2016-04-01 02:57:12 +00:00
|
|
|
Kirigami.Action {
|
2017-07-19 14:46:27 +00:00
|
|
|
iconName: "icons/ic_help_outline.svg"
|
2017-07-19 14:39:43 +00:00
|
|
|
text: qsTr("Help")
|
2016-03-13 18:13:04 +00:00
|
|
|
onTriggered: {
|
2017-10-06 14:33:41 +00:00
|
|
|
Qt.openUrlExternally("https://subsurface-divelog.org/documentation/subsurface-mobile-v2-user-manual/")
|
2016-03-13 18:13:04 +00:00
|
|
|
}
|
2015-11-29 16:43:56 +00:00
|
|
|
}
|
2017-04-13 17:57:22 +00:00
|
|
|
] // end actions
|
2017-07-24 17:17:04 +00:00
|
|
|
Kirigami.Icon {
|
2017-10-04 15:45:50 +00:00
|
|
|
source: "icons/" + (subsurfaceTheme.currentTheme != "" ? subsurfaceTheme.currentTheme : "Blue") + "_gps.svg"
|
2017-07-24 17:17:04 +00:00
|
|
|
enabled: false
|
|
|
|
visible: locationServiceEnabled
|
|
|
|
}
|
2015-10-08 23:57:10 +00:00
|
|
|
|
|
|
|
}
|
2015-11-29 18:09:59 +00:00
|
|
|
|
2017-06-21 20:44:24 +00:00
|
|
|
function blueTheme() {
|
2017-07-15 14:33:50 +00:00
|
|
|
Material.theme = Material.Light
|
2017-07-25 17:46:59 +00:00
|
|
|
Material.accent = subsurfaceTheme.bluePrimaryColor
|
2017-06-23 19:29:22 +00:00
|
|
|
subsurfaceTheme.currentTheme = "Blue"
|
|
|
|
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.blueDarkerPrimaryColor
|
|
|
|
subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.blueDarkerPrimaryTextColor
|
|
|
|
subsurfaceTheme.primaryColor = subsurfaceTheme.bluePrimaryColor
|
|
|
|
subsurfaceTheme.primaryTextColor = subsurfaceTheme.bluePrimaryTextColor
|
|
|
|
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.blueLightPrimaryColor
|
|
|
|
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.blueLightPrimaryTextColor
|
|
|
|
subsurfaceTheme.backgroundColor = subsurfaceTheme.blueBackgroundColor
|
2017-06-24 01:07:48 +00:00
|
|
|
subsurfaceTheme.textColor = subsurfaceTheme.blueTextColor
|
2017-06-24 18:18:18 +00:00
|
|
|
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.blueSecondaryTextColor
|
2017-07-28 13:59:49 +00:00
|
|
|
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
|
2017-07-15 14:31:51 +00:00
|
|
|
subsurfaceTheme.drawerColor = subsurfaceTheme.lightDrawerColor
|
2017-06-21 20:44:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
function pinkTheme() {
|
2017-07-15 14:33:50 +00:00
|
|
|
Material.theme = Material.Light
|
2017-07-25 17:46:59 +00:00
|
|
|
Material.accent = subsurfaceTheme.pinkPrimaryColor
|
2017-06-23 19:29:22 +00:00
|
|
|
subsurfaceTheme.currentTheme = "Pink"
|
|
|
|
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.pinkDarkerPrimaryColor
|
|
|
|
subsurfaceTheme.darkerPrimaryTextColor = subsurfaceTheme.pinkDarkerPrimaryTextColor
|
|
|
|
subsurfaceTheme.primaryColor = subsurfaceTheme.pinkPrimaryColor
|
|
|
|
subsurfaceTheme.primaryTextColor = subsurfaceTheme.pinkPrimaryTextColor
|
|
|
|
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.pinkLightPrimaryColor
|
|
|
|
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.pinkLightPrimaryTextColor
|
|
|
|
subsurfaceTheme.backgroundColor = subsurfaceTheme.pinkBackgroundColor
|
2017-06-24 01:07:48 +00:00
|
|
|
subsurfaceTheme.textColor = subsurfaceTheme.pinkTextColor
|
2017-06-24 18:18:18 +00:00
|
|
|
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.pinkSecondaryTextColor
|
2017-07-28 13:59:49 +00:00
|
|
|
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
|
2017-07-15 14:31:51 +00:00
|
|
|
subsurfaceTheme.drawerColor = subsurfaceTheme.lightDrawerColor
|
2017-06-21 22:47:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
function darkTheme() {
|
2017-07-15 14:33:50 +00:00
|
|
|
Material.theme = Material.Dark
|
2017-07-25 17:46:59 +00:00
|
|
|
Material.accent = subsurfaceTheme.darkerPrimaryColor
|
2017-06-23 19:29:22 +00:00
|
|
|
subsurfaceTheme.currentTheme = "Dark"
|
|
|
|
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.darkDarkerPrimaryColor
|
|
|
|
subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.darkDarkerPrimaryTextColor
|
|
|
|
subsurfaceTheme.primaryColor = subsurfaceTheme.darkPrimaryColor
|
|
|
|
subsurfaceTheme.primaryTextColor = subsurfaceTheme.darkPrimaryTextColor
|
|
|
|
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.darkLightPrimaryColor
|
|
|
|
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.darkLightPrimaryTextColor
|
|
|
|
subsurfaceTheme.backgroundColor = subsurfaceTheme.darkBackgroundColor
|
2017-06-24 01:07:48 +00:00
|
|
|
subsurfaceTheme.textColor = subsurfaceTheme.darkTextColor
|
2017-06-24 18:18:18 +00:00
|
|
|
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.darkSecondaryTextColor
|
2017-07-28 13:59:49 +00:00
|
|
|
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
|
2017-07-15 14:31:51 +00:00
|
|
|
subsurfaceTheme.drawerColor = subsurfaceTheme.darkDrawerColor
|
2017-06-21 20:44:24 +00:00
|
|
|
}
|
|
|
|
|
2015-11-29 18:09:59 +00:00
|
|
|
QtObject {
|
|
|
|
id: subsurfaceTheme
|
2017-07-17 19:07:19 +00:00
|
|
|
property int regularPointSize: fontMetrics.font.pointSize
|
|
|
|
property int titlePointSize: Math.round(regularPointSize * 1.5)
|
|
|
|
property int smallPointSize: Math.round(regularPointSize * 0.8)
|
2017-06-21 14:39:07 +00:00
|
|
|
|
2017-06-23 19:29:22 +00:00
|
|
|
// colors currently in use
|
|
|
|
property string currentTheme
|
|
|
|
property color darkerPrimaryColor
|
|
|
|
property color darkerPrimaryTextColor
|
|
|
|
property color primaryColor
|
|
|
|
property color primaryTextColor
|
|
|
|
property color lightPrimaryColor
|
|
|
|
property color lightPrimaryTextColor
|
|
|
|
property color backgroundColor
|
2017-06-24 01:07:48 +00:00
|
|
|
property color textColor
|
2017-06-24 18:18:18 +00:00
|
|
|
property color secondaryTextColor
|
2017-07-15 14:31:51 +00:00
|
|
|
property color drawerColor
|
2017-06-23 19:29:22 +00:00
|
|
|
|
|
|
|
// colors for the blue theme
|
|
|
|
property color blueDarkerPrimaryColor: "#303F9f"
|
|
|
|
property color blueDarkerPrimaryTextColor: "#ECECEC"
|
|
|
|
property color bluePrimaryColor: "#3F51B5"
|
2017-06-24 18:18:18 +00:00
|
|
|
property color bluePrimaryTextColor: "#FFFFFF"
|
2017-06-23 19:29:22 +00:00
|
|
|
property color blueLightPrimaryColor: "#C5CAE9"
|
|
|
|
property color blueLightPrimaryTextColor: "#212121"
|
|
|
|
property color blueBackgroundColor: "#eff0f1"
|
2017-06-24 01:07:48 +00:00
|
|
|
property color blueTextColor: blueLightPrimaryTextColor
|
2017-06-24 18:18:18 +00:00
|
|
|
property color blueSecondaryTextColor: "#757575"
|
2017-06-23 19:29:22 +00:00
|
|
|
|
|
|
|
// colors for the pink theme
|
2017-07-14 13:44:40 +00:00
|
|
|
property color pinkDarkerPrimaryColor: "#C2185B"
|
2017-06-23 19:29:22 +00:00
|
|
|
property color pinkDarkerPrimaryTextColor: "#ECECEC"
|
|
|
|
property color pinkPrimaryColor: "#FF69B4"
|
|
|
|
property color pinkPrimaryTextColor: "#212121"
|
|
|
|
property color pinkLightPrimaryColor: "#FFDDF4"
|
|
|
|
property color pinkLightPrimaryTextColor: "#212121"
|
|
|
|
property color pinkBackgroundColor: "#eff0f1"
|
2017-06-24 01:07:48 +00:00
|
|
|
property color pinkTextColor: pinkLightPrimaryTextColor
|
2017-06-24 18:18:18 +00:00
|
|
|
property color pinkSecondaryTextColor: "#757575"
|
2017-06-23 19:29:22 +00:00
|
|
|
|
|
|
|
// colors for the dark theme
|
|
|
|
property color darkDarkerPrimaryColor: "#303F9f"
|
|
|
|
property color darkDarkerPrimaryTextColor: "#ECECEC"
|
|
|
|
property color darkPrimaryColor: "#3F51B5"
|
2017-06-21 14:39:07 +00:00
|
|
|
property color darkPrimaryTextColor: "#ECECEC"
|
2017-06-23 19:29:22 +00:00
|
|
|
property color darkLightPrimaryColor: "#C5CAE9"
|
|
|
|
property color darkLightPrimaryTextColor: "#212121"
|
2017-07-14 13:37:02 +00:00
|
|
|
property color darkBackgroundColor: "#303030"
|
2017-06-24 01:07:48 +00:00
|
|
|
property color darkTextColor: darkPrimaryTextColor
|
2017-06-24 18:18:18 +00:00
|
|
|
property color darkSecondaryTextColor: "#757575"
|
2017-06-21 22:47:29 +00:00
|
|
|
|
2017-06-24 18:18:18 +00:00
|
|
|
property color contrastAccentColor: "#FF5722" // used for delete button
|
2017-07-15 14:31:51 +00:00
|
|
|
property color lightDrawerColor: "#FFFFFF"
|
|
|
|
property color darkDrawerColor: "#424242"
|
2017-06-21 14:39:07 +00:00
|
|
|
|
2016-09-17 19:56:47 +00:00
|
|
|
property int columnWidth: Math.round(rootItem.width/(Kirigami.Units.gridUnit*28)) > 0 ? Math.round(rootItem.width / Math.round(rootItem.width/(Kirigami.Units.gridUnit*28))) : rootItem.width
|
2017-06-21 05:51:25 +00:00
|
|
|
Component.onCompleted: {
|
2017-07-25 17:46:59 +00:00
|
|
|
Kirigami.Theme.highlightColor = Qt.binding(function() { return primaryColor })
|
2017-07-15 14:36:35 +00:00
|
|
|
Kirigami.Theme.highlightedTextColor = Qt.binding(function() { return darkerPrimaryTextColor })
|
2017-06-21 22:47:29 +00:00
|
|
|
Kirigami.Theme.backgroundColor = Qt.binding(function() { return backgroundColor })
|
2017-06-24 01:07:48 +00:00
|
|
|
Kirigami.Theme.textColor = Qt.binding(function() { return textColor })
|
2017-07-25 17:46:59 +00:00
|
|
|
Kirigami.Theme.buttonHoverColor = Qt.binding(function() { return primaryColor })
|
2017-07-15 14:31:51 +00:00
|
|
|
Kirigami.Theme.viewBackgroundColor = Qt.binding(function() { return drawerColor })
|
2017-07-15 14:35:38 +00:00
|
|
|
Kirigami.Theme.viewTextColor = Qt.binding(function() { return textColor })
|
2017-07-17 20:08:39 +00:00
|
|
|
Kirigami.Theme.buttonBackgroundColor = Qt.binding(function() { return drawerColor })
|
2017-07-15 14:35:38 +00:00
|
|
|
Kirigami.Theme.buttonTextColor = Qt.binding(function() { return textColor })
|
2017-07-25 17:46:59 +00:00
|
|
|
Kirigami.Theme.buttonFocusColor = Qt.binding(function() { return "red" })
|
2017-06-23 19:29:22 +00:00
|
|
|
|
|
|
|
// this needs to pick the theme from persistent preference settings
|
2017-06-24 02:35:48 +00:00
|
|
|
var theme = manager.theme
|
|
|
|
if (theme == "Blue")
|
|
|
|
blueTheme()
|
|
|
|
else if (theme == "Pink")
|
|
|
|
pinkTheme()
|
|
|
|
else
|
|
|
|
darkTheme()
|
2017-06-21 05:51:25 +00:00
|
|
|
}
|
2015-11-29 18:09:59 +00:00
|
|
|
}
|
2015-11-29 20:13:57 +00:00
|
|
|
property Item stackView: pageStack
|
2016-03-08 20:26:54 +00:00
|
|
|
pageStack.initialPage: DiveList {
|
2016-01-29 02:27:54 +00:00
|
|
|
id: diveList
|
2016-01-19 20:42:58 +00:00
|
|
|
opacity: 0
|
|
|
|
Behavior on opacity {
|
|
|
|
NumberAnimation {
|
|
|
|
duration: 200
|
|
|
|
easing.type: Easing.OutQuad
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-12 17:56:48 +00:00
|
|
|
}
|
2015-07-10 08:40:30 +00:00
|
|
|
|
2015-07-12 17:56:48 +00:00
|
|
|
QMLManager {
|
|
|
|
id: manager
|
2015-06-09 19:20:44 +00:00
|
|
|
}
|
2015-07-12 17:56:48 +00:00
|
|
|
|
2017-07-20 17:39:55 +00:00
|
|
|
Settings {
|
|
|
|
id: settingsWindow
|
2015-07-12 17:56:48 +00:00
|
|
|
visible: false
|
|
|
|
}
|
|
|
|
|
2016-02-10 20:53:59 +00:00
|
|
|
About {
|
|
|
|
id: aboutWindow
|
|
|
|
visible: false
|
|
|
|
}
|
|
|
|
|
2015-07-21 12:00:29 +00:00
|
|
|
DiveDetails {
|
|
|
|
id: detailsWindow
|
|
|
|
visible: false
|
2016-04-27 12:44:18 +00:00
|
|
|
anchors.fill: parent
|
2015-07-21 12:00:29 +00:00
|
|
|
}
|
2015-07-23 11:46:02 +00:00
|
|
|
|
2015-08-19 07:18:26 +00:00
|
|
|
Log {
|
|
|
|
id: logWindow
|
|
|
|
visible: false
|
|
|
|
}
|
2015-10-08 23:57:10 +00:00
|
|
|
|
2016-01-08 05:40:15 +00:00
|
|
|
GpsList {
|
|
|
|
id: gpsWindow
|
2016-03-08 20:26:54 +00:00
|
|
|
visible: false
|
2016-01-08 05:40:15 +00:00
|
|
|
}
|
|
|
|
|
2017-05-11 10:47:54 +00:00
|
|
|
DownloadFromDiveComputer {
|
|
|
|
id: downloadFromDc
|
|
|
|
visible: false
|
|
|
|
}
|
|
|
|
|
2015-11-06 21:53:26 +00:00
|
|
|
ThemeTest {
|
|
|
|
id: themetest
|
|
|
|
visible: false
|
|
|
|
}
|
|
|
|
|
2015-10-08 23:57:10 +00:00
|
|
|
Component.onCompleted: {
|
2016-01-19 20:42:58 +00:00
|
|
|
rootItem.visible = true
|
2016-01-29 02:27:54 +00:00
|
|
|
diveList.opacity = 1
|
2016-01-19 20:42:58 +00:00
|
|
|
rootItem.opacity = 1
|
2016-09-17 19:56:47 +00:00
|
|
|
pageStack.defaultColumnWidth = Kirigami.Units.gridUnit * 28
|
2016-01-19 20:42:58 +00:00
|
|
|
}
|
2016-12-27 17:36:02 +00:00
|
|
|
/* TODO: Verify where opacity went to.
|
2016-01-19 20:42:58 +00:00
|
|
|
Behavior on opacity {
|
|
|
|
NumberAnimation {
|
|
|
|
duration: 200
|
|
|
|
easing.type: Easing.OutQuad
|
|
|
|
}
|
2015-10-08 23:57:10 +00:00
|
|
|
}
|
2016-12-27 17:36:02 +00:00
|
|
|
*/
|
2015-05-27 10:34:55 +00:00
|
|
|
}
|