From 02fd71fe58154bb46d5deba413b26c8c385e45ab Mon Sep 17 00:00:00 2001 From: Thomas-Karl Pietrowski Date: Fri, 11 Sep 2015 15:46:17 +0200 Subject: [PATCH 1/2] Fixes "could not create shader program" #385 For any reason this problem seems to be Ubuntu-specific and is also present since pyqt4. * Updated the #131 pull request and added platform.linux_distribution to check for "Ubuntu" * Added notice about the bug report above the if-clause * Added comment why is needed --- cura/CuraApplication.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 811e879207..1697cc020e 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1,6 +1,13 @@ # Copyright (c) 2015 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. +import platform + +if platform.system() == "Linux": # Needed for platform.linux_distribution, which is not available on Windows and OSX + # For Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/941826 + if platform.linux_distribution()[0] in ("Ubuntu", ): # Just in case it also happens on Debian, so it can be added + from OpenGL import GL + from UM.Qt.QtApplication import QtApplication from UM.Scene.SceneNode import SceneNode from UM.Scene.Camera import Camera From f95fcef19d266a8e001f0a2b9e61483888451b63 Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Fri, 11 Sep 2015 18:26:32 -0700 Subject: [PATCH 2/2] Fix a few typos in comments and tooltip nog to not --- resources/qml/ViewPage.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/qml/ViewPage.qml b/resources/qml/ViewPage.qml index 37a5024375..6905c044f4 100644 --- a/resources/qml/ViewPage.qml +++ b/resources/qml/ViewPage.qml @@ -35,14 +35,14 @@ UM.PreferencesPage } Button { - id: viewText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox + id: viewText //is a button so the user doesn't have to click inconveniently precise to enable or disable the checkbox //: Display Overhang preference checkbox text: catalog.i18nc("@option:check","Display Overhang"); onClicked: overhangCheckbox.checked = !overhangCheckbox.checked //: Display Overhang preference tooltip - tooltip: catalog.i18nc("@info:tooltip","Highlight unsupported areas of the model in red. Without support these areas will nog print properly.") + tooltip: catalog.i18nc("@info:tooltip","Highlight unsupported areas of the model in red. Without support these areas will not print properly.") style: ButtonStyle { @@ -68,13 +68,13 @@ UM.PreferencesPage } Button { - id: centerText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox + id: centerText //is a button so the user doesn't have to click inconveniently precise to enable or disable the checkbox - //: Display Overhang preference checkbox + //: Display Center camera preference checkbox text: catalog.i18nc("@action:button","Center camera when item is selected"); onClicked: centerCheckbox.checked = !centerCheckbox.checked - //: Display Overhang preference tooltip + //: Display Center camera preference tooltip tooltip: catalog.i18nc("@info:tooltip","Moves the camera so the object is in the center of the view when an object is selected") style: ButtonStyle