3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 20:31:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge branch 'master' into ui_rework_4_0

Browse source
This commit is contained in:
Diego Prado Gesto 2018-12-02 12:11:12 +01:00
commit e73a91e746
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py
View file

@ -341,7 +341,6 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
# Request more data if info is not complete # Request more data if info is not complete
if not info.address: if not info.address:
Logger.log("d", "Trying to get address of %s", name)
info = zero_conf.get_service_info(service_type, name) info = zero_conf.get_service_info(service_type, name)
if info: if info:

6
resources/qml/Preferences/SettingVisibilityPage.qml
View file

@ -117,7 +117,7 @@ UM.PreferencesPage
{ {
for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i) for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
{ {
if(settingVisibilityPresetsModel.items[i].id == settingVisibilityPresetsModel.activePreset) if(settingVisibilityPresetsModel.items[i].presetId == settingVisibilityPresetsModel.activePreset)
{ {
currentIndex = i; currentIndex = i;
return; return;
@ -128,8 +128,8 @@ UM.PreferencesPage
onActivated: onActivated:
{ {
var preset_id = settingVisibilityPresetsModel.items[index].id; var preset_id = settingVisibilityPresetsModel.items[index].presetId
settingVisibilityPresetsModel.setActivePreset(preset_id); settingVisibilityPresetsModel.setActivePreset(preset_id)
} }
} }