From 2a8a715df609f85c5946097e3016191538cb889d Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Tue, 16 Jun 2020 03:57:06 +0200 Subject: [PATCH] temporary: attempot to display devtools in qt --- contrib/epee/include/string_coding.h | 2 ++ src/gui/qt-daemon/application/mainwindow.cpp | 25 +++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/contrib/epee/include/string_coding.h b/contrib/epee/include/string_coding.h index a12af007..0b125bbd 100644 --- a/contrib/epee/include/string_coding.h +++ b/contrib/epee/include/string_coding.h @@ -37,6 +37,8 @@ #endif #include #endif +#include "warnings.h" + namespace epee { diff --git a/src/gui/qt-daemon/application/mainwindow.cpp b/src/gui/qt-daemon/application/mainwindow.cpp index 731bab30..bb779866 100644 --- a/src/gui/qt-daemon/application/mainwindow.cpp +++ b/src/gui/qt-daemon/application/mainwindow.cpp @@ -101,19 +101,38 @@ MainWindow::MainWindow(): m_backend_stopped_2(false), m_system_shutdown(false) { + + /* m_view = new QWebEngineView(this); m_channel = new QWebChannel(m_view->page()); m_view->page()->setWebChannel(m_channel); #if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) m_view->page()->setDevToolsPage(m_view->page()); #endif + */ + + //temporary + m_view = new QWebEngineView(this); + m_channel = new QWebChannel(m_view->page()); + m_view->page()->setWebChannel(m_channel); + + + QSplitter* pspliter = new QSplitter(Qt::Horizontal); + pspliter->addWidget(m_view); + QWebEngineView* pinspector = new QWebEngineView(); + pspliter->addWidget(pinspector); + pinspector->page()->setInspectedPage(m_view->page()); + + + // register QObjects to be exposed to JavaScript m_channel->registerObject(QStringLiteral("mediator_object"), this); connect(m_view, SIGNAL(loadFinished(bool)), SLOT(on_load_finished(bool))); - setCentralWidget(m_view); + setCentralWidget(pspliter); + //setCentralWidget(m_view); //this->setMouseTracking(true); m_view->page()->settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, true); @@ -363,8 +382,8 @@ bool MainWindow::init(const std::string& html_path) } //---- - this->setContextMenuPolicy(Qt::ContextMenuPolicy::NoContextMenu); - m_view->setContextMenuPolicy(Qt::ContextMenuPolicy::NoContextMenu); + //this->setContextMenuPolicy(Qt::ContextMenuPolicy::NoContextMenu); + //m_view->setContextMenuPolicy(Qt::ContextMenuPolicy::NoContextMenu); return true; CATCH_ENTRY2(false);