3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

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

Browse source
This commit is contained in:
Ghostkeeper 2017-09-27 14:20:38 +02:00
commit d417bfc7cc
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
23 changed files with 111 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/AboutDialog.qml
View file

@ -14,8 +14,8 @@ UM.Dialog
//: About dialog title
title: catalog.i18nc("@title:window","About Cura")
minimumWidth: 500
minimumHeight: 650
minimumWidth: 500 * screenScaleFactor
minimumHeight: 650 * screenScaleFactor
width: minimumWidth
height: minimumHeight

12
resources/qml/AskOpenAsProjectOrModelsDialog.qml
View file

@ -18,8 +18,8 @@ UM.Dialog
id: base
title: catalog.i18nc("@title:window", "Open project file")
width: 450
height: 150
width: 450 * screenScaleFactor
height: 150 * screenScaleFactor
maximumHeight: height
maximumWidth: width
@ -61,10 +61,10 @@ UM.Dialog
Column
{
anchors.fill: parent
anchors.leftMargin: 20
anchors.rightMargin: 20
anchors.bottomMargin: 20
spacing: 10
anchors.leftMargin: 20 * screenScaleFactor
anchors.rightMargin: 20 * screenScaleFactor
anchors.bottomMargin: 20 * screenScaleFactor
spacing: 10 * screenScaleFactor
Label
{

4
resources/qml/DiscardOrKeepProfileChangesDialog.qml
View file

@ -14,8 +14,8 @@ UM.Dialog
id: base
title: catalog.i18nc("@title:window", "Discard or Keep changes")
width: 800
height: 400
width: 800 * screenScaleFactor
height: 400 * screenScaleFactor
property var changesModel: Cura.UserChangesModel{ id: userChangesModel}
onVisibilityChanged:
{

2
resources/qml/ExtruderButton.qml
View file

@ -67,7 +67,7 @@ Button
height: UM.Theme.getSize("extruder_button_material").height
radius: width / 2
border.width: 1
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("extruder_button_material_border")
opacity: !base.enabled ? 0.2 : 1.0

14
resources/qml/OpenFilesIncludingProjectsDialog.qml
View file

@ -17,8 +17,8 @@ UM.Dialog
id: base
title: catalog.i18nc("@title:window", "Open file(s)")
width: 420
height: 170
width: 420 * screenScaleFactor
height: 170 * screenScaleFactor
maximumHeight: height
maximumWidth: width
@ -28,7 +28,7 @@ UM.Dialog
modality: UM.Application.platform == "linux" ? Qt.NonModal : Qt.WindowModal;
property var fileUrls: []
property int spacerHeight: 10
property int spacerHeight: 10 * screenScaleFactor
function loadProjectFile(projectFile)
{
@ -52,12 +52,12 @@ UM.Dialog
Column
{
anchors.fill: parent
anchors.leftMargin: 20
anchors.rightMargin: 20
anchors.bottomMargin: 20
anchors.leftMargin: 20 * screenScaleFactor
anchors.rightMargin: 20 * screenScaleFactor
anchors.bottomMargin: 20 * screenScaleFactor
anchors.left: parent.left
anchors.right: parent.right
spacing: 10
spacing: 10 * screenScaleFactor
Label
{

8
resources/qml/Preferences/GeneralPage.qml
View file

@ -513,7 +513,7 @@ UM.PreferencesPage
Column
{
spacing: 4
spacing: 4 * screenScaleFactor
Label
{
@ -523,7 +523,7 @@ UM.PreferencesPage
ComboBox
{
id: choiceOnOpenProjectDropDownButton
width: 200
width: 200 * screenScaleFactor
model: ListModel
{
@ -572,7 +572,7 @@ UM.PreferencesPage
Column
{
spacing: 4
spacing: 4 * screenScaleFactor
Label
{
@ -583,7 +583,7 @@ UM.PreferencesPage
ComboBox
{
id: choiceOnProfileOverrideDropDownButton
width: 200
width: 200 * screenScaleFactor
model: ListModel
{

8
resources/qml/Preferences/MachinesPage.qml
View file

@ -91,7 +91,7 @@ UM.ManagementPage
Item
{
width: childrenRect.width + 2
width: childrenRect.width + 2 * screenScaleFactor
height: childrenRect.height
Button
{
@ -112,8 +112,6 @@ UM.ManagementPage
{
id: actionDialog
property var content
minimumWidth: 350
minimumHeight: 350
onContentChanged:
{
contents = content;
@ -257,8 +255,8 @@ UM.ManagementPage
UM.RenameDialog
{
id: renameDialog;
width: 300
height: 150
width: 300 * screenScaleFactor
height: 150 * screenScaleFactor
object: base.currentItem && base.currentItem.name ? base.currentItem.name : "";
property var machine_name_validator: Cura.MachineNameValidator { }
validName: renameDialog.newName.match(renameDialog.machine_name_validator.machineNameRegex) != null;

4
resources/qml/Settings/SettingCheckBox.qml
View file

@ -119,8 +119,8 @@ SettingItem
UM.RecolorImage {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width/2.5
height: parent.height/2.5
width: parent.width / 2.5
height: parent.height / 2.5
sourceSize.width: width
sourceSize.height: width
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text");

4
resources/qml/Settings/SettingComboBox.qml
View file

@ -86,8 +86,8 @@ SettingItem
source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5
sourceSize.height: width + 5
sourceSize.width: width + 5 * screenScaleFactor
sourceSize.height: width + 5 * screenScaleFactor
color: UM.Theme.getColor("setting_control_text");

4
resources/qml/Settings/SettingExtruder.qml
View file

@ -137,8 +137,8 @@ SettingItem
source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5
sourceSize.height: width + 5
sourceSize.width: width + 5 * screenScaleFactor
sourceSize.height: width + 5 * screenScaleFactor
color: UM.Theme.getColor("setting_control_text")
}

4
resources/qml/Settings/SettingOptionalExtruder.qml
View file

@ -156,8 +156,8 @@ SettingItem
source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5
sourceSize.height: width + 5
sourceSize.width: width + 5 * screenScaleFactor
sourceSize.height: width + 5 * screenScaleFactor
color: UM.Theme.getColor("setting_control_text")
}

34
resources/qml/SidebarSimple.qml
View file

@ -213,7 +213,7 @@ Item
{
id: groovechildrect
width: base.width * 0.55
height: 2
height: 2 * screenScaleFactor
color: UM.Theme.getColor("quality_slider_unavailable")
anchors.verticalCenter: qualitySlider.verticalCenter
x: 0
@ -229,8 +229,8 @@ Item
{
anchors.verticalCenter: parent.verticalCenter
color: Cura.ProfilesModel.getItem(index).available ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
width: 1
height: 6
width: 1 * screenScaleFactor
height: 6 * screenScaleFactor
y: 0
x: qualityModel.qualitySliderStepWidth * index
}
@ -260,18 +260,18 @@ Item
{
//Draw Available line
groove: Rectangle {
implicitHeight: 2
implicitHeight: 2 * screenScaleFactor
color: UM.Theme.getColor("quality_slider_available")
radius: 1
radius: 1 * screenScaleFactor
}
handle: Item {
Rectangle {
id: qualityhandleButton
anchors.centerIn: parent
color: control.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
implicitWidth: 10
implicitHeight: 10
radius: 10
implicitWidth: 10 * screenScaleFactor
implicitHeight: 10 * screenScaleFactor
radius: 10 * screenScaleFactor
}
}
}
@ -372,7 +372,7 @@ Item
//anchors.top: parent.top
anchors.left: infillSlider.left
anchors.leftMargin: (infillSlider.value / infillSlider.stepSize) * (infillSlider.width / (infillSlider.maximumValue / infillSlider.stepSize)) - 10
anchors.leftMargin: (infillSlider.value / infillSlider.stepSize) * (infillSlider.width / (infillSlider.maximumValue / infillSlider.stepSize)) - 10 * screenScaleFactor
anchors.right: parent.right
text: infillSlider.value + "%"
@ -413,8 +413,8 @@ Item
groove: Rectangle {
id: groove
implicitWidth: 200
implicitHeight: 2
implicitWidth: 200 * screenScaleFactor
implicitHeight: 2 * screenScaleFactor
color: control.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
radius: 1
}
@ -424,9 +424,9 @@ Item
id: handleButton
anchors.centerIn: parent
color: control.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
implicitWidth: 10
implicitHeight: 10
radius: 10
implicitWidth: 10 * screenScaleFactor
implicitHeight: 10 * screenScaleFactor
radius: 10 * screenScaleFactor
}
}
@ -436,8 +436,8 @@ Item
Rectangle {
anchors.verticalCenter: parent.verticalCenter
color: control.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
width: 1
height: 6
width: 1 * screenScaleFactor
height: 6 * screenScaleFactor
y: 0
x: styleData.handleWidth / 2 + index * ((repeater.width - styleData.handleWidth) / (repeater.count-1))
}
@ -489,7 +489,7 @@ Item
UM.RecolorImage {
anchors.fill: parent
anchors.margins: 2
anchors.margins: 2 * screenScaleFactor
sourceSize.width: width
sourceSize.height: width
source: UM.Theme.getIcon(model.icon)

2
resources/qml/Toolbar.qml
View file

@ -67,7 +67,7 @@ Item
}
}
Item { height: UM.Theme.getSize("default_margin").height; width: 1; visible: extruders.count > 0 }
Item { height: UM.Theme.getSize("default_margin").height; width: UM.Theme.getSize("default_lining").width; visible: extruders.count > 0 }
Repeater
{

10
resources/qml/WorkspaceSummaryDialog.qml
View file

@ -13,10 +13,12 @@ UM.Dialog
{
title: catalog.i18nc("@title:window", "Save Project")
width: 500
height: 400
minimumWidth: 500 * screenScaleFactor
minimumHeight: 400 * screenScaleFactor
width: minimumWidth
height: minimumHeight
property int spacerHeight: 10
property int spacerHeight: 10 * screenScaleFactor
property bool dontShowAgain: true
@ -63,7 +65,7 @@ UM.Dialog
Column
{
anchors.fill: parent
spacing: 2
spacing: 2 * screenScaleFactor
Label
{
id: titleLabel

18
resources/themes/cura-light/styles.qml
View file

@ -309,7 +309,7 @@ QtObject {
}
Behavior on color { ColorAnimation { duration: 50; } }
border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? 2 : 0
border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? 2 * screenScaleFactor : 0
border.color: Theme.getColor("tool_button_border")
UM.RecolorImage {
@ -506,8 +506,8 @@ QtObject {
source: control.iconSource;
width: Theme.getSize("section_icon").width;
height: Theme.getSize("section_icon").height;
sourceSize.width: width + 15
sourceSize.height: width + 15
sourceSize.width: width + 15 * screenScaleFactor
sourceSize.height: width + 15 * screenScaleFactor
}
}
@ -648,8 +648,8 @@ QtObject {
source: Theme.getIcon("arrow_bottom")
width: Theme.getSize("standard_arrow").width
height: Theme.getSize("standard_arrow").height
sourceSize.width: width + 5
sourceSize.height: width + 5
sourceSize.width: width + 5 * screenScaleFactor
sourceSize.height: width + 5 * screenScaleFactor
color: Theme.getColor("setting_control_text");
}
@ -707,8 +707,8 @@ QtObject {
source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5
sourceSize.height: width + 5
sourceSize.width: width + 5 * screenScaleFactor
sourceSize.height: width + 5 * screenScaleFactor
color: UM.Theme.getColor("setting_control_text")
}
@ -734,8 +734,8 @@ QtObject {
UM.RecolorImage {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width/2.5
height: parent.height/2.5
width: parent.width / 2.5
height: parent.height / 2.5
sourceSize.width: width
sourceSize.height: width
color: Theme.getColor("checkbox_mark")