diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml index 0cdfd7f7..ac2849b8 100644 --- a/Linphone/view/Page/Main/Call/CallPage.qml +++ b/Linphone/view/Page/Main/Call/CallPage.qml @@ -208,23 +208,22 @@ AbstractMainPage { Layout.fillWidth: true Layout.rightMargin: 39 * DefaultStyle.dp placeholderText: qsTr("Rechercher un appel") + visible: historyListView.count !== 0 focus: true KeyNavigation.up: titleLoader KeyNavigation.down: historyListView } - Item { - Layout.topMargin: 38 * DefaultStyle.dp + Item { + Layout.topMargin: 38 * DefaultStyle.dp Layout.fillWidth: true Layout.fillHeight: true - Control.Control { - id: listLayout - anchors.fill: parent - anchors.rightMargin: 39 * DefaultStyle.dp + Control.Control { + id: listLayout + anchors.fill: parent + anchors.rightMargin: 39 * DefaultStyle.dp - background: Item{} - ColumnLayout { - anchors.fill: parent - ColumnLayout { + background: Item{} + contentItem: ColumnLayout { Text { visible: historyListView.count === 0 Layout.alignment: Qt.AlignHCenter @@ -411,18 +410,18 @@ AbstractMainPage { Control.ScrollBar.vertical: scrollbar } } - } - } - ScrollBar { - id: scrollbar - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.right: parent.right - anchors.rightMargin: 8 * DefaultStyle.dp - active: true - policy: Control.ScrollBar.AsNeeded - } - } + + } + ScrollBar { + id: scrollbar + anchors.top: parent.top + anchors.bottom: parent.bottom + anchors.right: parent.right + anchors.rightMargin: 8 * DefaultStyle.dp + active: true + policy: Control.ScrollBar.AsNeeded + } + } } } } diff --git a/Linphone/view/Page/Main/Contact/ContactPage.qml b/Linphone/view/Page/Main/Contact/ContactPage.qml index 00840556..d6067de0 100644 --- a/Linphone/view/Page/Main/Contact/ContactPage.qml +++ b/Linphone/view/Page/Main/Contact/ContactPage.qml @@ -62,7 +62,7 @@ AbstractMainPage { if (!contact) return var mainWin = UtilsCpp.getMainWindow() mainWin.showConfirmationLambdaPopup("", - contact.core.displayName + qsTr("sera supprimé des contacts. Voulez-vous continuer ?"), + qsTr("%1 sera supprimé des contacts. Voulez-vous continuer ?").arg(contact.core.displayName), "", function (confirmed) { if (confirmed) { diff --git a/Linphone/view/Page/Main/Meeting/MeetingPage.qml b/Linphone/view/Page/Main/Meeting/MeetingPage.qml index f3a748cc..006ba6af 100644 --- a/Linphone/view/Page/Main/Meeting/MeetingPage.qml +++ b/Linphone/view/Page/Main/Meeting/MeetingPage.qml @@ -160,14 +160,15 @@ AbstractMainPage { SearchBar { id: searchBar Layout.fillWidth: true - Layout.topMargin: 18 * DefaultStyle.dp - Layout.rightMargin: 38 * DefaultStyle.dp + Layout.topMargin: 18 * DefaultStyle.dp + Layout.rightMargin: 38 * DefaultStyle.dp placeholderText: qsTr("Rechercher une réunion") + visible: conferenceList.count !== 0 KeyNavigation.up: conferenceList KeyNavigation.down: conferenceList } Text { - Layout.topMargin: 38 * DefaultStyle.dp + Layout.topMargin: 137 * DefaultStyle.dp Layout.fillHeight: true Layout.alignment: Qt.AlignHCenter text: mainItem.emptyListText