Fix empty lists ui
ui fixes fix crash participantCore fix account name on init fix #LINQT-1366 fix #LINQT-1380 try to fix #LINQT-1379 (new call : crash when ending the call before remote answers)
This commit is contained in:
parent
c5777e2dd1
commit
a80f4c1a6e
3 changed files with 31 additions and 23 deletions
|
|
@ -9,7 +9,7 @@ import SettingsCpp
|
|||
AbstractMainPage {
|
||||
id: mainItem
|
||||
noItemButtonText: qsTr("Nouvel appel")
|
||||
emptyListText: qsTr("Aucun appel")
|
||||
emptyListText: qsTr("Historique d'appel vide")
|
||||
newItemIconSource: AppIcons.newCall
|
||||
|
||||
property var selectedRowHistoryGui
|
||||
|
|
@ -208,10 +208,17 @@ AbstractMainPage {
|
|||
Layout.fillWidth: true
|
||||
Layout.rightMargin: 39 * DefaultStyle.dp
|
||||
placeholderText: qsTr("Rechercher un appel")
|
||||
visible: historyListView.count !== 0
|
||||
visible: historyListView.count !== 0 || text.length !== 0
|
||||
focus: true
|
||||
KeyNavigation.up: titleLoader
|
||||
KeyNavigation.down: historyListView
|
||||
Binding {
|
||||
target: mainItem
|
||||
property: "showDefaultItem"
|
||||
when: searchBar.text.length != 0
|
||||
value: false
|
||||
restoreMode: Binding.RestoreBindingOrValue
|
||||
}
|
||||
}
|
||||
Item {
|
||||
Layout.topMargin: 38 * DefaultStyle.dp
|
||||
|
|
@ -225,17 +232,13 @@ AbstractMainPage {
|
|||
background: Item{}
|
||||
contentItem: ColumnLayout {
|
||||
Text {
|
||||
visible: historyListView.count === 0
|
||||
visible: historyListView.count === 0 || searchBar.text.length != 0
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
text: qsTr("Aucun appel")
|
||||
text: qsTr("Aucun appel%1").arg(searchBar.text.length != 0 ? " correspondant" : "")
|
||||
font {
|
||||
pixelSize: 16 * DefaultStyle.dp
|
||||
weight: 800 * DefaultStyle.dp
|
||||
}
|
||||
Binding on text {
|
||||
when: searchBar.text.length !== 0
|
||||
value: qsTr("Aucun appel correspondant")
|
||||
}
|
||||
}
|
||||
ListView {
|
||||
id: historyListView
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ AbstractMainPage {
|
|||
|
||||
// rightPanelStackView.initialItem: contactDetail
|
||||
|
||||
showDefaultItem: rightPanelStackView.depth == 0 && contactList.count == 0
|
||||
showDefaultItem: rightPanelStackView.depth == 0 && contactList.count === 0 && searchBar.text.length === 0
|
||||
|
||||
MagicSearchProxy {
|
||||
id: allFriends
|
||||
|
|
@ -211,7 +211,7 @@ AbstractMainPage {
|
|||
spacing: 38 * DefaultStyle.dp
|
||||
SearchBar {
|
||||
id: searchBar
|
||||
visible: contactList.count != 0
|
||||
visible: contactList.count != 0 || text.length !== 0
|
||||
Layout.leftMargin: leftPanel.leftMargin
|
||||
Layout.rightMargin: leftPanel.rightMargin
|
||||
Layout.topMargin: 18 * DefaultStyle.dp
|
||||
|
|
@ -236,10 +236,10 @@ AbstractMainPage {
|
|||
width: parent.width
|
||||
spacing: 15 * DefaultStyle.dp
|
||||
Text {
|
||||
visible: contactList.count === 0 && favoriteList.count === 0
|
||||
visible: contactList.count === 0 || searchBar.text.length != 0
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.topMargin: 137 * DefaultStyle.dp
|
||||
text: qsTr("Aucun contact")
|
||||
text: qsTr("Aucun contact%1").arg(searchBar.text.length !== 0 ? " correspondant" : "")
|
||||
font {
|
||||
pixelSize: 16 * DefaultStyle.dp
|
||||
weight: 800 * DefaultStyle.dp
|
||||
|
|
@ -920,4 +920,4 @@ AbstractMainPage {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -128,6 +128,7 @@ AbstractMainPage {
|
|||
Control.StackView.onActivated: {
|
||||
mainItem.selectedConference = conferenceList.selectedConference
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
id: listLayoutIn
|
||||
anchors.fill: parent
|
||||
|
|
@ -163,25 +164,27 @@ AbstractMainPage {
|
|||
Layout.topMargin: 18 * DefaultStyle.dp
|
||||
Layout.rightMargin: 38 * DefaultStyle.dp
|
||||
placeholderText: qsTr("Rechercher une réunion")
|
||||
visible: conferenceList.count !== 0
|
||||
visible: conferenceList.count !== 0 || text.length !== 0
|
||||
KeyNavigation.up: conferenceList
|
||||
KeyNavigation.down: conferenceList
|
||||
Binding {
|
||||
target: mainItem
|
||||
property: "showDefaultItem"
|
||||
when: searchBar.text.length !== 0
|
||||
value: false
|
||||
restoreMode: Binding.RestoreBindingOrValue
|
||||
}
|
||||
}
|
||||
Text {
|
||||
Layout.topMargin: 137 * DefaultStyle.dp
|
||||
visible: conferenceList.count === 0 || searchBar.text.length != 0
|
||||
Layout.topMargin: 137 * DefaultStyle.dp
|
||||
Layout.fillHeight: true
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
text: mainItem.emptyListText
|
||||
text: qsTr("Aucune réunion%1").arg(searchBar.text.length !== 0 ? " correspondante" : "")
|
||||
font {
|
||||
pixelSize: 16 * DefaultStyle.dp
|
||||
weight: 800 * DefaultStyle.dp
|
||||
}
|
||||
visible: mainItem.showDefaultItem
|
||||
Binding on text {
|
||||
when: searchBar.text.length !== 0
|
||||
value: qsTr("Aucune réunion correspondante")
|
||||
restoreMode: Binding.RestoreBindingOrValue
|
||||
}
|
||||
}
|
||||
MeetingListView {
|
||||
id: conferenceList
|
||||
|
|
@ -189,6 +192,7 @@ AbstractMainPage {
|
|||
Layout.topMargin: 38 * DefaultStyle.dp - 24 * DefaultStyle.dp
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
implicitHeight: contentHeight
|
||||
hoverEnabled: mainItem.leftPanelEnabled
|
||||
highlightFollowsCurrentItem: true
|
||||
preferredHighlightBegin: height/2 - 10
|
||||
|
|
@ -218,6 +222,7 @@ AbstractMainPage {
|
|||
|
||||
}
|
||||
}
|
||||
Item{Layout.fillHeight: true}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -339,7 +344,7 @@ AbstractMainPage {
|
|||
id: editFocusScope
|
||||
property bool isCreation
|
||||
property ConferenceInfoGui conferenceInfoGui
|
||||
width : parent.width
|
||||
width: parent.width
|
||||
height: editLayout.implicitHeight
|
||||
ColumnLayout {
|
||||
id: editLayout
|
||||
|
|
|
|||
Loading…
Reference in a new issue