3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Removed the components qml dir

Browse source 
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
This commit is contained in:
Jaime van Kessel 2018-10-15 10:26:27 +02:00
parent fc1faf79f5
commit 8cac5e1de2
11 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Account/AccountDetails.qml
View file

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

6
resources/qml/Account/GeneralOperations.qml
View file

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

6
resources/qml/Account/UserOperations.qml
View file

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

0
resources/qml/components/ActionButton.qml → resources/qml/ActionButton.qml
View file

1
resources/qml/Cura.qml
View file

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

5
resources/qml/components/MachineAndConfigurationSelector.qml → resources/qml/MachineAndConfigurationSelector.qml
View file

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

2
resources/qml/ProfileAndSettingComponent.qml
View file

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

1
resources/qml/Skeleton/ApplicationViews.qml
View file

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

1
resources/qml/Skeleton/TopHeader.qml
View file

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

0
resources/qml/components/ViewOrientationControls.qml → resources/qml/ViewOrientationControls.qml
View file

3
resources/qml/qmldir
View file

@ -1,5 +1,6 @@
module Cura module Cura
MachineAndConfigurationSelector 1.0 components/MachineAndConfigurationSelector.qml MachineAndConfigurationSelector 1.0 MachineAndConfigurationSelector.qml
MaterialAndVariantSelector 1.0 MaterialAndVariantSelector.qml MaterialAndVariantSelector 1.0 MaterialAndVariantSelector.qml
ProfileAndSettingComponent 1.0 ProfileAndSettingComponent.qml ProfileAndSettingComponent 1.0 ProfileAndSettingComponent.qml
ActionButton 1.0 ActionButton.qml