mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-04-25 07:28:34 +00:00
Fix chat room switch in contact edition
This commit is contained in:
Julien Wadel
parent
bee72586ab
commit
e3fc1b2803
1 changed files with 315 additions and 308 deletions
|
|
@ -14,312 +14,319 @@ import 'ContactEdit.js' as Logic
|
|||
// =============================================================================
|
||||
|
||||
ColumnLayout {
|
||||
id: contactEdit
|
||||
|
||||
property string sipAddress
|
||||
|
||||
readonly property alias vcard: contactEdit._vcard
|
||||
|
||||
property bool _edition: false
|
||||
property var _contact
|
||||
property var _vcard
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
spacing: 0
|
||||
|
||||
Component.onCompleted: Logic.handleCreation()
|
||||
|
||||
onVcardChanged: Logic.handleVcardChanged(vcard)
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
Loader {
|
||||
active: contactEdit._contact != null
|
||||
sourceComponent: Connections {
|
||||
target: contactEdit._contact
|
||||
|
||||
onContactUpdated: Logic.handleContactUpdated()
|
||||
}
|
||||
}
|
||||
|
||||
FileDialog {
|
||||
id: avatarChooser
|
||||
|
||||
folder: shortcuts.home
|
||||
title: qsTr('avatarChooserTitle')
|
||||
|
||||
onAccepted: Logic.setAvatar(fileUrls[0])
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Info bar.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
Rectangle {
|
||||
id: infoBar
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.bar.height
|
||||
color: ContactEditStyle.bar.color
|
||||
|
||||
RowLayout {
|
||||
anchors {
|
||||
fill: parent
|
||||
leftMargin: ContactEditStyle.bar.leftMargin
|
||||
rightMargin: ContactEditStyle.bar.rightMargin
|
||||
}
|
||||
|
||||
spacing: ContactEditStyle.bar.spacing
|
||||
|
||||
ActionButton {
|
||||
enabled: _edition
|
||||
icon: 'contact_card_photo'
|
||||
iconSize: ContactEditStyle.bar.avatarSize
|
||||
|
||||
onClicked: avatarChooser.open()
|
||||
|
||||
Avatar {
|
||||
id: avatar
|
||||
|
||||
anchors.fill: parent
|
||||
image: _vcard.avatar
|
||||
username: _vcard.username
|
||||
presenceLevel: _contact ? _contact.presenceLevel : -1
|
||||
visible: (isLoaded() && !parent.hovered) || !_edition
|
||||
}
|
||||
}
|
||||
|
||||
TransparentTextInput {
|
||||
id: usernameInput
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.bar.buttons.size
|
||||
|
||||
color: ContactEditStyle.bar.username.color
|
||||
|
||||
font {
|
||||
bold: true
|
||||
pointSize: ContactEditStyle.bar.username.pointSize
|
||||
}
|
||||
forceFocus: true
|
||||
readOnly: !_edition
|
||||
text: avatar.username
|
||||
|
||||
onEditingFinished: Logic.setUsername(text)
|
||||
onReadOnlyChanged: {
|
||||
if (!readOnly) {
|
||||
forceActiveFocus()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Row {
|
||||
Layout.alignment: Qt.AlignRight
|
||||
Layout.fillHeight: true
|
||||
|
||||
spacing: ContactEditStyle.bar.actions.spacing
|
||||
visible: _contact != null
|
||||
|
||||
ActionBar {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
iconSize: ContactEditStyle.bar.actions.history.iconSize
|
||||
|
||||
ActionButton {
|
||||
icon: 'history'
|
||||
|
||||
onClicked: sipAddressesMenu.open()
|
||||
|
||||
TooltipArea {
|
||||
text: qsTr('tooltipShowConversation')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ActionBar {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
ActionButton {
|
||||
icon: 'edit'
|
||||
iconSize: ContactEditStyle.bar.actions.edit.iconSize
|
||||
|
||||
visible: !_edition
|
||||
onClicked: Logic.editContact()
|
||||
}
|
||||
|
||||
ActionButton {
|
||||
icon: 'delete'
|
||||
iconSize: ContactEditStyle.bar.actions.del.iconSize
|
||||
|
||||
onClicked: Logic.removeContact()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
SipAddressesMenu {
|
||||
id: sipAddressesMenu
|
||||
|
||||
relativeTo: infoBar
|
||||
relativeX: infoBar.width - SipAddressesMenuStyle.entry.width
|
||||
relativeY: infoBar.height
|
||||
|
||||
sipAddresses: _contact ? _contact.vcard.sipAddresses : [ contactEdit.sipAddress ]
|
||||
|
||||
onSipAddressClicked: CallsListModel.launchChat( sipAddress,0 )
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Info list.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
Rectangle {
|
||||
Layout.fillHeight: true
|
||||
Layout.fillWidth: true
|
||||
|
||||
color: ContactEditStyle.content.color
|
||||
|
||||
Flickable {
|
||||
id: flick
|
||||
|
||||
ScrollBar.vertical: ForceScrollBar {}
|
||||
|
||||
anchors.fill: parent
|
||||
boundsBehavior: Flickable.StopAtBounds
|
||||
clip: true
|
||||
contentHeight: infoList.height
|
||||
contentWidth: width - ScrollBar.vertical.width
|
||||
flickableDirection: Flickable.VerticalFlick
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
ColumnLayout {
|
||||
id: infoList
|
||||
|
||||
width: flick.contentWidth
|
||||
|
||||
ListForm {
|
||||
id: addresses
|
||||
|
||||
Layout.leftMargin: ContactEditStyle.values.leftMargin
|
||||
Layout.rightMargin: ContactEditStyle.values.rightMargin
|
||||
Layout.topMargin: ContactEditStyle.values.topMargin
|
||||
Layout.fillWidth: true
|
||||
|
||||
minValues: _contact ? 1 : 0
|
||||
placeholder: qsTr('sipAccountsPlaceholder')
|
||||
readOnly: !_edition
|
||||
title: qsTr('sipAccounts')
|
||||
|
||||
onChanged: Logic.handleSipAddressChanged(addresses, index, oldValue, newValue)
|
||||
onRemoved: _vcard.removeSipAddress(value)
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.values.separator.height
|
||||
color: ContactEditStyle.values.separator.color
|
||||
}
|
||||
|
||||
ListForm {
|
||||
id: companies
|
||||
|
||||
Layout.leftMargin: ContactEditStyle.values.leftMargin
|
||||
Layout.rightMargin: ContactEditStyle.values.rightMargin
|
||||
|
||||
placeholder: qsTr('companiesPlaceholder')
|
||||
readOnly: !_edition
|
||||
title: qsTr('companies')
|
||||
|
||||
onChanged: Logic.handleCompanyChanged(companies, index, oldValue, newValue)
|
||||
onRemoved: _vcard.removeCompany(value)
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.values.separator.height
|
||||
color: ContactEditStyle.values.separator.color
|
||||
}
|
||||
|
||||
ListForm {
|
||||
id: emails
|
||||
|
||||
Layout.leftMargin: ContactEditStyle.values.leftMargin
|
||||
Layout.rightMargin: ContactEditStyle.values.rightMargin
|
||||
|
||||
placeholder: qsTr('emailsPlaceholder')
|
||||
readOnly: !_edition
|
||||
title: qsTr('emails')
|
||||
|
||||
onChanged: Logic.handleEmailChanged(emails, index, oldValue, newValue)
|
||||
onRemoved: _vcard.removeEmail(value)
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.values.separator.height
|
||||
color: ContactEditStyle.values.separator.color
|
||||
}
|
||||
|
||||
ListForm {
|
||||
id: urls
|
||||
|
||||
Layout.leftMargin: ContactEditStyle.values.leftMargin
|
||||
Layout.rightMargin: ContactEditStyle.values.rightMargin
|
||||
|
||||
placeholder: qsTr('webSitesPlaceholder')
|
||||
readOnly: !_edition
|
||||
title: qsTr('webSites')
|
||||
|
||||
onChanged: Logic.handleUrlChanged(urls, index, oldValue, newValue)
|
||||
onRemoved: _vcard.removeUrl(value)
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.values.separator.height
|
||||
color: ContactEditStyle.values.separator.color
|
||||
}
|
||||
|
||||
StaticListForm {
|
||||
Layout.leftMargin: ContactEditStyle.values.leftMargin
|
||||
Layout.rightMargin: ContactEditStyle.values.rightMargin
|
||||
|
||||
fields: Logic.buildAddressFields()
|
||||
|
||||
readOnly: !_edition
|
||||
title: qsTr('address')
|
||||
|
||||
onChanged: Logic.handleAddressChanged(index, value)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Edition buttons.
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
Row {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.bottomMargin: ContactEditStyle.values.bottomMargin
|
||||
Layout.topMargin: ContactEditStyle.buttons.topMargin
|
||||
|
||||
spacing: ContactEditStyle.buttons.spacing
|
||||
visible: _edition
|
||||
|
||||
TextButtonA {
|
||||
text: qsTr('cancel')
|
||||
onClicked: Logic.cancel()
|
||||
}
|
||||
|
||||
TextButtonB {
|
||||
enabled: usernameInput.text.length > 0 && _vcard.sipAddresses.length > 0
|
||||
text: qsTr('save')
|
||||
onClicked: Logic.save()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
id: contactEdit
|
||||
|
||||
property string sipAddress
|
||||
|
||||
readonly property alias vcard: contactEdit._vcard
|
||||
|
||||
property bool _edition: false
|
||||
property var _contact
|
||||
property var _vcard
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
spacing: 0
|
||||
|
||||
Component.onCompleted: Logic.handleCreation()
|
||||
|
||||
onVcardChanged: Logic.handleVcardChanged(vcard)
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
Loader {
|
||||
active: contactEdit._contact != null
|
||||
sourceComponent: Connections {
|
||||
target: contactEdit._contact
|
||||
|
||||
onContactUpdated: Logic.handleContactUpdated()
|
||||
}
|
||||
}
|
||||
|
||||
FileDialog {
|
||||
id: avatarChooser
|
||||
|
||||
folder: shortcuts.home
|
||||
title: qsTr('avatarChooserTitle')
|
||||
|
||||
onAccepted: Logic.setAvatar(fileUrls[0])
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Info bar.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
Rectangle {
|
||||
id: infoBar
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.bar.height
|
||||
color: ContactEditStyle.bar.color
|
||||
|
||||
RowLayout {
|
||||
anchors {
|
||||
fill: parent
|
||||
leftMargin: ContactEditStyle.bar.leftMargin
|
||||
rightMargin: ContactEditStyle.bar.rightMargin
|
||||
}
|
||||
|
||||
spacing: ContactEditStyle.bar.spacing
|
||||
|
||||
ActionButton {
|
||||
enabled: _edition
|
||||
icon: 'contact_card_photo'
|
||||
iconSize: ContactEditStyle.bar.avatarSize
|
||||
|
||||
onClicked: avatarChooser.open()
|
||||
|
||||
Avatar {
|
||||
id: avatar
|
||||
|
||||
anchors.fill: parent
|
||||
image: _vcard.avatar
|
||||
username: _vcard.username
|
||||
presenceLevel: _contact ? _contact.presenceLevel : -1
|
||||
visible: (isLoaded() && !parent.hovered) || !_edition
|
||||
}
|
||||
}
|
||||
|
||||
TransparentTextInput {
|
||||
id: usernameInput
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.bar.buttons.size
|
||||
|
||||
color: ContactEditStyle.bar.username.color
|
||||
|
||||
font {
|
||||
bold: true
|
||||
pointSize: ContactEditStyle.bar.username.pointSize
|
||||
}
|
||||
forceFocus: true
|
||||
readOnly: !_edition
|
||||
text: avatar.username
|
||||
|
||||
onEditingFinished: Logic.setUsername(text)
|
||||
onReadOnlyChanged: {
|
||||
if (!readOnly) {
|
||||
forceActiveFocus()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Row {
|
||||
Layout.alignment: Qt.AlignRight
|
||||
Layout.fillHeight: true
|
||||
|
||||
spacing: ContactEditStyle.bar.actions.spacing
|
||||
visible: _contact != null
|
||||
|
||||
ActionBar {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
iconSize: ContactEditStyle.bar.actions.history.iconSize
|
||||
|
||||
ActionButton {
|
||||
icon: 'history'
|
||||
|
||||
onClicked: sipAddressesMenu.open()
|
||||
|
||||
TooltipArea {
|
||||
text: qsTr('tooltipShowConversation')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ActionBar {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
ActionButton {
|
||||
icon: 'edit'
|
||||
iconSize: ContactEditStyle.bar.actions.edit.iconSize
|
||||
|
||||
visible: !_edition
|
||||
onClicked: Logic.editContact()
|
||||
}
|
||||
|
||||
ActionButton {
|
||||
icon: 'delete'
|
||||
iconSize: ContactEditStyle.bar.actions.del.iconSize
|
||||
|
||||
onClicked: Logic.removeContact()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
SipAddressesMenu {
|
||||
id: sipAddressesMenu
|
||||
|
||||
relativeTo: infoBar
|
||||
relativeX: infoBar.width - SipAddressesMenuStyle.entry.width
|
||||
relativeY: infoBar.height
|
||||
|
||||
sipAddresses: _contact ? _contact.vcard.sipAddresses : [ contactEdit.sipAddress ]
|
||||
|
||||
onSipAddressClicked: {
|
||||
var entry = CallsListModel.createChatRoom( "", false, [sipAddress], true )
|
||||
if(entry)
|
||||
window.setView('Conversation', {
|
||||
chatRoomModel:entry.chatRoomModel
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Info list.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
Rectangle {
|
||||
Layout.fillHeight: true
|
||||
Layout.fillWidth: true
|
||||
|
||||
color: ContactEditStyle.content.color
|
||||
|
||||
Flickable {
|
||||
id: flick
|
||||
|
||||
ScrollBar.vertical: ForceScrollBar {}
|
||||
|
||||
anchors.fill: parent
|
||||
boundsBehavior: Flickable.StopAtBounds
|
||||
clip: true
|
||||
contentHeight: infoList.height
|
||||
contentWidth: width - ScrollBar.vertical.width
|
||||
flickableDirection: Flickable.VerticalFlick
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
ColumnLayout {
|
||||
id: infoList
|
||||
|
||||
width: flick.contentWidth
|
||||
|
||||
ListForm {
|
||||
id: addresses
|
||||
|
||||
Layout.leftMargin: ContactEditStyle.values.leftMargin
|
||||
Layout.rightMargin: ContactEditStyle.values.rightMargin
|
||||
Layout.topMargin: ContactEditStyle.values.topMargin
|
||||
Layout.fillWidth: true
|
||||
|
||||
minValues: _contact ? 1 : 0
|
||||
placeholder: qsTr('sipAccountsPlaceholder')
|
||||
readOnly: !_edition
|
||||
title: qsTr('sipAccounts')
|
||||
|
||||
onChanged: Logic.handleSipAddressChanged(addresses, index, oldValue, newValue)
|
||||
onRemoved: _vcard.removeSipAddress(value)
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.values.separator.height
|
||||
color: ContactEditStyle.values.separator.color
|
||||
}
|
||||
|
||||
ListForm {
|
||||
id: companies
|
||||
|
||||
Layout.leftMargin: ContactEditStyle.values.leftMargin
|
||||
Layout.rightMargin: ContactEditStyle.values.rightMargin
|
||||
|
||||
placeholder: qsTr('companiesPlaceholder')
|
||||
readOnly: !_edition
|
||||
title: qsTr('companies')
|
||||
|
||||
onChanged: Logic.handleCompanyChanged(companies, index, oldValue, newValue)
|
||||
onRemoved: _vcard.removeCompany(value)
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.values.separator.height
|
||||
color: ContactEditStyle.values.separator.color
|
||||
}
|
||||
|
||||
ListForm {
|
||||
id: emails
|
||||
|
||||
Layout.leftMargin: ContactEditStyle.values.leftMargin
|
||||
Layout.rightMargin: ContactEditStyle.values.rightMargin
|
||||
|
||||
placeholder: qsTr('emailsPlaceholder')
|
||||
readOnly: !_edition
|
||||
title: qsTr('emails')
|
||||
|
||||
onChanged: Logic.handleEmailChanged(emails, index, oldValue, newValue)
|
||||
onRemoved: _vcard.removeEmail(value)
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.values.separator.height
|
||||
color: ContactEditStyle.values.separator.color
|
||||
}
|
||||
|
||||
ListForm {
|
||||
id: urls
|
||||
|
||||
Layout.leftMargin: ContactEditStyle.values.leftMargin
|
||||
Layout.rightMargin: ContactEditStyle.values.rightMargin
|
||||
|
||||
placeholder: qsTr('webSitesPlaceholder')
|
||||
readOnly: !_edition
|
||||
title: qsTr('webSites')
|
||||
|
||||
onChanged: Logic.handleUrlChanged(urls, index, oldValue, newValue)
|
||||
onRemoved: _vcard.removeUrl(value)
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ContactEditStyle.values.separator.height
|
||||
color: ContactEditStyle.values.separator.color
|
||||
}
|
||||
|
||||
StaticListForm {
|
||||
Layout.leftMargin: ContactEditStyle.values.leftMargin
|
||||
Layout.rightMargin: ContactEditStyle.values.rightMargin
|
||||
|
||||
fields: Logic.buildAddressFields()
|
||||
|
||||
readOnly: !_edition
|
||||
title: qsTr('address')
|
||||
|
||||
onChanged: Logic.handleAddressChanged(index, value)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Edition buttons.
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
Row {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.bottomMargin: ContactEditStyle.values.bottomMargin
|
||||
Layout.topMargin: ContactEditStyle.buttons.topMargin
|
||||
|
||||
spacing: ContactEditStyle.buttons.spacing
|
||||
visible: _edition
|
||||
|
||||
TextButtonA {
|
||||
text: qsTr('cancel')
|
||||
onClicked: Logic.cancel()
|
||||
}
|
||||
|
||||
TextButtonB {
|
||||
enabled: usernameInput.text.length > 0 && _vcard.sipAddresses.length > 0
|
||||
text: qsTr('save')
|
||||
onClicked: Logic.save()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue