From 43268c0f6578a1afd3c26e9f3f27d323c821c587 Mon Sep 17 00:00:00 2001
From: milad <milad@miladnazeri.com>
Date: Mon, 22 Jul 2019 16:20:54 -0700
Subject: [PATCH] Working QML window

---
 .../qml/controls/+webengine/FlickableWebViewCore.qml     | 4 ++--
 interface/resources/qml/hifi/PermissionPopup.qml         | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
index 8b792bf68d..f20117c3bd 100644
--- a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
@@ -5,7 +5,7 @@ import QtWebChannel 1.0
 import QtQuick.Controls 2.2
 
 import stylesUit 1.0 as StylesUIt
-import "../hifi/PermissionPopup.qml" as PermissionPopup
+import "../hifi" as Controls
 
 Item {
     id: flick
@@ -141,7 +141,7 @@ Item {
             });
         }
 
-        PermissionPopup {
+        Controls.PermissionPopup {
             id: permissionPopup
         }
 
diff --git a/interface/resources/qml/hifi/PermissionPopup.qml b/interface/resources/qml/hifi/PermissionPopup.qml
index 2b110051ad..3d1e5b992b 100644
--- a/interface/resources/qml/hifi/PermissionPopup.qml
+++ b/interface/resources/qml/hifi/PermissionPopup.qml
@@ -9,7 +9,6 @@ Item {
     width:  600
     height: 200
     z:100
-    HifiConstants { id: hifi }
 
     // anchors.top: buttons.bottom
     Rectangle {
@@ -21,7 +20,7 @@ Item {
         Row {
             id: webAccessHeaderContainer
             height: root.height * 0.30
-            RalewayLight {
+            HifiStyles.RalewayLight {
                 id: webAccessHeaderText
                 text: "WEB CAMERA ACCESS REQUEST"
                 width: mainContainer.width
@@ -37,7 +36,7 @@ Item {
             id: webAccessInfoContainer
             anchors.top: webAccessHeaderContainer.bottom
             anchors.topMargin: 10
-            RalewayLight {
+            HifiStyles.RalewayLight {
                 width: mainContainer.width
                 id: webAccessInfoText
                 horizontalAlignment: Text.AlignHCenter
@@ -57,7 +56,7 @@ Item {
             anchors.horizontalCenter: webAccessInfoContainer.horizontalCenter
             anchors.verticalCenter: webAccessInfoContainer.verticalCenter
             property real space: 5
-            Button {
+            HifiControls.Button {
                 anchors.left: permissionsButtonRow.left
                 id: leftButton
                 anchors.leftMargin: permissionsButtonRow.space
@@ -68,7 +67,7 @@ Item {
                 enabled: true
                 width: 155
             }
-            Button {  
+            HifiControls.Button {  
                 id: rightButton
                 anchors.left: leftButton.right
                 anchors.leftMargin: permissionsButtonRow.space