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

Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0

Browse Source
This commit is contained in:
Jaime van Kessel 2017-09-27 12:57:42 +02:00
commit 2dee054003
23 changed files with 111 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/CuraSplashScreen.py
View File

@ -10,7 +10,6 @@ from PyQt5.QtWidgets import QSplashScreen
from UM.Resources import Resources from UM.Resources import Resources
from UM.Application import Application from UM.Application import Application
class CuraSplashScreen(QSplashScreen): class CuraSplashScreen(QSplashScreen):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
@ -61,7 +60,7 @@ class CuraSplashScreen(QSplashScreen):
# draw version text # draw version text
font = QFont() # Using system-default font here font = QFont() # Using system-default font here
font.setPointSize(28) font.setPixelSize(37)
painter.setFont(font) painter.setFont(font)
painter.drawText(220, 66, 330 * self._scale, 230 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[0]) painter.drawText(220, 66, 330 * self._scale, 230 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[0])
if len(version) > 1: if len(version) > 1:
@ -81,7 +80,7 @@ class CuraSplashScreen(QSplashScreen):
# draw message text # draw message text
if self._current_message: if self._current_message:
font = QFont() # Using system-default font here font = QFont() # Using system-default font here
font.setPointSize(10) font.setPixelSize(13)
pen = QPen() pen = QPen()
pen.setColor(QColor(255, 255, 255, 255)) pen.setColor(QColor(255, 255, 255, 255))
painter.setPen(pen) painter.setPen(pen)
@ -107,5 +106,3 @@ class CuraSplashScreen(QSplashScreen):
self._to_stop = True self._to_stop = True
self._change_timer.stop() self._change_timer.stop()
super().close() super().close()

16
plugins/3MFReader/WorkspaceDialog.qml
View File

@ -12,11 +12,13 @@ UM.Dialog
{ {
title: catalog.i18nc("@title:window", "Open Project") title: catalog.i18nc("@title:window", "Open Project")
width: 500 minimumWidth: 500 * screenScaleFactor
height: 400 minimumHeight: 400 * screenScaleFactor
width: minimumWidth
height: minumumHeight
property int comboboxHeight: 15 property int comboboxHeight: 15 * screenScaleFactor
property int spacerHeight: 10 property int spacerHeight: 10 * screenScaleFactor
onClosing: manager.notifyClosed() onClosing: manager.notifyClosed()
onVisibleChanged: onVisibleChanged:
@ -31,7 +33,7 @@ UM.Dialog
Item Item
{ {
anchors.fill: parent anchors.fill: parent
anchors.margins: 20 anchors.margins: 20 * screenScaleFactor
UM.I18nCatalog UM.I18nCatalog
{ {
@ -59,7 +61,7 @@ UM.Dialog
Column Column
{ {
anchors.fill: parent anchors.fill: parent
spacing: 2 spacing: 2 * screenScaleFactor
Label Label
{ {
id: titleLabel id: titleLabel
@ -373,7 +375,7 @@ UM.Dialog
enabled: true enabled: true
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: ok_button.left anchors.right: ok_button.left
anchors.rightMargin:2 anchors.rightMargin: 2 * screenScaleFactor
} }
Button Button
{ {

38
plugins/ImageReader/ConfigUI.qml
View File

@ -10,11 +10,11 @@ import UM 1.1 as UM
UM.Dialog UM.Dialog
{ {
width: 350 * Screen.devicePixelRatio; width: minimumWidth;
minimumWidth: 350 * Screen.devicePixelRatio; minimumWidth: 350 * screenScaleFactor;
height: 250 * Screen.devicePixelRatio; height: minimumHeight;
minimumHeight: 250 * Screen.devicePixelRatio; minimumHeight: 250 * screenScaleFactor;
title: catalog.i18nc("@title:window", "Convert Image...") title: catalog.i18nc("@title:window", "Convert Image...")
@ -23,8 +23,8 @@ UM.Dialog
UM.I18nCatalog{id: catalog; name:"cura"} UM.I18nCatalog{id: catalog; name:"cura"}
anchors.fill: parent; anchors.fill: parent;
Layout.fillWidth: true Layout.fillWidth: true
columnSpacing: 16 columnSpacing: 16 * screenScaleFactor
rowSpacing: 4 rowSpacing: 4 * screenScaleFactor
columns: 1 columns: 1
UM.TooltipArea { UM.TooltipArea {
@ -36,7 +36,7 @@ UM.Dialog
Label { Label {
text: catalog.i18nc("@action:label","Height (mm)") text: catalog.i18nc("@action:label","Height (mm)")
width: 150 width: 150 * screenScaleFactor
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@ -44,7 +44,7 @@ UM.Dialog
id: peak_height id: peak_height
objectName: "Peak_Height" objectName: "Peak_Height"
validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: -500; top: 500;} validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: -500; top: 500;}
width: 180 width: 180 * screenScaleFactor
onTextChanged: { manager.onPeakHeightChanged(text) } onTextChanged: { manager.onPeakHeightChanged(text) }
} }
} }
@ -59,7 +59,7 @@ UM.Dialog
Label { Label {
text: catalog.i18nc("@action:label","Base (mm)") text: catalog.i18nc("@action:label","Base (mm)")
width: 150 width: 150 * screenScaleFactor
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@ -67,7 +67,7 @@ UM.Dialog
id: base_height id: base_height
objectName: "Base_Height" objectName: "Base_Height"
validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 0; top: 500;} validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 0; top: 500;}
width: 180 width: 180 * screenScaleFactor
onTextChanged: { manager.onBaseHeightChanged(text) } onTextChanged: { manager.onBaseHeightChanged(text) }
} }
} }
@ -82,7 +82,7 @@ UM.Dialog
Label { Label {
text: catalog.i18nc("@action:label","Width (mm)") text: catalog.i18nc("@action:label","Width (mm)")
width: 150 width: 150 * screenScaleFactor
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@ -91,7 +91,7 @@ UM.Dialog
objectName: "Width" objectName: "Width"
focus: true focus: true
validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 1; top: 500;} validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 1; top: 500;}
width: 180 width: 180 * screenScaleFactor
onTextChanged: { manager.onWidthChanged(text) } onTextChanged: { manager.onWidthChanged(text) }
} }
} }
@ -106,7 +106,7 @@ UM.Dialog
Label { Label {
text: catalog.i18nc("@action:label","Depth (mm)") text: catalog.i18nc("@action:label","Depth (mm)")
width: 150 width: 150 * screenScaleFactor
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
TextField { TextField {
@ -114,7 +114,7 @@ UM.Dialog
objectName: "Depth" objectName: "Depth"
focus: true focus: true
validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 1; top: 500;} validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 1; top: 500;}
width: 180 width: 180 * screenScaleFactor
onTextChanged: { manager.onDepthChanged(text) } onTextChanged: { manager.onDepthChanged(text) }
} }
} }
@ -130,14 +130,14 @@ UM.Dialog
//Empty label so 2 column layout works. //Empty label so 2 column layout works.
Label { Label {
text: "" text: ""
width: 150 width: 150 * screenScaleFactor
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
ComboBox { ComboBox {
id: image_color_invert id: image_color_invert
objectName: "Image_Color_Invert" objectName: "Image_Color_Invert"
model: [ catalog.i18nc("@item:inlistbox","Lighter is higher"), catalog.i18nc("@item:inlistbox","Darker is higher") ] model: [ catalog.i18nc("@item:inlistbox","Lighter is higher"), catalog.i18nc("@item:inlistbox","Darker is higher") ]
width: 180 width: 180 * screenScaleFactor
onCurrentIndexChanged: { manager.onImageColorInvertChanged(currentIndex) } onCurrentIndexChanged: { manager.onImageColorInvertChanged(currentIndex) }
} }
} }
@ -152,13 +152,13 @@ UM.Dialog
Label { Label {
text: catalog.i18nc("@action:label","Smoothing") text: catalog.i18nc("@action:label","Smoothing")
width: 150 width: 150 * screenScaleFactor
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
Item { Item {
width: 180 width: 180 * screenScaleFactor
height: 20 height: 20 * screenScaleFactor
Layout.fillWidth: true Layout.fillWidth: true
Slider { Slider {

6
plugins/LayerView/LayerView.qml
View File

@ -111,7 +111,7 @@ Item
visible: !UM.LayerView.compatibilityMode visible: !UM.LayerView.compatibilityMode
style: UM.Theme.styles.combobox style: UM.Theme.styles.combobox
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 10 anchors.rightMargin: 10 * screenScaleFactor
onActivated: onActivated:
{ {
@ -353,7 +353,7 @@ Item
property real minimumRangeHandleSize: UM.Theme.getSize("slider_handle").width / 2 property real minimumRangeHandleSize: UM.Theme.getSize("slider_handle").width / 2
property real trackThickness: UM.Theme.getSize("slider_groove").width property real trackThickness: UM.Theme.getSize("slider_groove").width
property real trackRadius: trackThickness / 2 property real trackRadius: trackThickness / 2
property real trackBorderWidth: UM.Theme.getSize("default_lining").width / 2 property real trackBorderWidth: UM.Theme.getSize("default_lining").width
property color upperHandleColor: UM.Theme.getColor("slider_handle") property color upperHandleColor: UM.Theme.getColor("slider_handle")
property color lowerHandleColor: UM.Theme.getColor("slider_handle") property color lowerHandleColor: UM.Theme.getColor("slider_handle")
property color rangeHandleColor: UM.Theme.getColor("slider_groove_fill") property color rangeHandleColor: UM.Theme.getColor("slider_groove_fill")
@ -602,7 +602,7 @@ Item
anchors.leftMargin: UM.Theme.getSize("default_margin").width / 2; anchors.leftMargin: UM.Theme.getSize("default_margin").width / 2;
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
width: Math.max(UM.Theme.getSize("line").width * maxValue.length + 2, 20); width: Math.max(UM.Theme.getSize("line").width * maxValue.length + 2 * screenScaleFactor, 20 * screenScaleFactor);
style: TextFieldStyle style: TextFieldStyle
{ {
textColor: UM.Theme.getColor("setting_control_text"); textColor: UM.Theme.getColor("setting_control_text");

4
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -30,7 +30,7 @@ Item {
{ {
// This is to ensure that the panel is first increasing in size up to 200 and then shows a scrollbar. // This is to ensure that the panel is first increasing in size up to 200 and then shows a scrollbar.
// It kinda looks ugly otherwise (big panel, no content on it) // It kinda looks ugly otherwise (big panel, no content on it)
property int maximumHeight: 200 * Screen.devicePixelRatio property int maximumHeight: 200 * screenScaleFactor
height: Math.min(contents.count * (UM.Theme.getSize("section").height + UM.Theme.getSize("default_lining").height), maximumHeight) height: Math.min(contents.count * (UM.Theme.getSize("section").height + UM.Theme.getSize("default_lining").height), maximumHeight)
ScrollView ScrollView
@ -246,7 +246,7 @@ Item {
id: settingPickDialog id: settingPickDialog
title: catalog.i18nc("@title:window", "Select Settings to Customize for this model") title: catalog.i18nc("@title:window", "Select Settings to Customize for this model")
width: Screen.devicePixelRatio * 360; width: screenScaleFactor * 360;
property string labelFilter: "" property string labelFilter: ""

8
plugins/PluginBrowser/PluginBrowser.qml
View File

@ -9,10 +9,10 @@ UM.Dialog
id: base id: base
title: catalog.i18nc("@title:window", "Find & Update plugins") title: catalog.i18nc("@title:window", "Find & Update plugins")
width: 600 * Screen.devicePixelRatio width: 600 * screenScaleFactor
height: 450 * Screen.devicePixelRatio height: 450 * screenScaleFactor
minimumWidth: 350 * Screen.devicePixelRatio minimumWidth: 350 * screenScaleFactor
minimumHeight: 350 * Screen.devicePixelRatio minimumHeight: 350 * screenScaleFactor
Item Item
{ {
anchors.fill: parent anchors.fill: parent

4
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View File

@ -298,8 +298,8 @@ Cura.MachineAction
title: catalog.i18nc("@title:window", "Printer Address") title: catalog.i18nc("@title:window", "Printer Address")
minimumWidth: 400 * Screen.devicePixelRatio minimumWidth: 400 * screenScaleFactor
minimumHeight: 120 * Screen.devicePixelRatio minimumHeight: 120 * screenScaleFactor
width: minimumWidth width: minimumWidth
height: minimumHeight height: minimumHeight

8
plugins/USBPrinting/FirmwareUpdateWindow.qml
View File

@ -11,10 +11,10 @@ UM.Dialog
{ {
id: base; id: base;
width: 500 * Screen.devicePixelRatio; width: minimumWidth;
minimumWidth: 500 * Screen.devicePixelRatio; minimumWidth: 500 * screenScaleFactor;
height: 100 * Screen.devicePixelRatio; height: minimumHeight;
minimumHeight: 100 * Screen.devicePixelRatio; minimumHeight: 100 * screenScaleFactor;
visible: true; visible: true;
modality: Qt.ApplicationModal; modality: Qt.ApplicationModal;

4
resources/qml/AboutDialog.qml
View File

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

12
resources/qml/AskOpenAsProjectOrModelsDialog.qml
View File

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

4
resources/qml/DiscardOrKeepProfileChangesDialog.qml
View File

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

2
resources/qml/ExtruderButton.qml
View File

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

14
resources/qml/OpenFilesIncludingProjectsDialog.qml
View File

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

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

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

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

@ -91,7 +91,7 @@ UM.ManagementPage
Item Item
{ {
width: childrenRect.width + 2 width: childrenRect.width + 2 * screenScaleFactor
height: childrenRect.height height: childrenRect.height
Button Button
{ {
@ -112,8 +112,6 @@ UM.ManagementPage
{ {
id: actionDialog id: actionDialog
property var content property var content
minimumWidth: 350
minimumHeight: 350
onContentChanged: onContentChanged:
{ {
contents = content; contents = content;
@ -257,8 +255,8 @@ UM.ManagementPage
UM.RenameDialog UM.RenameDialog
{ {
id: renameDialog; id: renameDialog;
width: 300 width: 300 * screenScaleFactor
height: 150 height: 150 * screenScaleFactor
object: base.currentItem && base.currentItem.name ? base.currentItem.name : ""; object: base.currentItem && base.currentItem.name ? base.currentItem.name : "";
property var machine_name_validator: Cura.MachineNameValidator { } property var machine_name_validator: Cura.MachineNameValidator { }
validName: renameDialog.newName.match(renameDialog.machine_name_validator.machineNameRegex) != null; 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 { UM.RecolorImage {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: parent.width/2.5 width: parent.width / 2.5
height: parent.height/2.5 height: parent.height / 2.5
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text"); 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") source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5 sourceSize.width: width + 5 * screenScaleFactor
sourceSize.height: width + 5 sourceSize.height: width + 5 * screenScaleFactor
color: UM.Theme.getColor("setting_control_text"); 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") source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5 sourceSize.width: width + 5 * screenScaleFactor
sourceSize.height: width + 5 sourceSize.height: width + 5 * screenScaleFactor
color: UM.Theme.getColor("setting_control_text") 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") source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5 sourceSize.width: width + 5 * screenScaleFactor
sourceSize.height: width + 5 sourceSize.height: width + 5 * screenScaleFactor
color: UM.Theme.getColor("setting_control_text") color: UM.Theme.getColor("setting_control_text")
} }

34
resources/qml/SidebarSimple.qml
View File

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

10
resources/qml/WorkspaceSummaryDialog.qml
View File

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

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

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