mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-04-23 06:09:38 +08:00

We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet. This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release. Contributes to issue CURA-8342. Revert "Revert "Fix merge conflict"" This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158. Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"" This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7. Revert "Revert "Fix typo in icon name"" This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512. Revert "Revert "Add list for deprecated icons"" This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943. Revert "Revert "Add Function icon"" This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544. Revert "Revert "Switch out inherit icon"" This reverts commit 26afff609381e2004d194c280f504b6226859bd3. Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura"" This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769. Revert "Fix incorrect icons" This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
269 lines
9.9 KiB
QML
269 lines
9.9 KiB
QML
// Copyright (c) 2019 Ultimaker B.V.
|
|
// Cura is released under the terms of the LGPLv3 or higher.
|
|
|
|
import QtQuick 2.10
|
|
import QtQuick.Controls 2.3
|
|
|
|
import UM 1.3 as UM
|
|
import Cura 1.1 as Cura
|
|
|
|
//
|
|
// This is the widget for adding a network printer. There are 2 parts in this widget. One is a scroll view of a list
|
|
// of discovered network printers. Beneath the scroll view is a container with 3 buttons: "Refresh", "Add by IP", and
|
|
// "Troubleshooting".
|
|
//
|
|
Item
|
|
{
|
|
id: base
|
|
height: networkPrinterInfo.height + controlsRectangle.height
|
|
|
|
property alias maxItemCountAtOnce: networkPrinterScrollView.maxItemCountAtOnce
|
|
property var currentItem: (networkPrinterListView.currentIndex >= 0)
|
|
? networkPrinterListView.model[networkPrinterListView.currentIndex]
|
|
: null
|
|
|
|
signal refreshButtonClicked()
|
|
signal addByIpButtonClicked()
|
|
signal addCloudPrinterButtonClicked()
|
|
|
|
Item
|
|
{
|
|
id: networkPrinterInfo
|
|
height: networkPrinterScrollView.visible ? networkPrinterScrollView.height : noPrinterLabel.height
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.top: parent.top
|
|
|
|
Label
|
|
{
|
|
id: noPrinterLabel
|
|
height: UM.Theme.getSize("setting_control").height + UM.Theme.getSize("default_margin").height
|
|
anchors.left: parent.left
|
|
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
|
text: catalog.i18nc("@label", "There is no printer found over your network.")
|
|
color: UM.Theme.getColor("text")
|
|
renderType: Text.NativeRendering
|
|
verticalAlignment: Text.AlignVCenter
|
|
visible: networkPrinterListView.count == 0 // Do not show if there are discovered devices.
|
|
}
|
|
|
|
ScrollView
|
|
{
|
|
id: networkPrinterScrollView
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
ScrollBar.horizontal.policy: ScrollBar.AsNeeded
|
|
ScrollBar.vertical.policy: ScrollBar.AsNeeded
|
|
|
|
property int maxItemCountAtOnce: 8 // show at max 8 items at once, otherwise you need to scroll.
|
|
height: Math.min(contentHeight, (maxItemCountAtOnce * UM.Theme.getSize("action_button").height) - UM.Theme.getSize("default_margin").height)
|
|
|
|
visible: networkPrinterListView.count > 0
|
|
|
|
clip: true
|
|
|
|
ListView
|
|
{
|
|
id: networkPrinterListView
|
|
anchors.fill: parent
|
|
model: contentLoader.enabled ? CuraApplication.getDiscoveredPrintersModel().discoveredPrinters: undefined
|
|
|
|
section.property: "modelData.sectionName"
|
|
section.criteria: ViewSection.FullString
|
|
section.delegate: sectionHeading
|
|
boundsBehavior: Flickable.StopAtBounds
|
|
flickDeceleration: 20000 // To prevent the flicking behavior.
|
|
cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item.
|
|
|
|
Component.onCompleted:
|
|
{
|
|
var toSelectIndex = -1
|
|
// Select the first one that's not "unknown" and is the host a group by default.
|
|
for (var i = 0; i < count; i++)
|
|
{
|
|
if (!model[i].isUnknownMachineType && model[i].isHostOfGroup)
|
|
{
|
|
toSelectIndex = i
|
|
break
|
|
}
|
|
}
|
|
currentIndex = toSelectIndex
|
|
}
|
|
|
|
// CURA-6483 For some reason currentIndex can be reset to 0. This check is here to prevent automatically
|
|
// selecting an unknown or non-host printer.
|
|
onCurrentIndexChanged:
|
|
{
|
|
var item = model[currentIndex]
|
|
if (!item || item.isUnknownMachineType || !item.isHostOfGroup)
|
|
{
|
|
currentIndex = -1
|
|
}
|
|
}
|
|
|
|
Component
|
|
{
|
|
id: sectionHeading
|
|
|
|
Label
|
|
{
|
|
anchors.left: parent.left
|
|
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
|
height: UM.Theme.getSize("setting_control").height
|
|
text: section
|
|
font: UM.Theme.getFont("default")
|
|
color: UM.Theme.getColor("small_button_text")
|
|
verticalAlignment: Text.AlignVCenter
|
|
renderType: Text.NativeRendering
|
|
}
|
|
}
|
|
|
|
delegate: Cura.MachineSelectorButton
|
|
{
|
|
text: modelData.device.name
|
|
|
|
width: networkPrinterListView.width
|
|
outputDevice: modelData.device
|
|
|
|
enabled: !modelData.isUnknownMachineType && modelData.isHostOfGroup
|
|
|
|
printerTypeLabelAutoFit: true
|
|
|
|
// update printer types for all items in the list
|
|
updatePrinterTypesOnlyWhenChecked: false
|
|
updatePrinterTypesFunction: updateMachineTypes
|
|
// show printer type as it is
|
|
printerTypeLabelConversionFunction: function(value) { return value }
|
|
|
|
function updateMachineTypes()
|
|
{
|
|
printerTypesList = [ modelData.readableMachineType ]
|
|
}
|
|
|
|
checkable: false
|
|
selected: ListView.view.currentIndex == model.index
|
|
onClicked:
|
|
{
|
|
ListView.view.currentIndex = index
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Horizontal line separating the buttons (below) and the discovered network printers (above)
|
|
Rectangle
|
|
{
|
|
id: separator
|
|
anchors.left: parent.left
|
|
anchors.top: networkPrinterInfo.bottom
|
|
anchors.right: parent.right
|
|
height: UM.Theme.getSize("default_lining").height
|
|
color: UM.Theme.getColor("lining")
|
|
}
|
|
|
|
Item
|
|
{
|
|
id: controlsRectangle
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.top: separator.bottom
|
|
|
|
height: UM.Theme.getSize("message_action_button").height + UM.Theme.getSize("default_margin").height
|
|
|
|
Cura.SecondaryButton
|
|
{
|
|
id: refreshButton
|
|
anchors.left: parent.left
|
|
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
text: catalog.i18nc("@label", "Refresh")
|
|
height: UM.Theme.getSize("message_action_button").height
|
|
onClicked: base.refreshButtonClicked()
|
|
}
|
|
|
|
Cura.SecondaryButton
|
|
{
|
|
id: addPrinterByIpButton
|
|
anchors.left: refreshButton.right
|
|
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
text: catalog.i18nc("@label", "Add printer by IP")
|
|
height: UM.Theme.getSize("message_action_button").height
|
|
onClicked: base.addByIpButtonClicked()
|
|
}
|
|
|
|
Cura.SecondaryButton
|
|
{
|
|
id: addCloudPrinterButton
|
|
anchors.left: addPrinterByIpButton.right
|
|
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
text: catalog.i18nc("@label", "Add cloud printer")
|
|
height: UM.Theme.getSize("message_action_button").height
|
|
onClicked: {
|
|
CuraApplication.getDiscoveredCloudPrintersModel().clear()
|
|
base.addCloudPrinterButtonClicked()
|
|
}
|
|
}
|
|
|
|
Item
|
|
{
|
|
id: troubleshootingButton
|
|
|
|
anchors.right: parent.right
|
|
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
height: troubleshootingLinkIcon.height
|
|
width: troubleshootingLinkIcon.width + troubleshootingLabel.width + UM.Theme.getSize("default_margin").width
|
|
|
|
UM.RecolorImage
|
|
{
|
|
id: troubleshootingLinkIcon
|
|
anchors.right: troubleshootingLabel.left
|
|
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
height: troubleshootingLabel.height
|
|
width: height
|
|
sourceSize.height: width
|
|
color: UM.Theme.getColor("text_link")
|
|
source: UM.Theme.getIcon("LinkExternal")
|
|
}
|
|
|
|
Label
|
|
{
|
|
id: troubleshootingLabel
|
|
anchors.right: parent.right
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
text: catalog.i18nc("@label", "Troubleshooting")
|
|
font: UM.Theme.getFont("default")
|
|
color: UM.Theme.getColor("text_link")
|
|
linkColor: UM.Theme.getColor("text_link")
|
|
renderType: Text.NativeRendering
|
|
}
|
|
|
|
MouseArea
|
|
{
|
|
anchors.fill: parent
|
|
hoverEnabled: true
|
|
onClicked:
|
|
{
|
|
// open the troubleshooting URL with web browser
|
|
const url = "https://ultimaker.com/in/cura/troubleshooting/network"
|
|
Qt.openUrlExternally(url)
|
|
}
|
|
onEntered:
|
|
{
|
|
troubleshootingLabel.font.underline = true
|
|
}
|
|
onExited:
|
|
{
|
|
troubleshootingLabel.font.underline = false
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|