3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars

Browse source 
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
This commit is contained in:
casper 2022-02-18 09:07:25 +01:00
commit 5a2e26eff6
376 changed files with 41670 additions and 33274 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/PerObjectSettingsTool/PerObjectItem.qml
View file

@ -5,7 +5,7 @@ import QtQuick 2.1
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.1
import UM 1.2 as UM
import UM 1.5 as UM
import Cura 1.0 as Cura
UM.TooltipArea
@ -16,7 +16,7 @@ UM.TooltipArea
width: childrenRect.width;
height: childrenRect.height;
Cura.CheckBox
UM.CheckBox
{
id: check