mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-20 21:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(src/components/camera/Camera): supports screenshots

Browse source
This commit is contained in:
Ronan Abhamon 2017-02-01 16:29:16 +01:00
parent e6fbc72e4d
commit 45e15a03e9
6 changed files with 78 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
linphone-desktop/assets/languages/en.ts
View file

@ -357,6 +357,13 @@ Server url not configured.</translation>
<translation>Display tooltips to discover Linphone Desktop</translation>
</message>
</context>
<context>
<name>Incall</name>
<message>
<source>saveScreenshotTitle</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>

7
linphone-desktop/assets/languages/fr.ts
View file

@ -345,6 +345,13 @@ Url du serveur non configurée.</translation>
<translation>Afficher les tooltips pour découvrir Linphone Desktop</translation>
</message>
</context>
<context>
<name>Incall</name>
<message>
<source>saveScreenshotTitle</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>IncomingCall</name>
<message>

40
linphone-desktop/src/components/camera/Camera.cpp
View file

@ -1,8 +1,8 @@
#include "Camera.hpp"
#include <QFileInfo>
#include <QOpenGLFunctions>
#include <QOpenGLTexture>
#include "../../utils.hpp"
#include "../core/CoreManager.hpp"
#include "Camera.hpp"
@ -52,15 +52,10 @@ QOpenGLFramebufferObject *CameraRenderer::createFramebufferObject (const QSize &
context_info->width = size.width();
context_info->height = size.height();
shared_ptr<linphone::Call> linphone_call = m_camera->m_call->getLinphoneCall();
linphone::CallState state = linphone_call->getState();
if (state == linphone::CallStateConnected || state == linphone::CallStateStreamsRunning) {
if (m_camera->m_is_preview)
CoreManager::getInstance()->getCore()->setNativePreviewWindowId(context_info);
else
linphone_call->setNativeVideoWindowId(context_info);
}
if (m_camera->m_is_preview)
CoreManager::getInstance()->getCore()->setNativePreviewWindowId(context_info);
else
m_camera->m_call->getLinphoneCall()->setNativeVideoWindowId(context_info);
return new QOpenGLFramebufferObject(size, format);
}
@ -95,9 +90,30 @@ Camera::~Camera () {
}
QQuickFramebufferObject::Renderer *Camera::createRenderer () const {
return new CameraRenderer(this);
m_renderer = new CameraRenderer(this);
return m_renderer;
}
// -----------------------------------------------------------------------------
void Camera::takeScreenshot () {
m_screenshot = m_renderer->framebufferObject()->toImage();
}
void Camera::saveScreenshot (const QString &path) {
QString formatted_path = path.startsWith("file://") ? path.mid(sizeof("file://") - 1) : path;
QFileInfo info(formatted_path);
QString extension = info.suffix();
m_screenshot.save(
formatted_path,
extension.size() > 0 ? ::Utils::qStringToLinphoneString(extension).c_str() : "jpg",
100
);
}
// -----------------------------------------------------------------------------
void Camera::mousePressEvent (QMouseEvent *) {
setFocus(true);
}

13
linphone-desktop/src/components/camera/Camera.hpp
View file

@ -1,17 +1,20 @@
#ifndef CAMERA_H_
#define CAMERA_H_
#include "../call/CallModel.hpp"
#include <QImage>
#include <QOpenGLFramebufferObject>
#include <QQuickFramebufferObject>
#include "../call/CallModel.hpp"
// =============================================================================
class Camera;
struct ContextInfo;
class CameraRenderer : public QQuickFramebufferObject::Renderer {
friend class Camera;
public:
CameraRenderer (const Camera *camera);
~CameraRenderer () = default;
@ -40,6 +43,9 @@ public:
QQuickFramebufferObject::Renderer *createRenderer () const override;
Q_INVOKABLE void takeScreenshot ();
Q_INVOKABLE void saveScreenshot (const QString &path);
signals:
void callChanged (CallModel *call);
void isPreviewChanged (bool is_preview);
@ -54,6 +60,9 @@ private:
bool m_is_preview = false;
CallModel *m_call = nullptr;
ContextInfo *m_context_info;
mutable CameraRenderer *m_renderer;
QImage m_screenshot;
};
#endif // CAMERA_H_

2
linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml
View file

@ -183,8 +183,8 @@ Row {
id: fileDialog
folder: shortcuts.home
title: qsTr('downloadFileTitle')
selectExisting: false
title: qsTr('downloadFileTitle')
onAccepted: proxyModel.downloadFile(index, fileUrl)
}

26
linphone-desktop/ui/views/App/Calls/Incall.qml
View file

@ -1,4 +1,5 @@
import QtQuick 2.7
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.3
import Common 1.0
@ -84,13 +85,31 @@ Rectangle {
id: cameraActions
anchors.right: parent.right
active: Boolean(call.videoInputEnabled)
active: Boolean(call.videoInputEnabled) && call.status !== CallModel.CallStatusEnded
sourceComponent: ActionBar {
iconSize: CallStyle.header.iconSize
ActionButton {
icon: 'screenshot'
FileDialog {
id: fileDialog
folder: shortcuts.home
selectExisting: false
title: qsTr('saveScreenshotTitle')
onAccepted: cameraLoader.item.saveScreenshot(fileUrl)
}
onClicked: {
// TODO: At this moment, FileDialog does not support default filename, use this name in the future:
//'linphone ' + ((new Date()).toLocaleString(Qt.locale(), 'yyyy-MM-dd hh:mm:ss')) + '.jpg'
cameraLoader.item.takeScreenshot()
fileDialog.open()
}
}
ActionButton {
@ -186,8 +205,9 @@ Rectangle {
}
Loader {
anchors.centerIn: parent
id: cameraLoader
anchors.centerIn: parent
sourceComponent: call.videoInputEnabled ? camera : avatar
}
}
@ -200,6 +220,8 @@ Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: CallStyle.actionArea.height
visible: call.status !== CallModel.CallStatusEnded
GridLayout {
anchors {
left: parent.left