lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

misc: improve chatview banners layout

Browse source 
Change-Id: Id357fd3fd3db1ce6fca2e1b34f192ca8f056b19c
This commit is contained in:
Aline Gondim Santos 2023-03-09 16:08:53 -03:00 • committed by Sébastien Blin
parent 88e945a856
commit c746d2786b
3 changed files with 44 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/app/mainview/components/ConversationErrorsRow.qml
View file

@ -51,6 +51,7 @@ Rectangle {
Text { Text {
id: errorLabel id: errorLabel
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
text: CurrentConversation.errors.count > 0 ? CurrentConversation.errors[0][0] : "" text: CurrentConversation.errors.count > 0 ? CurrentConversation.errors[0][0] : ""
color: JamiTheme.filterBadgeTextColor color: JamiTheme.filterBadgeTextColor

1
src/app/mainview/components/GenericErrorsRow.qml
View file

@ -42,6 +42,7 @@ Rectangle {
Text { Text {
id: errorLabel id: errorLabel
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
text: CurrentAccount.enabled? JamiStrings.noNetworkConnectivity : JamiStrings.disabledAccount text: CurrentAccount.enabled? JamiStrings.noNetworkConnectivity : JamiStrings.disabledAccount
color: JamiTheme.filterBadgeTextColor color: JamiTheme.filterBadgeTextColor

89
src/app/mainview/components/NotificationArea.qml
View file

@ -46,6 +46,7 @@ Rectangle {
Text { Text {
id: errorLabel id: errorLabel
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.margins: 0 Layout.margins: 0
text: JamiStrings.wantToJoin text: JamiStrings.wantToJoin
@ -54,57 +55,51 @@ Rectangle {
elide: Text.ElideRight elide: Text.ElideRight
} }
RowLayout { PushButton {
id: controls id: joinCallInAudio
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
Layout.rightMargin: JamiTheme.preferredMarginSize
source: JamiResources.place_audiocall_24dp_svg
toolTipText: JamiStrings.joinCall
imageColor: root.textColor
normalColor: "transparent"
hoveredColor: Qt.rgba(255, 255, 255, 0.2)
border.width: 1
border.color: root.textColor
onClicked: MessagesAdapter.joinCall(uri, device, id, true)
}
PushButton {
id: joinCallInVideo
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
Layout.rightMargin: JamiTheme.preferredMarginSize
source: JamiResources.videocam_24dp_svg
toolTipText: JamiStrings.joinCall
imageColor: root.textColor
normalColor: "transparent"
hoveredColor: Qt.rgba(255, 255, 255, 0.2)
border.width: 1
border.color: root.textColor
visible: CurrentAccount.videoEnabled_Video
onClicked: MessagesAdapter.joinCall(uri, device, id)
}
PushButton {
id: btnClose
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
PushButton { imageColor: root.textColor
id: joinCallInAudio normalColor: JamiTheme.transparentColor
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
Layout.rightMargin: JamiTheme.preferredMarginSize
source: JamiResources.place_audiocall_24dp_svg source: JamiResources.round_close_24dp_svg
toolTipText: JamiStrings.joinCall
imageColor: root.textColor onClicked: ConversationsAdapter.ignoreActiveCall(CurrentConversation.id, id, uri, device)
normalColor: "transparent"
hoveredColor: Qt.rgba(255, 255, 255, 0.2)
border.width: 1
border.color: root.textColor
onClicked: MessagesAdapter.joinCall(uri, device, id, true)
}
PushButton {
id: joinCallInVideo
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
Layout.rightMargin: JamiTheme.preferredMarginSize
source: JamiResources.videocam_24dp_svg
toolTipText: JamiStrings.joinCall
imageColor: root.textColor
normalColor: "transparent"
hoveredColor: Qt.rgba(255, 255, 255, 0.2)
border.width: 1
border.color: root.textColor
visible: CurrentAccount.videoEnabled_Video
onClicked: MessagesAdapter.joinCall(uri, device, id)
}
PushButton {
id: btnClose
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
imageColor: root.textColor
normalColor: JamiTheme.transparentColor
source: JamiResources.round_close_24dp_svg
onClicked: ConversationsAdapter.ignoreActiveCall(CurrentConversation.id, id, uri, device)
}
} }
} }