From 8cac5e1de214b34ad39328fe93b29a9bfe270afe Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 15 Oct 2018 10:26:27 +0200 Subject: [PATCH] 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 --- resources/qml/Account/AccountDetails.qml | 2 -- resources/qml/Account/GeneralOperations.qml | 6 ++---- resources/qml/Account/UserOperations.qml | 6 ++---- resources/qml/{components => }/ActionButton.qml | 0 resources/qml/Cura.qml | 1 - .../{components => }/MachineAndConfigurationSelector.qml | 5 ++--- resources/qml/ProfileAndSettingComponent.qml | 2 -- resources/qml/Skeleton/ApplicationViews.qml | 1 - resources/qml/Skeleton/TopHeader.qml | 1 - resources/qml/{components => }/ViewOrientationControls.qml | 0 resources/qml/qmldir | 5 +++-- 11 files changed, 9 insertions(+), 20 deletions(-) rename resources/qml/{components => }/ActionButton.qml (100%) rename resources/qml/{components => }/MachineAndConfigurationSelector.qml (94%) rename resources/qml/{components => }/ViewOrientationControls.qml (100%) diff --git a/resources/qml/Account/AccountDetails.qml b/resources/qml/Account/AccountDetails.qml index ab1ccc15df..4d6b0a314b 100644 --- a/resources/qml/Account/AccountDetails.qml +++ b/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 diff --git a/resources/qml/Account/GeneralOperations.qml b/resources/qml/Account/GeneralOperations.qml index d224de44bb..1f3cd51f26 100644 --- a/resources/qml/Account/GeneralOperations.qml +++ b/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 diff --git a/resources/qml/Account/UserOperations.qml b/resources/qml/Account/UserOperations.qml index 1704254ed3..ffcf518b6e 100644 --- a/resources/qml/Account/UserOperations.qml +++ b/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 diff --git a/resources/qml/components/ActionButton.qml b/resources/qml/ActionButton.qml similarity index 100% rename from resources/qml/components/ActionButton.qml rename to resources/qml/ActionButton.qml diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 8955cb9598..304f78e633 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -13,7 +13,6 @@ import Cura 1.1 as Cura import "Dialogs" import "Menus" import "Skeleton" -import "components" UM.MainWindow { diff --git a/resources/qml/components/MachineAndConfigurationSelector.qml b/resources/qml/MachineAndConfigurationSelector.qml similarity index 94% rename from resources/qml/components/MachineAndConfigurationSelector.qml rename to resources/qml/MachineAndConfigurationSelector.qml index 5b919c42d8..15b9ca6dd6 100644 --- a/resources/qml/components/MachineAndConfigurationSelector.qml +++ b/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 { diff --git a/resources/qml/ProfileAndSettingComponent.qml b/resources/qml/ProfileAndSettingComponent.qml index 33c2f37fb1..dbded90576 100644 --- a/resources/qml/ProfileAndSettingComponent.qml +++ b/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 { diff --git a/resources/qml/Skeleton/ApplicationViews.qml b/resources/qml/Skeleton/ApplicationViews.qml index eb8ab16fae..d91837a2db 100644 --- a/resources/qml/Skeleton/ApplicationViews.qml +++ b/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 diff --git a/resources/qml/Skeleton/TopHeader.qml b/resources/qml/Skeleton/TopHeader.qml index f08a0aaca3..7344d01436 100644 --- a/resources/qml/Skeleton/TopHeader.qml +++ b/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 diff --git a/resources/qml/components/ViewOrientationControls.qml b/resources/qml/ViewOrientationControls.qml similarity index 100% rename from resources/qml/components/ViewOrientationControls.qml rename to resources/qml/ViewOrientationControls.qml diff --git a/resources/qml/qmldir b/resources/qml/qmldir index 5083b5e80a..b9306b14bc 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -1,5 +1,6 @@ module Cura -MachineAndConfigurationSelector 1.0 components/MachineAndConfigurationSelector.qml +MachineAndConfigurationSelector 1.0 MachineAndConfigurationSelector.qml MaterialAndVariantSelector 1.0 MaterialAndVariantSelector.qml -ProfileAndSettingComponent 1.0 ProfileAndSettingComponent.qml \ No newline at end of file +ProfileAndSettingComponent 1.0 ProfileAndSettingComponent.qml +ActionButton 1.0 ActionButton.qml \ No newline at end of file