History

Update webwindow to use datawebview

Ryan Huffman committed 11 years ago

Commit 1193d861 parent 53b5c7e3 files · +12 −15Browse files

Showing the changes to interface/src/scripting/WebWindowClass.cpp (1 of 3 files). Show all

Unified · Split

interface/src/scripting/WebWindowClass.cpp+3−13
@@ -18,9 +18,10 @@ · 17 unmodified lines
1818 #include <QListWidget>
1919
2020 #include "Application.h"
21+#include "ui/DataWebPage.h"
2122 #include "MainWindow.h"
22−#include "WindowScriptingInterface.h"
2323 #include "WebWindowClass.h"
24+#include "WindowScriptingInterface.h"
2425
2526 ScriptEventBridge::ScriptEventBridge(QObject* parent) : QObject(parent) {
2627 }
@@ -33,17 +34,6 @@ void ScriptEventBridge::emitScriptEvent(const QString& data) { · 6 unmodified lines
3334 emit scriptEventReceived(data);
3435 }
3536
36−
37−class InterfaceWebPage : public QWebPage {
38−public:
39− InterfaceWebPage(QWidget* parent = nullptr) : QWebPage(parent) { }
40−protected:
41− virtual QString userAgentForUrl(const QUrl & url) const {
42− return "HighFidelityInterface/1.0";
43− }
44−};
45−
46−
4737 WebWindowClass::WebWindowClass(const QString& title, const QString& url, int width, int height, bool isToolWindow)
4838 : QObject(NULL),
4939 _eventBridge(new ScriptEventBridge(this)),
@@ -71,7 +61,7 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid · 21 unmodified lines
7161 addEventBridgeToWindowObject();
7262 }
7363
74− _webView->setPage(new InterfaceWebPage());
64+ _webView->setPage(new DataWebPage());
7565 _webView->setUrl(url);
7666
7767