mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-16 06:45:52 +08:00
Merge branch '4.11' of github.com:Ultimaker/Cura
This commit is contained in:
commit
44ba8e3d1f
@ -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
|
||||||
|
|
||||||
|
@ -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")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user