3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

CURA-5035 Review feedback

Browse source
This commit is contained in:
Ian Paschal 2018-05-02 12:01:29 +02:00
parent 3934f6f1b3
commit 62aeb6c954
10 changed files with 9 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/Toolbox/resources/qml/ToolboxDetailList.qml
View file

@ -18,7 +18,7 @@ Item
{
anchors
{
right: detailList.right
right: parent.right
topMargin: UM.Theme.getSize("wide_margin").height
bottomMargin: UM.Theme.getSize("wide_margin").height
top: parent.top

2
plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
View file

@ -11,7 +11,7 @@ Column
{
// HACK: GridLayouts don't render to the correct height with odd numbers of
// items, so if odd, add some extra space.
height: grid.model.items.length % 2 == 0 ? childrenRect.height : childrenRect.height + 3 * UM.Theme.getSize("wide_margin").height
height: grid.model.items.length % 2 == 0 ? childrenRect.height : childrenRect.height + UM.Theme.getSize("toolbox_thumbnail_small").height
width: parent.width
spacing: UM.Theme.getSize("default_margin").height
Label

4
plugins/Toolbox/resources/qml/ToolboxFooter.qml
View file

@ -15,7 +15,7 @@ Item
Label
{
visible: toolbox.restartRequired
text: "You will need to restart Cura before changes in plugins have effect."
text: catalog.i18nc("@info", "You will need to restart Cura before changes in plugins have effect.")
height: Math.floor(UM.Theme.getSize("toolbox_footer_button").height)
verticalAlignment: Text.AlignVCenter
anchors
@ -30,7 +30,7 @@ Item
Button
{
id: restartButton
text: "Quit Cura"
text: catalog.i18nc("@info:button", "Quit Cura")
anchors
{
top: parent.top

2
plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml
View file

@ -42,7 +42,7 @@ UM.Dialog
anchors.right: parent.right
anchors.topMargin: UM.Theme.getSize("default_margin").height
readOnly: true
text: licenseDialog.licenseContent != null ? licenseDialog.licenseContent : ""
text: licenseDialog.licenseContent
}
}
rightButtons:

2
plugins/Toolbox/resources/qml/ToolboxLoadingPage.qml
View file

@ -13,7 +13,7 @@ Rectangle
color: "transparent"
Label
{
text: "Fetching packages..."
text: catalog.i18nc("@info", "Fetching packages...")
anchors
{
centerIn: parent

4
plugins/Toolbox/src/Toolbox.py
View file

@ -310,7 +310,7 @@ class Toolbox(QObject, Extension):
@pyqtSlot()
def cancelDownload(self):
Logger.log("i", "Toolbox: User cancelled the download of a plugin.")
self.resetDownload();
self.resetDownload()
return
def resetDownload(self):
@ -338,6 +338,7 @@ class Toolbox(QObject, Extension):
if reply.error() == QNetworkReply.HostNotFoundError:
Logger.log("w", "Unable to reach server.")
self.resetDownload()
return
if reply.operation() == QNetworkAccessManager.GetOperation:
@ -363,7 +364,6 @@ class Toolbox(QObject, Extension):
self._models["plugins_showcase"].setMetadata(self._metadata["plugins_showcase"])
self._metadata["materials_showcase"] = json_data["data"]["material"]["authors"]
self._models["materials_showcase"].setMetadata(self._metadata["materials_showcase"])
print("MATERIAL SHOWCASE", self._metadata["materials_showcase"])
else:
# ...until here.
# This hack arises for multiple reasons but the main