GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update extruder button styles

Browse Source 
CURA-4211
This commit is contained in:
Lipu Fei 2017-09-06 10:20:38 +02:00
parent 81b6675518
commit e15a96263d
7 changed files with 121 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/CuraApplication.py
View File

@ -125,6 +125,8 @@ class CuraApplication(QtApplication):
# Cura will always show the Add Machine Dialog upon start. # Cura will always show the Add Machine Dialog upon start.
stacksValidationFinished = pyqtSignal() # Emitted whenever a validation is finished stacksValidationFinished = pyqtSignal() # Emitted whenever a validation is finished
syncConfigurationFromPrinter = pyqtSignal() # Emitted when the user wants to sync configuration from printer
def __init__(self): def __init__(self):
# this list of dir names will be used by UM to detect an old cura directory # this list of dir names will be used by UM to detect an old cura directory
for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "user", "variants"]: for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "user", "variants"]:
@ -1393,3 +1395,7 @@ class CuraApplication(QtApplication):
node = node.getParent() node = node.getParent()
Selection.add(node) Selection.add(node)
@pyqtSlot()
def startSyncingConfigurationFromPrinter(self):
self.syncConfigurationFromPrinter.emit()

1
plugins/UM3NetworkPrinting/DiscoverUM3Action.py
View File

@ -26,6 +26,7 @@ class DiscoverUM3Action(MachineAction):
self.__additional_components_view = None self.__additional_components_view = None
Application.getInstance().engineCreatedSignal.connect(self._createAdditionalComponentsView) Application.getInstance().engineCreatedSignal.connect(self._createAdditionalComponentsView)
Application.getInstance().syncConfigurationFromPrinter.connect(self.loadConfigurationFromPrinter)
self._last_zeroconf_event_time = time.time() self._last_zeroconf_event_time = time.time()
self._zeroconf_change_grace_period = 0.25 # Time to wait after a zeroconf service change before allowing a zeroconf reset self._zeroconf_change_grace_period = 0.25 # Time to wait after a zeroconf service change before allowing a zeroconf reset

11
resources/qml/ExtruderButton.qml
View File

@ -57,17 +57,18 @@ Button
{ {
right: parent.right right: parent.right
top: parent.top top: parent.top
margins: UM.Theme.getSize("extruder_button_material_margin").width rightMargin: UM.Theme.getSize("extruder_button_material_margin").width
topMargin: UM.Theme.getSize("extruder_button_material_margin").height
} }
color: model.color color: model.color
width: UM.Theme.getSize("extruder_button_material_size").width width: UM.Theme.getSize("extruder_button_material").width
height: UM.Theme.getSize("extruder_button_material_size").height height: UM.Theme.getSize("extruder_button_material").height
radius: width / 2 radius: width / 2
border.width: 0 border.width: 1
border.color: "transparent" border.color: UM.Theme.getColor("extruder_button_material_border")
opacity: !base.enabled ? 0.2 : 1.0 opacity: !base.enabled ? 0.2 : 1.0
} }

127
resources/qml/SidebarHeader.qml
View File

@ -24,41 +24,109 @@ Column
Item Item
{ {
height: UM.Theme.getSize("default_margin").height / 4
width: height
visible: extruderSelectionRow.visible
}
Label
{
id: extruderSelectionLabel
anchors anchors
{ {
left: parent.left left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("sidebar_margin").width
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("sidebar_margin").width
topMargin: UM.Theme.getSize("default_margin").height
} }
height: UM.Theme.getSize("sidebar_tabs").height / 3
text: catalog.i18nc("@label", "Extruder configuration")
font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text")
visible: extruderSelectionRow.visible visible: extruderSelectionRow.visible
height: syncMachineButton.height + UM.Theme.getSize("sidebar_margin").height / 2
Label
{
id: extruderSelectionLabel
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
height: UM.Theme.getSize("sidebar_tabs").height / 3
text: catalog.i18nc("@label", "Extruder configuration")
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text")
visible: extruderSelectionRow.visible
}
Button
{
id: syncMachineButton
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
text: catalog.i18nc("@button:action", "Sync")
visible: extruderSelectionRow.visible
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
enabled: printerConnected
onClicked:
{
CuraApplication.startSyncingConfigurationFromPrinter();
}
style: ButtonStyle
{
background: Rectangle
{
implicitWidth: UM.Theme.getSize("button").width * 1.1
implicitHeight: UM.Theme.getSize("sidebar_tabs").height / 3
color: "transparent"
}
label: Item
{
implicitWidth: UM.Theme.getSize("button").width * 1.1
implicitHeight: UM.Theme.getSize("sidebar_tabs").height / 3
Label
{
id: labelText
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_lining").width
anchors.right: downArrow.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
anchors.top: parent.top
text: control.text
font: UM.Theme.getFont("default")
color: control.hovered ? UM.Theme.getColor("sync_button_text_hovered") : UM.Theme.getColor("sync_button_text")
elide: Text.ElideRight;
verticalAlignment: Text.AlignVCenter;
}
UM.RecolorImage
{
id: downArrow
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_lining").width * 2
anchors.top: labelText.top
anchors.topMargin: UM.Theme.getSize("default_margin").height / 3
source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5
sourceSize.height: width + 5
color: control.hovered ? UM.Theme.getColor("sync_button_text_hovered") : UM.Theme.getColor("sync_button_text")
}
}
}
}
} }
Item Item
{ {
id: extruderSelectionRow id: extruderSelectionRow
width: parent.width width: parent.width
height: UM.Theme.getSize("sidebar_tabs").height height: UM.Theme.getSize("sidebar_tabs").height * 2 / 3
visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint
anchors anchors
{ {
left: parent.left left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width * 1.5
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("default_margin").width * 1.5
} }
ListView ListView
@ -136,7 +204,7 @@ Column
width: { width: {
var extruderTextWidth = extruderStaticText.visible ? extruderStaticText.width : 0; var extruderTextWidth = extruderStaticText.visible ? extruderStaticText.width : 0;
var iconWidth = extruderIconItem.width; var iconWidth = extruderIconItem.width;
return extruderTextWidth + iconWidth + UM.Theme.getSize("default_margin").width / 4; return extruderTextWidth + iconWidth + UM.Theme.getSize("default_margin").width / 2;
} }
// Static text "Extruder" // Static text "Extruder"
@ -150,7 +218,7 @@ Column
control.hovered ? UM.Theme.getColor("action_button_hovered_text") : control.hovered ? UM.Theme.getColor("action_button_hovered_text") :
UM.Theme.getColor("action_button_text") UM.Theme.getColor("action_button_text")
font: UM.Theme.getFont("default") font: control.checked ? UM.Theme.getFont("default_bold") : UM.Theme.getFont("default")
text: catalog.i18nc("@label", "Extruder") text: catalog.i18nc("@label", "Extruder")
visible: width < (control.width - extruderIconItem.width - UM.Theme.getSize("default_margin").width) visible: width < (control.width - extruderIconItem.width - UM.Theme.getSize("default_margin").width)
elide: Text.ElideRight elide: Text.ElideRight
@ -168,7 +236,7 @@ Column
var minimumWidth = control.width < UM.Theme.getSize("button").width ? control.width : UM.Theme.getSize("button").width; var minimumWidth = control.width < UM.Theme.getSize("button").width ? control.width : UM.Theme.getSize("button").width;
var minimumHeight = control.height < UM.Theme.getSize("button").height ? control.height : UM.Theme.getSize("button").height; var minimumHeight = control.height < UM.Theme.getSize("button").height ? control.height : UM.Theme.getSize("button").height;
var minimumSize = minimumWidth < minimumHeight ? minimumWidth : minimumHeight; var minimumSize = minimumWidth < minimumHeight ? minimumWidth : minimumHeight;
minimumSize -= UM.Theme.getSize("default_margin").width; minimumSize -= UM.Theme.getSize("default_margin").width / 2;
return minimumSize; return minimumSize;
} }
@ -205,18 +273,18 @@ Column
{ {
right: parent.right right: parent.right
top: parent.top top: parent.top
rightMargin: parent.sizeToUse * 0.04 rightMargin: parent.sizeToUse * 0.01
topMargin: parent.sizeToUse * 0.04 topMargin: parent.sizeToUse * 0.05
} }
color: model.color color: model.color
width: parent.width * 0.27 width: parent.width * 0.35
height: parent.height * 0.27 height: parent.height * 0.35
radius: width / 2 radius: width / 2
border.width: 0 border.width: 1
border.color: "transparent" border.color: UM.Theme.getColor("extruder_button_material_border")
opacity: !control.checked ? 0.6 : 1.0 opacity: !control.checked ? 0.6 : 1.0
} }
@ -337,7 +405,7 @@ Column
Item Item
{ {
id: materialInfoRow id: materialInfoRow
height: UM.Theme.getSize("sidebar_setup").height height: UM.Theme.getSize("sidebar_setup").height / 2
visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings
anchors anchors
@ -358,10 +426,11 @@ Column
{ {
id: materialInfoLabel id: materialInfoLabel
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Check material compability"); text: catalog.i18nc("@label", "Check material compability")
font: UM.Theme.getFont("default"); font: UM.Theme.getFont("default");
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignTop
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")

3
resources/qml/Topbar.qml
View File

@ -111,10 +111,11 @@ Rectangle
{ {
case "printing": case "printing":
case "pre_print": case "pre_print":
case "wait_cleanup":
case "pausing": case "pausing":
case "resuming": case "resuming":
return UM.Theme.getIcon("tab_status_busy"); return UM.Theme.getIcon("tab_status_busy");
case "wait_cleanup":
return UM.Theme.getIcon("tab_status_finished");
case "ready": case "ready":
case "": case "":
return UM.Theme.getIcon("tab_status_connected") return UM.Theme.getIcon("tab_status_connected")

8
resources/themes/cura-light/icons/extruder_button.svg
View File

@ -41,7 +41,7 @@
showgrid="false" showgrid="false"
inkscape:pagecheckerboard="true" inkscape:pagecheckerboard="true"
inkscape:zoom="23.442308" inkscape:zoom="23.442308"
inkscape:cx="11.848284" inkscape:cx="4.9163727"
inkscape:cy="17.941232" inkscape:cy="17.941232"
inkscape:window-x="2552" inkscape:window-x="2552"
inkscape:window-y="-8" inkscape:window-y="-8"
@ -61,10 +61,4 @@
style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
rx="13.735848" rx="13.735848"
ry="13.735849" /> ry="13.735849" />
<circle
style="fill:none;stroke:#ffffff;stroke-width:1.39310181;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4509"
cx="24.75"
cy="5.25"
r="4.5534492" />
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

9
resources/themes/cura-light/theme.json
View File

@ -96,6 +96,11 @@
"button_tooltip_border": [24, 41, 77, 255], "button_tooltip_border": [24, 41, 77, 255],
"button_tooltip_text": [24, 41, 77, 255], "button_tooltip_text": [24, 41, 77, 255],
"extruder_button_material_border": [255, 255, 255, 255],
"sync_button_text": [120, 120, 120, 255],
"sync_button_text_hovered": [0, 0, 0, 255],
"tab_checked": [255, 255, 255, 255], "tab_checked": [255, 255, 255, 255],
"tab_checked_border": [255, 255, 255, 255], "tab_checked_border": [255, 255, 255, 255],
"tab_checked_text": [24, 41, 77, 255], "tab_checked_text": [24, 41, 77, 255],
@ -261,8 +266,8 @@
"default_arrow": [0.8, 0.8], "default_arrow": [0.8, 0.8],
"logo": [9.5, 2.0], "logo": [9.5, 2.0],
"extruder_button_material_margin": [0.875, 0.875], "extruder_button_material_margin": [0.50, 0.9],
"extruder_button_material_size": [0.68, 0.68], "extruder_button_material": [0.75, 0.75],
"sidebar": [35.0, 10.0], "sidebar": [35.0, 10.0],
"sidebar_margin": [1.71, 1.43], "sidebar_margin": [1.71, 1.43],