diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml index 969662c26..c10fa0ab3 100644 --- a/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml +++ b/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml @@ -13,8 +13,4 @@ Rectangle { color: TextFieldStyle.background.color.normal radius: TextFieldStyle.background.radius - - ScrollableListView { - anchors.fill: parent - } } diff --git a/linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml b/linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml index c0acb55a7..30de38a72 100644 --- a/linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml +++ b/linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml @@ -6,11 +6,11 @@ import Linphone.Styles 1.0 // ============================================================================= SearchBox { - id: searchBox + id: searchBar // --------------------------------------------------------------------------- - readonly property alias isOpen: searchBox._isOpen + readonly property alias isOpen: searchBar._isOpen // --------------------------------------------------------------------------- @@ -27,7 +27,10 @@ SearchBox { // --------------------------------------------------------------------------- - onEnterPressed: view.interpretableSipAddress.length > 0 && searchBox.launchCall(interpretableSipAddress) + onEnterPressed: { + var sipAddress = view.interpretableSipAddress + return sipAddress.length > 0 && searchBar.launchCall(sipAddress) + } // --------------------------------------------------------------------------- @@ -37,35 +40,35 @@ SearchBox { actions: [{ icon: 'video_call', handler: function (entry) { - searchBox.closeMenu() - searchBox.launchVideoCall(entry.sipAddress) + searchBar.closeMenu() + searchBar.launchVideoCall(entry.sipAddress) } }, { icon: 'call', handler: function (entry) { - searchBox.closeMenu() - searchBox.launchCall(entry.sipAddress) + searchBar.closeMenu() + searchBar.launchCall(entry.sipAddress) } }, { icon: 'chat', handler: function (entry) { - searchBox.closeMenu() - searchBox.launchChat(entry.sipAddress) + searchBar.closeMenu() + searchBar.launchChat(entry.sipAddress) } }] headerButtonDescription: qsTr('addContact') headerButtonIcon: 'contact_add' headerButtonAction: (function (sipAddress) { - searchBox.closeMenu() - searchBox.addContact(sipAddress) + searchBar.closeMenu() + searchBar.addContact(sipAddress) }) - genSipAddress: searchBox.filter + genSipAddress: searchBar.filter onEntryClicked: { - searchBox.closeMenu() - searchBox.entryClicked(entry) + searchBar.closeMenu() + searchBar.entryClicked(entry) } } } diff --git a/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml b/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml index 7c5cf6ab9..954d60d11 100644 --- a/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml +++ b/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml @@ -52,6 +52,25 @@ ConfirmDialog { ScrollableListViewField { Layout.fillHeight: true Layout.fillWidth: true + + SipAddressesView { + id: view + + anchors.fill: parent + + actions: [{ + icon: 'video_call', + handler: function (entry) { + console.log('toto') + } + }] + + genSipAddress: filter.text + + onEntryClicked: { + console.log('todo2') + } + } } } } diff --git a/linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml index 6c7b1c360..57146b184 100644 --- a/linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml @@ -9,7 +9,7 @@ QtObject { property int height: 420 property int leftMargin: 35 property int rightMargin: 35 - property int width: 680 + property int width: 740 property QtObject columns: QtObject { property QtObject selector: QtObject {