CURA-5035 Review feedback

cura/CuraPackageManager.py

@@ -254,7 +254,7 @@ class CuraPackageManager(QObject):
                 package_dir = os.path.join(root, dir_name, package_id)
                 if os.path.exists(package_dir):
                     Logger.log("i", "Removing '%s' for package [%s]", package_dir, package_id)
-                shutil.rmtree(package_dir)
+                    shutil.rmtree(package_dir)
             break
 
     # Installs all files associated with the given package.

plugins/Toolbox/resources/qml/ToolboxDetailList.qml

@@ -18,7 +18,7 @@ Item
         {
             anchors
             {
-                right: detailList.right
+                right: parent.right
                 topMargin: UM.Theme.getSize("wide_margin").height
                 bottomMargin: UM.Theme.getSize("wide_margin").height
                 top: parent.top

plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml

@@ -11,7 +11,7 @@ Column
 {
     // HACK: GridLayouts don't render to the correct height with odd numbers of
     // items, so if odd, add some extra space.
-    height: grid.model.items.length % 2 == 0 ? childrenRect.height : childrenRect.height + 3 * UM.Theme.getSize("wide_margin").height
+    height: grid.model.items.length % 2 == 0 ? childrenRect.height : childrenRect.height + UM.Theme.getSize("toolbox_thumbnail_small").height
     width: parent.width
     spacing: UM.Theme.getSize("default_margin").height
     Label

plugins/Toolbox/resources/qml/ToolboxFooter.qml

@@ -15,7 +15,7 @@ Item
     Label
     {
         visible: toolbox.restartRequired
-        text: "You will need to restart Cura before changes in plugins have effect."
+        text: catalog.i18nc("@info", "You will need to restart Cura before changes in plugins have effect.")
         height: Math.floor(UM.Theme.getSize("toolbox_footer_button").height)
         verticalAlignment: Text.AlignVCenter
         anchors
@@ -30,7 +30,7 @@ Item
     Button
     {
         id: restartButton
-        text: "Quit Cura"
+        text: catalog.i18nc("@info:button", "Quit Cura")
         anchors
         {
             top: parent.top

plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml

@@ -42,7 +42,7 @@ UM.Dialog
             anchors.right: parent.right
             anchors.topMargin: UM.Theme.getSize("default_margin").height
             readOnly: true
-            text: licenseDialog.licenseContent != null ? licenseDialog.licenseContent : ""
+            text: licenseDialog.licenseContent
         }
     }
     rightButtons:

plugins/Toolbox/resources/qml/ToolboxLoadingPage.qml

@@ -13,7 +13,7 @@ Rectangle
     color: "transparent"
     Label
     {
-        text: "Fetching packages..."
+        text: catalog.i18nc("@info", "Fetching packages...")
         anchors
         {
             centerIn: parent

plugins/Toolbox/src/Toolbox.py

@@ -310,7 +310,7 @@ class Toolbox(QObject, Extension):
     @pyqtSlot()
     def cancelDownload(self):
         Logger.log("i", "Toolbox: User cancelled the download of a plugin.")
-        self.resetDownload();
+        self.resetDownload()
         return
 
     def resetDownload(self):
@@ -338,6 +338,7 @@ class Toolbox(QObject, Extension):
 
         if reply.error() == QNetworkReply.HostNotFoundError:
             Logger.log("w", "Unable to reach server.")
+            self.resetDownload()
             return
 
         if reply.operation() == QNetworkAccessManager.GetOperation:
@@ -363,7 +364,6 @@ class Toolbox(QObject, Extension):
                             self._models["plugins_showcase"].setMetadata(self._metadata["plugins_showcase"])
                             self._metadata["materials_showcase"] = json_data["data"]["material"]["authors"]
                             self._models["materials_showcase"].setMetadata(self._metadata["materials_showcase"])
-                            print("MATERIAL SHOWCASE", self._metadata["materials_showcase"])
                         else:
                             # ...until here.
                             # This hack arises for multiple reasons but the main

resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg

@@ -1,14 +0,0 @@
-[general]
-version = 3
-name = Fine
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 4
-type = quality
-quality_type = normal
-weight = 0
-global_quality = True
-
-[values]
-layer_height = 0.1

resources/variants/ultimaker_s5_aa04.inst.cfg

@@ -1,42 +0,0 @@
-[general]
-name = AA 0.4
-version = 3
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 4
-type = variant
-hardware_type = nozzle
-
-[values]
-brim_width = 7
-machine_nozzle_cool_down_speed = 0.9
-machine_nozzle_id = AA 0.4
-machine_nozzle_tip_outer_diameter = 1.0
-raft_acceleration = =acceleration_print
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_jerk = =jerk_print
-raft_margin = 15
-raft_surface_layers = 2
-retraction_amount = 6.5
-retraction_count_max = 25
-retraction_min_travel = =line_width * 2
-retraction_prime_speed = =retraction_speed
-skin_overlap = 15
-speed_print = 70
-speed_topbottom = =math.ceil(speed_print * 30 / 70)
-speed_wall = =math.ceil(speed_print * 30 / 70)
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-support_top_distance = =support_z_distance
-support_use_towers = True
-support_z_distance = =layer_height * 2
-switch_extruder_prime_speed = =switch_extruder_retraction_speeds
-switch_extruder_retraction_amount = =machine_heat_zone_length
-top_bottom_thickness = 1.2
-wall_thickness = 1.3

resources/variants/ultimaker_s5_glass.inst.cfg

@@ -1,13 +0,0 @@
-[general]
-name = Glass
-version = 3
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 4
-type = variant
-hardware_type = buildplate
-
-[values]
-material_bed_temperature = =default_material_bed_temperature
-machine_buildplate_type = glass