add today button meeting list #LINQT-1886
This commit is contained in:
parent
1ddfae8802
commit
e3aebd3c00
6 changed files with 42 additions and 19 deletions
1
Linphone/data/image/calendar.svg
Normal file
1
Linphone/data/image/calendar.svg
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="#000000" viewBox="0 0 256 256"><path d="M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM72,48v8a8,8,0,0,0,16,0V48h80v8a8,8,0,0,0,16,0V48h24V80H48V48ZM208,208H48V96H208V208Zm-96-88v64a8,8,0,0,1-16,0V132.94l-4.42,2.22a8,8,0,0,1-7.16-14.32l16-8A8,8,0,0,1,112,120Zm59.16,30.45L152,176h16a8,8,0,0,1,0,16H136a8,8,0,0,1-6.4-12.8l28.78-38.37A8,8,0,1,0,145.07,132a8,8,0,1,1-13.85-8A24,24,0,0,1,176,136,23.76,23.76,0,0,1,171.16,150.45Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 604 B |
|
|
@ -245,7 +245,7 @@ ListView {
|
||||||
EffectImage {
|
EffectImage {
|
||||||
visible: modelData != undefined && modelData.core.lastMessage && modelData.core.lastMessage.core.isCalendarInvite && !remoteComposingInfo.visible
|
visible: modelData != undefined && modelData.core.lastMessage && modelData.core.lastMessage.core.isCalendarInvite && !remoteComposingInfo.visible
|
||||||
fillMode: Image.PreserveAspectFit
|
fillMode: Image.PreserveAspectFit
|
||||||
imageSource: AppIcons.calendar
|
imageSource: AppIcons.calendarBlank
|
||||||
colorizationColor: DefaultStyle.main2_500
|
colorizationColor: DefaultStyle.main2_500
|
||||||
Layout.preferredHeight: Math.round(14 * DefaultStyle.dp)
|
Layout.preferredHeight: Math.round(14 * DefaultStyle.dp)
|
||||||
Layout.preferredWidth: Math.round(14 * DefaultStyle.dp)
|
Layout.preferredWidth: Math.round(14 * DefaultStyle.dp)
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,16 @@ ListView {
|
||||||
mainItem.selectedConference = null
|
mainItem.selectedConference = null
|
||||||
mainItem.currentIndex = -1
|
mainItem.currentIndex = -1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function scrollToCurrentDate() {
|
||||||
|
currentIndex = -1
|
||||||
|
confInfoProxy.selectData(confInfoProxy.getCurrentDateConfInfo())
|
||||||
|
moveToCurrentItem()
|
||||||
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------
|
//----------------------------------------------------------------
|
||||||
function moveToCurrentItem(){
|
function moveToCurrentItem(){
|
||||||
if( mainItem.currentIndex >= 0)
|
if(mainItem.currentIndex >= 0)
|
||||||
mainItem.positionViewAtIndex(mainItem.currentIndex, ListView.Contain)
|
mainItem.positionViewAtIndex(mainItem.currentIndex, ListView.Contain)
|
||||||
}
|
}
|
||||||
onCurrentItemChanged: {
|
onCurrentItemChanged: {
|
||||||
|
|
|
||||||
|
|
@ -331,7 +331,7 @@ AbstractSettingsLayout {
|
||||||
EffectImage {
|
EffectImage {
|
||||||
Layout.preferredWidth: Math.round(20 * DefaultStyle.dp)
|
Layout.preferredWidth: Math.round(20 * DefaultStyle.dp)
|
||||||
Layout.preferredHeight: Math.round(20 * DefaultStyle.dp)
|
Layout.preferredHeight: Math.round(20 * DefaultStyle.dp)
|
||||||
imageSource: AppIcons.calendar
|
imageSource: AppIcons.calendarBlank
|
||||||
colorizationColor: DefaultStyle.main2_600
|
colorizationColor: DefaultStyle.main2_600
|
||||||
fillMode: Image.PreserveAspectFit
|
fillMode: Image.PreserveAspectFit
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -184,32 +184,47 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
Item{Layout.fillWidth: true}
|
Item{Layout.fillWidth: true}
|
||||||
Button {
|
Button {
|
||||||
|
id: newConfButton
|
||||||
style: ButtonStyle.noBackground
|
style: ButtonStyle.noBackground
|
||||||
icon.source: AppIcons.plusCircle
|
icon.source: AppIcons.plusCircle
|
||||||
Layout.preferredWidth: Math.round(28 * DefaultStyle.dp)
|
Layout.preferredWidth: Math.round(28 * DefaultStyle.dp)
|
||||||
Layout.preferredHeight: Math.round(28 * DefaultStyle.dp)
|
Layout.preferredHeight: Math.round(28 * DefaultStyle.dp)
|
||||||
icon.width: Math.round(28 * DefaultStyle.dp)
|
icon.width: Math.round(28 * DefaultStyle.dp)
|
||||||
icon.height: Math.round(28 * DefaultStyle.dp)
|
icon.height: Math.round(28 * DefaultStyle.dp)
|
||||||
|
KeyNavigation.down: scrollToCurrentDateButton
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainItem.editConference()
|
mainItem.editConference()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SearchBar {
|
RowLayout {
|
||||||
id: searchBar
|
id: scrollToCurrentDateButton
|
||||||
Layout.fillWidth: true
|
visible: conŒferenceList.count !== 0 || text.length !== 0
|
||||||
Layout.topMargin: Math.round(18 * DefaultStyle.dp)
|
spacing: Math.round(11 * DefaultStyle.dp)
|
||||||
Layout.rightMargin: Math.round(38 * DefaultStyle.dp)
|
Layout.topMargin: Math.round(18 * DefaultStyle.dp)
|
||||||
//: "Rechercher une réunion"
|
Layout.rightMargin: Math.round(38 * DefaultStyle.dp)
|
||||||
placeholderText: qsTr("meetings_search_hint")
|
KeyNavigation.up: newConfButton
|
||||||
KeyNavigation.up: conferenceList
|
KeyNavigation.down: searchBar
|
||||||
KeyNavigation.down: conferenceList
|
Button {
|
||||||
visible: conferenceList.count !== 0 || text.length !== 0
|
Layout.preferredWidth: Math.round(32 * DefaultStyle.dp)
|
||||||
Binding {
|
Layout.preferredHeight: Math.round(32 * DefaultStyle.dp)
|
||||||
target: mainItem
|
icon.source: AppIcons.calendar
|
||||||
property: "showDefaultItem"
|
style: ButtonStyle.noBackground
|
||||||
when: searchBar.text.length !== 0
|
onClicked: conferenceList.scrollToCurrentDate()
|
||||||
value: false
|
}
|
||||||
|
SearchBar {
|
||||||
|
id: searchBar
|
||||||
|
Layout.fillWidth: true
|
||||||
|
//: "Rechercher une réunion"
|
||||||
|
placeholderText: qsTr("meetings_search_hint")
|
||||||
|
KeyNavigation.up: scrollToCurrentDateButton
|
||||||
|
KeyNavigation.down: conferenceList
|
||||||
|
Binding {
|
||||||
|
target: mainItem
|
||||||
|
property: "showDefaultItem"
|
||||||
|
when: searchBar.text.length !== 0
|
||||||
|
value: false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Text {
|
Text {
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,8 @@ QtObject {
|
||||||
property string cellSignalNone: "image://internal/cell-signal-none.svg"
|
property string cellSignalNone: "image://internal/cell-signal-none.svg"
|
||||||
property string mobile: "image://internal/device-mobile-camera.svg"
|
property string mobile: "image://internal/device-mobile-camera.svg"
|
||||||
property string desktop: "image://internal/desktop.svg"
|
property string desktop: "image://internal/desktop.svg"
|
||||||
property string calendar: "image://internal/calendar-blank.svg"
|
property string calendarBlank: "image://internal/calendar-blank.svg"
|
||||||
|
property string calendar: "image://internal/calendar.svg"
|
||||||
property string bell: "image://internal/bell.svg"
|
property string bell: "image://internal/bell.svg"
|
||||||
property string bellSlash: "image://internal/bell-slash.svg"
|
property string bellSlash: "image://internal/bell-slash.svg"
|
||||||
property string bellDnd: "image://internal/bell-dnd.svg"
|
property string bellDnd: "image://internal/bell-dnd.svg"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue