Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-24 22:58:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename stylues-uit => stylesUit & controls-uit => controlsUit

Browse source 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
This commit is contained in:
Alexander Ivash 2018-06-15 21:44:12 +03:00
parent 1cc2569bd8
commit 740123b853
198 changed files with 274 additions and 280 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/AudioScopeUI.qml
View file

@ -10,8 +10,8 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import "styles-uit" import stylesUit 1.0
import "controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
Item { Item {
id: root id: root

4
interface/resources/qml/Browser.qml
View file

@ -2,9 +2,9 @@ import QtQuick 2.5
import QtWebChannel 1.0 import QtWebChannel 1.0
import QtWebEngine 1.5 import QtWebEngine 1.5
import "controls-uit" import controlsUit 1.0
import "styles" as HifiStyles import "styles" as HifiStyles
import "styles-uit" import stylesUit 1.0
import "windows" import "windows"
ScrollingWindow { ScrollingWindow {

4
interface/resources/qml/CurrentAPI.qml
View file

@ -10,8 +10,8 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import "styles-uit" import stylesUit 1.0
import "controls-uit" as HifiControls import controlsUit 1.0 as HifiControls
Item { Item {
id: root id: root

2
interface/resources/qml/InfoView.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import "controls-uit" import controlsUit 1.0
import "windows" as Windows import "windows" as Windows
Windows.ScrollingWindow { Windows.ScrollingWindow {

4
interface/resources/qml/LoginDialog.qml
View file

@ -11,8 +11,8 @@
import Hifi 1.0 import Hifi 1.0
import QtQuick 2.4 import QtQuick 2.4
import "controls-uit" import controlsUit 1.0
import "styles-uit" import stylesUit 1.0
import "windows" import "windows"
import "LoginDialog" import "LoginDialog"

4
interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
View file

@ -13,8 +13,8 @@ import QtQuick 2.4
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 as OriginalStyles import QtQuick.Controls.Styles 1.4 as OriginalStyles
import "../../controls-uit" import controlsUit 1.0
import "../../styles-uit" import stylesUit 1.0
Item { Item {
id: linkAccountBody id: linkAccountBody

4
interface/resources/qml/LoginDialog/+android/SignUpBody.qml
View file

@ -13,8 +13,8 @@ import QtQuick 2.4
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 as OriginalStyles import QtQuick.Controls.Styles 1.4 as OriginalStyles
import "../../controls-uit" import controlsUit 1.0
import "../../styles-uit" import stylesUit 1.0
Item { Item {
id: signupBody id: signupBody

4
interface/resources/qml/LoginDialog/CompleteProfileBody.qml
View file

@ -12,8 +12,8 @@ import Hifi 1.0
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Controls.Styles 1.4 as OriginalStyles import QtQuick.Controls.Styles 1.4 as OriginalStyles
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
Item { Item {
id: completeProfileBody id: completeProfileBody

5
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -13,8 +13,9 @@ import QtQuick 2.7
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 as OriginalStyles import QtQuick.Controls.Styles 1.4 as OriginalStyles
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
Item { Item {
id: linkAccountBody id: linkAccountBody
clip: true clip: true

4
interface/resources/qml/LoginDialog/SignInBody.qml
View file

@ -12,8 +12,8 @@ import Hifi 1.0
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls.Styles 1.4 as OriginalStyles import QtQuick.Controls.Styles 1.4 as OriginalStyles
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
Item { Item {
id: signInBody id: signInBody

4
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -12,8 +12,8 @@ import Hifi 1.0
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
Item { Item {
id: signupBody id: signupBody

4
interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
View file

@ -12,8 +12,8 @@ import Hifi 1.0
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
Item { Item {
id: usernameCollisionBody id: usernameCollisionBody

4
interface/resources/qml/LoginDialog/WelcomeBody.qml
View file

@ -11,8 +11,8 @@
import Hifi 1.0 import Hifi 1.0
import QtQuick 2.4 import QtQuick 2.4
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
Item { Item {
id: welcomeBody id: welcomeBody

4
interface/resources/qml/QmlWebWindow.qml
View file

@ -13,8 +13,8 @@ import QtWebEngine 1.1
import QtWebChannel 1.0 import QtWebChannel 1.0
import "windows" as Windows import "windows" as Windows
import "controls-uit" as Controls import controlsUit 1.0 as Controls
import "styles-uit" import stylesUit 1.0
Windows.ScrollingWindow { Windows.ScrollingWindow {
id: root id: root

4
interface/resources/qml/QmlWindow.qml
View file

@ -2,9 +2,9 @@ import QtQuick 2.3
import "windows" as Windows import "windows" as Windows
import "controls" import "controls"
import "controls-uit" as Controls import controlsUit 1.0 as Controls
import "styles" import "styles"
import "styles-uit" import stylesUit 1.0
Windows.Window { Windows.Window {
id: root id: root

4
interface/resources/qml/TabletBrowser.qml
View file

@ -3,9 +3,9 @@ import QtWebChannel 1.0
import QtWebEngine 1.5 import QtWebEngine 1.5
import "controls" import "controls"
import "controls-uit" as HifiControls import controlsUit 1.0 as HifiControls
import "styles" as HifiStyles import "styles" as HifiStyles
import "styles-uit" import stylesUit 1.0
import "windows" import "windows"
Item { Item {

4
interface/resources/qml/UpdateDialog.qml
View file

@ -4,9 +4,9 @@ import QtQuick.Controls 1.3
import QtQuick.Controls.Styles 1.3 import QtQuick.Controls.Styles 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "controls-uit" import controlsUit 1.0
import "styles" as HifiStyles import "styles" as HifiStyles
import "styles-uit" import stylesUit 1.0
import "windows" import "windows"
ScrollingWindow { ScrollingWindow {

1
interface/resources/qml/controls/Button.qml
View file

@ -3,7 +3,6 @@ import QtQuick.Controls 2.2 as Original
import "." import "."
import "../styles" import "../styles"
import "../controls-uit"
Original.Button { Original.Button {
id: control id: control

2
interface/resources/qml/controls/FlickableWebViewCore.qml
View file

@ -4,7 +4,7 @@ import QtWebChannel 1.0
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import "../styles-uit" as StylesUIt import stylesUit 1.0 as StylesUIt
Item { Item {
id: flick id: flick

2
interface/resources/qml/controls/TabletWebButton.qml
View file

@ -10,7 +10,7 @@
import Hifi 1.0 import Hifi 1.0
import QtQuick 2.4 import QtQuick 2.4
import "../styles-uit" import stylesUit 1.0
Rectangle { Rectangle {
property alias text: label.text property alias text: label.text

2
interface/resources/qml/controls/TabletWebScreen.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.7 import QtQuick 2.7
import "../controls-uit" as HiFiControls import controlsUit 1.0 as HiFiControls
Item { Item {
id: root id: root

4
interface/resources/qml/controls/TabletWebView.qml
View file

@ -1,8 +1,8 @@
import QtQuick 2.7 import QtQuick 2.7
import QtWebEngine 1.5 import QtWebEngine 1.5
import "../controls-uit" as HiFiControls import controlsUit 1.0 as HiFiControls
import "../styles" as HifiStyles import "../styles" as HifiStyles
import "../styles-uit" import stylesUit 1.0
Item { Item {
id: root id: root

2
interface/resources/qml/controls/WebView.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.7 import QtQuick 2.7
import "../controls-uit" as HiFiControls import controlsUit 1.0 as HiFiControls
Item { Item {
width: parent !== null ? parent.width : undefined width: parent !== null ? parent.width : undefined

4
interface/resources/qml/controls-uit/+android/ImageButton.qml → interface/resources/qml/controlsUit/+android/ImageButton.qml
View file

@ -1,6 +1,6 @@
// //
// ImageButton.qml // ImageButton.qml
// interface/resources/qml/controls-uit // interface/resources/qml/controlsUit
// //
// Created by Gabriel Calero & Cristian Duarte on 12 Oct 2017 // Created by Gabriel Calero & Cristian Duarte on 12 Oct 2017
// Copyright 2017 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../styles-uit" as HifiStyles import "../stylesUit" as HifiStyles
Item { Item {
id: button id: button

4
interface/resources/qml/controls-uit/AttachmentsTable.qml → interface/resources/qml/controlsUit/AttachmentsTable.qml
View file

@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.XmlListModel 2.0 import QtQuick.XmlListModel 2.0
import "../styles-uit" import "../stylesUit"
import "../controls-uit" as HifiControls import "." as HifiControls
import "../windows" import "../windows"
import "../hifi/models" import "../hifi/models"

0
interface/resources/qml/controls-uit/BaseWebView.qml → interface/resources/qml/controlsUit/BaseWebView.qml
View file

2
interface/resources/qml/controls-uit/Button.qml → interface/resources/qml/controlsUit/Button.qml
View file

@ -12,7 +12,7 @@ import QtQuick 2.7
import QtQuick.Controls 2.3 as Original import QtQuick.Controls 2.3 as Original
import TabletScriptingInterface 1.0 import TabletScriptingInterface 1.0
import "../styles-uit" import "../stylesUit"
Original.Button { Original.Button {
id: control; id: control;

2
interface/resources/qml/controls-uit/CheckBox.qml → interface/resources/qml/controlsUit/CheckBox.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 2.2 as Original import QtQuick.Controls 2.2 as Original
import "../styles-uit" import "../stylesUit"
import TabletScriptingInterface 1.0 import TabletScriptingInterface 1.0

4
interface/resources/qml/controls-uit/CheckBoxQQC2.qml → interface/resources/qml/controlsUit/CheckBoxQQC2.qml
View file

@ -11,8 +11,8 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import "../styles-uit" import "../stylesUit"
import "../controls-uit" as HiFiControls import "." as HiFiControls
import TabletScriptingInterface 1.0 import TabletScriptingInterface 1.0
CheckBox { CheckBox {

4
interface/resources/qml/controls-uit/ComboBox.qml → interface/resources/qml/controlsUit/ComboBox.qml
View file

@ -11,8 +11,8 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import "../styles-uit" import "../stylesUit"
import "../controls-uit" as HifiControls import "." as HifiControls
FocusScope { FocusScope {
id: root id: root

2
interface/resources/qml/controls-uit/ContentSection.qml → interface/resources/qml/controlsUit/ContentSection.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "../styles-uit" import "../stylesUit"
Column { Column {
property string name: "Content Section" property string name: "Content Section"

4
interface/resources/qml/controls-uit/FilterBar.qml → interface/resources/qml/controlsUit/FilterBar.qml
View file

@ -12,8 +12,8 @@ import QtQuick 2.9
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "../styles-uit" import "../stylesUit"
import "../controls-uit" as HifiControls import "." as HifiControls
Item { Item {
id: root; id: root;

2
interface/resources/qml/controls-uit/GlyphButton.qml → interface/resources/qml/controlsUit/GlyphButton.qml
View file

@ -12,7 +12,7 @@ import QtQuick 2.7
import QtQuick.Controls 2.2 as Original import QtQuick.Controls 2.2 as Original
import TabletScriptingInterface 1.0 import TabletScriptingInterface 1.0
import "../styles-uit" import "../stylesUit"
Original.Button { Original.Button {
id: control id: control

0
interface/resources/qml/controls-uit/HorizontalRule.qml → interface/resources/qml/controlsUit/HorizontalRule.qml
View file

2
interface/resources/qml/controls-uit/HorizontalSpacer.qml → interface/resources/qml/controlsUit/HorizontalSpacer.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import "../stylesUit"
Item { Item {
id: root id: root

2
interface/resources/qml/controls-uit/ImageMessageBox.qml → interface/resources/qml/controlsUit/ImageMessageBox.qml
View file

@ -9,7 +9,7 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import "../stylesUit"
Item { Item {
id: imageBox id: imageBox

0
interface/resources/qml/controls-uit/Key.qml → interface/resources/qml/controlsUit/Key.qml
View file

0
interface/resources/qml/controls-uit/Keyboard.qml → interface/resources/qml/controlsUit/Keyboard.qml
View file

2
interface/resources/qml/controls-uit/Label.qml → interface/resources/qml/controlsUit/Label.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.7 import QtQuick 2.7
import "../styles-uit" import "../stylesUit"
RalewaySemiBold { RalewaySemiBold {
HifiConstants { id: hifi } HifiConstants { id: hifi }

2
interface/resources/qml/controls-uit/QueuedButton.qml → interface/resources/qml/controlsUit/QueuedButton.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import "../stylesUit"
import "." as HifiControls import "." as HifiControls
HifiControls.Button { HifiControls.Button {

4
interface/resources/qml/controls-uit/RadioButton.qml → interface/resources/qml/controlsUit/RadioButton.qml
View file

@ -11,8 +11,8 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 2.2 as Original import QtQuick.Controls 2.2 as Original
import "../styles-uit" import "../stylesUit"
import "../controls-uit" as HifiControls import "." as HifiControls
import TabletScriptingInterface 1.0 import TabletScriptingInterface 1.0

2
interface/resources/qml/controls-uit/ScrollBar.qml → interface/resources/qml/controlsUit/ScrollBar.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import "../styles-uit" import "../stylesUit"
ScrollBar { ScrollBar {
visible: size < 1.0 visible: size < 1.0

2
interface/resources/qml/controls-uit/Separator.qml → interface/resources/qml/controlsUit/Separator.qml
View file

@ -9,7 +9,7 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import "../stylesUit"
Item { Item {
property int colorScheme: 0; property int colorScheme: 0;

4
interface/resources/qml/controls-uit/Slider.qml → interface/resources/qml/controlsUit/Slider.qml
View file

@ -11,8 +11,8 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import "../styles-uit" import "../stylesUit"
import "../controls-uit" as HifiControls import "." as HifiControls
Slider { Slider {
id: slider id: slider

4
interface/resources/qml/controls-uit/SpinBox.qml → interface/resources/qml/controlsUit/SpinBox.qml
View file

@ -11,8 +11,8 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import "../styles-uit" import "../stylesUit"
import "../controls-uit" as HifiControls import "." as HifiControls
SpinBox { SpinBox {
id: spinBox id: spinBox

2
interface/resources/qml/controls-uit/Switch.qml → interface/resources/qml/controlsUit/Switch.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.2 as Original import QtQuick.Controls 2.2 as Original
import "../styles-uit" import "../stylesUit"
Item { Item {
id: rootSwitch; id: rootSwitch;

2
interface/resources/qml/controls-uit/Table.qml → interface/resources/qml/controlsUit/Table.qml
View file

@ -13,7 +13,7 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Controls 2.3 as QQC2 import QtQuick.Controls 2.3 as QQC2
import "../styles-uit" import "../stylesUit"
TableView { TableView {
id: tableView id: tableView

2
interface/resources/qml/controls-uit/TabletContentSection.qml → interface/resources/qml/controlsUit/TabletContentSection.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "../styles-uit" import "../stylesUit"
Column { Column {
property string name: "Content Section" property string name: "Content Section"

2
interface/resources/qml/controls-uit/TabletHeader.qml → interface/resources/qml/controlsUit/TabletHeader.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import "../stylesUit"
Rectangle { Rectangle {

4
interface/resources/qml/controls-uit/TextAction.qml → interface/resources/qml/controlsUit/TextAction.qml
View file

@ -10,8 +10,8 @@
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import "../stylesUit"
import "../controls-uit" as HifiControls import "." as HifiControls
Item { Item {
property string icon: "" property string icon: ""

2
interface/resources/qml/controls-uit/TextEdit.qml → interface/resources/qml/controlsUit/TextEdit.qml
View file

@ -9,7 +9,7 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import "../stylesUit"
TextEdit { TextEdit {

4
interface/resources/qml/controls-uit/TextField.qml → interface/resources/qml/controlsUit/TextField.qml
View file

@ -12,8 +12,8 @@ import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import "../styles-uit" import "../stylesUit"
import "../controls-uit" as HifiControls import "." as HifiControls
TextField { TextField {
id: textField id: textField

0
interface/resources/qml/controls-uit/ToolTip.qml → interface/resources/qml/controlsUit/ToolTip.qml
View file

2
interface/resources/qml/controls-uit/Tree.qml → interface/resources/qml/controlsUit/Tree.qml
View file

@ -15,7 +15,7 @@ import QtQuick.Controls.Styles 1.4
import QtQuick.Controls 2.2 as QQC2 import QtQuick.Controls 2.2 as QQC2
import "../styles-uit" import "../stylesUit"
TreeView { TreeView {
id: treeView id: treeView

2
interface/resources/qml/controls-uit/VerticalSpacer.qml → interface/resources/qml/controlsUit/VerticalSpacer.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import "../stylesUit"
Item { Item {
id: root id: root

2
interface/resources/qml/controls-uit/WebGlyphButton.qml → interface/resources/qml/controlsUit/WebGlyphButton.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 2.2 as Original import QtQuick.Controls 2.2 as Original
import "../styles-uit" import "../stylesUit"
Original.Button { Original.Button {
id: control id: control

0
interface/resources/qml/controls-uit/WebSpinner.qml → interface/resources/qml/controlsUit/WebSpinner.qml
View file

0
interface/resources/qml/controls-uit/WebView.qml → interface/resources/qml/controlsUit/WebView.qml
View file

0
interface/resources/qml/controls-uit/qmldir → interface/resources/qml/controlsUit/qmldir
View file

2
interface/resources/qml/dialogs/AssetDialog.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
import "assetDialog" import "assetDialog"

4
interface/resources/qml/dialogs/CustomQueryDialog.qml
View file

@ -12,8 +12,8 @@ import QtQuick 2.7;
import QtQuick.Dialogs 1.2 as OriginalDialogs; import QtQuick.Dialogs 1.2 as OriginalDialogs;
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import "../controls-uit"; import controlsUit 1.0
import "../styles-uit"; import stylesUit 1.0
import "../windows"; import "../windows";
ModalWindow { ModalWindow {

4
interface/resources/qml/dialogs/FileDialog.qml
View file

@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import ".." import ".."
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
import "fileDialog" import "fileDialog"

4
interface/resources/qml/dialogs/MessageDialog.qml
View file

@ -11,8 +11,8 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
import "messageDialog" import "messageDialog"

4
interface/resources/qml/dialogs/PreferencesDialog.qml
View file

@ -10,8 +10,8 @@
import QtQuick 2.5 import QtQuick 2.5
import "../controls-uit" as HifiControls import controlsUit 1.0 as HifiControls
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
import "preferences" import "preferences"

4
interface/resources/qml/dialogs/QueryDialog.qml
View file

@ -11,8 +11,8 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
ModalWindow { ModalWindow {

2
interface/resources/qml/dialogs/TabletAssetDialog.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
import "assetDialog" import "assetDialog"

4
interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
View file

@ -12,8 +12,8 @@ import QtQuick 2.7
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
TabletModalWindow { TabletModalWindow {

4
interface/resources/qml/dialogs/TabletFileDialog.qml
View file

@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import ".." import ".."
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
import "fileDialog" import "fileDialog"

4
interface/resources/qml/dialogs/TabletLoginDialog.qml
View file

@ -11,8 +11,8 @@
import Hifi 1.0 import Hifi 1.0
import QtQuick 2.5 import QtQuick 2.5
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
import "../LoginDialog" import "../LoginDialog"

4
interface/resources/qml/dialogs/TabletMessageBox.qml
View file

@ -11,8 +11,8 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
import "messageDialog" import "messageDialog"

4
interface/resources/qml/dialogs/TabletQueryDialog.qml
View file

@ -12,8 +12,8 @@ import QtQuick 2.7
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import "../controls-uit" import controlsUit 1.0
import "../styles-uit" import stylesUit 1.0
import "../windows" import "../windows"
TabletModalWindow { TabletModalWindow {

4
interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
View file

@ -12,8 +12,8 @@ import QtQuick 2.7
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Controls 1.5 as QQC1 import QtQuick.Controls 1.5 as QQC1
import "../../controls-uit" import controlsUit 1.0
import "../../styles-uit" import stylesUit 1.0
import "../fileDialog" import "../fileDialog"

2
interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../controls-uit" import controlsUit 1.0
ComboBox { ComboBox {
id: root id: root

2
interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import "../../controls-uit" import controlsUit 1.0
Button { Button {
property var dialog; property var dialog;

2
interface/resources/qml/dialogs/preferences/AvatarPreference.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../controls-uit" import controlsUit 1.0
import "../../hifi/tablet/tabletWindows/preferences" import "../../hifi/tablet/tabletWindows/preferences"
Preference { Preference {

2
interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../dialogs" import "../../dialogs"
import "../../controls-uit" import controlsUit 1.0
Preference { Preference {
id: root id: root

2
interface/resources/qml/dialogs/preferences/ButtonPreference.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import TabletScriptingInterface 1.0 import TabletScriptingInterface 1.0
import "../../controls-uit" import controlsUit 1.0
Preference { Preference {
id: root id: root

2
interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import TabletScriptingInterface 1.0 import TabletScriptingInterface 1.0
import "../../controls-uit" import controlsUit 1.0
Preference { Preference {
id: root id: root

4
interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
View file

@ -10,8 +10,8 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../controls-uit" as HiFiControls import controlsUit 1.0 as HiFiControls
import "../../styles-uit" import stylesUit 1.0
Preference { Preference {
id: root id: root

2
interface/resources/qml/dialogs/preferences/EditablePreference.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../dialogs" import "../../dialogs"
import "../../controls-uit" import controlsUit 1.0
Preference { Preference {
id: root id: root

2
interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../controls-uit" import controlsUit 1.0
Preference { Preference {
id: root id: root

4
interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml
View file

@ -10,8 +10,8 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../controls-uit" import controlsUit 1.0
import "../../styles-uit" import stylesUit 1.0
Preference { Preference {
id: root id: root

4
interface/resources/qml/dialogs/preferences/Section.qml
View file

@ -12,8 +12,8 @@ import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import Hifi 1.0 import Hifi 1.0
import "../../controls-uit" as HiFiControls import controlsUit 1.0 as HiFiControls
import "../../styles-uit" import stylesUit 1.0
import "." import "."
Preference { Preference {

2
interface/resources/qml/dialogs/preferences/SliderPreference.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../dialogs" import "../../dialogs"
import "../../controls-uit" import controlsUit 1.0
Preference { Preference {
id: root id: root

2
interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../controls-uit" import controlsUit 1.0
Preference { Preference {
id: root id: root

2
interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
View file

@ -11,7 +11,7 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../dialogs" import "../../dialogs"
import "../../controls-uit" import controlsUit 1.0
Preference { Preference {
id: root id: root

4
interface/resources/qml/hifi/+android/ActionBar.qml
View file

@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../controls" as HifiControls import "../../controls" as HifiControls
import ".." import ".."

4
interface/resources/qml/hifi/+android/AudioBar.qml
View file

@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../controls" as HifiControls import "../../controls" as HifiControls
import ".." import ".."

2
interface/resources/qml/hifi/+android/AvatarOption.qml
View file

@ -11,7 +11,7 @@
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick 2.5 import QtQuick 2.5
import "../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
ColumnLayout { ColumnLayout {
id: itemRoot id: itemRoot

4
interface/resources/qml/hifi/+android/StatsBar.qml
View file

@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../controls" as HifiControls import "../../controls" as HifiControls
import ".." import ".."

4
interface/resources/qml/hifi/+android/WindowHeader.qml
View file

@ -16,8 +16,8 @@ import QtQuick.Layouts 1.3
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "." import "."
import "../styles" as HifiStyles import "../styles" as HifiStyles
import "../styles-uit" import stylesUit 1.0
import "../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../controls" as HifiControls import "../controls" as HifiControls
import ".." import ".."

4
interface/resources/qml/hifi/+android/bottomHudOptions.qml
View file

@ -16,8 +16,8 @@ import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../../styles" as HifiStyles import "../../styles" as HifiStyles
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../controls" as HifiControls import "../../controls" as HifiControls
import ".." import ".."
import "." import "."

4
interface/resources/qml/hifi/+android/modesbar.qml
View file

@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../controls" as HifiControls import "../../controls" as HifiControls
import ".." import ".."

4
interface/resources/qml/hifi/AssetServer.qml
View file

@ -14,8 +14,8 @@ import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../styles-uit" import stylesUit 1.0
import "../controls-uit" as HifiControls import controlsUit 1.0 as HifiControls
import "../windows" as Windows import "../windows" as Windows
import "../dialogs" import "../dialogs"

2
interface/resources/qml/hifi/Card.qml
View file

@ -17,7 +17,7 @@ import QtGraphicalEffects 1.0
import TabletScriptingInterface 1.0 import TabletScriptingInterface 1.0
import "toolbars" import "toolbars"
import "../styles-uit" import stylesUit 1.0
Item { Item {
id: root; id: root;

4
interface/resources/qml/hifi/ComboDialog.qml
View file

@ -10,8 +10,8 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import stylesUit 1.0
import "../controls-uit" import controlsUit 1.0
Item { Item {
property var dialogTitleText : ""; property var dialogTitleText : "";

2
interface/resources/qml/hifi/Desktop.qml
View file

@ -8,7 +8,7 @@ import "../desktop" as OriginalDesktop
import ".." import ".."
import "." import "."
import "./toolbars" import "./toolbars"
import "../controls-uit" import controlsUit 1.0
OriginalDesktop.Desktop { OriginalDesktop.Desktop {
id: desktop id: desktop

2
interface/resources/qml/hifi/DesktopLetterboxMessage.qml
View file

@ -10,7 +10,7 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import stylesUit 1.0
Item { Item {
property alias text: popupText.text property alias text: popupText.text

2
interface/resources/qml/hifi/Feed.qml
View file

@ -15,7 +15,7 @@ import Hifi 1.0
import QtQuick 2.5 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "toolbars" import "toolbars"
import "../styles-uit" import stylesUit 1.0
import "qrc:////qml//hifi//models" as HifiModels // Absolute path so the same code works everywhere. import "qrc:////qml//hifi//models" as HifiModels // Absolute path so the same code works everywhere.
Column { Column {

2
interface/resources/qml/hifi/LetterboxMessage.qml
View file

@ -10,7 +10,7 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import "../styles-uit" import stylesUit 1.0
Item { Item {
property alias text: popupText.text property alias text: popupText.text

Some files were not shown because too many files have changed in this diff Show more