From 4b746879b1bd4e4cb3a4d7357410491151e120d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 25 Aug 2022 08:26:34 -0400
Subject: [PATCH] sip: various fixes
Change-Id: I466683f1c95e983ca6a33d084b4aabf4c3d6549e
GitLab: #816
GitLab: #814
---
.../components/ConversationListView.qml | 4 ++--
src/app/mainview/components/WelcomePage.qml | 20 +++++++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/app/mainview/components/ConversationListView.qml b/src/app/mainview/components/ConversationListView.qml
index 6433a9bf9..07801811a 100644
--- a/src/app/mainview/components/ConversationListView.qml
+++ b/src/app/mainview/components/ConversationListView.qml
@@ -20,9 +20,9 @@
import QtQuick
import QtQuick.Controls
-import net.jami.Models 1.1
import net.jami.Adapters 1.1
import net.jami.Constants 1.1
+import net.jami.Models 1.1
import "../../commoncomponents"
@@ -142,7 +142,7 @@ JamiListView {
isBanned = item.isBanned
mode = item.mode
contactType = LRCInstance.currentAccountType
- readOnly = mode === Conversation.Mode.NON_SWARM && !item.isTemporary
+ readOnly = mode === Conversation.Mode.NON_SWARM && !item.isTemporary && CurrentAccount.type !== Profile.Type.SIP
if (model.dataForRow(row, ConversationList.IsCoreDialog)) {
userProfile.aliasText = item.title
diff --git a/src/app/mainview/components/WelcomePage.qml b/src/app/mainview/components/WelcomePage.qml
index d6a78b2a8..ca381fb60 100644
--- a/src/app/mainview/components/WelcomePage.qml
+++ b/src/app/mainview/components/WelcomePage.qml
@@ -95,8 +95,27 @@ Rectangle {
color: JamiTheme.textColor
}
+ Label {
+ id: descriptionLabel
+ visible: CurrentAccount.type === Profile.Type.SIP
+
+ anchors.top: welcome.bottom
+ anchors.left: parent.left
+ anchors.topMargin: JamiTheme.preferredMarginSize * 2
+ anchors.leftMargin: JamiTheme.preferredMarginSize
+ width: 300
+
+ font.pixelSize: JamiTheme.headerFontSize
+
+ wrapMode: Text.WordWrap
+
+ text: JamiStrings.description
+ color: JamiTheme.textColor
+ }
+
Label {
id: identifierDescription
+ visible: CurrentAccount.type !== Profile.Type.SIP
anchors.top: welcome.bottom
anchors.left: parent.left
@@ -115,6 +134,7 @@ Rectangle {
JamiIdentifier {
id: identifier
editable: true
+ visible: CurrentAccount.type !== Profile.Type.SIP
anchors.top: identifierDescription.bottom
anchors.left: parent.left
--
GitLab