diff --git a/cura.desktop.in b/cura.desktop.in index 782167b5fc..778e1d5033 100644 --- a/cura.desktop.in +++ b/cura.desktop.in @@ -10,6 +10,6 @@ TryExec=@CMAKE_INSTALL_FULL_BINDIR@/cura Icon=cura-icon Terminal=false Type=Application -MimeType=application/sla;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png; +MimeType=application/sla;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;model/x3d+xml; Categories=Graphics; Keywords=3D;Printing; diff --git a/cura/CuraSplashScreen.py b/cura/CuraSplashScreen.py index f6ce703fa8..77c9ad1427 100644 --- a/cura/CuraSplashScreen.py +++ b/cura/CuraSplashScreen.py @@ -62,7 +62,7 @@ class CuraSplashScreen(QSplashScreen): painter.setFont(font) painter.drawText(215, 66, 330 * self._scale, 230 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[0]) if len(version) > 1: - font.setPointSize(12) + font.setPixelSize(16) painter.setFont(font) painter.setPen(QColor(200, 200, 200, 255)) painter.drawText(247, 105, 330 * self._scale, 255 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[1]) diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json old mode 100755 new mode 100644 diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json old mode 100755 new mode 100644 diff --git a/resources/definitions/helloBEEprusa.def.json b/resources/definitions/helloBEEprusa.def.json old mode 100755 new mode 100644 diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index aa0f8a3f38..8061d7fc7c 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -34,20 +34,6 @@ Column width: height } - Item - { - anchors - { - left: parent.left - leftMargin: UM.Theme.getSize("sidebar_margin").width - right: parent.right - rightMargin: UM.Theme.getSize("sidebar_margin").width - } - visible: extruderSelectionRow.visible - height: UM.Theme.getSize("default_lining").hieght - width: height - } - Item { id: extruderSelectionRow diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index a68e2171f9..1205d8cf5c 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -366,7 +366,7 @@ Item } onEntered: { - var content = catalog.i18nc("@tooltip","You have selected a custom profile. If you want to change it, go to custom mode.") + var content = catalog.i18nc("@tooltip","You have modified some profile settings. If you want to change these go to custom mode.") base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, customisedSettings.height), content) } onExited: base.hideTooltip()