kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Web] Remove deprecated Qt < 5.9 code

Browse Source
This commit is contained in:
Chris Hennes
2021-03-31 13:07:06 -05:00
committed by wmayer
parent 0177f9b9f8
commit 8e6c5946cd
4 changed files with 16 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Web/App/Server.cpp
View File

@@ -114,11 +114,7 @@ AppServer::AppServer(QObject* parent)
{
}
#if QT_VERSION >=0x050000
void AppServer::incomingConnection(qintptr socket)
#else
void AppServer::incomingConnection(int socket)
#endif
{
QTcpSocket* s = new QTcpSocket(this);
connect(s, SIGNAL(readyRead()), this, SLOT(readClient()));

4
src/Mod/Web/App/Server.h
View File

@@ -85,11 +85,7 @@ public:
AppServer(QObject* parent = 0);
static std::string runPython(const QByteArray&);
#if QT_VERSION >=0x050000
void incomingConnection(qintptr socket);
#else
void incomingConnection(int socket);
#endif
protected:
void customEvent(QEvent* e);

51
src/Mod/Web/Gui/BrowserView.cpp
View File

@@ -52,7 +52,7 @@
#endif
#if QT_VERSION >= 0x050700 && defined(QTWEBENGINE)
#if defined(QTWEBENGINE)
# include <QWebEnginePage>
# include <QWebEngineView>
# include <QWebEngineSettings>
@@ -60,20 +60,16 @@
# include <QWebEngineContextMenuData>
# include <QWebEngineUrlRequestInterceptor>
# include <QWebEngineUrlRequestInfo>
# define QWEBVIEW QWebEngineView
# define QWEBPAGE QWebEnginePage
#elif QT_VERSION >= 0x040400 && defined(QTWEBKIT)
#elif defined(QTWEBKIT)
# include <QWebFrame>
# include <QWebView>
# include <QWebSettings>
# include <QNetworkAccessManager>
# define QWEBVIEW QWebView
# define QWEBPAGE QWebPage
using QWebEngineView = QWebView;
using QWebEnginePage = QWebPage;
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
# include <QScreen>
#endif
#include <QScreen>
#include <QLatin1String>
#include <QRegExp>
@@ -237,14 +233,10 @@ Py::Object BrowserViewPy::setHtml(const Py::Tuple& args)
*/
WebView::WebView(QWidget *parent)
: QWEBVIEW(parent)
: QWebEngineView(parent)
{
// Increase html font size for high DPI displays
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
QRect mainScreenSize = QApplication::primaryScreen()->geometry();
#else
QRect mainScreenSize = QApplication::desktop()->screenGeometry();
#endif
if (mainScreenSize.width() > 1920){
setTextSizeMultiplier (mainScreenSize.width()/1920.0);
}
@@ -270,23 +262,19 @@ void WebView::mousePressEvent(QMouseEvent *event)
return;
}
}
QWEBVIEW::mousePressEvent(event);
QWebEngineView::mousePressEvent(event);
}
#endif
void WebView::wheelEvent(QWheelEvent *event)
{
if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
qreal factor = zoomFactor() + (-event->angleDelta().y() / 800.0);
#else
qreal factor = zoomFactor() + (-event->delta() / 800.0);
#endif
setZoomFactor(factor);
event->accept();
return;
}
QWEBVIEW::wheelEvent(event);
QWebEngineView::wheelEvent(event);
}
void WebView::contextMenuEvent(QContextMenuEvent *event)
@@ -313,12 +301,12 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
connect (newAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
signalMapper->setMapping(newAction, WebAction::OpenLinkInNewWindow);
menu.addAction(pageAction(QWEBPAGE::DownloadLinkToDisk));
menu.addAction(pageAction(QWEBPAGE::CopyLinkToClipboard));
menu.addAction(pageAction(QWebEnginePage::DownloadLinkToDisk));
menu.addAction(pageAction(QWebEnginePage::CopyLinkToClipboard));
menu.exec(mapToGlobal(event->pos()));
return;
}
#if QT_VERSION >= 0x050800 && defined(QTWEBENGINE)
#if defined(QTWEBENGINE)
else { // for view source
// QWebEngine caches standardContextMenu, guard so we only add signalmapper once
static bool firstRun = true;
@@ -352,7 +340,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
menu->exec(event->globalPos());
}
#endif
QWEBVIEW::contextMenuEvent(event);
QWebEngineView::contextMenuEvent(event);
}
void WebView::triggerContextMenuAction(int id)
@@ -445,10 +433,7 @@ BrowserView::BrowserView(QWidget* parent)
#endif
view->settings()->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, true);
#if QT_VERSION >= 0x050800
view->settings()->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled,false);
#endif
connect(view->page()->profile(), SIGNAL(downloadRequested(QWebEngineDownloadItem*)),
this, SLOT(onDownloadRequested(QWebEngineDownloadItem*)));
@@ -498,11 +483,7 @@ void BrowserView::onLinkClicked (const QUrl & url)
// query
QString q;
if (url.hasQuery())
#if QT_VERSION >= 0x050000
q = url.query();
#else
q = QString::fromAscii(url.encodedQuery().data());
#endif
//QString fragment = url. fragment();
@@ -541,11 +522,7 @@ void BrowserView::onLinkClicked (const QUrl & url)
}
// Gui::Command::doCommand(Gui::Command::Gui,"execfile('%s')",(const char*) fi.absoluteFilePath(). toLocal8Bit());
QString filename = Base::Tools::escapeEncodeFilename(fi.absoluteFilePath());
#if PY_MAJOR_VERSION < 3
Gui::Command::doCommand(Gui::Command::Gui,"exec(open(unicode('%s', 'utf-8')).read())",(const char*) filename.toUtf8());
#else
Gui::Command::doCommand(Gui::Command::Gui,"with open('%s') as file:\n\texec(file.read())",(const char*) filename.toUtf8());
#endif
}
catch (const Base::Exception& e) {
QMessageBox::critical(this, tr("Error"), QString::fromUtf8(e.what()));
@@ -801,9 +778,9 @@ bool BrowserView::onMsg(const char* pMsg,const char** )
bool BrowserView::onHasMsg(const char* pMsg) const
{
if (strcmp(pMsg,"Back")==0)
return view->page()->action(QWEBPAGE::Back)->isEnabled();
return view->page()->action(QWebEnginePage::Back)->isEnabled();
if (strcmp(pMsg,"Next")==0)
return view->page()->action(QWEBPAGE::Forward)->isEnabled();
return view->page()->action(QWebEnginePage::Forward)->isEnabled();
if (strcmp(pMsg,"Refresh")==0) return !isLoading;
if (strcmp(pMsg,"Stop")==0) return isLoading;
if (strcmp(pMsg,"ZoomIn")==0) return true;

4
src/Mod/Web/Gui/BrowserView.h
View File

@@ -29,12 +29,12 @@
#include <Gui/Window.h>
#include <QLineEdit>
#if QT_VERSION >= 0x050700 && defined(QTWEBENGINE)
#if defined(QTWEBENGINE)
#include <QWebEngineView>
namespace WebGui {
class WebEngineUrlRequestInterceptor;
};
#elif QT_VERSION >= 0x040400 && defined(QTWEBKIT)
#elif defined(QTWEBKIT)
#include <QWebView>
#endif