From a5d930b3f7aab2a271ea7f4894e464bf328f9e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 1 Aug 2022 11:12:21 -0400
Subject: [PATCH] misc: cleanup some warnings
Change-Id: I33776abf89b5aced6006e517a5878baf0a40cc8e
---
src/app/commoncomponents/EditableLineEdit.qml | 2 +-
src/app/commoncomponents/UsernameLineEdit.qml | 3 +--
src/app/mainview/components/ContactPickerItemDelegate.qml | 2 ++
src/app/mainview/components/WelcomePage.qml | 6 +++---
src/app/wizardview/components/CreateAccountPage.qml | 2 ++
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/app/commoncomponents/EditableLineEdit.qml b/src/app/commoncomponents/EditableLineEdit.qml
index 8daab3375..5bcca2eb7 100644
--- a/src/app/commoncomponents/EditableLineEdit.qml
+++ b/src/app/commoncomponents/EditableLineEdit.qml
@@ -53,7 +53,7 @@ Item {
property alias verticalAlignment: lineEdit.verticalAlignment
property alias horizontalAlignment: lineEdit.horizontalAlignment
property alias font: lineEdit.font
- property var placeholderText
+ property var placeholderText: ""
property alias placeholderTextColor: lineEdit.placeholderTextColor
property alias backgroundColor: lineEdit.backgroundColor
property var editIconColor: "transparent"
diff --git a/src/app/commoncomponents/UsernameLineEdit.qml b/src/app/commoncomponents/UsernameLineEdit.qml
index 1db84f0ee..f2553c2d7 100644
--- a/src/app/commoncomponents/UsernameLineEdit.qml
+++ b/src/app/commoncomponents/UsernameLineEdit.qml
@@ -25,8 +25,7 @@ import net.jami.Constants 1.1
EditableLineEdit {
id: root
- placeholderText: isRendezVous ? JamiStrings.chooseAName :
- JamiStrings.chooseYourUserName
+ placeholderText: JamiStrings.chooseYourUserName
firstIco: readOnly? "" : JamiResources.person_24dp_svg
firstIcoColor: "#03B9E9"
diff --git a/src/app/mainview/components/ContactPickerItemDelegate.qml b/src/app/mainview/components/ContactPickerItemDelegate.qml
index 778a0c1ee..f538be691 100644
--- a/src/app/mainview/components/ContactPickerItemDelegate.qml
+++ b/src/app/mainview/components/ContactPickerItemDelegate.qml
@@ -81,6 +81,7 @@ ItemDelegate {
color: JamiTheme.textColor
text: textMetricsContactPickerContactName.elidedText
+ textFormat: TextEdit.PlainText
font.pointSize: JamiTheme.textFontSize
}
@@ -102,6 +103,7 @@ ItemDelegate {
}
text: textMetricsContactPickerContactId.elidedText
+ textFormat: TextEdit.PlainText
font.pointSize: JamiTheme.textFontSize
}
}
diff --git a/src/app/mainview/components/WelcomePage.qml b/src/app/mainview/components/WelcomePage.qml
index 7eb6df407..97e3887f8 100644
--- a/src/app/mainview/components/WelcomePage.qml
+++ b/src/app/mainview/components/WelcomePage.qml
@@ -98,7 +98,7 @@ Rectangle {
Label {
id: identifierDescription
-
+
anchors.top: welcome.bottom
anchors.left: parent.left
anchors.topMargin: JamiTheme.preferredMarginSize
@@ -116,7 +116,7 @@ Rectangle {
JamiIdentifier {
id: identifier
editable: true
-
+
anchors.top: identifierDescription.bottom
anchors.left: parent.left
anchors.margins: JamiTheme.preferredMarginSize
@@ -157,7 +157,7 @@ Rectangle {
Flow {
id: flow
- spacing: 12
+ spacing: 13
Repeater {
model: TipsModel
diff --git a/src/app/wizardview/components/CreateAccountPage.qml b/src/app/wizardview/components/CreateAccountPage.qml
index 30f3b5e96..c79dfa584 100644
--- a/src/app/wizardview/components/CreateAccountPage.qml
+++ b/src/app/wizardview/components/CreateAccountPage.qml
@@ -134,6 +134,8 @@ Rectangle {
Layout.topMargin: 15
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: Math.min(440, root.width - JamiTheme.preferredMarginSize * 2)
+ placeholderText: isRendezVous ? JamiStrings.chooseAName :
+ JamiStrings.chooseYourUserName
focus: visible
fontSize: 18
--
GitLab