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>
This commit is contained in:
Sebastian Kügler 2015-11-12 00:18:57 +01:00 committed by Dirk Hohndel
parent ac1607dce2
commit 63cde0e120
3 changed files with 103 additions and 4 deletions

View file

@ -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
}
}
}

View file

@ -62,6 +62,7 @@ Rectangle {
text: date
opacity: 0.6
color: theme.textColor
font.pointSize: units.smallPointSize
anchors {
right: parent.right
top: parent.top

View file

@ -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
}
}
}
}
}