Merge remote-tracking branch 'origin/3.5'

This commit is contained in:
Lipu Fei 2018-09-21 12:11:18 +02:00
commit a80fde1495

View File

@ -83,7 +83,6 @@ from cura.Settings.SettingInheritanceManager import SettingInheritanceManager
from cura.Settings.SimpleModeSettingsManager import SimpleModeSettingsManager from cura.Settings.SimpleModeSettingsManager import SimpleModeSettingsManager
from cura.Machines.VariantManager import VariantManager from cura.Machines.VariantManager import VariantManager
from plugins.SliceInfoPlugin.SliceInfo import SliceInfo
from .SingleInstance import SingleInstance from .SingleInstance import SingleInstance
from .AutoSave import AutoSave from .AutoSave import AutoSave
@ -1712,7 +1711,7 @@ class CuraApplication(QtApplication):
@pyqtSlot() @pyqtSlot()
def showMoreInformationDialogForAnonymousDataCollection(self): def showMoreInformationDialogForAnonymousDataCollection(self):
try: try:
slice_info = cast(SliceInfo, self._plugin_registry.getPluginObject("SliceInfoPlugin")) slice_info = self._plugin_registry.getPluginObject("SliceInfoPlugin")
slice_info.showMoreInfoDialog() slice_info.showMoreInfoDialog()
except PluginNotFoundError: except PluginNotFoundError:
Logger.log("w", "Plugin SliceInfo was not found, so not able to show the info dialog.") Logger.log("w", "Plugin SliceInfo was not found, so not able to show the info dialog.")