From d7866d99819a93c36ca39feba782817cc4ed1290 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 6 Jun 2015 10:48:07 -0700 Subject: [PATCH] Rename previous Dialog to VrDialog --- interface/resources/qml/Browser.qml | 2 +- interface/resources/qml/InfoView.qml | 2 +- interface/resources/qml/MarketplaceDialog.qml | 2 +- interface/resources/qml/MessageDialog.qml | 2 +- interface/resources/qml/TestDialog.qml | 2 +- .../resources/qml/controls/{DialogOld.qml => VrDialog.qml} | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename interface/resources/qml/controls/{DialogOld.qml => VrDialog.qml} (100%) diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml index 3de616e05b..947bf739fc 100644 --- a/interface/resources/qml/Browser.qml +++ b/interface/resources/qml/Browser.qml @@ -4,7 +4,7 @@ import QtWebKit 3.0 import "controls" import "styles" -DialogOld { +VrDialog { id: root HifiConstants { id: hifi } title: "Browser" diff --git a/interface/resources/qml/InfoView.qml b/interface/resources/qml/InfoView.qml index e97ebdeaf3..012f04f1fd 100644 --- a/interface/resources/qml/InfoView.qml +++ b/interface/resources/qml/InfoView.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Styles 1.3 import QtWebKit 3.0 import "controls" -DialogOld { +VrDialog { id: root width: 800 height: 800 diff --git a/interface/resources/qml/MarketplaceDialog.qml b/interface/resources/qml/MarketplaceDialog.qml index 4ad3c6515f..946f32e84a 100644 --- a/interface/resources/qml/MarketplaceDialog.qml +++ b/interface/resources/qml/MarketplaceDialog.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Styles 1.3 import QtWebKit 3.0 import "controls" -DialogOld { +VrDialog { title: "Test Dlg" id: testDialog objectName: "Browser" diff --git a/interface/resources/qml/MessageDialog.qml b/interface/resources/qml/MessageDialog.qml index 5c699e1f1f..e8b01df9d0 100644 --- a/interface/resources/qml/MessageDialog.qml +++ b/interface/resources/qml/MessageDialog.qml @@ -5,7 +5,7 @@ import QtQuick.Dialogs 1.2 import "controls" import "styles" -DialogOld { +VrDialog { id: root HifiConstants { id: hifi } property real spacing: hifi.layout.spacing diff --git a/interface/resources/qml/TestDialog.qml b/interface/resources/qml/TestDialog.qml index 3ae61fa054..e6675b7282 100644 --- a/interface/resources/qml/TestDialog.qml +++ b/interface/resources/qml/TestDialog.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.3 import "controls" -DialogOld { +VrDialog { title: "Test Dialog" id: testDialog objectName: "TestDialog" diff --git a/interface/resources/qml/controls/DialogOld.qml b/interface/resources/qml/controls/VrDialog.qml similarity index 100% rename from interface/resources/qml/controls/DialogOld.qml rename to interface/resources/qml/controls/VrDialog.qml