3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4.11' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2021-08-12 15:49:41 +02:00
commit 44ba8e3d1f
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/Toolbox/src/PackagesModel.py
View file

@ -58,7 +58,6 @@ class PackagesModel(ListModel):
items = [] items = []
if self._metadata is None: if self._metadata is None:
Logger.logException("w", "Failed to load packages for Marketplace")
self.setItems(items) self.setItems(items)
return return

3
resources/qml/PrintSetupSelector/Custom/MenuButton.qml
View file

@ -18,6 +18,7 @@ Button
property string labelText: "" property string labelText: ""
id: button id: button
hoverEnabled: true hoverEnabled: true
leftPadding:UM.Theme.getSize("wide_margin").width
background: Rectangle background: Rectangle
{ {
@ -45,8 +46,6 @@ Button
text: button.text != "" ? replaceText(button.text) : replaceText(button.labelText) text: button.text != "" ? replaceText(button.text) : replaceText(button.labelText)
height: contentHeight height: contentHeight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
anchors.left: button.left
anchors.leftMargin: UM.Theme.getSize("wide_margin").width
renderType: Text.NativeRendering renderType: Text.NativeRendering
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: button.enabled ? UM.Theme.getColor("text") :UM.Theme.getColor("text_inactive") color: button.enabled ? UM.Theme.getColor("text") :UM.Theme.getColor("text_inactive")