GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 13:09:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove usage of plugin model

Browse Source
This commit is contained in:
Jaime van Kessel 2019-02-21 17:16:59 +01:00
parent d9c4edf093
commit 48ed9b6e20
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/Menus/MaterialMenu.qml
View File

@ -97,7 +97,7 @@ Menu
id: brandMaterialsMenu id: brandMaterialsMenu
title: materialName title: materialName
property string materialName: model.name property string materialName: model.name
property ListModel brandMaterialColors: model.colors property var brandMaterialColors: model.colors
Instantiator Instantiator
{ {

24
resources/qml/Preferences/GeneralPage.qml
View File

@ -101,24 +101,10 @@ UM.PreferencesPage
UM.Preferences.resetPreference("cura/choice_on_open_project") UM.Preferences.resetPreference("cura/choice_on_open_project")
setDefaultOpenProjectOption(UM.Preferences.getValue("cura/choice_on_open_project")) setDefaultOpenProjectOption(UM.Preferences.getValue("cura/choice_on_open_project"))
if (pluginExistsAndEnabled("SliceInfoPlugin")) { UM.Preferences.resetPreference("info/send_slice_info")
UM.Preferences.resetPreference("info/send_slice_info") sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info"))
sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info")) UM.Preferences.resetPreference("info/automatic_update_check")
} checkUpdatesCheckbox.checked = boolCheck(UM.Preferences.getValue("info/automatic_update_check"))
if (pluginExistsAndEnabled("UpdateChecker")) {
UM.Preferences.resetPreference("info/automatic_update_check")
checkUpdatesCheckbox.checked = boolCheck(UM.Preferences.getValue("info/automatic_update_check"))
}
}
function pluginExistsAndEnabled(pluginName)
{
var pluginItem = plugins.find("id", pluginName)
if (pluginItem > -1)
{
return plugins.getItem(pluginItem).enabled
}
return false
} }
ScrollView ScrollView
@ -670,7 +656,6 @@ UM.PreferencesPage
UM.TooltipArea UM.TooltipArea
{ {
visible: pluginExistsAndEnabled("UpdateChecker")
width: childrenRect.width width: childrenRect.width
height: visible ? childrenRect.height : 0 height: visible ? childrenRect.height : 0
text: catalog.i18nc("@info:tooltip","Should Cura check for updates when the program is started?") text: catalog.i18nc("@info:tooltip","Should Cura check for updates when the program is started?")
@ -686,7 +671,6 @@ UM.PreferencesPage
UM.TooltipArea UM.TooltipArea
{ {
visible: pluginExistsAndEnabled("SliceInfoPlugin")
width: childrenRect.width width: childrenRect.width
height: visible ? childrenRect.height : 0 height: visible ? childrenRect.height : 0
text: catalog.i18nc("@info:tooltip","Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.") text: catalog.i18nc("@info:tooltip","Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.")