diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index f3879c2d2..f017455bb 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -1070,6 +1070,11 @@ Server url ikke konfigureret. 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index 1545fc759..972da8377 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -1070,6 +1070,11 @@ Server URL ist nicht konfiguriert. 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 0f4bc20c7..c73ebc283 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -1070,6 +1070,11 @@ Server URL not configured. 'Add contact' : Item menu to add the contact to address book Add contact + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + Schedule a meeting + CreateAppSipAccount diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index b6094b842..56cb8e49e 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -1070,6 +1070,11 @@ URL del servidor no configurada. 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 5c269161b..eb1788e41 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -1070,6 +1070,11 @@ URL du serveur non configurée. 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 16359799e..452e2e128 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -1064,6 +1064,11 @@ A kiszolgáló URL-je nincs konfigurálva. 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index a8def0c44..1e87818e8 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -1070,6 +1070,11 @@ URL del server non configurato. 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index d5f58b6b1..362c176ba 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -1064,6 +1064,11 @@ 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 9ccc1b330..8b41b0138 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -1076,6 +1076,11 @@ Nesukonfigūruotas serverio url. 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index 6018f8a6f..2ba4126dd 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -1070,6 +1070,11 @@ URL do servidor não configurado. 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index ae52dcd2e..b02abe23e 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -1076,6 +1076,11 @@ 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 52d715ed3..c6f03fcc4 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -1070,6 +1070,11 @@ Serverwebbadressen är inte konfigurerad. 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index ea5fabd1b..2a29e04c1 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -1064,6 +1064,11 @@ Sunucu url'si yapılandırılmadı. 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index e526fd4b0..46946d21b 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -1076,6 +1076,11 @@ 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 8f14bdb70..819661abf 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -1064,6 +1064,11 @@ 'Add contact' : Item menu to add the contact to address book + + conversationMenuScheduleMeeting + 'Schedule a meeting' : Item menu to schedule a meeting with the chat participants. + + CreateAppSipAccount diff --git a/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml index 0c9ffa5ec..b20229906 100644 --- a/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml @@ -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' diff --git a/linphone-app/ui/views/App/Dialog/NewConference.qml b/linphone-app/ui/views/App/Dialog/NewConference.qml index 50b23fa8f..5c96db1a5 100644 --- a/linphone-app/ui/views/App/Dialog/NewConference.qml +++ b/linphone-app/ui/views/App/Dialog/NewConference.qml @@ -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: { diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml index 34a3cfc2c..49e2403ac 100644 --- a/linphone-app/ui/views/App/Main/Conversation.qml +++ b/linphone-app/ui/views/App/Main/Conversation.qml @@ -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