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

cura/CuraApplication.py

@@ -276,19 +276,13 @@ class CuraApplication(QtApplication):
                     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):

plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py

@@ -88,10 +88,13 @@ class WindowsRemovableDrivePlugin(RemovableDrivePlugin.RemovableDrivePlugin):
 
         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)

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: [

resources/themes/cura/theme.json

@@ -102,6 +102,7 @@
         "setting_control_text": [0, 0, 0, 255],
         "setting_control_hover": [139, 143, 153, 255],
         "setting_control_selected": [35, 35, 35, 255],
+        "setting_control_revert": [85, 85, 85, 255],
         "setting_unit": [174, 174, 174, 255],
         "setting_validation_error": [255, 57, 14, 255],
         "setting_validation_warning": [255, 186, 15, 255],