applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Revert "Merge pull request #239 from calamares/qtwebengine""

Browse source 
This reverts commit 8806bb67ac.
This commit is contained in:
Teo Mrnjavac 2016-03-29 10:22:58 +02:00
parent 3a6eb3b790
commit 3323e3c8c0
4 changed files with 69 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/modules/webview/CMakeLists.txt
View file

@ -1,11 +1,42 @@
find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebKit WebKitWidgets )
list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
${PROJECT_BINARY_DIR}/src/libcalamaresui
)
list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
calamaresui
)
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui
${QT_QTWEBKIT_INCLUDE_DIR} )
if ( Qt5Core_VERSION VERSION_LESS 5.6 )
find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebKit WebKitWidgets )
list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
${QT_QTWEBKIT_INCLUDE_DIR}
)
list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
Qt5::WebKit
Qt5::WebKitWidgets
)
set( WEBVIEW_WITH_WEBKIT 1 )
else()
find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets )
list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
${QT_QTWEBENGINE_INCLUDE_DIR}
)
list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
Qt5::WebEngine
Qt5::WebEngineWidgets
)
set( WEBVIEW_WITH_WEBENGINE 1 )
endif()
include_directories( ${CALA_WEBVIEW_INCLUDE_DIRECTORIES} )
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules )
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h )
calamares_add_plugin( webview
TYPE viewmodule
@ -13,8 +44,6 @@ calamares_add_plugin( webview
SOURCES
WebViewStep.cpp
LINK_LIBRARIES
calamaresui
Qt5::WebKit
Qt5::WebKitWidgets
${CALA_WEBVIEW_LINK_LIBRARIES}
SHARED_LIB
)

7
src/modules/webview/WebViewConfig.h.in Normal file
View file

@ -0,0 +1,7 @@
#ifndef CALAMARESWEBVIEWCONFIG_H
#define CALAMARESWEBVIEWCONFIG_H
#cmakedefine WEBVIEW_WITH_WEBENGINE
#cmakedefine WEBVIEW_WITH_WEBKIT
#endif // CALAMARESWEBVIEWCONFIG_H

18
src/modules/webview/WebViewStep.cpp
View file

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2015, Rohan Garg <rohan@garg.io>
* Copyright 2016, Teo Mrnjavac <teo@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -19,7 +20,12 @@
#include "WebViewStep.h"
#include <QVariant>
#ifdef WEBVIEW_WITH_WEBKIT
#include <QWebView>
#else
#include <QWebEngineView>
#endif
CALAMARES_PLUGIN_FACTORY_DEFINITION( WebViewStepFactory, registerPlugin<WebViewStep>(); )
@ -27,7 +33,17 @@ WebViewStep::WebViewStep( QObject* parent )
: Calamares::ViewStep( parent )
{
emit nextStatusChanged( true );
m_view = new QWebView;
m_view = new C_QWEBVIEW();
#ifdef WEBVIEW_WITH_WEBKIT
m_view->settings()->setFontFamily( QWebSettings::StandardFont,
m_view->settings()->
fontFamily( QWebSettings::SansSerifFont ) );
m_view->setRenderHints( QPainter::Antialiasing |
QPainter::TextAntialiasing |
QPainter::HighQualityAntialiasing |
QPainter::SmoothPixmapTransform |
QPainter::NonCosmeticDefaultPen );
#endif
}

13
src/modules/webview/WebViewStep.h
View file

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2015, Rohan Garg <rohan@garg.io>
* Copyright 2016, Teo Mrnjavac <teo@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -19,7 +20,7 @@
#ifndef WEBVIEWPLUGIN_H
#define WEBVIEWPLUGIN_H
#include <QObject>
#include "WebViewConfig.h"
#include <utils/PluginFactory.h>
#include <viewpages/ViewStep.h>
@ -28,7 +29,13 @@
#include <QVariantMap>
class QWebView;
#ifdef WEBVIEW_WITH_WEBKIT
#define C_QWEBVIEW QWebView
#else
#define C_QWEBVIEW QWebEngineView
#endif
class C_QWEBVIEW;
class PLUGINDLLEXPORT WebViewStep : public Calamares::ViewStep
{
@ -57,7 +64,7 @@ public:
void setConfigurationMap( const QVariantMap& configurationMap ) override;
private:
QWebView *m_view;
C_QWEBVIEW *m_view;
QString m_url;
QString m_prettyName;
};