GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 02:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update QML import versions and add headings

Browse Source 
CURA-6598
This commit is contained in:
Lipu Fei 2019-09-03 11:01:39 +02:00
parent 7dc84f14a8
commit 52f3f9b773
9 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/qml/LabelBar.qml
View File

@ -1,7 +1,12 @@
import QtQuick 2.0 // Copyright (c) 2019 Ultimaker B.V.
import QtQuick.Controls 2.1 // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import UM 1.2 as UM import UM 1.2 as UM
// The labelBar shows a set of labels that are evenly spaced from oneother. // The labelBar shows a set of labels that are evenly spaced from oneother.
// The first item is aligned to the left, the last is aligned to the right. // The first item is aligned to the left, the last is aligned to the right.
// It's intended to be used together with RadioCheckBar. As such, it needs // It's intended to be used together with RadioCheckBar. As such, it needs

4
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View File

@ -1,8 +1,8 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.10
import QtQuick.Controls 2.0 import QtQuick.Controls 2.3
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import UM 1.2 as UM import UM 1.2 as UM

6
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View File

@ -1,9 +1,9 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.10
import QtQuick.Controls 2.0 import QtQuick.Controls 2.3
import QtQuick.Controls 1.1 as OldControls import QtQuick.Controls 1.4 as OldControls
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.6 as Cura import Cura 1.6 as Cura

7
resources/qml/PrintSetupSelector/Custom/MenuButton.qml
View File

@ -1,8 +1,11 @@
import QtQuick 2.0 // Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import Cura 1.6 as Cura
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.6 as Cura
Button Button
{ {

8
resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
View File

@ -1,8 +1,12 @@
import QtQuick 2.0 // Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import Cura 1.6 as Cura
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.6 as Cura
Popup Popup
{ {
id: popup id: popup

2
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View File

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.10
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3

2
resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml
View File

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4

2
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View File

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls 2.3 as Controls2 import QtQuick.Controls 2.3 as Controls2
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4

5
resources/qml/RadioCheckbar.qml
View File

@ -1,4 +1,7 @@
import QtQuick 2.0 // Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import UM 1.1 as UM import UM 1.1 as UM