Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles

Better imports for controls and styles
2025-04-05 21:12:25 +02:00 · 2018-10-22 11:50:09 -07:00 · 2018-10-22 11:50:09 -07:00 · e40a021339
commit e40a021339
parent bd480bab80 64f67d5eb7
255 changed files with 389 additions and 3082 deletions
--- a/interface/resources/QtWebEngine/UIDelegates/Menu.qml
+++ b/interface/resources/QtWebEngine/UIDelegates/Menu.qml
@ -1,7 +1,7 @@
 import QtQuick 2.5

-import "../../qml/controls-uit"
-import "../../qml/styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 Item {
    id: menu
--- a/interface/resources/QtWebEngine/UIDelegates/MenuItem.qml
+++ b/interface/resources/QtWebEngine/UIDelegates/MenuItem.qml
@ -1,7 +1,7 @@
 import QtQuick 2.5

-import "../../qml/controls-uit"
-import "../../qml/styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 Item {
    id: root
--- a/interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml
+++ b/interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml
@ -1,7 +1,7 @@
 import QtQuick 2.5

-import "../../qml/controls-uit"
-import "../../qml/styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../../qml/dialogs"

 QtObject {
--- a/interface/resources/qml/AudioScopeUI.qml
+++ b/interface/resources/qml/AudioScopeUI.qml
@ -10,8 +10,8 @@

 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import "styles-uit"
-import "controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit

 Item {
    id: root
--- a/interface/resources/qml/Browser.qml
+++ b/interface/resources/qml/Browser.qml
@ -2,9 +2,9 @@ import QtQuick 2.5
 import QtWebChannel 1.0
 import QtWebEngine 1.5

-import "controls-uit"
+import controlsUit 1.0
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"

 ScrollingWindow {
--- a/interface/resources/qml/CurrentAPI.qml
+++ b/interface/resources/qml/CurrentAPI.qml
@ -10,8 +10,8 @@

 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import "styles-uit"
-import "controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls

 Item {
    id: root
--- a/interface/resources/qml/InfoView.qml
+++ b/interface/resources/qml/InfoView.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5
 import Hifi 1.0 as Hifi

-import "controls-uit"
+import controlsUit 1.0
 import "windows" as Windows

 Windows.ScrollingWindow {
--- a/interface/resources/qml/InteractiveWindow.qml
+++ b/interface/resources/qml/InteractiveWindow.qml
@ -12,9 +12,9 @@ import QtQuick 2.3

 import "windows" as Windows
 import "controls"
-import "controls-uit" as Controls
+import controlsUit 1.0 as Controls
 import "styles"
-import "styles-uit"
+import stylesUit 1.0

 Windows.Window {
    id: root;
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.4

-import "controls-uit"
-import "styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "windows"

 import "LoginDialog"
--- a/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
@ -13,8 +13,8 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles

-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 Item {
    id: linkAccountBody
--- a/interface/resources/qml/LoginDialog/+android/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/+android/SignUpBody.qml
@ -13,8 +13,8 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles

-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 Item {
    id: signupBody
--- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
+++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 Item {
    id: completeProfileBody
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@ -13,8 +13,9 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
+
 Item {
    id: linkAccountBody
    clip: true
--- a/interface/resources/qml/LoginDialog/SignInBody.qml
+++ b/interface/resources/qml/LoginDialog/SignInBody.qml
@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.7
 import QtQuick.Controls.Styles 1.4 as OriginalStyles

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 Item {
    id: signInBody
--- a/interface/resources/qml/LoginDialog/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.7
 import QtQuick.Controls 1.4

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 Item {
    id: signupBody
--- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
+++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.4
 import QtQuick.Controls 1.4

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 Item {
    id: usernameCollisionBody
--- a/interface/resources/qml/LoginDialog/WelcomeBody.qml
+++ b/interface/resources/qml/LoginDialog/WelcomeBody.qml
@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.4

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 Item {
    id: welcomeBody
--- a/interface/resources/qml/QmlWebWindow.qml
+++ b/interface/resources/qml/QmlWebWindow.qml
@ -13,8 +13,8 @@ import QtWebEngine 1.1
 import QtWebChannel 1.0

 import "windows" as Windows
-import "controls-uit" as Controls
-import "styles-uit"
+import controlsUit 1.0 as Controls
+import stylesUit 1.0

 Windows.ScrollingWindow {
    id: root
--- a/interface/resources/qml/QmlWindow.qml
+++ b/interface/resources/qml/QmlWindow.qml
@ -2,9 +2,9 @@ import QtQuick 2.3

 import "windows" as Windows
 import "controls"
-import "controls-uit" as Controls
+import controlsUit 1.0 as Controls
 import "styles"
-import "styles-uit"
+import stylesUit 1.0

 Windows.Window {
    id: root
--- a/interface/resources/qml/TabletBrowser.qml
+++ b/interface/resources/qml/TabletBrowser.qml
@ -3,9 +3,9 @@ import QtWebChannel 1.0
 import QtWebEngine 1.5

 import "controls"
-import "controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"

 Item {
--- a/interface/resources/qml/UpdateDialog.qml
+++ b/interface/resources/qml/UpdateDialog.qml
@ -4,9 +4,9 @@ import QtQuick.Controls 1.3
 import QtQuick.Controls.Styles 1.3
 import QtGraphicalEffects 1.0

-import "controls-uit"
+import controlsUit 1.0
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"

 ScrollingWindow {
--- a/interface/resources/qml/controls/Button.qml
+++ b/interface/resources/qml/controls/Button.qml
@ -3,7 +3,6 @@ import QtQuick.Controls 2.2 as Original

 import "."
 import "../styles"
-import "../controls-uit"

 Original.Button {
    id: control
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@ -4,7 +4,7 @@ import QtWebChannel 1.0

 import QtQuick.Controls 2.2

-import "../styles-uit" as StylesUIt
+import stylesUit 1.0 as StylesUIt

 Item {
    id: flick
--- a/interface/resources/qml/controls/TabletWebButton.qml
+++ b/interface/resources/qml/controls/TabletWebButton.qml
@ -10,7 +10,7 @@

 import Hifi 1.0
 import QtQuick 2.4
-import "../styles-uit"
+import stylesUit 1.0

 Rectangle {
    property alias text: label.text
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@ -1,5 +1,5 @@
 import QtQuick 2.7
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls

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

 Item {
    id: root
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@ -1,5 +1,5 @@
 import QtQuick 2.7
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls

 Item {
    width: parent !== null ? parent.width : undefined
--- a/interface/resources/qml/controls-uit/+android/ImageButton.qml
+++ b/interface/resources/qml/controls-uit/+android/ImageButton.qml
@ -1,6 +1,6 @@
 //
 //  ImageButton.qml
-//  interface/resources/qml/controls-uit
+//  interface/resources/qml/controlsUit
 //
 //  Created by Gabriel Calero & Cristian Duarte on 12 Oct 2017
 //  Copyright 2017 High Fidelity, Inc.
@ -11,7 +11,7 @@

 import QtQuick 2.5
 import QtQuick.Layouts 1.3
-import "../styles-uit" as HifiStyles
+import "../stylesUit" as HifiStyles

 Item {
    id: button
@ -79,4 +79,4 @@ Item {
            }
        }
    ]
-}
+}
--- a/interface/resources/qml/controls-uit/AttachmentsTable.qml
+++ b/interface/resources/qml/controls-uit/AttachmentsTable.qml
@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.XmlListModel 2.0

-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 import "../windows"
 import "../hifi/models"

--- a/interface/resources/qml/controls-uit/BaseWebView.qml
+++ b/interface/resources/qml/controls-uit/BaseWebView.qml
--- a/interface/resources/qml/controls-uit/Button.qml
+++ b/interface/resources/qml/controls-uit/Button.qml
@ -12,7 +12,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.3 as Original
 import TabletScriptingInterface 1.0

-import "../styles-uit"
+import "../stylesUit"

 Original.Button {
    id: control;
--- a/interface/resources/qml/controls-uit/CheckBox.qml
+++ b/interface/resources/qml/controls-uit/CheckBox.qml
@ -11,7 +11,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 2.2 as Original

-import "../styles-uit"
+import "../stylesUit"

 import TabletScriptingInterface 1.0

--- a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
+++ b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2

-import "../styles-uit"
-import "../controls-uit" as HiFiControls
+import "../stylesUit"
+import "." as HiFiControls
 import TabletScriptingInterface 1.0

 CheckBox {
--- a/interface/resources/qml/controls-uit/ComboBox.qml
+++ b/interface/resources/qml/controls-uit/ComboBox.qml
@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2

-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls

 FocusScope {
    id: root
--- a/interface/resources/qml/controls-uit/ContentSection.qml
+++ b/interface/resources/qml/controls-uit/ContentSection.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0

-import "../styles-uit"
+import "../stylesUit"

 Column {
    property string name: "Content Section"
--- a/interface/resources/qml/controls-uit/FilterBar.qml
+++ b/interface/resources/qml/controls-uit/FilterBar.qml
@ -12,8 +12,8 @@ import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0

-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls

 Item {
    id: root;
--- a/interface/resources/qml/controls-uit/GlyphButton.qml
+++ b/interface/resources/qml/controls-uit/GlyphButton.qml
@ -12,7 +12,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2 as Original
 import TabletScriptingInterface 1.0

-import "../styles-uit"
+import "../stylesUit"

 Original.Button {
    id: control
--- a/interface/resources/qml/controls-uit/HorizontalRule.qml
+++ b/interface/resources/qml/controls-uit/HorizontalRule.qml
--- a/interface/resources/qml/controls-uit/HorizontalSpacer.qml
+++ b/interface/resources/qml/controls-uit/HorizontalSpacer.qml
@ -10,7 +10,7 @@

 import QtQuick 2.5

-import "../styles-uit"
+import "../stylesUit"

 Item {
    id: root
--- a/interface/resources/qml/controls-uit/ImageMessageBox.qml
+++ b/interface/resources/qml/controls-uit/ImageMessageBox.qml
@ -9,7 +9,7 @@
 //

 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"

 Item {
    id: imageBox
--- a/interface/resources/qml/controls-uit/Key.qml
+++ b/interface/resources/qml/controls-uit/Key.qml
--- a/interface/resources/qml/controls-uit/Keyboard.qml
+++ b/interface/resources/qml/controls-uit/Keyboard.qml
--- a/interface/resources/qml/controls-uit/Label.qml
+++ b/interface/resources/qml/controls-uit/Label.qml
@ -10,7 +10,7 @@

 import QtQuick 2.7

-import "../styles-uit"
+import "../stylesUit"

 RalewaySemiBold {
    HifiConstants { id: hifi }
--- a/interface/resources/qml/controls-uit/QueuedButton.qml
+++ b/interface/resources/qml/controls-uit/QueuedButton.qml
@ -10,7 +10,7 @@

 import QtQuick 2.5

-import "../styles-uit"
+import "../stylesUit"
 import "." as HifiControls

 HifiControls.Button {
--- a/interface/resources/qml/controls-uit/RadioButton.qml
+++ b/interface/resources/qml/controls-uit/RadioButton.qml
@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.2 as Original

-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls

 import TabletScriptingInterface 1.0

--- a/interface/resources/qml/controls-uit/ScrollBar.qml
+++ b/interface/resources/qml/controls-uit/ScrollBar.qml
@ -11,7 +11,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2

-import "../styles-uit"
+import "../stylesUit"

 ScrollBar {
    visible: size < 1.0
--- a/interface/resources/qml/controls-uit/Separator.qml
+++ b/interface/resources/qml/controls-uit/Separator.qml
@ -9,7 +9,7 @@
 //

 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"

 Item {
    property int colorScheme: 0;
--- a/interface/resources/qml/controls-uit/Slider.qml
+++ b/interface/resources/qml/controls-uit/Slider.qml
@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2

-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls

 Slider {
    id: slider
--- a/interface/resources/qml/controls-uit/SpinBox.qml
+++ b/interface/resources/qml/controls-uit/SpinBox.qml
@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2

-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls

 SpinBox {
    id: spinBox
--- a/interface/resources/qml/controls-uit/Switch.qml
+++ b/interface/resources/qml/controls-uit/Switch.qml
@ -11,7 +11,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2 as Original

-import "../styles-uit"
+import "../stylesUit"

 Item {
    id: rootSwitch;
--- a/interface/resources/qml/controls-uit/Table.qml
+++ b/interface/resources/qml/controls-uit/Table.qml
@ -13,7 +13,7 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls 2.3 as QQC2

-import "../styles-uit"
+import "../stylesUit"

 TableView {
    id: tableView
--- a/interface/resources/qml/controls-uit/TabletContentSection.qml
+++ b/interface/resources/qml/controls-uit/TabletContentSection.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0

-import "../styles-uit"
+import "../stylesUit"

 Column {
    property string name: "Content Section"
--- a/interface/resources/qml/controls-uit/TabletHeader.qml
+++ b/interface/resources/qml/controls-uit/TabletHeader.qml
@ -10,7 +10,7 @@

 import QtQuick 2.5

-import "../styles-uit"
+import "../stylesUit"

 Rectangle {

--- a/interface/resources/qml/controls-uit/TextAction.qml
+++ b/interface/resources/qml/controls-uit/TextAction.qml
@ -10,8 +10,8 @@

 import QtQuick 2.5

-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls

 Item {
    property string icon: ""
--- a/interface/resources/qml/controls-uit/TextEdit.qml
+++ b/interface/resources/qml/controls-uit/TextEdit.qml
@ -9,7 +9,7 @@
 //

 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"

 TextEdit {

--- a/interface/resources/qml/controls-uit/TextField.qml
+++ b/interface/resources/qml/controls-uit/TextField.qml
@ -12,8 +12,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4

-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls

 TextField {
    id: textField
--- a/interface/resources/qml/controls-uit/ToolTip.qml
+++ b/interface/resources/qml/controls-uit/ToolTip.qml
--- a/interface/resources/qml/controls-uit/Tree.qml
+++ b/interface/resources/qml/controls-uit/Tree.qml
@ -15,7 +15,7 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls 2.2 as QQC2


-import "../styles-uit"
+import "../stylesUit"

 TreeView {
    id: treeView
--- a/interface/resources/qml/controls-uit/VerticalSpacer.qml
+++ b/interface/resources/qml/controls-uit/VerticalSpacer.qml
@ -10,7 +10,7 @@

 import QtQuick 2.5

-import "../styles-uit"
+import "../stylesUit"

 Item {
    id: root
--- a/interface/resources/qml/controls-uit/WebGlyphButton.qml
+++ b/interface/resources/qml/controls-uit/WebGlyphButton.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.2 as Original

-import "../styles-uit"
+import "../stylesUit"

 Original.Button {
    id: control
--- a/interface/resources/qml/controls-uit/WebSpinner.qml
+++ b/interface/resources/qml/controls-uit/WebSpinner.qml
--- a/interface/resources/qml/controls-uit/WebView.qml
+++ b/interface/resources/qml/controls-uit/WebView.qml
--- a/interface/resources/qml/controls-uit/qmldir
+++ b/interface/resources/qml/controls-uit/qmldir
--- a/interface/resources/qml/dialogs/AssetDialog.qml
+++ b/interface/resources/qml/dialogs/AssetDialog.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5
 import Qt.labs.settings 1.0

-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"

 import "assetDialog"
--- a/interface/resources/qml/dialogs/CustomQueryDialog.qml
+++ b/interface/resources/qml/dialogs/CustomQueryDialog.qml
@ -12,8 +12,8 @@ import QtQuick 2.7;
 import QtQuick.Dialogs 1.2 as OriginalDialogs;
 import QtQuick.Controls 2.3

-import "../controls-uit";
-import "../styles-uit";
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows";

 ModalWindow {
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
 import QtQuick.Controls 2.3

 import ".."
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"

 import "fileDialog"
--- a/interface/resources/qml/dialogs/MessageDialog.qml
+++ b/interface/resources/qml/dialogs/MessageDialog.qml
@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2 as OriginalDialogs

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"

 import "messageDialog"
--- a/interface/resources/qml/dialogs/PreferencesDialog.qml
+++ b/interface/resources/qml/dialogs/PreferencesDialog.qml
@ -10,8 +10,8 @@

 import QtQuick 2.5

-import "../controls-uit" as HifiControls
-import "../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 import "../windows"
 import "preferences"

--- a/interface/resources/qml/dialogs/QueryDialog.qml
+++ b/interface/resources/qml/dialogs/QueryDialog.qml
@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.3

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"

 ModalWindow {
--- a/interface/resources/qml/dialogs/TabletAssetDialog.qml
+++ b/interface/resources/qml/dialogs/TabletAssetDialog.qml
@ -10,7 +10,7 @@

 import QtQuick 2.5

-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"

 import "assetDialog"
--- a/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
+++ b/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import QtQuick.Controls 2.3

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"

 TabletModalWindow {
--- a/interface/resources/qml/dialogs/TabletFileDialog.qml
+++ b/interface/resources/qml/dialogs/TabletFileDialog.qml
@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
 import QtQuick.Controls 2.3

 import ".."
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"

 import "fileDialog"
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.5

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"

 import "../LoginDialog"
--- a/interface/resources/qml/dialogs/TabletMessageBox.qml
+++ b/interface/resources/qml/dialogs/TabletMessageBox.qml
@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2 as OriginalDialogs

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"

 import "messageDialog"
--- a/interface/resources/qml/dialogs/TabletQueryDialog.qml
+++ b/interface/resources/qml/dialogs/TabletQueryDialog.qml
@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import QtQuick.Controls 2.3

-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"

 TabletModalWindow {
--- a/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
+++ b/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.3
 import QtQuick.Controls 1.5 as QQC1

-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 import "../fileDialog"

--- a/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
+++ b/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
@ -10,7 +10,7 @@

 import QtQuick 2.5

-import "../../controls-uit"
+import controlsUit 1.0

 ComboBox {
    id: root
--- a/interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml
+++ b/interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2

-import "../../controls-uit"
+import controlsUit 1.0

 Button {
    property var dialog;
--- a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
@ -10,7 +10,7 @@

 import QtQuick 2.5

-import "../../controls-uit"
+import controlsUit 1.0
 import "../../hifi/tablet/tabletWindows/preferences"

 Preference {
--- a/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
+++ b/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5

 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0

 Preference {
    id: root
--- a/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5
 import TabletScriptingInterface 1.0

-import "../../controls-uit"
+import controlsUit 1.0

 Preference {
    id: root
--- a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5
 import TabletScriptingInterface 1.0

-import "../../controls-uit"
+import controlsUit 1.0

 Preference {
    id: root
--- a/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
@ -10,8 +10,8 @@

 import QtQuick 2.5

-import "../../controls-uit" as HiFiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HiFiControls
+import stylesUit 1.0

 Preference {
    id: root
--- a/interface/resources/qml/dialogs/preferences/EditablePreference.qml
+++ b/interface/resources/qml/dialogs/preferences/EditablePreference.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5

 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0

 Preference {
    id: root
--- a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@ -10,7 +10,7 @@

 import QtQuick 2.5

-import "../../controls-uit"
+import controlsUit 1.0

 Preference {
    id: root
--- a/interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml
@ -10,8 +10,8 @@

 import QtQuick 2.5

-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0

 Preference {
    id: root
--- a/interface/resources/qml/dialogs/preferences/Section.qml
+++ b/interface/resources/qml/dialogs/preferences/Section.qml
@ -12,8 +12,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import Hifi 1.0

-import "../../controls-uit" as HiFiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HiFiControls
+import stylesUit 1.0
 import "."

 Preference {
--- a/interface/resources/qml/dialogs/preferences/SliderPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SliderPreference.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5

 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0

 Preference {
    id: root
--- a/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
@ -10,7 +10,7 @@

 import QtQuick 2.5

-import "../../controls-uit"
+import controlsUit 1.0

 Preference {
    id: root
--- a/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
@ -11,7 +11,7 @@
 import QtQuick 2.5

 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0

 Preference {
    id: root
--- a/interface/resources/qml/hifi/+android/ActionBar.qml
+++ b/interface/resources/qml/hifi/+android/ActionBar.qml
@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."

--- a/interface/resources/qml/hifi/+android/AudioBar.qml
+++ b/interface/resources/qml/hifi/+android/AudioBar.qml
@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."

--- a/interface/resources/qml/hifi/+android/AvatarOption.qml
+++ b/interface/resources/qml/hifi/+android/AvatarOption.qml
@ -11,7 +11,7 @@

 import QtQuick.Layouts 1.3
 import QtQuick 2.5
-import "../controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit

 ColumnLayout {
    id: itemRoot
--- a/interface/resources/qml/hifi/+android/StatsBar.qml
+++ b/interface/resources/qml/hifi/+android/StatsBar.qml
@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."

--- a/interface/resources/qml/hifi/+android/WindowHeader.qml
+++ b/interface/resources/qml/hifi/+android/WindowHeader.qml
@ -16,8 +16,8 @@ import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
 import "."
 import "../styles" as HifiStyles
-import "../styles-uit"
-import "../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../controls" as HifiControls
 import ".."

--- a/interface/resources/qml/hifi/+android/bottomHudOptions.qml
+++ b/interface/resources/qml/hifi/+android/bottomHudOptions.qml
@ -16,8 +16,8 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
 import "../../styles" as HifiStyles
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 import "."
--- a/interface/resources/qml/hifi/+android/modesbar.qml
+++ b/interface/resources/qml/hifi/+android/modesbar.qml
@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."

--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@ -14,8 +14,8 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0

-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../windows" as Windows
 import "../dialogs"

--- a/interface/resources/qml/hifi/AvatarApp.qml
+++ b/interface/resources/qml/hifi/AvatarApp.qml
@ -3,8 +3,8 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtQml.Models 2.1
 import QtGraphicalEffects 1.0
-import "../controls-uit" as HifiControls
-import "../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 import "avatarapp"

 Rectangle {
--- a/interface/resources/qml/hifi/Card.qml
+++ b/interface/resources/qml/hifi/Card.qml
@ -17,7 +17,7 @@ import QtGraphicalEffects 1.0
 import TabletScriptingInterface 1.0

 import "toolbars"
-import "../styles-uit"
+import stylesUit 1.0

 Item {
    id: root;
--- a/Show more
+++ b/Show more