Commit 2cbb1282 authored by Ilya Bizyaev's avatar Ilya Bizyaev 📱 Committed by LNJ

Replace deprecated labes, Fix formatting

parent eb30d5bd
......@@ -41,17 +41,17 @@ Kirigami.Page {
anchors.horizontalCenter: parent.horizontalCenter
}
Kirigami.Label {
Controls.Label {
text: qsTr("A simple, user-friendly Jabber/XMPP client")
anchors.horizontalCenter: parent.horizontalCenter
}
Kirigami.Label {
Controls.Label {
text: qsTr("License:") + " GPLv3+ / CC BY-SA 4.0"
anchors.horizontalCenter: parent.horizontalCenter
}
Kirigami.Label {
Controls.Label {
text: "Copyright (C) 2016-2017 Kaidan developers and contributors"
anchors.horizontalCenter: parent.horizontalCenter
}
......
......@@ -43,7 +43,7 @@ Kirigami.Page {
Layout.fillWidth: true
// JID field
Kirigami.Label {
Controls.Label {
id: jidLabel
text: qsTr("Your Jabber-ID:")
......@@ -76,7 +76,7 @@ Kirigami.Page {
}
// Password field
Kirigami.Label {
Controls.Label {
text: qsTr("Your Password:")
}
Controls.TextField {
......
......@@ -30,7 +30,7 @@ Kirigami.OverlaySheet {
Layout.fillWidth: true
}
Kirigami.Label {
Controls.Label {
text: qsTr("Nickname:")
}
Controls.TextField {
......@@ -39,7 +39,7 @@ Kirigami.OverlaySheet {
Layout.fillWidth: true
}
Kirigami.Label {
Controls.Label {
text: qsTr("Jabber-ID:")
}
Controls.TextField {
......
......@@ -36,7 +36,7 @@ Kirigami.OverlaySheet {
Layout.fillWidth: true
}
Kirigami.Label {
Controls.Label {
id: infoLabel
text: ""
wrapMode: Text.WordWrap
......
......@@ -19,6 +19,7 @@
*/
import QtQuick 2.6
import QtQuick.Controls 2.0 as Controls
import org.kde.kirigami 2.0 as Kirigami
Row {
......@@ -58,45 +59,45 @@ Row {
}
Column {
id: layout
id: layout
Kirigami.Label {
id: label
width: Math.min(implicitWidth, pageStack.lastItem.width * 0.8)
Controls.Label {
id: label
width: Math.min(implicitWidth, pageStack.lastItem.width * 0.8)
height: implicitHeight
leftPadding: Kirigami.Units.gridUnit * 0.5
rightPadding: Kirigami.Units.gridUnit * 0.5
topPadding: Kirigami.Units.gridUnit * 0.5
bottomPadding: Kirigami.Units.gridUnit * 0.2
text: messageBody
wrapMode: Text.Wrap
color: sentByMe ? "black" : "white"
}
text: messageBody
wrapMode: Text.Wrap
color: sentByMe ? "black" : "white"
}
Row {
Row {
id: messageInfo
leftPadding: Kirigami.Units.gridUnit * 0.5
rightPadding: Kirigami.Units.gridUnit * 0.5
bottomPadding: Kirigami.Units.gridUnit * 0.5
spacing: Kirigami.Units.gridUnit * 0.5
Kirigami.Label {
id: dateLabel
Controls.Label {
id: dateLabel
height: implicitHeight
text: Qt.formatDateTime(dateTime, "dd MMM, hh:mm")
color: sentByMe ? "grey" : "#e0e0e0"
}
Image {
id: checkmark
visible: (sentByMe && isRead)
id: checkmark
visible: (sentByMe && isRead)
anchors.verticalCenter: dateLabel.verticalCenter
height: Kirigami.Units.gridUnit * 0.6
width: Kirigami.Units.gridUnit * 0.6
source: kaidan.getResourcePath("images/message_checkmark.svg");
height: Kirigami.Units.gridUnit * 0.6
width: Kirigami.Units.gridUnit * 0.6
source: kaidan.getResourcePath("images/message_checkmark.svg");
mipmap: true
}
}
}
}
}
}
}
}
......@@ -56,7 +56,7 @@ Kirigami.SwipeListItem {
}
}
// bottom
Kirigami.Label {
Controls.Label {
Layout.fillWidth: true
text: kaidan.removeNewLinesFromString(lastMessage);
}
......
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