From 946b8ae92d53923ecd720b15a4667bb7532df8be Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 19 Oct 2017 10:25:19 +0200 Subject: [PATCH 1/2] Remove executable bit for non-executable files --- resources/extruders/hBp_extruder_left.def.json | 0 resources/extruders/hBp_extruder_right.def.json | 0 resources/meshes/BEEVERYCREATIVE-helloBEEprusa.stl | Bin resources/qml/Actions.qml | 0 resources/qml/Cura.qml | 0 resources/qml/Menus/ContextMenu.qml | 0 resources/qml/Preferences/GeneralPage.qml | 0 resources/qml/Sidebar.qml | 0 8 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 resources/extruders/hBp_extruder_left.def.json mode change 100755 => 100644 resources/extruders/hBp_extruder_right.def.json mode change 100755 => 100644 resources/meshes/BEEVERYCREATIVE-helloBEEprusa.stl mode change 100755 => 100644 resources/qml/Actions.qml mode change 100755 => 100644 resources/qml/Cura.qml mode change 100755 => 100644 resources/qml/Menus/ContextMenu.qml mode change 100755 => 100644 resources/qml/Preferences/GeneralPage.qml mode change 100755 => 100644 resources/qml/Sidebar.qml diff --git a/resources/extruders/hBp_extruder_left.def.json b/resources/extruders/hBp_extruder_left.def.json old mode 100755 new mode 100644 diff --git a/resources/extruders/hBp_extruder_right.def.json b/resources/extruders/hBp_extruder_right.def.json old mode 100755 new mode 100644 diff --git a/resources/meshes/BEEVERYCREATIVE-helloBEEprusa.stl b/resources/meshes/BEEVERYCREATIVE-helloBEEprusa.stl old mode 100755 new mode 100644 diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml old mode 100755 new mode 100644 diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml old mode 100755 new mode 100644 diff --git a/resources/qml/Menus/ContextMenu.qml b/resources/qml/Menus/ContextMenu.qml old mode 100755 new mode 100644 diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml old mode 100755 new mode 100644 diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml old mode 100755 new mode 100644 From 5a125aa514e5891b03f6db10bc52904d710c5bbf Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 19 Oct 2017 13:37:45 +0200 Subject: [PATCH 2/2] Rename printCoreRow to variantRow Because on only one of our printers it's actually a print core. Internally we've always called it the variant. --- resources/qml/SidebarHeader.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 8061d7fc7c..f3887e2885 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -277,10 +277,10 @@ Column } } - // Print core row + //Variant row Item { - id: printCoreRow + id: variantRow height: UM.Theme.getSize("sidebar_setup").height visible: Cura.MachineManager.hasVariants && !sidebar.monitoringPrint && !sidebar.hideSettings @@ -294,7 +294,7 @@ Column Label { - id: printCoreLabel + id: variantLabel text: Cura.MachineManager.activeDefinitionVariantsName; width: Math.floor(parent.width * 0.45 - UM.Theme.getSize("default_margin").width) font: UM.Theme.getFont("default"); @@ -302,7 +302,7 @@ Column } ToolButton { - id: printCoreSelection + id: variantSelection text: Cura.MachineManager.activeVariantName tooltip: Cura.MachineManager.activeVariantName; visible: Cura.MachineManager.hasVariants