mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/mobile-widgets/qml/Settings.qml

514 lines
14 KiB
QML
Raw Normal View History

Add SPDX header to mobile widgets and QML files Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-27 20:30:36 +02:00
// SPDX-License-Identifier: GPL-2.0
QML UI: QtQuick to 2.6 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>
2017-10-29 08:44:06 +01:00
import QtQuick 2.6
QML UI: QtQuick.Controls to version 2.2 Tested fine without visual changes. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-29 13:44:22 +01:00
import QtQuick.Controls 2.2 as Controls
QML UI: add QML Preferences Dialog This will allow the user to edit and save their Subsurface cloud credentials. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10 10:48:28 +03:00
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
QML UI: QtQuick.Layouts to 1.2 And again, no visual changes. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-30 11:26:47 +01:00
import QtQuick.Layouts 1.2
Mobile QML UI: bump Kirigami imports to 2.4 Primarily for reasens of keeping up with upstream. And hopefully bugfixes and added functionality. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 22:09:26 +02:00
import org.kde.kirigami 2.4 as Kirigami
QML UI: add QML Preferences Dialog This will allow the user to edit and save their Subsurface cloud credentials. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10 10:48:28 +03:00
import org.subsurfacedivelog.mobile 1.0
QML UI: make Preferences page scrollable This commit only has the actual changes, the next commit will clean up the white space in order to make it more obvious what was done. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 18:47:18 -07:00
Kirigami.ScrollablePage {
Mobile: consolidate settings to one page and menu entry Addresses: #492 Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Had a bit of rebase issue with this one. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 19:39:55 +02:00
objectName: "Settings"
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
id: settingsPage
Mobile: add default cylinder UI Add the UI components to let the user set the default cylinder and select the chosen cylinder when adding a new dive. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-08-20 20:02:54 +02:00
property alias defaultCylinderModel: defaultCylinderBox.model
property alias defaultCylinderIndex: defaultCylinderBox.currentIndex
Mobile: consolidate settings to one page and menu entry Addresses: #492 Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Had a bit of rebase issue with this one. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 19:39:55 +02:00
title: qsTr("Settings")
Mobile QML UI: fix background colors For some reason, after the update of the main.qml to version 2.2, all Kirigami Pages and scrollablePages show up plain white. So now, set a proper background for these pages. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-02-16 11:17:20 +01:00
background: Rectangle { color: subsurfaceTheme.backgroundColor }
QML UI: Settings: remove more margins Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-08-03 15:47:37 -07:00
property real gridWidth: settingsPage.width - Kirigami.Units.gridUnit
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
property var describe: [qsTr("Undefined"),
qsTr("Incorrect username/password combination"),
qsTr("Credentials need to be verified"),
qsTr("Credentials verified"),
qsTr("No cloud mode")]
QML UI: make Preferences page scrollable This commit only has the actual changes, the next commit will clean up the white space in order to make it more obvious what was done. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 18:47:18 -07:00
ColumnLayout {
QML UI: Settings: remove more margins Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-08-03 15:47:37 -07:00
width: gridWidth
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
GridLayout {
id: cloudSetting
columns: 3
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Controls.Label {
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
text: qsTr("Cloud status")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 3
}
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.Label {
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
text: qsTr("Email")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
QML UI: cleanup some whitespace and string formatting This addresses some review comment on whitespace and translated string formatting. In the string formatting, a tiny additional change is made. I wanted the email address in the explanation text in a bold font. Using the HTML <b> for this, removed the /n newline characters in the output. Apparantly, mixing these two formatting styles does not work. No problem, replaced the /n to HTML style too. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-29 09:15:43 +02:00
Layout.preferredWidth: gridWidth * 0.15
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
}
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.Label {
core,tests: change qml register function In order to address the C++ object directy in qml, a different registration is needed. qmlRegisterType, registers the C++ class, allowing qml code to inherit from it and make qml objects. This is needed for graphical elemnets like profile and map setContentProperty, registers the C++ object, thus allowing signals to be catched. Signed-off-by: Jan Iversen <jani@apache.org>
2018-09-04 11:18:43 +02:00
text: prefs.credentialStatus === CloudStatus.CS_NOCLOUD ? qsTr("Not applicable") : prefs.cloudUserName
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
QML UI: cleanup some whitespace and string formatting This addresses some review comment on whitespace and translated string formatting. In the string formatting, a tiny additional change is made. I wanted the email address in the explanation text in a bold font. Using the HTML <b> for this, removed the /n newline characters in the output. Apparantly, mixing these two formatting styles does not work. No problem, replaced the /n to HTML style too. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-29 09:15:43 +02:00
Layout.preferredWidth: gridWidth * 0.60
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
}
SsrfButton {
QML UI: cleanup some whitespace and string formatting This addresses some review comment on whitespace and translated string formatting. In the string formatting, a tiny additional change is made. I wanted the email address in the explanation text in a bold font. Using the HTML <b> for this, removed the /n newline characters in the output. Apparantly, mixing these two formatting styles does not work. No problem, replaced the /n to HTML style too. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-29 09:15:43 +02:00
id: changeCloudSettings
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
text: qsTr("Change")
onClicked: {
QML UIL: fix more problems with members moving from manager to prefs That change clearly would have benefited from better code review. This is a superset of a change proposed by Jan Iversen. Closes #1406 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-18 17:53:08 +09:00
prefs.cancelCredentialsPinSetup()
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
rootItem.returnTopPage()
}
}
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.Label {
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
text: qsTr("Status")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
QML UI: cleanup some whitespace and string formatting This addresses some review comment on whitespace and translated string formatting. In the string formatting, a tiny additional change is made. I wanted the email address in the explanation text in a bold font. Using the HTML <b> for this, removed the /n newline characters in the output. Apparantly, mixing these two formatting styles does not work. No problem, replaced the /n to HTML style too. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-29 09:15:43 +02:00
Layout.preferredWidth: gridWidth * 0.15
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
}
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.Label {
mobile: move settings from qmlmanager to qmlprefs add settings variables/functions to qmlprefs remove settings variables/functions from qmlmanager change manager. to prefs. in qml files for setting variables/functions Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-13 18:06:11 +02:00
text: describe[prefs.credentialStatus]
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
QML UI: cleanup some whitespace and string formatting This addresses some review comment on whitespace and translated string formatting. In the string formatting, a tiny additional change is made. I wanted the email address in the explanation text in a bold font. Using the HTML <b> for this, removed the /n newline characters in the output. Apparantly, mixing these two formatting styles does not work. No problem, replaced the /n to HTML style too. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-29 09:15:43 +02:00
Layout.preferredWidth: gridWidth * 0.60
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
}
Mobile: consolidate settings to one page and menu entry Addresses: #492 Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Had a bit of rebase issue with this one. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 19:39:55 +02:00
}
QML UI: rework cloud credentials block Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 18:56:24 +02:00
Mobile: consolidate settings to one page and menu entry Addresses: #492 Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Had a bit of rebase issue with this one. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 19:39:55 +02:00
Rectangle {
color: subsurfaceTheme.darkerPrimaryColor
height: 1
opacity: 0.5
Layout.fillWidth: true
}
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
GridLayout {
Mobile: consolidate settings to one page and menu entry Addresses: #492 Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Had a bit of rebase issue with this one. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 19:39:55 +02:00
id: themeSettings
QML UI: simplify settings page code 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>
2017-07-22 12:04:27 +02:00
columns: 3
QML UI: add QML Preferences Dialog This will allow the user to edit and save their Subsurface cloud credentials. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10 10:48:28 +03:00
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Controls.Label {
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
text: qsTr("Theme")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
QML UI: simplify settings page code 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>
2017-07-22 12:04:27 +02:00
Layout.columnSpan: 3
QML UI: move theme setting into preferences And reorganize settings and preferences a bit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 13:06:17 -07:00
}
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.Label {
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
text: qsTr("Blue")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
color: subsurfaceTheme.textColor
rightPadding: Kirigami.Units.gridUnit
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
Layout.preferredWidth: gridWidth * 0.15
QML UI: show a small color palette preview When picking which color theme to use, show the user how things will look. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 18:08:47 -07:00
}
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
Row {
QML UI: fix typo And remove line that's commented out. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-22 13:06:48 -07:00
Layout.preferredWidth: gridWidth * 0.6
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
Rectangle {
id: blueRect
color: subsurfaceTheme.blueBackgroundColor
border.color: "black"
QML UI: make the theme settings not overflow page width As per title. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-22 11:54:21 +02:00
width: sampleRegularBlue.width + Kirigami.Units.gridUnit
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
height: Kirigami.Units.gridUnit * 2
Text {
id: sampleRegularBlue
text: qsTr("regular text")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
color: subsurfaceTheme.blueTextColor
anchors {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
}
}
Rectangle {
color: subsurfaceTheme.bluePrimaryColor
border.color: "black"
QML UI: make the theme settings not overflow page width As per title. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-22 11:54:21 +02:00
width: sampleHighlightBlue.width + Kirigami.Units.gridUnit
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
height: Kirigami.Units.gridUnit * 2
Text {
id: sampleHighlightBlue
text: qsTr("Highlight")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
color: subsurfaceTheme.bluePrimaryTextColor
anchors {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
QML UI: show a small color palette preview When picking which color theme to use, show the user how things will look. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 18:08:47 -07:00
}
}
}
QML UI: replace all switches with our own As per title, helps simplify theme modifications. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-24 20:04:47 +02:00
SsrfSwitch {
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
id: blueButton
Layout.preferredWidth: gridWidth * 0.25
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
checked: subsurfaceTheme.currentTheme === "Blue"
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
enabled: subsurfaceTheme.currentTheme !== "Blue"
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
onClicked: {
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
blueTheme()
mobile-widgets: replace qmlprefs::theme with qPrefDisplay::theme Shortcut and use qPrefDisplay::theme() direct Signed-off-by: Jan Iversen <jani@apache.org>
2018-09-12 13:50:24 +02:00
PrefDisplay.theme = subsurfaceTheme.currentTheme
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
}
QML UI: Style the radio buttons This styles the radio buttons in the preferences pane so they follows the theme colors. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-08 19:17:10 +02:00
}
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.Label {
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
id: pinkLabel
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
text: qsTr("Pink")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
rightPadding: Kirigami.Units.gridUnit
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
Layout.preferredWidth: gridWidth * 0.15
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
}
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
Row {
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
Layout.preferredWidth: gridWidth * 0.6
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
Rectangle {
id: pinkRect
color: subsurfaceTheme.pinkBackgroundColor
border.color: "black"
QML UI: make the theme settings not overflow page width As per title. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-22 11:54:21 +02:00
width: sampleRegularPink.width + Kirigami.Units.gridUnit
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
height: Kirigami.Units.gridUnit * 2
Text {
id: sampleRegularPink
text: qsTr("regular text")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
color: subsurfaceTheme.pinkTextColor
anchors {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
QML UI: show a small color palette preview When picking which color theme to use, show the user how things will look. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 18:08:47 -07:00
}
}
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
Rectangle {
color: subsurfaceTheme.pinkPrimaryColor
border.color: "black"
QML UI: make the theme settings not overflow page width As per title. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-22 11:54:21 +02:00
width: sampleHighlightPink.width + Kirigami.Units.gridUnit
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
height: Kirigami.Units.gridUnit * 2
Text {
id: sampleHighlightPink
text: qsTr("Highlight")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
color: subsurfaceTheme.pinkPrimaryTextColor
anchors {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
QML UI: show a small color palette preview When picking which color theme to use, show the user how things will look. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 18:08:47 -07:00
}
}
}
QML UI: make the theme settings not overflow page width As per title. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-22 11:54:21 +02:00
QML UI: replace all switches with our own As per title, helps simplify theme modifications. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-24 20:04:47 +02:00
SsrfSwitch {
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
id: pinkButton
Layout.preferredWidth: gridWidth * 0.25
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
checked: subsurfaceTheme.currentTheme === "Pink"
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
enabled: subsurfaceTheme.currentTheme !== "Pink"
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
onClicked: {
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
pinkTheme()
mobile-widgets: replace qmlprefs::theme with qPrefDisplay::theme Shortcut and use qPrefDisplay::theme() direct Signed-off-by: Jan Iversen <jani@apache.org>
2018-09-12 13:50:24 +02:00
PrefDisplay.theme = subsurfaceTheme.currentTheme
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
}
QML UI: Style the radio buttons This styles the radio buttons in the preferences pane so they follows the theme colors. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-08 19:17:10 +02:00
}
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.Label {
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
text: qsTr("Dark")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
color: subsurfaceTheme.textColor
rightPadding: Kirigami.Units.gridUnit
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
Layout.preferredWidth: gridWidth * 0.15
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
}
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
Row {
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
Layout.preferredWidth: gridWidth * 0.6
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
Rectangle {
id: blackRect
color: subsurfaceTheme.darkBackgroundColor
border.color: "black"
QML UI: make the theme settings not overflow page width As per title. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-22 11:54:21 +02:00
width: sampleRegularDark.width + Kirigami.Units.gridUnit
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
height: Kirigami.Units.gridUnit * 2
Text {
id: sampleRegularDark
text: qsTr("regular text")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
color: subsurfaceTheme.darkTextColor
anchors {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
QML UI: show a small color palette preview When picking which color theme to use, show the user how things will look. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 18:08:47 -07:00
}
}
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
Rectangle {
color: subsurfaceTheme.darkPrimaryColor
border.color: "black"
QML UI: make the theme settings not overflow page width As per title. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-22 11:54:21 +02:00
width: sampleHighlightDark.width + Kirigami.Units.gridUnit
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
height: Kirigami.Units.gridUnit * 2
Text {
id: sampleHighlightDark
text: qsTr("Highlight")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
color: subsurfaceTheme.darkPrimaryTextColor
anchors {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
QML UI: show a small color palette preview When picking which color theme to use, show the user how things will look. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 18:08:47 -07:00
}
}
}
QML UI: replace all switches with our own As per title, helps simplify theme modifications. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-24 20:04:47 +02:00
SsrfSwitch {
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
id: darkButton
Layout.preferredWidth: gridWidth * 0.25
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
checked: subsurfaceTheme.currentTheme === "Dark"
QML UI: replace theme checkboxes with switches 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>
2017-07-23 12:44:52 +02:00
enabled: subsurfaceTheme.currentTheme !== "Dark"
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
onClicked: {
darkTheme()
mobile-widgets: replace qmlprefs::theme with qPrefDisplay::theme Shortcut and use qPrefDisplay::theme() direct Signed-off-by: Jan Iversen <jani@apache.org>
2018-09-12 13:50:24 +02:00
PrefDisplay.theme = subsurfaceTheme.currentTheme
Mobile Settings formatting Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
2017-07-20 19:55:58 +12:00
}
}
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Controls.Label {
QML UI: add settings for scale factor The visual feels backwards as the selected one is grayed out... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 18:01:45 -07:00
text: qsTr("Scaling")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light
QML UI: add settings for scale factor The visual feels backwards as the selected one is grayed out... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 18:01:45 -07:00
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 3
}
Row {
Layout.preferredWidth: gridWidth * 0.8
Layout.columnSpan: 3
spacing: Kirigami.Units.largeSpacing
SsrfButton {
text: qsTr("smaller")
enabled: PrefDisplay.mobile_scale !== 0.85
onClicked: {
PrefDisplay.mobile_scale = 0.85
mobile, QML: scale font from the buttons After the work in the previous commit, it gets very simple to implement font scaling. Just assign a the new desired font scale to the used font metrics. The QML engine does all the work. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-25 13:05:02 +02:00
fontMetrics.font.pointSize = subsurfaceTheme.basePointSize * PrefDisplay.mobile_scale;
QML UI: add settings for scale factor The visual feels backwards as the selected one is grayed out... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 18:01:45 -07:00
}
}
SsrfButton {
text: qsTr("regular")
enabled: PrefDisplay.mobile_scale !== 1.0
onClicked: {
PrefDisplay.mobile_scale = 1.0
mobile, QML: scale font from the buttons After the work in the previous commit, it gets very simple to implement font scaling. Just assign a the new desired font scale to the used font metrics. The QML engine does all the work. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-25 13:05:02 +02:00
fontMetrics.font.pointSize = subsurfaceTheme.basePointSize * PrefDisplay.mobile_scale;
QML UI: add settings for scale factor The visual feels backwards as the selected one is grayed out... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 18:01:45 -07:00
}
}
SsrfButton {
text: qsTr("larger")
enabled: PrefDisplay.mobile_scale !== 1.15
onClicked: {
PrefDisplay.mobile_scale = 1.15
mobile, QML: scale font from the buttons After the work in the previous commit, it gets very simple to implement font scaling. Just assign a the new desired font scale to the used font metrics. The QML engine does all the work. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-25 13:05:02 +02:00
fontMetrics.font.pointSize = subsurfaceTheme.basePointSize * PrefDisplay.mobile_scale;
QML UI: add settings for scale factor The visual feels backwards as the selected one is grayed out... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 18:01:45 -07:00
}
}
}
QML UI: show a small color palette preview When picking which color theme to use, show the user how things will look. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 18:08:47 -07:00
}
QML UI: replace all switches with our own As per title, helps simplify theme modifications. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-24 20:04:47 +02:00
Mobile: consolidate settings to one page and menu entry Addresses: #492 Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Had a bit of rebase issue with this one. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 19:39:55 +02:00
Rectangle {
color: subsurfaceTheme.darkerPrimaryColor
height: 1
opacity: 0.5
Layout.fillWidth: true
}
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
GridLayout {
id: gpsPrefs
columns: 2
QML UI: move theme setting into preferences And reorganize settings and preferences a bit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 13:06:17 -07:00
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Controls.Label {
Mobile: rename UI string for webservice Trivial rename of a UI string. The string "Subsurface GPS data webservice" reminds me too much of the legacy webservice. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-19 09:54:11 +02:00
text: qsTr("GPS location service")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 2
}
QML UI: add preference for webservice user id This handles the user id for the Subsurface webservice for GPS location tracking. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-13 17:14:22 -08:00
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.Label {
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
text: qsTr("Distance threshold (meters)")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
QML UI: cleanup some whitespace and string formatting This addresses some review comment on whitespace and translated string formatting. In the string formatting, a tiny additional change is made. I wanted the email address in the explanation text in a bold font. Using the HTML <b> for this, removed the /n newline characters in the output. Apparantly, mixing these two formatting styles does not work. No problem, replaced the /n to HTML style too. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-29 09:15:43 +02:00
Layout.preferredWidth: gridWidth * 0.75
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
}
Location service: make distance and time threshold configurable Right now the distance is always in meters, the mobile app doesn't deal with units at all, anyway. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-14 09:10:06 -08:00
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.TextField {
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
id: distanceThreshold
mobile-widgets: move distanceThreshold handling to qPref Remove distanceThreshold from qmlprefs and use qPref instead update qml no user experience change Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-12 09:12:03 +02:00
text: PrefLocationService.distance_threshold
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
QML UI: simplify settings page code 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>
2017-07-22 12:04:27 +02:00
Layout.preferredWidth: gridWidth * 0.25
QML UI: enable auto-save on settings page Automatically save changes made on the settings page on completion of text fields or theme checkboxes. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 21:53:42 +02:00
onEditingFinished: {
mobile-widgets: move distanceThreshold handling to qPref Remove distanceThreshold from qmlprefs and use qPref instead update qml no user experience change Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-12 09:12:03 +02:00
PrefLocationService.distance_threshold = distanceThreshold.text
QML UI: enable auto-save on settings page Automatically save changes made on the settings page on completion of text fields or theme checkboxes. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 21:53:42 +02:00
}
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
}
Location service: make distance and time threshold configurable Right now the distance is always in meters, the mobile app doesn't deal with units at all, anyway. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-14 09:10:06 -08:00
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.Label {
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
text: qsTr("Time threshold (minutes)")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
QML UI: simplify settings page code 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>
2017-07-22 12:04:27 +02:00
Layout.preferredWidth: gridWidth * 0.75
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
}
Location service: make distance and time threshold configurable Right now the distance is always in meters, the mobile app doesn't deal with units at all, anyway. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-14 09:10:06 -08:00
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.TextField {
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
id: timeThreshold
mobile-widgets: remove setTimeThreshold from system Use qPrefLocationService::set_time_threshold and remove from qmlprefs.cpp and qmlmanager.cpp Remark: mobile UI shows time in minutes, while it is stored (and calculated) in seconds. Therefore a /60 when reading and *60 when setting. Signed-off-by: Jan Iversen <jani@apache.org>
2018-09-12 13:40:59 +02:00
text: PrefLocationService.time_threshold / 60
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
QML UI: simplify settings page code 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>
2017-07-22 12:04:27 +02:00
Layout.preferredWidth: gridWidth * 0.25
QML UI: enable auto-save on settings page Automatically save changes made on the settings page on completion of text fields or theme checkboxes. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 21:53:42 +02:00
onEditingFinished: {
mobile-widgets: remove setTimeThreshold from system Use qPrefLocationService::set_time_threshold and remove from qmlprefs.cpp and qmlmanager.cpp Remark: mobile UI shows time in minutes, while it is stored (and calculated) in seconds. Therefore a /60 when reading and *60 when setting. Signed-off-by: Jan Iversen <jani@apache.org>
2018-09-12 13:40:59 +02:00
PrefLocationService.time_threshold = timeThreshold.text * 60
QML UI: enable auto-save on settings page Automatically save changes made on the settings page on completion of text fields or theme checkboxes. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 21:53:42 +02:00
}
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
}
Location service: make distance and time threshold configurable Right now the distance is always in meters, the mobile app doesn't deal with units at all, anyway. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-14 09:10:06 -08:00
QML UI: move location service to preferences page Move the locations service switch to the GPS section of the preferences page. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-19 20:57:12 +02:00
}
Mobile: add default cylinder UI Add the UI components to let the user set the default cylinder and select the chosen cylinder when adding a new dive. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-08-20 20:02:54 +02:00
Rectangle {
color: subsurfaceTheme.darkerPrimaryColor
height: 1
opacity: 0.5
Layout.fillWidth: true
}
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Mobile: add default cylinder UI Add the UI components to let the user set the default cylinder and select the chosen cylinder when adding a new dive. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-08-20 20:02:54 +02:00
GridLayout {
id: defaultCylinder
columns: 2
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Layout.rightMargin: Kirigami.Units.gridUnit * 1.5
Mobile: add default cylinder UI Add the UI components to let the user set the default cylinder and select the chosen cylinder when adding a new dive. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-08-20 20:02:54 +02:00
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Controls.Label {
Mobile: add default cylinder UI Add the UI components to let the user set the default cylinder and select the chosen cylinder when adding a new dive. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-08-20 20:02:54 +02:00
text: qsTr("Default Cylinder")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light
Mobile: add default cylinder UI Add the UI components to let the user set the default cylinder and select the chosen cylinder when adding a new dive. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-08-20 20:02:54 +02:00
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 2
}
Controls.Label {
text: qsTr("Cylinder:")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Mobile: add default cylinder UI Add the UI components to let the user set the default cylinder and select the chosen cylinder when adding a new dive. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-08-20 20:02:54 +02:00
}
Controls.ComboBox {
id: defaultCylinderBox
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredHeight: fontMetrics.height * 2.5
Mobile: add default cylinder UI Add the UI components to let the user set the default cylinder and select the chosen cylinder when adding a new dive. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-08-20 20:02:54 +02:00
inputMethodHints: Qt.ImhNoPredictiveText
Layout.fillWidth: true
onActivated: {
core,tests: change qml register function In order to address the C++ object directy in qml, a different registration is needed. qmlRegisterType, registers the C++ class, allowing qml code to inherit from it and make qml objects. This is needed for graphical elemnets like profile and map setContentProperty, registers the C++ object, thus allowing signals to be catched. Signed-off-by: Jan Iversen <jani@apache.org>
2018-09-04 11:18:43 +02:00
PrefGeneral.set_default_cylinder(defaultCylinderBox.currentText)
Mobile: add default cylinder UI Add the UI components to let the user set the default cylinder and select the chosen cylinder when adding a new dive. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-08-20 20:02:54 +02:00
}
}
}
QML UI: merge all GPS settings in one block Put all GPS settings in one block and revert to a 2 column layout while maintaing the 4 column widh. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 21:19:26 +02:00
Rectangle {
color: subsurfaceTheme.darkerPrimaryColor
height: 1
Mobile/settings: add button to forget remembered dive computers Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 09:33:20 -07:00
opacity: 0.5
Layout.fillWidth: true
}
GridLayout {
id: divecomputers
columns: 2
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Controls.Label {
Mobile/settings: add button to forget remembered dive computers Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 09:33:20 -07:00
text: qsTr("Dive computers")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light
Mobile/settings: add button to forget remembered dive computers Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 09:33:20 -07:00
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing
Layout.columnSpan: 2
}
Controls.Label {
text: qsTr("Forget remembered dive computers")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Mobile/settings: add button to forget remembered dive computers Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 09:33:20 -07:00
Layout.preferredWidth: gridWidth * 0.75
}
SsrfButton {
id: forgetDCButton
text: qsTr("Forget")
Mobile/Settings: Disable unusable option Disable the "Forget DCs" button when there is no DCs saved. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-09-23 07:29:09 +02:00
enabled: PrefDiveComputer.vendor1 !== ""
Mobile/settings: add button to forget remembered dive computers Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 09:33:20 -07:00
onClicked: {
Mobile: remove all related data when forgetting DCs We need to delete all related data when forgetting dive computers or we will have an issue if we connect a DC from the same vendor but of a different model. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-10-02 17:22:09 +02:00
PrefDiveComputer.vendor1 = PrefDiveComputer.product1 = PrefDiveComputer.device1 = ""
PrefDiveComputer.vendor2 = PrefDiveComputer.product2 = PrefDiveComputer.device2 = ""
PrefDiveComputer.vendor3 = PrefDiveComputer.product3 = PrefDiveComputer.device3 = ""
PrefDiveComputer.vendor4 = PrefDiveComputer.product4 = PrefDiveComputer.device4 = ""
PrefDiveComputer.vendor = PrefDiveComputer.product = PrefDiveComputer.device = ""
Mobile/settings: add button to forget remembered dive computers Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-22 09:33:20 -07:00
}
}
}
Rectangle {
color: subsurfaceTheme.darkerPrimaryColor
height: 1
QML UI: merge all GPS settings in one block Put all GPS settings in one block and revert to a 2 column layout while maintaing the 4 column widh. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 21:19:26 +02:00
opacity: 0.5
Layout.fillWidth: true
}
Mobile: add units selection to settings page Add the option for the user to set the desired unit system for Subsurface-mobile regardless of system locale Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-16 15:23:59 +02:00
GridLayout {
id: unit_system
columns: 2
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Controls.Label {
Mobile: add units selection to settings page Add the option for the user to set the desired unit system for Subsurface-mobile regardless of system locale Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-16 15:23:59 +02:00
text: qsTr("Units")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light
Mobile: add units selection to settings page Add the option for the user to set the desired unit system for Subsurface-mobile regardless of system locale Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-16 15:23:59 +02:00
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 2
}
Controls.Label {
text: qsTr("Use Imperial Units")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Mobile: add units selection to settings page Add the option for the user to set the desired unit system for Subsurface-mobile regardless of system locale Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-16 15:23:59 +02:00
Layout.preferredWidth: gridWidth * 0.75
}
SsrfSwitch {
id: imperialButton
checked: PrefUnits.unit_system === "imperial"
enabled: PrefUnits.unit_system === "metric"
Layout.preferredWidth: gridWidth * 0.25
onClicked: {
PrefUnits.set_unit_system("imperial")
manager.changesNeedSaving()
Update divelist when changing units We need to explicitly refresh the divelist when switching between metric and imperial unit systems. Or the changes will not be visible until we restart the app or scroll outside of what's in the current cache. This will update both the divelist view and the dive profiles to show the new units. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-09-20 20:21:29 +02:00
manager.refreshDiveList()
Mobile: add units selection to settings page Add the option for the user to set the desired unit system for Subsurface-mobile regardless of system locale Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-16 15:23:59 +02:00
}
}
Controls.Label {
text: qsTr("Use Metric Units")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
Mobile: add units selection to settings page Add the option for the user to set the desired unit system for Subsurface-mobile regardless of system locale Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-16 15:23:59 +02:00
Layout.preferredWidth: gridWidth * 0.75
}
SsrfSwitch {
id: metricButtton
checked: PrefUnits.unit_system === "metric"
enabled: PrefUnits.unit_system === "imperial"
Layout.preferredWidth: gridWidth * 0.25
onClicked: {
PrefUnits.set_unit_system("metric")
manager.changesNeedSaving()
Update divelist when changing units We need to explicitly refresh the divelist when switching between metric and imperial unit systems. Or the changes will not be visible until we restart the app or scroll outside of what's in the current cache. This will update both the divelist view and the dive profiles to show the new units. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-09-20 20:21:29 +02:00
manager.refreshDiveList()
Mobile: add units selection to settings page Add the option for the user to set the desired unit system for Subsurface-mobile regardless of system locale Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-16 15:23:59 +02:00
}
}
}
Rectangle {
color: subsurfaceTheme.darkerPrimaryColor
height: 1
opacity: 0.5
Layout.fillWidth: true
}
QML UI: add checkbox to show/hide developer menu Add a checkbox to the preferences page to facilitate selective visibility of the developer menu. With the coresponding function in qmlmanager. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-19 16:35:46 +02:00
GridLayout {
id: developer
QML UI: simplify settings page code 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>
2017-07-22 12:04:27 +02:00
columns: 2
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
Controls.Label {
QML UI: add checkbox to show/hide developer menu Add a checkbox to the preferences page to facilitate selective visibility of the developer menu. With the coresponding function in qmlmanager. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-19 16:35:46 +02:00
text: qsTr("Developer")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light
QML UI: add checkbox to show/hide developer menu Add a checkbox to the preferences page to facilitate selective visibility of the developer menu. With the coresponding function in qmlmanager. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-19 16:35:46 +02:00
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
QML UI: simplify settings page code 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>
2017-07-22 12:04:27 +02:00
Layout.columnSpan: 2
QML UI: add checkbox to show/hide developer menu Add a checkbox to the preferences page to facilitate selective visibility of the developer menu. With the coresponding function in qmlmanager. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-19 16:35:46 +02:00
}
mobile: silence deprecated messages in logging about Kirigami.Label 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>
2017-10-12 14:25:22 +02:00
Controls.Label {
QML UI: Replace checkboxes on settingspage with switches Replace the checkboxes for location services and developer with switches. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 20:47:17 +02:00
text: qsTr("Display Developer menu")
mobile, QML UI: Settings page scalability A relatively big change for such a simple page. Most relevant changes are: 1) Do not use Kirigami.Header anymore. It appears that this header has word wrapping on (and we cannot override that). This is annoying on this page, as headings seems randomly be split over 2 lines, even in cases where there is more than enhough room to display it on one line. And as the Kirigami.Header is just a trivial wrapper of a Text field, we can simple replace it. 2) A lot of the toplevel GridLayouts had width properties set. These are not needed (and confused my debugging code), so they are removed withput any visual change. As a general rule, do not try to set properties that are not needed. In general, it can only lead to binding loops or undefined behavior. 3) Add a font size to our Theme. The step from regular to title size was a little too big. 4) And, obviously, numerous font.pointSize lines are added to actually resize the font. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-27 11:54:28 +02:00
font.pointSize: subsurfaceTheme.regularPointSize
QML UI: simplify settings page code 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>
2017-07-22 12:04:27 +02:00
Layout.preferredWidth: gridWidth * 0.75
QML UI: Replace checkboxes on settingspage with switches Replace the checkboxes for location services and developer with switches. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-20 20:47:17 +02:00
}
QML UI: replace all switches with our own As per title, helps simplify theme modifications. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-24 20:04:47 +02:00
SsrfSwitch {
QML UI: add checkbox to show/hide developer menu Add a checkbox to the preferences page to facilitate selective visibility of the developer menu. With the coresponding function in qmlmanager. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-19 16:35:46 +02:00
id: developerButton
mobile-widgets: make show_developer persistent Remove developer from qmlprefs and use qPref instead Update qml show_developer is saved on disk, and thus remembered between starts. Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-12 08:55:55 +02:00
checked: PrefDisplay.show_developer
QML UI: simplify settings page code 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>
2017-07-22 12:04:27 +02:00
Layout.preferredWidth: gridWidth * 0.25
QML UI: add checkbox to show/hide developer menu Add a checkbox to the preferences page to facilitate selective visibility of the developer menu. With the coresponding function in qmlmanager. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-19 16:35:46 +02:00
onClicked: {
mobile-widgets: make show_developer persistent Remove developer from qmlprefs and use qPref instead Update qml show_developer is saved on disk, and thus remembered between starts. Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-12 08:55:55 +02:00
PrefDisplay.show_developer = checked
QML UI: remove unnecessary margin This makes better use of the available space. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-08-03 15:30:32 -07:00
}
QML UI: add checkbox to show/hide developer menu Add a checkbox to the preferences page to facilitate selective visibility of the developer menu. With the coresponding function in qmlmanager. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-19 16:35:46 +02:00
}
}
Whitespace change No code change at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 20:53:16 -07:00
Item {
height: Kirigami.Units.gridUnit * 6
QML UI: add preference for libdivecomputer log Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 18:08:36 -07:00
}
QML UI: make Preferences page scrollable This commit only has the actual changes, the next commit will clean up the white space in order to make it more obvious what was done. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 18:47:18 -07:00
}
QML UI: add QML Preferences Dialog This will allow the user to edit and save their Subsurface cloud credentials. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10 10:48:28 +03:00
}
Reference in a new issue Copy permalink