3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 04:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-22 10:00:57 +01:00
commit 80dff49b8a
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View file

@ -16,10 +16,13 @@ ScrollView
{
id: base
// The currently selected machine item in the local machine list.
property var currentItem: (machineList.currentIndex >= 0)
? machineList.model.getItem(machineList.currentIndex)
: null
// The currently active (expanded) section/category, where section/category is the grouping of local machine items.
property string currentSection: preferredCategory
// By default (when this list shows up) we always expand the "Ultimaker" section.
property string preferredCategory: "Ultimaker"
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff

2
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View file

@ -91,7 +91,7 @@ Item
anchors.left: parent.left
anchors.right: parent.right
anchors.rightMargin: 10
anchors.rightMargin: UM.Theme.getSize("default_margin").width
outputDevice: modelData.device
enabled: !modelData.is_unknown_machine_type