summaryrefslogtreecommitdiffstats
path: root/qt-mobile
diff options
context:
space:
mode:
authorGravatar Sebastian Kügler <sebas@kde.org>2015-11-12 00:18:57 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-11-11 19:04:26 -0800
commit63cde0e12097835dbd728b95561c0e69a73621f3 (patch)
treea8d00c198395ad0039c64b0f1baa52f9c0c2d730 /qt-mobile
parentac1607dce2e58a0840433ff40d37698c25f74d06 (diff)
downloadsubsurface-63cde0e12097835dbd728b95561c0e69a73621f3.tar.gz
dpi improvements for small text
- word-wrap and style the log message at the bottom, this should fix clipping of error messages down there - introduce units.smallPointSize, which defines a small font size to use for toned-down display elements (e.g. the date in the dive list) - No need to assign the default value to Text.text Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile')
-rw-r--r--qt-mobile/qml/CloudStorage.qml97
-rw-r--r--qt-mobile/qml/DiveList.qml1
-rw-r--r--qt-mobile/qml/main.qml9
3 files changed, 103 insertions, 4 deletions
diff --git a/qt-mobile/qml/CloudStorage.qml b/qt-mobile/qml/CloudStorage.qml
new file mode 100644
index 000000000..b199be739
--- /dev/null
+++ b/qt-mobile/qml/CloudStorage.qml
@@ -0,0 +1,97 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+import QtQuick.Window 2.2
+import QtQuick.Dialogs 1.2
+import QtQuick.Layouts 1.1
+import org.subsurfacedivelog.mobile 1.0
+
+Item {
+ id: loginWindow
+
+ signal accept
+
+ property string username: login.text;
+ property string password: password.text;
+ property bool issave: savePassword.checked;
+
+ GridLayout {
+ columns: 2
+ anchors.fill: parent
+ anchors.margins: units.gridUnit
+
+ Label {
+ text: "Cloud credentials"
+ Layout.bottomMargin: units.largeSpacing
+ font.pointSize: units.titlePointSize
+ Layout.columnSpan: 2
+ }
+
+ Label {
+ text: "Email"
+ Layout.alignment: Qt.AlignRight
+ }
+
+ TextField {
+ id: login
+ text: manager.cloudUserName
+ Layout.fillWidth: true
+ }
+
+ Label {
+ text: "Password"
+ Layout.alignment: Qt.AlignRight
+ }
+
+ TextField {
+ id: password
+ text: manager.cloudPassword
+ echoMode: TextInput.Password
+ Layout.fillWidth: true
+ }
+
+ Label {
+ text: "Show password"
+ Layout.alignment: Qt.AlignRight
+ }
+
+ CheckBox {
+ checked: false
+ id: showPassword
+ onCheckedChanged: {
+ password.echoMode = checked ? TextInput.Normal : TextInput.Password
+ }
+ }
+
+ Label {
+ text: "Remember"
+ Layout.alignment: Qt.AlignRight
+ }
+
+ CheckBox {
+ checked: manager.saveCloudPassword
+ id: savePassword
+ }
+
+ Item { width: units.gridUnit; height: width }
+ Item {
+ height: saveButton.height
+ width: saveButton.width
+ Button {
+ id: saveButton
+ text: "Save"
+ anchors.centerIn: parent
+ onClicked: {
+ manager.cloudUserName = login.text
+ manager.cloudPassword = password.text
+ manager.saveCloudPassword = savePassword.checked
+ manager.savePreferences()
+ stackView.pop()
+ }
+ }
+ }
+
+ Item {
+ Layout.fillHeight: true
+ }
+ }
+}
diff --git a/qt-mobile/qml/DiveList.qml b/qt-mobile/qml/DiveList.qml
index 52f0d6a91..a72d34ed4 100644
--- a/qt-mobile/qml/DiveList.qml
+++ b/qt-mobile/qml/DiveList.qml
@@ -62,6 +62,7 @@ Rectangle {
text: date
opacity: 0.6
color: theme.textColor
+ font.pointSize: units.smallPointSize
anchors {
right: parent.right
top: parent.top
diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml
index bbb0806da..d22710ea4 100644
--- a/qt-mobile/qml/main.qml
+++ b/qt-mobile/qml/main.qml
@@ -18,7 +18,8 @@ ApplicationWindow {
Theme.Units {
id: units
- property int titlePointSize: fontMetrics.font.pointSize * 1.5
+ property int titlePointSize: Math.round(fontMetrics.font.pointSize * 1.5)
+ property int smallPointSize: Math.round(fontMetrics.font.pointSize * 0.7)
}
@@ -134,16 +135,16 @@ ApplicationWindow {
id: messageArea
height: childrenRect.height
Layout.fillWidth: true
+ color: theme.backgroundColor
Text {
id: message
color: theme.textColor
- text: ""
+ wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
styleColor: theme.textColor
- font.pointSize: 10
+ font.pointSize: units.smallPointSize
}
}
-
}
}
}