Browse Source

Removed the components qml dir

We can consider putting components into their own folder, but we first should have a clear definition of what they are / should be.

CURA-5772
Jaime van Kessel 6 years ago
parent
commit
8cac5e1de2

+ 0 - 2
resources/qml/Account/AccountDetails.qml

@@ -7,8 +7,6 @@ import QtQuick.Controls 2.1
 import UM 1.4 as UM
 import Cura 1.1 as Cura
 
-import "../components"
-
 Column
 {
     property var profile: null

+ 2 - 4
resources/qml/Account/GeneralOperations.qml

@@ -7,13 +7,11 @@ import QtQuick.Controls 1.1
 import UM 1.4 as UM
 import Cura 1.1 as Cura
 
-import "../components"
-
 Row
 {
     spacing: UM.Theme.getSize("default_margin").width
 
-    ActionButton
+    Cura.ActionButton
     {
         width: UM.Theme.getSize("account_button").width
         height: UM.Theme.getSize("account_button").height
@@ -25,7 +23,7 @@ Row
         onClicked: Qt.openUrlExternally("https://account.ultimaker.com")
     }
 
-    ActionButton
+    Cura.ActionButton
     {
         width: UM.Theme.getSize("account_button").width
         height: UM.Theme.getSize("account_button").height

+ 2 - 4
resources/qml/Account/UserOperations.qml

@@ -7,13 +7,11 @@ import QtQuick.Controls 1.1
 import UM 1.4 as UM
 import Cura 1.1 as Cura
 
-import "../components"
-
 Row
 {
     spacing: UM.Theme.getSize("default_margin").width
 
-    ActionButton
+    Cura.ActionButton
     {
         width: UM.Theme.getSize("account_button").width
         height: UM.Theme.getSize("account_button").height
@@ -25,7 +23,7 @@ Row
         onClicked: Qt.openUrlExternally("https://account.ultimaker.com")
     }
 
-    ActionButton
+    Cura.ActionButton
     {
         width: UM.Theme.getSize("account_button").width
         height: UM.Theme.getSize("account_button").height

+ 0 - 0
resources/qml/components/ActionButton.qml → resources/qml/ActionButton.qml


+ 0 - 1
resources/qml/Cura.qml

@@ -13,7 +13,6 @@ import Cura 1.1 as Cura
 import "Dialogs"
 import "Menus"
 import "Skeleton"
-import "components"
 
 UM.MainWindow
 {

+ 2 - 3
resources/qml/components/MachineAndConfigurationSelector.qml → resources/qml/MachineAndConfigurationSelector.qml

@@ -5,9 +5,8 @@ import QtQuick 2.7
 
 import UM 1.2 as UM
 import Cura 1.0 as Cura
-import "../Menus"
-import "../Menus/ConfigurationMenu"
-import ".."
+import "Menus"
+import "Menus/ConfigurationMenu"
 
 Rectangle
 {

+ 0 - 2
resources/qml/ProfileAndSettingComponent.qml

@@ -9,8 +9,6 @@ import UM 1.2 as UM
 import Cura 1.0 as Cura
 import "Menus"
 import "Menus/ConfigurationMenu"
-import "components"
-
 
 Rectangle
 {

+ 0 - 1
resources/qml/Skeleton/ApplicationViews.qml

@@ -9,7 +9,6 @@ import QtQuick.Layouts 1.1
 import UM 1.4 as UM
 import Cura 1.0 as Cura
 
-import "../components"
 
 // This item contains the views selector, a combobox that is dynamically created from
 // the list of available Views (packages that create different visualizations of the

+ 0 - 1
resources/qml/Skeleton/TopHeader.qml

@@ -8,7 +8,6 @@ import QtQuick.Controls.Styles 1.1
 import UM 1.4 as UM
 import Cura 1.0 as Cura
 
-import "../components"
 import "../Account"
 
 Rectangle

+ 0 - 0
resources/qml/components/ViewOrientationControls.qml → resources/qml/ViewOrientationControls.qml


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