Skip to content

GitLab

Commit f63b4d87 authored by Martin Straka's avatar Martin Straka
Browse files
Options

Fixed header font size, using Text instead of Label (issue #58)

parent 358fbb9d
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 41 deletions
qml/main.qml
View file @ f63b4d87
......@@ -122,7 +122,7 @@ ApplicationWindow {
anchors.centerIn: parent
running: false
}
Label {
Text {
id: statusBarText
color: datovkaPalette.text
anchors.centerIn: parent
......
qml/pages/PageAboutApp.qml
View file @ f63b4d87
......@@ -55,7 +55,7 @@ Component {
}
}
}
Label {
Text {
text: qsTr("About Datovka")
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement.right
......
qml/pages/PageAccountDetail.qml
View file @ f63b4d87
......@@ -43,30 +43,35 @@ Component {
height: headerHeight
color: datovkaPalette.highlight
Image {
id: backElement4
id: backElement
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: defaultMargin
sourceSize.height: navImgHeight
source: "qrc:/ui/back.svg"
}
MouseArea {
anchors.fill: parent
onClicked: {
files.clearFileModel()
pageView.pop(StackView.Immediate)
Rectangle {
anchors.left: parent.left
width: parent.width * 0.5
height: parent.height
color: "transparent"
MouseArea {
anchors.fill: parent
onClicked: {
pageView.pop(StackView.Immediate)
}
}
}
Column {
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement4.right
anchors.left: backElement.right
anchors.leftMargin: defaultMargin
Label {
Text {
text: acntName + " (" + userName + ")"
font.bold: true
color: datovkaPalette.text
}
Label {
Text {
text: qsTr("Account info")
font.bold: true
color: datovkaPalette.text
......
qml/pages/PageMenuAccount.qml
View file @ f63b4d87
......@@ -68,12 +68,12 @@ Component {
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement.right
anchors.leftMargin: defaultMargin
Label {
Text {
text: acntName + " (" + userName + ")"
font.bold: true
color: datovkaPalette.text
}
Label {
Text {
text: qsTr("Account properties")
font.bold: true
color: datovkaPalette.text
......
qml/pages/PageMenuDatovkaSettings.qml
View file @ f63b4d87
......@@ -59,7 +59,7 @@ Component {
}
}
}
Label {
Text {
text: qsTr("Datovka settings")
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement.right
......
qml/pages/PageMenuMessage.qml
View file @ f63b4d87
......@@ -75,7 +75,7 @@ Component {
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement.right
anchors.leftMargin: defaultMargin
Label {
Text {
text: {
if (msgType == MessageType.TYPE_RECEIVED) {
qsTr("Received message") + " " + msgId
......@@ -86,7 +86,7 @@ Component {
font.bold: true
color: datovkaPalette.text
}
Label {
Text {
text: qsTr("Message operations")
font.bold: true
color: datovkaPalette.text
......
qml/pages/PageMenuMessageDetail.qml
View file @ f63b4d87
......@@ -71,7 +71,7 @@ Component {
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement.right
anchors.leftMargin: defaultMargin
Label {
Text {
text: {
if (msgType == MessageType.TYPE_RECEIVED) {
qsTr("Received message") + " " + msgId
......@@ -82,7 +82,7 @@ Component {
font.bold: true
color: datovkaPalette.text
}
Label {
Text {
text: qsTr("Attachment operations")
font.bold: true
color: datovkaPalette.text
......
qml/pages/PageMenuMessageList.qml
View file @ f63b4d87
......@@ -70,7 +70,7 @@ Component {
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement.right
anchors.leftMargin: defaultMargin
Label {
Text {
text: {
if (msgType == MessageType.TYPE_RECEIVED) {
qsTr("Received messages")
......@@ -81,7 +81,7 @@ Component {
font.bold: true
color: datovkaPalette.text
}
Label {
Text {
text: qsTr("Message operations")
font.bold: true
color: datovkaPalette.text
......
qml/pages/PageMessageDetail.qml
View file @ f63b4d87
......@@ -79,12 +79,12 @@ Component {
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement3.right
anchors.leftMargin: defaultMargin
Label {
Text {
text: acntName + " (" + userName + ")"
font.bold: true
color: datovkaPalette.text
}
Label {
Text {
text: {
if (msgType == MessageType.TYPE_RECEIVED) {
qsTr("Received message") + " " + msgId
......
qml/pages/PageMessageList.qml
View file @ f63b4d87
......@@ -83,12 +83,12 @@ Component {
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement2.right
anchors.leftMargin: defaultMargin
Label {
Text {
text: acntName + " (" + userName + ")"
font.bold: true
color: datovkaPalette.text
}
Label {
Text {
text: {
if (msgType == MessageType.TYPE_RECEIVED) {
qsTr("Received messages")
......
qml/pages/PageSettingsAccount.qml
View file @ f63b4d87
......@@ -68,7 +68,7 @@ Component {
}
}
}
Label {
Text {
id: pageLabel
text: qsTr("Add a new account")
anchors.verticalCenter: parent.verticalCenter
......@@ -110,7 +110,7 @@ Component {
id: certificateItem
visible: false
spacing: 4
Label {
Text {
color: datovkaPalette.text
text: qsTr("Certificate")
}
......@@ -145,7 +145,7 @@ Component {
}
Column {
spacing: 4
Label {
Text {
color: datovkaPalette.text
text: qsTr("Login method")
}
......@@ -174,7 +174,7 @@ Component {
}
Column {
spacing: 4
Label {
Text {
color: datovkaPalette.text
text: qsTr("Account name")
}
......@@ -223,7 +223,7 @@ Component {
}
Column {
spacing: 4
Label {
Text {
color: datovkaPalette.text
text: qsTr("Username")
}
......@@ -273,7 +273,7 @@ Component {
}
Column {
spacing: 4
Label {
Text {
color: datovkaPalette.text
text: qsTr("Password")
}
......
qml/pages/PageSettingsGeneral.qml
View file @ f63b4d87
......@@ -60,7 +60,7 @@ Component {
}
}
}
Label {
Text {
text: qsTr("General settings")
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement.right
......@@ -99,7 +99,7 @@ Component {
spacing: formItemVerticalSpacing
Column {
spacing: 4
Label {
Text {
color: datovkaPalette.text
text: qsTr("Language")
}
......@@ -126,7 +126,7 @@ Component {
}
Column {
spacing: 1
Label {
Text {
id: fontSizeLabel
color: datovkaPalette.text
width: myWidht
......
qml/pages/PageSettingsPin.qml
View file @ f63b4d87
......@@ -143,7 +143,7 @@ Component {
}
}
}
Label {
Text {
text: qsTr("PIN Settings")
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement.right
......@@ -322,7 +322,7 @@ Component {
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.Wrap
}
Label {
Text {
id: lockIntervalLabel
color: datovkaPalette.text
anchors.horizontalCenter: parent.horizontalCenter
......
qml/pages/PageSettingsStorage.qml
View file @ f63b4d87
......@@ -60,7 +60,7 @@ Component {
}
}
}
Label {
Text {
text: qsTr("Storage settings")
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement.right
......@@ -99,7 +99,7 @@ Component {
spacing: formItemVerticalSpacing
Column {
spacing: 1
Label {
Text {
id: messageLifeLabel
color: datovkaPalette.text
width: myWidht
......@@ -126,7 +126,7 @@ Component {
}
Column {
spacing: 1
Label {
Text {
id: attachLifeLabel
color: datovkaPalette.text
width: myWidht
......@@ -155,7 +155,7 @@ Component {
id: changeDatabaseLocation
visible: false
spacing: 1
Label {
Text {
id: dbPathLabel
color: datovkaPalette.text
width: myWidht
......@@ -204,7 +204,7 @@ Component {
}
Column {
spacing: 1
Label {
Text {
id: vacuumLabel
color: datovkaPalette.text
width: myWidht
......
qml/pages/PageSettingsSync.qml
View file @ f63b4d87
......@@ -59,7 +59,7 @@ Component {
}
}
}
Label {
Text {
text: qsTr("Synchronization settings")
anchors.verticalCenter: parent.verticalCenter
anchors.left: backElement.right
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment