Skip to content
Snippets Groups Projects
Commit 9b2dbb64 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

misc: fix build without webengine

Change-Id: I2511cd89e1ce7f60424f69ab6576d7fb992dd58c
GitLab: #881
parent 9e4f5a19
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,6 @@ import QtQuick.Controls ...@@ -20,7 +20,6 @@ import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform import Qt.labs.platform
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import QtWebEngine
import net.jami.Models 1.1 import net.jami.Models 1.1
import net.jami.Adapters 1.1 import net.jami.Adapters 1.1
......
...@@ -19,7 +19,6 @@ import QtQuick.Controls ...@@ -19,7 +19,6 @@ import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform import Qt.labs.platform
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import QtWebEngine
import net.jami.Models 1.1 import net.jami.Models 1.1
import net.jami.Adapters 1.1 import net.jami.Adapters 1.1
......
...@@ -19,7 +19,6 @@ import QtQuick.Controls ...@@ -19,7 +19,6 @@ import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform import Qt.labs.platform
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import QtWebEngine
import net.jami.Models 1.1 import net.jami.Models 1.1
import net.jami.Adapters 1.1 import net.jami.Adapters 1.1
...@@ -92,59 +91,17 @@ Component { ...@@ -92,59 +91,17 @@ Component {
} }
Component { Component {
id: avMediaComp id: avMediaComp
Loader { Loader {
property real msgRadius: 20 Component.onCompleted: {
var qml = WITH_WEBENGINE ?
Rectangle { "qrc:/webengine/VideoPreview.qml" :
id: videoAudioRect "qrc:/nowebengine/VideoPreview.qml"
color: JamiTheme.secondaryBackgroundColor setSource( qml, { isVideo: mediaInfo.isVideo, html:mediaInfo.html } )
anchors.fill: parent
WebEngineView {
id: wev
property bool isVideo: mediaInfo.isVideo
property string html: mediaInfo.html
anchors.fill: parent
anchors.verticalCenter: videoAudioRect.verticalCenter
backgroundColor: JamiTheme.secondaryBackgroundColor
anchors.topMargin: isVideo? 0 : wev.implicitHeight / 2
settings.fullScreenSupportEnabled: isVideo
settings.javascriptCanOpenWindows: false
Component.onCompleted: loadHtml(html, 'file://')
onFullScreenRequested: function(request) {
if (request.toggleOn) {
layoutManager.pushFullScreenItem(
this,
videoAudioRect,
null,
function() { wev.fullScreenCancelled() })
} else if (!request.toggleOn) {
layoutManager.removeFullScreenItem(this)
}
request.accept()
}
}
layer.enabled: true
layer.effect: OpacityMask {
maskSource: Item {
width: videoAudioRect.width
height: videoAudioRect.height
Rectangle {
anchors.centerIn: parent
width: videoAudioRect.width
height: videoAudioRect.height
radius: JamiTheme.swarmDetailsPageDocumentsMediaRadius
}
}
}
} }
property real msgRadius: 20
} }
} }
Component { Component {
id: imageMediaComp id: imageMediaComp
......
...@@ -21,7 +21,6 @@ import QtQuick.Controls ...@@ -21,7 +21,6 @@ import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform import Qt.labs.platform
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import QtWebEngine
import net.jami.Models 1.1 import net.jami.Models 1.1
import net.jami.Adapters 1.1 import net.jami.Adapters 1.1
......
/*
* Copyright (C) 2022 Savoir-faire Linux Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
Rectangle {
property var mediaInfo: undefined
}
\ No newline at end of file
/*
* Copyright (C) 2022 Savoir-faire Linux Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick
import QtWebEngine
import Qt5Compat.GraphicalEffects
import net.jami.Constants 1.1
Rectangle {
id: root
color: JamiTheme.secondaryBackgroundColor
anchors.fill: parent
property bool isVideo: false
property string html: ""
WebEngineView {
id: wev
anchors.fill: parent
anchors.verticalCenter: root.verticalCenter
backgroundColor: JamiTheme.secondaryBackgroundColor
anchors.topMargin: root.isVideo? 0 : wev.implicitHeight / 2
settings.fullScreenSupportEnabled: root.isVideo
settings.javascriptCanOpenWindows: false
Component.onCompleted: loadHtml(root.html, 'file://')
onFullScreenRequested: function(request) {
if (request.toggleOn) {
layoutManager.pushFullScreenItem(
this,
root,
null,
function() { wev.fullScreenCancelled() })
} else if (!request.toggleOn) {
layoutManager.removeFullScreenItem(this)
}
request.accept()
}
}
layer.enabled: true
layer.effect: OpacityMask {
maskSource: Item {
width: root.width
height: root.height
Rectangle {
anchors.centerIn: parent
width: root.width
height: root.height
radius: JamiTheme.swarmDetailsPageDocumentsMediaRadius
}
}
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment