GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 21:59:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface

Browse Source
This commit is contained in:
Jaime van Kessel 2019-09-03 11:27:38 +02:00
commit c2225c9afc
No known key found for this signature in database
GPG Key ID: 3710727397403C91
9 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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
@ -27,8 +32,9 @@ Item
Item Item
{ {
Layout.fillWidth: true Layout.fillWidth: true
Layout.maximumWidth: index + 1 === repeater.count || repeater.count <= 1 ? itemSize : base.width / (repeater.count - 1) Layout.maximumWidth: Math.round(index + 1 === repeater.count || repeater.count <= 1 ? itemSize : base.width / (repeater.count - 1))
height: label.height height: label.height
Label Label
{ {
id: label id: label
@ -47,7 +53,7 @@ Item
// We want the center of the label to align with the center of the item, so we negatively offset by half the contentWidth // We want the center of the label to align with the center of the item, so we negatively offset by half the contentWidth
right: index + 1 === repeater.count ? parent.right: undefined right: index + 1 === repeater.count ? parent.right: undefined
left: index + 1 === repeater.count || index === 0 ? undefined: parent.left left: index + 1 === repeater.count || index === 0 ? undefined: parent.left
leftMargin: (0.5 * itemSize) - 0.5 * contentWidth leftMargin: Math.round((itemSize - contentWidth) * 0.5)
} }
} }
} }

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