From 5b2b0d334ff64c2398129e04f41a58212cb25cdb Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 24 May 2021 17:46:30 +0200 Subject: [PATCH] add webview --- linphone-app/CMakeLists.txt | 2 +- linphone-app/src/app/main.cpp | 4 ++++ .../Main/Assistant/AssistantAbstractView.qml | 4 +++- .../App/Main/Assistant/CreateAppSipAccount.qml | 17 +++++++++++++++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt index 95a900923..7dca4154b 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -90,7 +90,7 @@ if( WIN32) endif() set(CMAKE_INCLUDE_CURRENT_DIR ON)#useful for config.h -set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 Svg LinguistTools Concurrent Network Test) +set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 Svg LinguistTools Concurrent Network Test WebView) if (UNIX AND NOT APPLE) list(APPEND QT5_PACKAGES DBus) endif () diff --git a/linphone-app/src/app/main.cpp b/linphone-app/src/app/main.cpp index 8813e1ca2..d602b035e 100644 --- a/linphone-app/src/app/main.cpp +++ b/linphone-app/src/app/main.cpp @@ -20,18 +20,22 @@ #include "AppController.hpp" #include +#include #ifdef QT_QML_DEBUG #include #endif + // ============================================================================= int main (int argc, char *argv[]) { + QtWebView::initialize(); AppController controller(argc, argv); #ifdef QT_QML_DEBUG QQmlDebuggingEnabler enabler; #endif //QLoggingCategory::setFilterRules("*.debug=true;qml=false"); App *app = controller.getApp(); + if (app->isSecondary()) { qInfo() << QStringLiteral("Running secondary app success. Kill it now."); diff --git a/linphone-app/ui/views/App/Main/Assistant/AssistantAbstractView.qml b/linphone-app/ui/views/App/Main/Assistant/AssistantAbstractView.qml index 7c03b48f7..f993555a3 100644 --- a/linphone-app/ui/views/App/Main/Assistant/AssistantAbstractView.qml +++ b/linphone-app/ui/views/App/Main/Assistant/AssistantAbstractView.qml @@ -20,6 +20,7 @@ Item { property alias title: title.text property bool backEnabled: true + property bool maximized: false // Used to stretch content to fit all the view (the title will be set to top) default property alias _content: content.data @@ -33,6 +34,7 @@ Item { // --------------------------------------------------------------------------- Column { + id:titleBar anchors.centerIn: parent spacing: AssistantAbstractViewStyle.info.spacing @@ -75,7 +77,7 @@ Item { id: content anchors.horizontalCenter: parent.horizontalCenter - height: AssistantAbstractViewStyle.content.height + height: (maximized?view.height - description.height - title.height - buttons.height -titleBar.spacing*3 : AssistantAbstractViewStyle.content.height) width: AssistantAbstractViewStyle.content.width } } diff --git a/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccount.qml index 4d8a83179..d0158c470 100644 --- a/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccount.qml +++ b/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccount.qml @@ -1,4 +1,5 @@ import QtQuick 2.7 +import QtWebView 1.15 import Common 1.0 @@ -9,11 +10,23 @@ import App.Styles 1.0 AssistantAbstractView { description: qsTr('createAppSipAccountDescription') title: qsTr('createAppSipAccountTitle').replace('%1', Qt.application.name.toUpperCase()) + maximized:true // --------------------------------------------------------------------------- // Menu. // --------------------------------------------------------------------------- - + + WebView{ + anchors.fill:parent + httpUserAgent: 'Linphone Desktop' + //url:'https://www.whatismybrowser.com/detect/what-is-my-user-agent' + url: 'https://subscribe.linphone.org/register' + onLoadingChanged: { + if (loadRequest.errorString) + console.error(loadRequest.errorString); + } + } +/* Column { anchors.centerIn: parent spacing: CreateAppSipAccountStyle.buttons.spacing @@ -36,5 +49,5 @@ AssistantAbstractView { onClicked: assistant.pushView('CreateAppSipAccountWithEmail') } - } + }*/ }