diff --git a/src/app/mainview/components/ConversationListView.qml b/src/app/mainview/components/ConversationListView.qml index 6433a9bf975bb07fc886c427fdb3272ec540a75d..07801811aed72718783649787fca0ae14cdf0181 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 d6a78b2a860281f222f2b23073ec378da5af2747..ca381fb607123b520b385964c6549e69d107fc53 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