mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-30 02:19:23 +00:00
Option to schedule a meeting from a group chat.
This commit is contained in:
parent
1eb9f130eb
commit
b080e56823
18 changed files with 115 additions and 3 deletions
|
|
@ -1070,6 +1070,11 @@ Server url ikke konfigureret.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1070,6 +1070,11 @@ Server URL ist nicht konfiguriert.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1070,6 +1070,11 @@ Server URL not configured.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation>Add contact</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation>Schedule a meeting</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1070,6 +1070,11 @@ URL del servidor no configurada.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1070,6 +1070,11 @@ URL du serveur non configurée.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1064,6 +1064,11 @@ A kiszolgáló URL-je nincs konfigurálva.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1070,6 +1070,11 @@ URL del server non configurato.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1064,6 +1064,11 @@
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1076,6 +1076,11 @@ Nesukonfigūruotas serverio url.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1070,6 +1070,11 @@ URL do servidor não configurado.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1076,6 +1076,11 @@
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1070,6 +1070,11 @@ Serverwebbadressen är inte konfigurerad.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1064,6 +1064,11 @@ Sunucu url'si yapılandırılmadı.</translation>
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1076,6 +1076,11 @@
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -1064,6 +1064,11 @@
|
|||
<extracomment>'Add contact' : Item menu to add the contact to address book</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conversationMenuScheduleMeeting</source>
|
||||
<extracomment>'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>CreateAppSipAccount</name>
|
||||
|
|
|
|||
|
|
@ -44,6 +44,10 @@ QtObject {
|
|||
property QtObject ephemeral: QtObject {
|
||||
property string icon : 'menu_ephemeral_custom'
|
||||
}
|
||||
property QtObject scheduleMeeting: QtObject {
|
||||
property string icon : 'meetings_custom'
|
||||
}
|
||||
|
||||
property QtObject contact: QtObject {
|
||||
property string add : 'contact_add_custom'
|
||||
property string view : 'contact_view_custom'
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ DialogPlus {
|
|||
onConferenceInfoModelChanged: selectedParticipants.setAddresses(conferenceInfoModel)
|
||||
property bool forceSchedule : false
|
||||
property int creationState: 0// -1=error, 0=Idle, 1=processing, 2=processed
|
||||
|
||||
Connections{
|
||||
target: conferenceInfoModel
|
||||
onConferenceCreated: {
|
||||
|
|
|
|||
|
|
@ -394,10 +394,10 @@ ColumnLayout {
|
|||
y:mainBar.height
|
||||
menuStyle : MenuStyle.aux2
|
||||
|
||||
property bool showGroupInfo: chatRoomModel & !chatRoomModel.isOneToOne
|
||||
property bool showGroupInfo: chatRoomModel && !chatRoomModel.isOneToOne
|
||||
property bool showDevices : conversation.securityLevel != 1
|
||||
property bool showEphemerals: conversation.securityLevel != 1 // && chatRoomModel.isMeAdmin // Uncomment when session mode will be implemented
|
||||
|
||||
property bool showScheduleMeeting: showGroupInfo && SettingsModel.conferenceEnabled
|
||||
|
||||
MenuItem{
|
||||
id:contactMenu
|
||||
|
|
@ -484,7 +484,39 @@ ColumnLayout {
|
|||
height:visible ? 1 : 0
|
||||
width:parent.width
|
||||
color: ConversationStyle.menu.separatorColor
|
||||
visible: deleteMenuItem.visible && (contactMenu.visible || groupInfoMenu.visible || devicesMenuItem.visible || ephemeralMenuItem.visible)
|
||||
visible: scheduleMeetingMenuItem.visible && (contactMenu.visible || groupInfoMenu.visible || devicesMenuItem.visible || ephemeralMenuItem.visible)
|
||||
}
|
||||
MenuItem{
|
||||
id: scheduleMeetingMenuItem
|
||||
property ConferenceInfoModel conferenceInfoModel: ConferenceInfoModel{}
|
||||
|
||||
//: 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants.
|
||||
text: qsTr('conversationMenuScheduleMeeting')
|
||||
iconMenu: MenuItemStyle.scheduleMeeting.icon
|
||||
iconSizeMenu: 40
|
||||
menuItemStyle : MenuItemStyle.aux2
|
||||
visible: conversationMenu.showScheduleMeeting
|
||||
onClicked: {
|
||||
conferenceInfoModel.isScheduled = true
|
||||
conferenceInfoModel.subject = chatRoomModel.subject
|
||||
conferenceInfoModel.setParticipants(conversation.chatRoomModel.participants)
|
||||
|
||||
window.detachVirtualWindow()
|
||||
window.attachVirtualWindow(Utils.buildAppDialogUri('NewConference')
|
||||
,{conferenceInfoModel: scheduleMeetingMenuItem.conferenceInfoModel}
|
||||
, function (status) {
|
||||
if( status){
|
||||
setView('Conferences')
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle{
|
||||
height:visible ? 1 : 0
|
||||
width:parent.width
|
||||
color: ConversationStyle.menu.separatorColor
|
||||
visible: deleteMenuItem.visible && (contactMenu.visible || groupInfoMenu.visible || devicesMenuItem.visible || ephemeralMenuItem.visible || scheduleMeetingMenuItem.visible)
|
||||
}
|
||||
MenuItem{
|
||||
id: deleteMenuItem
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue