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
18#include <QListWidget>18#include <QListWidget>
19 19
20#include "Application.h"20#include "Application.h"
21#include "ui/DataWebPage.h"
21#include "MainWindow.h"22#include "MainWindow.h"
22#include "WindowScriptingInterface.h"
23#include "WebWindowClass.h"23#include "WebWindowClass.h"
24#include "WindowScriptingInterface.h"
24 25
25ScriptEventBridge::ScriptEventBridge(QObject* parent) : QObject(parent) {26ScriptEventBridge::ScriptEventBridge(QObject* parent) : QObject(parent) {
26}27}
@@ -33,17 +34,6 @@ void ScriptEventBridge::emitScriptEvent(const QString& data) { · 6 unmodified lines
33 emit scriptEventReceived(data);34 emit scriptEventReceived(data);
34}35}
35 36
36
37class InterfaceWebPage : public QWebPage {
38public:
39 InterfaceWebPage(QWidget* parent = nullptr) : QWebPage(parent) { }
40protected:
41 virtual QString userAgentForUrl(const QUrl & url) const {
42 return "HighFidelityInterface/1.0";
43 }
44};
45
46
47WebWindowClass::WebWindowClass(const QString& title, const QString& url, int width, int height, bool isToolWindow)37WebWindowClass::WebWindowClass(const QString& title, const QString& url, int width, int height, bool isToolWindow)
48 : QObject(NULL),38 : QObject(NULL),
49 _eventBridge(new ScriptEventBridge(this)),39 _eventBridge(new ScriptEventBridge(this)),
@@ -71,7 +61,7 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid · 21 unmodified lines
71 addEventBridgeToWindowObject();61 addEventBridgeToWindowObject();
72 }62 }
73 63
74 _webView->setPage(new InterfaceWebPage());64 _webView->setPage(new DataWebPage());
75 _webView->setUrl(url);65 _webView->setUrl(url);
76 66
77 67