mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-04-17 20:08:28 +00:00
UI fixes :
RichText fixes #LINQT-2460 #LINQT-2464 remove double back button chat infos #LINQT-2471 hide chat history button if call log does not have one #LINQT-2467 Cancel reply to when switching chat #LINQT-2407 fix typo
This commit is contained in:
parent
b690b75c96
commit
0a3d9cf8c9
8 changed files with 17 additions and 8 deletions
|
|
@ -16,7 +16,6 @@ ColumnLayout {
|
||||||
|
|
||||||
property FriendGui contact
|
property FriendGui contact
|
||||||
property var conferenceInfo: callHistoryGui?.core.conferenceInfo
|
property var conferenceInfo: callHistoryGui?.core.conferenceInfo
|
||||||
property var chatGui: callHistoryGui?.core.chatGui
|
|
||||||
property bool isConference: conferenceInfo != undefined && conferenceInfo != null
|
property bool isConference: conferenceInfo != undefined && conferenceInfo != null
|
||||||
property string contactAddress: specificAddress != "" ? specificAddress : contact && contact.core.defaultAddress || ""
|
property string contactAddress: specificAddress != "" ? specificAddress : contact && contact.core.defaultAddress || ""
|
||||||
property var computedContactNameObj: UtilsCpp.getDisplayName(contactAddress)
|
property var computedContactNameObj: UtilsCpp.getDisplayName(contactAddress)
|
||||||
|
|
@ -126,13 +125,12 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
RowLayout {
|
RowLayout {
|
||||||
id: confWithChatLayout
|
id: confWithChatLayout
|
||||||
visible: mainItem.isConference && !SettingsCpp.disableMeetingsFeature && mainItem.chatGui !== null
|
visible: mainItem.isConference && !SettingsCpp.disableMeetingsFeature && mainItem.callHistoryGui?.core.hasChat
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
spacing: Utils.getSizeWithScreenRatio(72)
|
spacing: Utils.getSizeWithScreenRatio(72)
|
||||||
// Layout.fillWidth: true
|
// Layout.fillWidth: true
|
||||||
Layout.preferredHeight: childrenRect.height
|
Layout.preferredHeight: childrenRect.height
|
||||||
LabelButton {
|
LabelButton {
|
||||||
visible: !SettingsCpp.disableChatFeature
|
|
||||||
width: Utils.getSizeWithScreenRatio(56)
|
width: Utils.getSizeWithScreenRatio(56)
|
||||||
height: Utils.getSizeWithScreenRatio(56)
|
height: Utils.getSizeWithScreenRatio(56)
|
||||||
button.icon.width: Utils.getSizeWithScreenRatio(24)
|
button.icon.width: Utils.getSizeWithScreenRatio(24)
|
||||||
|
|
@ -152,7 +150,7 @@ ColumnLayout {
|
||||||
height: Utils.getSizeWithScreenRatio(56)
|
height: Utils.getSizeWithScreenRatio(56)
|
||||||
button.icon.width: Utils.getSizeWithScreenRatio(24)
|
button.icon.width: Utils.getSizeWithScreenRatio(24)
|
||||||
button.icon.height: Utils.getSizeWithScreenRatio(24)
|
button.icon.height: Utils.getSizeWithScreenRatio(24)
|
||||||
button.icon.source: button.checked ? AppIcons.callList : AppIcons.chatTeardropText
|
button.icon.source: AppIcons.chatTeardropText
|
||||||
//: "Conversation"
|
//: "Conversation"
|
||||||
label: qsTr("contact_conversation_action")
|
label: qsTr("contact_conversation_action")
|
||||||
button.onPressed: {
|
button.onPressed: {
|
||||||
|
|
|
||||||
|
|
@ -265,6 +265,7 @@ Control.Control {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
text: mainItem.chatMessage.core.text
|
text: mainItem.chatMessage.core.text
|
||||||
|
textFormat: Text.RichText
|
||||||
}
|
}
|
||||||
ChatMessageContent {
|
ChatMessageContent {
|
||||||
id: chatBubbleContent
|
id: chatBubbleContent
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ FocusScope {
|
||||||
? UtilsCpp.getUsername(mainItem.addressFromFilter)
|
? UtilsCpp.getUsername(mainItem.addressFromFilter)
|
||||||
: mainItem.addressFromFilter
|
: mainItem.addressFromFilter
|
||||||
text: UtilsCpp.boldTextPart(address, mainItem.highlightText)
|
text: UtilsCpp.boldTextPart(address, mainItem.highlightText)
|
||||||
textFormat: Text.AutoText
|
textFormat: Text.RichText
|
||||||
maximumLineCount: 1
|
maximumLineCount: 1
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
font {
|
font {
|
||||||
|
|
|
||||||
|
|
@ -172,7 +172,7 @@ ColumnLayout {
|
||||||
BigButton {
|
BigButton {
|
||||||
Layout.preferredHeight: height
|
Layout.preferredHeight: height
|
||||||
height: implicitHeight
|
height: implicitHeight
|
||||||
visible: mainItem.screenSharingAvailable$
|
visible: mainItem.screenSharingAvailable
|
||||||
enabled: mainItem.isLocalScreenSharing || windowsLayout.currentIndex !== -1 || screensLayout.currentIndex !== -1
|
enabled: mainItem.isLocalScreenSharing || windowsLayout.currentIndex !== -1 || screensLayout.currentIndex !== -1
|
||||||
text: mainItem.conference && mainItem.conference.core.isLocalScreenSharing
|
text: mainItem.conference && mainItem.conference.core.isLocalScreenSharing
|
||||||
//: "Stop
|
//: "Stop
|
||||||
|
|
|
||||||
|
|
@ -61,6 +61,7 @@ Popup {
|
||||||
Text {
|
Text {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
text: mainItem.title
|
text: mainItem.title
|
||||||
|
textFormat: Text.RichText
|
||||||
color: mainItem.isSuccess ? DefaultStyle.success_500_main : DefaultStyle.danger_500_main
|
color: mainItem.isSuccess ? DefaultStyle.success_500_main : DefaultStyle.danger_500_main
|
||||||
font {
|
font {
|
||||||
pixelSize: Typography.h4.pixelSize
|
pixelSize: Typography.h4.pixelSize
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,11 @@ FocusScope {
|
||||||
onActiveFocusChanged: if(activeFocus) {
|
onActiveFocusChanged: if(activeFocus) {
|
||||||
if (chatMessagesListView.lastItemVisible) chat.core.lMarkAsRead()
|
if (chatMessagesListView.lastItemVisible) chat.core.lMarkAsRead()
|
||||||
}
|
}
|
||||||
|
onChatChanged: {
|
||||||
|
chatMessage = null
|
||||||
|
replyingToMessage = false
|
||||||
|
editingMessage = false
|
||||||
|
}
|
||||||
MouseArea{
|
MouseArea{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onPressed: {
|
onPressed: {
|
||||||
|
|
@ -476,7 +481,7 @@ FocusScope {
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: replyLayout
|
id: replyLayout
|
||||||
spacing: 0
|
spacing: 0
|
||||||
visible: mainItem.chatMessage && (mainItem.replyingToMessage || mainItem.editingMessage)
|
visible: mainItem.chatMessage && (mainItem.replyingToMessage || mainItem.editingMessage)
|
||||||
Text {
|
Text {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
//: Reply to %1
|
//: Reply to %1
|
||||||
|
|
@ -617,6 +622,7 @@ FocusScope {
|
||||||
color: DefaultStyle.grey_0
|
color: DefaultStyle.grey_0
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
RoundButton {
|
RoundButton {
|
||||||
|
visible: contentLoader.panelType === SelectedChatView.PanelType.None
|
||||||
style: ButtonStyle.noBackgroundOrange
|
style: ButtonStyle.noBackgroundOrange
|
||||||
icon.source: AppIcons.leftArrow
|
icon.source: AppIcons.leftArrow
|
||||||
onClicked: detailsPanel.visible = false
|
onClicked: detailsPanel.visible = false
|
||||||
|
|
|
||||||
|
|
@ -281,6 +281,7 @@ LoginLayout {
|
||||||
Text {
|
Text {
|
||||||
id: privacyLinkText
|
id: privacyLinkText
|
||||||
text: acceptCguAndPrivacyPolicyItem.associatedText
|
text: acceptCguAndPrivacyPolicyItem.associatedText
|
||||||
|
textFormat: Text.RichText
|
||||||
onLinkActivated: (link) => Qt.openUrlExternally(link)
|
onLinkActivated: (link) => Qt.openUrlExternally(link)
|
||||||
font {
|
font {
|
||||||
pixelSize: Typography.p1.pixelSize
|
pixelSize: Typography.p1.pixelSize
|
||||||
|
|
|
||||||
|
|
@ -96,6 +96,7 @@ LoginLayout {
|
||||||
Text {
|
Text {
|
||||||
id: title
|
id: title
|
||||||
text: modelData.title
|
text: modelData.title
|
||||||
|
textFormat: Text.RichText
|
||||||
font {
|
font {
|
||||||
pixelSize: Typography.h2.pixelSize
|
pixelSize: Typography.h2.pixelSize
|
||||||
weight: Typography.h2.weight
|
weight: Typography.h2.weight
|
||||||
|
|
@ -105,6 +106,7 @@ LoginLayout {
|
||||||
id: txt
|
id: txt
|
||||||
Layout.maximumWidth: Utils.getSizeWithScreenRatio(361)
|
Layout.maximumWidth: Utils.getSizeWithScreenRatio(361)
|
||||||
wrapMode: Text.WordWrap
|
wrapMode: Text.WordWrap
|
||||||
|
textFormat: Text.RichText
|
||||||
font {
|
font {
|
||||||
pixelSize: Typography.p1.pixelSize
|
pixelSize: Typography.p1.pixelSize
|
||||||
weight: Typography.p1.weight
|
weight: Typography.p1.weight
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue