This commit is contained in:
ChrisTerBeke 2018-05-02 16:52:56 +02:00
commit 2a5736737f
118 changed files with 234 additions and 155 deletions

View File

@ -205,6 +205,10 @@ class MaterialManager(QObject):
else:
# this material is variant-specific, so we save it in a variant-specific node under the
# machine-specific node
# Check first if the variant exist in the manager
existing_variant = self._application.getVariantManager().getVariantNode(definition, variant_name)
if existing_variant is not None:
if variant_name not in machine_node.children_map:
machine_node.children_map[variant_name] = MaterialNode()
@ -213,6 +217,10 @@ class MaterialManager(QObject):
ConfigurationErrorMessage.getInstance().addFaultyContainers(root_material_id)
continue
variant_node.material_map[root_material_id] = MaterialNode(material_metadata)
else:
# Add this container id to the wrong containers list in the registry
Logger.log("w", "Not adding {id} to the material manager because the variant does not exist.".format(id = material_metadata["id"]))
self._container_registry.wrong_container_ids.append(material_metadata["id"])
self.materialsUpdated.emit()

View File

@ -46,6 +46,11 @@ Window
id: viewLoading
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "loading"
}
ToolboxErrorPage
{
id: viewErrored
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "errored"
}
ToolboxDownloadsPage
{
id: viewDownloads

View File

@ -11,9 +11,6 @@ Item
id: tile
property bool installed: toolbox.isInstalled(model.id)
width: detailList.width - UM.Theme.getSize("wide_margin").width
// TODO: Without this line, every instance of this object has 0 height. With
// it, QML spits out tons of bugs claiming a binding loop (not true). Why?
// Because QT is garbage.
height: Math.max(UM.Theme.getSize("toolbox_detail_tile").height, childrenRect.height + UM.Theme.getSize("default_margin").height)
Item
{
@ -40,21 +37,9 @@ Item
{
anchors.top: packageName.bottom
width: parent.width
text:
{
if (model.description.length > 235)
{
if (model.description.substring(234, 235) == " ")
{
return model.description.substring(0, 234) + "..."
}
else
{
return model.description.substring(0, 235) + "..."
}
}
return model.description
}
text: model.description
maximumLineCount: 3
elide: Text.ElideRight
wrapMode: Text.WordWrap
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
@ -88,21 +73,7 @@ Item
}
}
}
enabled:
{
if (installed)
{
return true
}
if ( toolbox.isDownloading )
{
return toolbox.activePackage == model ? true : false
}
else
{
return true
}
}
enabled: installed || !(toolbox.isDownloading && toolbox.activePackage != model) //Don't allow installing while another download is running.
opacity: enabled ? 1.0 : 0.5
style: ButtonStyle
{
@ -264,7 +235,8 @@ Item
color: UM.Theme.getColor("lining")
width: tile.width
height: UM.Theme.getSize("default_lining").height
anchors.bottom: tile.bottom
anchors.top: supportedConfigsChart.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height + UM.Theme.getSize("wide_margin").height //Normal margin for spacing after chart, wide margin between items.
}
Connections
{

View File

@ -0,0 +1,22 @@
// Copyright (c) 2018 Ultimaker B.V.
// Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
Rectangle
{
id: page
width: parent.width
height: parent.height
color: "transparent"
Label
{
text: catalog.i18nc("@info", "Could not connect to the Cura Package database. Please check your connection.")
anchors
{
centerIn: parent
}
}
}

View File

@ -314,6 +314,7 @@ class Toolbox(QObject, Extension):
return
def resetDownload(self):
if self._download_reply:
self._download_reply.abort()
self._download_reply.downloadProgress.disconnect(self._onDownloadProgress)
self._download_reply = None
@ -333,11 +334,13 @@ class Toolbox(QObject, Extension):
if reply.error() == QNetworkReply.TimeoutError:
Logger.log("w", "Got a timeout.")
self.setViewPage("errored")
self.resetDownload()
return
if reply.error() == QNetworkReply.HostNotFoundError:
Logger.log("w", "Unable to reach server.")
self.setViewPage("errored")
self.resetDownload()
return

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine - Experimental
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine - Experimental
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast - Experimental
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint - Experimental
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast - Experimental
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast - Experimental
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint - Experimental
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast - Experimental
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = ultimaker_s5

View File

@ -0,0 +1,14 @@
[general]
version = 4
name = Fine
definition = ultimaker_s5
[metadata]
setting_version = 4
type = quality
quality_type = normal
weight = 0
global_quality = True
[values]
layer_height = 0.1

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Sprint
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fast
definition = ultimaker_s5

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extreme
definition = vertex_delta_k8800

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = vertex_delta_k8800

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = vertex_delta_k8800

View File

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast
definition = zyyx_agile

Some files were not shown because too many files have changed in this diff Show More