mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-12 09:17:50 -06:00
Merge branch '4.0'
This commit is contained in:
commit
5e3dedf62b
6 changed files with 48 additions and 32 deletions
|
@ -151,7 +151,7 @@ class CuraEngineBackend(QObject, Backend):
|
||||||
if self._multi_build_plate_model:
|
if self._multi_build_plate_model:
|
||||||
self._multi_build_plate_model.activeBuildPlateChanged.connect(self._onActiveViewChanged)
|
self._multi_build_plate_model.activeBuildPlateChanged.connect(self._onActiveViewChanged)
|
||||||
|
|
||||||
self._application.globalContainerStackChanged.connect(self._onGlobalStackChanged)
|
self._application.getMachineManager().globalContainerChanged.connect(self._onGlobalStackChanged)
|
||||||
self._onGlobalStackChanged()
|
self._onGlobalStackChanged()
|
||||||
|
|
||||||
# extruder enable / disable. Actually wanted to use machine manager here, but the initialization order causes it to crash
|
# extruder enable / disable. Actually wanted to use machine manager here, but the initialization order causes it to crash
|
||||||
|
@ -821,7 +821,7 @@ class CuraEngineBackend(QObject, Backend):
|
||||||
extruder.propertyChanged.disconnect(self._onSettingChanged)
|
extruder.propertyChanged.disconnect(self._onSettingChanged)
|
||||||
extruder.containersChanged.disconnect(self._onChanged)
|
extruder.containersChanged.disconnect(self._onChanged)
|
||||||
|
|
||||||
self._global_container_stack = self._application.getGlobalContainerStack()
|
self._global_container_stack = self._application.getMachineManager().activeMachine
|
||||||
|
|
||||||
if self._global_container_stack:
|
if self._global_container_stack:
|
||||||
self._global_container_stack.propertyChanged.connect(self._onSettingChanged) # Note: Only starts slicing when the value changed.
|
self._global_container_stack.propertyChanged.connect(self._onSettingChanged) # Note: Only starts slicing when the value changed.
|
||||||
|
|
|
@ -19,7 +19,7 @@ Item
|
||||||
property int position: 0
|
property int position: 0
|
||||||
|
|
||||||
// The extruder icon size; NOTE: This shouldn't need to be changed
|
// The extruder icon size; NOTE: This shouldn't need to be changed
|
||||||
property int size: 32 // TODO: Theme!
|
property int size: 32 * screenScaleFactor // TODO: Theme!
|
||||||
|
|
||||||
// THe extruder icon source; NOTE: This shouldn't need to be changed
|
// THe extruder icon source; NOTE: This shouldn't need to be changed
|
||||||
property string iconSource: "../svg/icons/extruder.svg"
|
property string iconSource: "../svg/icons/extruder.svg"
|
||||||
|
@ -35,27 +35,17 @@ Item
|
||||||
width: size
|
width: size
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* The label uses some "fancy" math to ensure that if you change the overall
|
|
||||||
* icon size, the number scales with it. That is to say, the font properties
|
|
||||||
* are linked to the icon size, NOT the theme. And that's intentional.
|
|
||||||
*/
|
|
||||||
Label
|
Label
|
||||||
{
|
{
|
||||||
id: positionLabel
|
id: positionLabel
|
||||||
font
|
font: UM.Theme.getFont("small")
|
||||||
{
|
height: Math.round(size / 2)
|
||||||
pointSize: Math.round(size * 0.3125)
|
|
||||||
weight: Font.Bold
|
|
||||||
}
|
|
||||||
height: Math.round(size / 2) * screenScaleFactor
|
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
text: position + 1
|
text: position + 1
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
width: Math.round(size / 2) * screenScaleFactor
|
width: Math.round(size / 2)
|
||||||
x: Math.round(size * 0.25) * screenScaleFactor
|
x: Math.round(size * 0.25)
|
||||||
y: Math.round(size * 0.15625) * screenScaleFactor
|
y: Math.round(size * 0.15625)
|
||||||
// TODO: Once 'size' is themed, screenScaleFactor won't be needed
|
|
||||||
visible: position >= 0
|
visible: position >= 0
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -109,7 +109,7 @@ Item
|
||||||
{
|
{
|
||||||
id: buttonRow
|
id: buttonRow
|
||||||
property real padding: UM.Theme.getSize("default_margin").width
|
property real padding: UM.Theme.getSize("default_margin").width
|
||||||
height: childrenRect.height + 2 * padding
|
height: recommendedButton.height + 2 * padding + (draggableArea.visible ? draggableArea.height : 0)
|
||||||
|
|
||||||
anchors
|
anchors
|
||||||
{
|
{
|
||||||
|
@ -149,14 +149,14 @@ Item
|
||||||
//Invisible area at the bottom with which you can resize the panel.
|
//Invisible area at the bottom with which you can resize the panel.
|
||||||
MouseArea
|
MouseArea
|
||||||
{
|
{
|
||||||
|
id: draggableArea
|
||||||
anchors
|
anchors
|
||||||
{
|
{
|
||||||
left: parent.left
|
left: parent.left
|
||||||
right: parent.right
|
right: parent.right
|
||||||
bottom: parent.bottom
|
bottom: parent.bottom
|
||||||
top: recommendedButton.bottom
|
|
||||||
topMargin: UM.Theme.getSize("default_lining").height
|
|
||||||
}
|
}
|
||||||
|
height: childrenRect.height
|
||||||
cursorShape: Qt.SplitVCursor
|
cursorShape: Qt.SplitVCursor
|
||||||
visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom
|
visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom
|
||||||
drag
|
drag
|
||||||
|
@ -187,15 +187,29 @@ Item
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
UM.RecolorImage
|
Rectangle
|
||||||
{
|
{
|
||||||
width: parent.width * 0.05
|
width: parent.width
|
||||||
height: parent.height * 0.3
|
height: UM.Theme.getSize("narrow_margin").height
|
||||||
|
color: UM.Theme.getColor("secondary")
|
||||||
|
|
||||||
anchors.centerIn: parent
|
Rectangle
|
||||||
|
{
|
||||||
|
anchors.bottom: parent.top
|
||||||
|
width: parent.width
|
||||||
|
height: UM.Theme.getSize("default_lining").height
|
||||||
|
color: UM.Theme.getColor("lining")
|
||||||
|
}
|
||||||
|
|
||||||
source: UM.Theme.getIcon("grip_lines")
|
UM.RecolorImage
|
||||||
color: UM.Theme.getColor("lining")
|
{
|
||||||
|
width: UM.Theme.getSize("drag_icon").width
|
||||||
|
height: UM.Theme.getSize("drag_icon").height
|
||||||
|
anchors.centerIn: parent
|
||||||
|
|
||||||
|
source: UM.Theme.getIcon("resize")
|
||||||
|
color: UM.Theme.getColor("small_button_text")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 6">
|
|
||||||
<rect width="30" height="2" rx="1" ry="1" />
|
|
||||||
<rect width="30" height="2" rx="1" ry="1" y="4" />
|
|
||||||
</svg>
|
|
Before Width: | Height: | Size: 170 B |
15
resources/themes/cura-light/icons/resize.svg
Normal file
15
resources/themes/cura-light/icons/resize.svg
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<svg width="17px" height="3px" viewBox="0 0 17 3" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||||
|
<!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
|
||||||
|
<title>Group</title>
|
||||||
|
<desc>Created with Sketch.</desc>
|
||||||
|
<g id="Print-settings" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||||
|
<g id="1024_custom--1-ex-copy" transform="translate(-773.000000, -643.000000)" fill="#999999">
|
||||||
|
<g id="Group" transform="translate(773.000000, 643.000000)">
|
||||||
|
<circle id="Oval" cx="1.5" cy="1.5" r="1.5"></circle>
|
||||||
|
<circle id="Oval-Copy" cx="8.5" cy="1.5" r="1.5"></circle>
|
||||||
|
<circle id="Oval-Copy-2" cx="15.5" cy="1.5" r="1.5"></circle>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 863 B |
|
@ -443,11 +443,12 @@
|
||||||
"print_setup_slider_tickmarks": [0.32, 0.32],
|
"print_setup_slider_tickmarks": [0.32, 0.32],
|
||||||
"print_setup_big_item": [28, 2.5],
|
"print_setup_big_item": [28, 2.5],
|
||||||
"print_setup_icon": [1.2, 1.2],
|
"print_setup_icon": [1.2, 1.2],
|
||||||
|
"drag_icon": [1.416, 0.25],
|
||||||
|
|
||||||
"expandable_component_content_header": [0.0, 3.0],
|
"expandable_component_content_header": [0.0, 3.0],
|
||||||
|
|
||||||
"configuration_selector": [35.0, 4.0],
|
"configuration_selector": [35.0, 4.0],
|
||||||
"configuration_selector_mode_tabs": [0.0, 3.0],
|
"configuration_selector_mode_tabs": [1.0, 3.0],
|
||||||
|
|
||||||
"action_panel_widget": [26.0, 0.0],
|
"action_panel_widget": [26.0, 0.0],
|
||||||
"action_panel_information_widget": [20.0, 0.0],
|
"action_panel_information_widget": [20.0, 0.0],
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue