From 379430d0728edb78bb505e1334b171d94eb9e0d5 Mon Sep 17 00:00:00 2001 From: petterreinholdtsen Date: Thu, 12 Oct 2017 13:40:46 +0200 Subject: [PATCH 1/6] List model/x3d+xml in the desktop file Add model/x3d+xml as a supported MIME type in the desktop file. Fixes issue #2571. --- cura.desktop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura.desktop.in b/cura.desktop.in index 782167b5fc..2d823f01a0 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; From ad8af82a58693e0e0fb6db725fb9b2cf3633b01e Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 16 Oct 2017 14:51:59 +0200 Subject: [PATCH 2/6] Fix size of "beta" classifier on splash screen for HiDPI (windows) screens --- cura/CuraSplashScreen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]) From b2dbefc82340a3061c8925f6fdb8cdd094147407 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Wed, 18 Oct 2017 15:44:02 +0200 Subject: [PATCH 3/6] Update helper text for custom changes in recommended settings - CURA-4333 --- resources/qml/SidebarSimple.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() From 3ddb277477086e2a66376f4b36462e0a4e195615 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Wed, 18 Oct 2017 16:01:14 +0200 Subject: [PATCH 4/6] Remove double sidebar header item, fixes #2605 --- resources/qml/SidebarHeader.qml | 14 -------------- 1 file changed, 14 deletions(-) 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 From 5a8fa92c3fa2d504f8eabeeb49ea24b004404b75 Mon Sep 17 00:00:00 2001 From: "A.Sasin" Date: Thu, 19 Oct 2017 09:01:15 +0200 Subject: [PATCH 5/6] Added semicolon CURA-4449 --- cura.desktop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura.desktop.in b/cura.desktop.in index 2d823f01a0..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;model/x3d+xml +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; From 475f6223d47719af15f428a37bdde270aa02b80c Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 19 Oct 2017 10:24:24 +0200 Subject: [PATCH 6/6] Remove executable bit for json files --- resources/definitions/dagoma_discoeasy200.def.json | 0 resources/definitions/fdmprinter.def.json | 0 resources/definitions/helloBEEprusa.def.json | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 resources/definitions/dagoma_discoeasy200.def.json mode change 100755 => 100644 resources/definitions/fdmprinter.def.json mode change 100755 => 100644 resources/definitions/helloBEEprusa.def.json 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