Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

ad1217 · Sep 18, 2015 · d7923b8 · d7923b8
2 parents 90b033e + 6a91490
commit d7923b8
Show file tree

Hide file tree

Showing 5 changed files with 10,410 additions and 15 deletions.
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
@@ -276,19 +276,13 @@ def multiplyObject(self, object_id, count):
                     new_node.callDecoration("setConvexHull",None)
 
                     op.addOperation(AddSceneNodeOperation(new_node,node.getParent().getParent()))
-
-                    pass
                 else:
-                    new_node = SceneNode()
-                    new_node.setMeshData(node.getMeshData())
-
-                    new_node.translate(Vector((i + 1) * node.getBoundingBox().width, node.getPosition().y, 0))
-                    new_node.setOrientation(node.getOrientation())
-                    new_node.setScale(node.getScale())
-                    new_node.setSelectable(True)
+                    new_node = copy.deepcopy(node)
+                    new_node.callDecoration("setConvexHull", None)
                     op.addOperation(AddSceneNodeOperation(new_node, node.getParent()))
+
             op.push()
-    
+
     ##  Center object on platform.
     @pyqtSlot("quint64")
     def centerObject(self, object_id):

diff --git a/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
@@ -88,10 +88,13 @@ def performEjectDevice(self, device):
 
         result = None
         # Then, try and tell it to eject
-        if not windll.kernel32.DeviceIoControl(handle, IOCTL_STORAGE_EJECT_MEDIA, None, None, None, None, None, None):
+        try:
+            if not windll.kernel32.DeviceIoControl(handle, IOCTL_STORAGE_EJECT_MEDIA, None, None, None, None, None, None):
+                result = False
+            else:
+                result = True
+        except Exception as e:
             result = False
-        else:
-            result = True
 
         # Finally, close the handle
         windll.kernel32.CloseHandle(handle)

diff --git a/plugins/USBPrinting/FirmwareUpdateWindow.qml b/plugins/USBPrinting/FirmwareUpdateWindow.qml
@@ -5,7 +5,7 @@ import QtQuick 2.2
 import QtQuick.Window 2.2
 import QtQuick.Controls 1.2
 
-import UM 1.0 as UM
+import UM 1.1 as UM
 
 UM.Dialog
 {
@@ -23,7 +23,7 @@ UM.Dialog
     {
         anchors.fill: parent;
 
-        Text
+        Label
         {
             anchors
             {
@@ -70,6 +70,8 @@ UM.Dialog
         {
            id: palette;
         }
+
+        UM.I18nCatalog { id: catalog; name: "cura"; }
     }
 
     rightButtons: [