diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index 194afe424..8de01b8e7 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -551,7 +551,7 @@ Server url ikke konfigureret. icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. Samtalesadresse @@ -2523,6 +2523,11 @@ Klik her: <a href="%1">%1</a> 'Always' : auto download mode description for activated feature without any constraints. + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index c7c4b2fd5..2cba89438 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -551,7 +551,7 @@ Server URL ist nicht konfiguriert. icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. @@ -2523,6 +2523,11 @@ Klicken Sie hier: <a href="%1">%1</a> 'Always' : auto download mode description for activated feature without any constraints. + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index fa5a4f3e4..ba1d5362d 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -2528,6 +2528,11 @@ Click here: <a href="%1">%1</a> 'Always' : auto download mode description for activated feature without any constraints. Always + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + Enable screenshots + SettingsLdap diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 3c6549e69..50eb9cb82 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -551,7 +551,7 @@ URL del servidor no configurada. icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. Dirección de la conferencia @@ -2523,6 +2523,11 @@ Haga clic aquí: <a href="%1">%1 </a> 'Always' : auto download mode description for activated feature without any constraints. + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 8dde76b4f..dcb0de117 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -551,7 +551,7 @@ URL du serveur non configurée. icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. Adresse de la réunion @@ -2523,6 +2523,11 @@ Cliquez ici : <a href="%1">%1</a> 'Always' : auto download mode description for activated feature without any constraints. Toujours + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index be85773ad..266825b11 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -550,7 +550,7 @@ A kiszolgáló URL-je nincs konfigurálva. icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. @@ -2510,6 +2510,11 @@ Kattintson ide: <a href="%1">%1</a> 'Always' : auto download mode description for activated feature without any constraints. + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 660b82ed6..210e540a0 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -551,7 +551,7 @@ URL del server non configurato. icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. Indirizzo conferenza @@ -2523,6 +2523,11 @@ Clicca: <a href="%1">%1</a> 'Always' : auto download mode description for activated feature without any constraints. Sempre + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index eaab506a2..7190aff9e 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -550,7 +550,7 @@ icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. @@ -2510,6 +2510,11 @@ 'Always' : auto download mode description for activated feature without any constraints. + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 64ab6f525..531add7e0 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -552,7 +552,7 @@ Nesukonfigūruotas serverio url. icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. @@ -2536,6 +2536,11 @@ Spustelėkite čia: <a href="%1">%1</a> 'Always' : auto download mode description for activated feature without any constraints. + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index c29864e3f..97c657188 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -551,7 +551,7 @@ URL do servidor não configurado. icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. @@ -2523,6 +2523,11 @@ Clique aqui: <a href="%1">%1 </a> 'Always' : auto download mode description for activated feature without any constraints. + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index b330810fb..dbfcabc99 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -552,7 +552,7 @@ icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. Адрес конференции @@ -2536,6 +2536,11 @@ 'Always' : auto download mode description for activated feature without any constraints. Всегда + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 61869adb9..8e407cff7 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -551,7 +551,7 @@ Serverwebbadressen är inte konfigurerad. icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. @@ -2523,6 +2523,11 @@ Klicka här: <a href="%1">%1</a> 'Always' : auto download mode description for activated feature without any constraints. + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index f6a062033..2de807e62 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -550,7 +550,7 @@ Sunucu url'si yapılandırılmadı. icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. @@ -2510,6 +2510,11 @@ Buraya tıklayın: <a href="%1">%1</a> 'Always' : auto download mode description for activated feature without any constraints. Her zaman + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index aa977364b..2c1c125f2 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -552,7 +552,7 @@ icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. @@ -2536,6 +2536,11 @@ 'Always' : auto download mode description for activated feature without any constraints. + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index e349312e5..71c0cbab3 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -550,7 +550,7 @@ icsconferenceAddressTitle - 'Meeting address' : Title for the conference address. + 'Meeting address' : Title for the meeting address. @@ -2510,6 +2510,11 @@ 'Always' : auto download mode description for activated feature without any constraints. + + callScreenshotEnabledLabel + 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + + SettingsLdap diff --git a/linphone-app/src/components/conference/ConferenceModel.cpp b/linphone-app/src/components/conference/ConferenceModel.cpp index 5c2bced0d..2e1582375 100644 --- a/linphone-app/src/components/conference/ConferenceModel.cpp +++ b/linphone-app/src/components/conference/ConferenceModel.cpp @@ -104,7 +104,7 @@ QDateTime ConferenceModel::getStartDate() const{ } qint64 ConferenceModel::getElapsedSeconds() const { - return getStartDate().secsTo(QDateTime::currentDateTime()); + return mConference->getDuration(); } ParticipantModel* ConferenceModel::getLocalParticipant() const{ diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index 83cbe6df4..ce815e893 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -866,7 +866,16 @@ void SettingsModel::setWaitRegistrationForCall(const bool& status){ mConfig->setInt(UiSection, "call_wait_registration", status); emit waitRegistrationForCallChanged(status); } - + +bool SettingsModel::getIncallScreenshotEnabled() const{ + return !!mConfig->getInt(UiSection, "show_take_screenshot_button_in_call", 0); +} + +void SettingsModel::setIncallScreenshotEnabled(const bool& status){ + mConfig->setInt(UiSection, "show_take_screenshot_button_in_call", status); + emit incallScreenshotEnabledChanged(status); +} + // ----------------------------------------------------------------------------- bool SettingsModel::getConferenceEnabled () const { diff --git a/linphone-app/src/components/settings/SettingsModel.hpp b/linphone-app/src/components/settings/SettingsModel.hpp index 728cbe227..3cf63bb4f 100644 --- a/linphone-app/src/components/settings/SettingsModel.hpp +++ b/linphone-app/src/components/settings/SettingsModel.hpp @@ -128,6 +128,7 @@ class SettingsModel : public QObject { Q_PROPERTY(bool waitRegistrationForCall READ getWaitRegistrationForCall WRITE setWaitRegistrationForCall NOTIFY waitRegistrationForCallChanged)// Allow call only if the current proxy has been registered + Q_PROPERTY(bool incallScreenshotEnabled READ getIncallScreenshotEnabled WRITE setIncallScreenshotEnabled NOTIFY incallScreenshotEnabledChanged) Q_PROPERTY(bool conferenceEnabled READ getConferenceEnabled WRITE setConferenceEnabled NOTIFY conferenceEnabledChanged) Q_PROPERTY(bool videoConferenceEnabled READ getVideoConferenceEnabled NOTIFY videoConferenceEnabledChanged) @@ -429,7 +430,10 @@ public: void setHideEmptyChatRooms(const bool& data); bool getWaitRegistrationForCall() const; - void setWaitRegistrationForCall(const bool& data); + void setWaitRegistrationForCall(const bool& status); + + bool getIncallScreenshotEnabled() const; + void setIncallScreenshotEnabled(const bool& status); bool getGroupChatEnabled()const; @@ -716,6 +720,7 @@ signals: void groupChatEnabledChanged(); void hideEmptyChatRoomsChanged (bool status); void waitRegistrationForCallChanged (bool status); + void incallScreenshotEnabledChanged(bool status); void conferenceEnabledChanged (bool status); void videoConferenceEnabledChanged (); diff --git a/linphone-app/ui/views/App/Calls/Incall.qml b/linphone-app/ui/views/App/Calls/Incall.qml index 23d8c1a14..06bbd56fe 100644 --- a/linphone-app/ui/views/App/Calls/Incall.qml +++ b/linphone-app/ui/views/App/Calls/Incall.qml @@ -269,7 +269,7 @@ Rectangle { isCustom: true backgroundRadius: width/2 colorSet: IncallStyle.buttons.screenshot - visible: mainItem.callModel.snapshotEnabled && mainItem.isReady + visible: SettingsModel.incallScreenshotEnabled && mainItem.isReady && mainItem.callModel && mainItem.callModel.snapshotEnabled onClicked: mainItem.callModel.takeSnapshot() //: 'Take Snapshot' : Tooltip for takking snapshot. tooltipText: qsTr('incallSnapshotTooltip') diff --git a/linphone-app/ui/views/App/Calls/IncallFullscreen.qml b/linphone-app/ui/views/App/Calls/IncallFullscreen.qml index 60fcae72f..67852707f 100644 --- a/linphone-app/ui/views/App/Calls/IncallFullscreen.qml +++ b/linphone-app/ui/views/App/Calls/IncallFullscreen.qml @@ -236,7 +236,7 @@ Window { isCustom: true backgroundRadius: width/2 colorSet: IncallStyle.buttons.screenshot - visible: conference.callModel && conference.callModel.snapshotEnabled + visible: SettingsModel.incallScreenshotEnabled && conference.callModel && conference.callModel.snapshotEnabled onClicked: conference.callModel && conference.callModel.takeSnapshot() //: 'Take Snapshot' : Tooltip for takking snapshot. tooltipText: qsTr('incallSnapshotTooltip') diff --git a/linphone-app/ui/views/App/Settings/SettingsCallsChat.qml b/linphone-app/ui/views/App/Settings/SettingsCallsChat.qml index 184df8046..dc933268f 100644 --- a/linphone-app/ui/views/App/Settings/SettingsCallsChat.qml +++ b/linphone-app/ui/views/App/Settings/SettingsCallsChat.qml @@ -203,7 +203,18 @@ TabContainer { onClicked: SettingsModel.automaticallyRecordCalls = !checked } } - + } + FormLine { + FormGroup { + //: 'Enable screenshots' : Label on switch to choose if we can take screenshots while being in call. + label: qsTr('callScreenshotEnabledLabel') + + Switch { + checked: SettingsModel.incallScreenshotEnabled + + onClicked: SettingsModel.incallScreenshotEnabled = !checked + } + } } }