History

allow moving of location from DataWebDialog for locations

Stephen Birarda committed 12 years ago

Commit 523a4e61 parent 84df6053 files · +58 −6Browse files

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

Unified · Split

interface/src/ui/DataWebDialog.cpp+3−6
@@ -14,9 +14,9 @@ · 13 unmodified lines
14 14
15#include <AccountManager.h>15#include <AccountManager.h>
16#include <LimitedNodeList.h>16#include <LimitedNodeList.h>
17#include <OAuthNetworkAccessManager.h>
18 17
19#include "Application.h"18#include "Application.h"
19#include "DataWebPage.h"
20 20
21#include "DataWebDialog.h"21#include "DataWebDialog.h"
22 22
@@ -24,11 +24,8 @@ DataWebDialog::DataWebDialog() { · 1 unmodified line
24 // make sure the dialog deletes itself when it closes24 // make sure the dialog deletes itself when it closes
25 setAttribute(Qt::WA_DeleteOnClose);25 setAttribute(Qt::WA_DeleteOnClose);
26 26
27 // use an OAuthNetworkAccessManager instead of regular QNetworkAccessManager so our requests are authed27 // set our page to a DataWebPage
28 page()->setNetworkAccessManager(OAuthNetworkAccessManager::getInstance());28 setPage(new DataWebPage(this));
29
30 // have the page delegate external links so they can be captured by the Application in case they are a hifi link
31 page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
32 29
33 // have the Application handle external links30 // have the Application handle external links
34 connect(this, &QWebView::linkClicked, Application::getInstance(), &Application::openUrl);31 connect(this, &QWebView::linkClicked, Application::getInstance(), &Application::openUrl);