GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 04:25:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Let DiscoverUM3Action use controls 2

Browse Source
This commit is contained in:
Jaime van Kessel 2021-11-11 15:59:51 +01:00
parent 54b52b6d4d
commit 980ac986df
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml
View File

@ -5,7 +5,7 @@ import UM 1.2 as UM
import Cura 1.5 as Cura import Cura 1.5 as Cura
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.1 import QtQuick.Controls 2.9
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
@ -112,17 +112,10 @@ Cura.MachineAction
ScrollView ScrollView
{ {
id: objectListContainer id: objectListContainer
frameVisible: true
width: parent.width width: parent.width
height: base.height - contentRow.y - discoveryTip.height height: base.height - contentRow.y - discoveryTip.height
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
Rectangle
{
parent: viewport
anchors.fill: parent
color: palette.light
}
ListView ListView
{ {
id: listview id: listview
@ -138,11 +131,13 @@ Cura.MachineAction
Component.onCompleted: manager.startDiscovery() Component.onCompleted: manager.startDiscovery()
delegate: Rectangle delegate: Rectangle
{ {
height: childrenRect.height height: printNameLabel.height
color: ListView.isCurrentItem ? palette.highlight : index % 2 ? palette.base : palette.alternateBase color: ListView.isCurrentItem ? palette.highlight : index % 2 ? palette.base : palette.alternateBase
width: parent.width width: listview.width
Label Label
{ {
id: printNameLabel
height: contentHeight
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right anchors.right: parent.right
@ -385,7 +380,6 @@ Cura.MachineAction
manualPrinterDialog.hide() manualPrinterDialog.hide()
} }
enabled: manualPrinterDialog.addressText.trim() != "" enabled: manualPrinterDialog.addressText.trim() != ""
isDefault: true
} }
] ]
} }