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

Also convert visibility-preset dropdown.

Browse Source 
This will make this Qt5.15 control work on mac again. (Since the older controls are deprecated.)

CURA-8127
This commit is contained in:
Remco Burema 2021-04-07 08:31:49 +02:00
parent 39e9dcd4f5
commit d2007901f7
No known key found for this signature in database
GPG Key ID: 215C49431D43F98C
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/qml/Preferences/SettingVisibilityPage.qml
View File

@ -5,6 +5,8 @@ import QtQuick 2.1
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.1
import QtQuick.Controls 2.3 as NewControls
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
@ -96,7 +98,7 @@ UM.PreferencesPage
onTextChanged: definitionsModel.filter = {"i18n_label": "*" + text} onTextChanged: definitionsModel.filter = {"i18n_label": "*" + text}
} }
ComboBox NewControls.ComboBox
{ {
id: visibilityPreset id: visibilityPreset
width: 150 * screenScaleFactor width: 150 * screenScaleFactor
@ -104,6 +106,7 @@ UM.PreferencesPage
{ {
top: parent.top top: parent.top
right: parent.right right: parent.right
bottom: scrollView.top
} }
model: settingVisibilityPresetsModel.items model: settingVisibilityPresetsModel.items