File fix-crash-on-start.patch of Package cura

Overview Repositories Revisions Requests Users Attributes Meta

File fix-crash-on-start.patch of Package cura (Revision 8a749fbacf50145e985a448396f47681)

Currently displaying revision 8a749fbacf50145e985a448396f47681 , Show latest

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index f88467d65..e288d6933 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -772,7 +772,7 @@ class CuraApplication(QtApplication):
         self._setting_visibility_presets_model = SettingVisibilityPresetsModel(self.getPreferences(), parent = self)
 
         # Initialize Cura API
-        self._cura_API.initialize()
+#        self._cura_API.initialize()
 
         self._output_device_manager.start()
         self._welcome_pages_model.initialize()
@@ -861,6 +861,9 @@ class CuraApplication(QtApplication):
         # Initialize QML engine
         self.setMainQml(Resources.getPath(self.ResourceTypes.QmlFiles, "Cura.qml"))
         self._qml_import_paths.append(Resources.getPath(self.ResourceTypes.QmlFiles))
+#        from cura.API import CuraAPI
+#        qmlRegisterSingletonType(CuraAPI, "Cura", 1, 1, "API", self.getCuraAPI)
+
         self.initializeEngine()
 
         # Initialize UI state
@@ -1089,9 +1092,6 @@ class CuraApplication(QtApplication):
 
         qmlRegisterType(PrinterOutputDevice, "Cura", 1, 0, "PrinterOutputDevice")
 
-        from cura.API import CuraAPI
-        qmlRegisterSingletonType(CuraAPI, "Cura", 1, 1, "API", self.getCuraAPI)
-
         # As of Qt5.7, it is necessary to get rid of any ".." in the path for the singleton to work.
         actions_url = QUrl.fromLocalFile(os.path.abspath(Resources.getPath(CuraApplication.ResourceTypes.QmlFiles, "Actions.qml")))
         qmlRegisterSingletonType(actions_url, "Cura", 1, 0, "Actions")
diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index 5d1a20c8b..f55ef312a 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -87,6 +87,12 @@ Item
     Controls2.Button
     {
         id: marketplaceButton
+        anchors
+        {
+            verticalCenter: parent.verticalCenter
+            right: parent.right
+            rightMargin: UM.Theme.getSize("default_margin").width
+        }
         text: catalog.i18nc("@action:button", "Marketplace")
         height: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
         onClicked: Cura.Actions.browsePackages.trigger()
@@ -139,14 +145,4 @@ Item
         }
     }
 
-    AccountWidget
-    {
-        id: accountWidget
-        anchors
-        {
-            verticalCenter: parent.verticalCenter
-            right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
-        }
-    }
 }

Places

File fix-crash-on-start.patch of Package cura (Revision 8a749fbacf50145e985a448396f47681)

Places