aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@libreoffice.org>2018-05-20 16:15:13 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-05-21 07:57:14 -0700
commit571965ec6d9a26a543760b8470b093270dd08fbe (patch)
treea956d964313db877f8f538627720b767a5cc6434
parent67838de5bc6cad6edf5ad7a92279df0f3f32bf0d (diff)
downloadsubsurface-571965ec6d9a26a543760b8470b093270dd08fbe.tar.gz
mobile: removed setting for libdivecomputer.log
Users need a simple way to report download problems. Asking them to go into settings, activate logging, and repeat the download is too much. libdivecomputer.log will always be generated, but overwritten, with every download, so the latest log is ready. The download is very slow due to BT, so there are no impact of having the log active, neither in terms of size (a concern on small mobiles) or write time. Signed-off-by: Jan Iversen <jani@apache.org>
-rw-r--r--mobile-widgets/qml/DownloadFromDiveComputer.qml2
-rw-r--r--mobile-widgets/qml/Settings.qml32
-rw-r--r--mobile-widgets/qmlmanager.cpp10
-rw-r--r--mobile-widgets/qmlmanager.h6
4 files changed, 2 insertions, 48 deletions
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml
index 1fd374b4a..268a2aa69 100644
--- a/mobile-widgets/qml/DownloadFromDiveComputer.qml
+++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml
@@ -34,7 +34,7 @@ Kirigami.Page {
deviceData.deviceId : 0
deviceData.diveId : 0
deviceData.saveDump : false
- deviceData.saveLog : false
+ deviceData.saveLog : true
onFinished : {
importModel.repopulate()
diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml
index 6f1ad3486..40ee2ea08 100644
--- a/mobile-widgets/qml/Settings.qml
+++ b/mobile-widgets/qml/Settings.qml
@@ -307,38 +307,6 @@ Kirigami.ScrollablePage {
Layout.fillWidth: true
}
GridLayout {
- id: libdclogprefs
- columns: 2
- width: parent.width
- Kirigami.Heading {
- text: qsTr("Dive computer")
- color: subsurfaceTheme.textColor
- level: 4
- Layout.topMargin: Kirigami.Units.largeSpacing
- Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
- Layout.columnSpan: 2
- }
-
- Controls.Label {
- text: qsTr("Save detailed log")
- Layout.preferredWidth: gridWidth * 0.75
- }
- SsrfSwitch {
- id: libdclogButton
- checked: manager.libdcLog
- Layout.preferredWidth: gridWidth * 0.25
- onClicked: {
- manager.libdcLog = checked
- }
- }
- }
- Rectangle {
- color: subsurfaceTheme.darkerPrimaryColor
- height: 1
- opacity: 0.5
- Layout.fillWidth: true
- }
- GridLayout {
id: developer
columns: 2
width: parent.width - Kirigami.Units.gridUnit
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp
index 2b2d4cbbe..1e7bd0f83 100644
--- a/mobile-widgets/qmlmanager.cpp
+++ b/mobile-widgets/qmlmanager.cpp
@@ -137,8 +137,7 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
m_selectedDiveTimestamp(0),
m_credentialStatus(CS_UNKNOWN),
alreadySaving(false),
- m_device_data(new DCDeviceData(this)),
- m_libdcLog(false)
+ m_device_data(new DCDeviceData(this))
{
m_instance = this;
m_lastDevicePixelRatio = qApp->devicePixelRatio();
@@ -1634,13 +1633,6 @@ void QMLManager::setProgressMessage(QString text)
emit progressMessageChanged();
}
-void QMLManager::setLibdcLog(bool value)
-{
- m_libdcLog = value;
- DCDeviceData::instance()->setSaveLog(value);
- emit libdcLogChanged();
-}
-
void QMLManager::setDeveloper(bool value)
{
m_developer = value;
diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h
index 1a7166b65..f632610f6 100644
--- a/mobile-widgets/qmlmanager.h
+++ b/mobile-widgets/qmlmanager.h
@@ -44,7 +44,6 @@ class QMLManager : public QObject {
Q_PROPERTY(QStringList cylinderInit READ cylinderInit CONSTANT)
Q_PROPERTY(bool showPin MEMBER m_showPin WRITE setShowPin NOTIFY showPinChanged)
Q_PROPERTY(QString progressMessage MEMBER m_progressMessage WRITE setProgressMessage NOTIFY progressMessageChanged)
- Q_PROPERTY(bool libdcLog MEMBER m_libdcLog WRITE setLibdcLog NOTIFY libdcLogChanged)
Q_PROPERTY(bool developer MEMBER m_developer WRITE setDeveloper NOTIFY developerChanged)
Q_PROPERTY(bool btEnabled MEMBER m_btEnabled WRITE setBtEnabled NOTIFY btEnabledChanged)
@@ -122,9 +121,6 @@ public:
QString progressMessage() const;
void setProgressMessage(QString text);
- bool libdcLog() const;
- void setLibdcLog(bool value);
-
bool developer() const;
void setDeveloper(bool value);
@@ -241,7 +237,6 @@ private:
bool m_showPin;
DCDeviceData *m_device_data;
QString m_progressMessage;
- bool m_libdcLog;
bool m_developer;
bool m_btEnabled;
void updateAllGlobalLists();
@@ -274,7 +269,6 @@ signals:
void showPinChanged();
void sendScreenChanged(QScreen *screen);
void progressMessageChanged();
- void libdcLogChanged();
void developerChanged();
void btEnabledChanged();
void suitListChanged();