diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 93f7fa97ff..d51685ac29 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -508,14 +508,14 @@ class CuraApplication(QtApplication): self.getController().contextMenuRequested.connect(self._onContextMenuRequested) self.getCuraSceneController().activeBuildPlateChanged.connect(self.updatePlatformActivityDelayed) - self.showSplashMessage(self._i18n_catalog.i18nc("@info:progress", "Loading machines...")) + self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Loading machines...")) self._container_registry.allMetadataLoaded.connect(ContainerRegistry.getInstance) with self._container_registry.lockFile(): self._container_registry.loadAllMetadata() - self.showSplashMessage(self._i18n_catalog.i18nc("@info:progress", "Setting up preferences...")) + self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Setting up preferences...")) # Set the setting version for Preferences preferences = self.getPreferences() preferences.addPreference("metadata/setting_version", 0) @@ -637,6 +637,7 @@ class CuraApplication(QtApplication): @override(Application) def setGlobalContainerStack(self, stack: "GlobalStack") -> None: + self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Initializing Active Machine...")) super().setGlobalContainerStack(stack) ## A reusable dialogbox @@ -741,18 +742,30 @@ class CuraApplication(QtApplication): self._plugins_loaded = True + ## Set a short, user-friendly hint about current loading status. + # The way this message is displayed depends on application state + def _setLoadingHint(self, hint: str): + if self.started: + Logger.info(hint) + else: + self.showSplashMessage(hint) + def run(self): super().run() Logger.log("i", "Initializing machine manager") + self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Initializing machine manager...")) self._machine_manager = MachineManager(self, parent = self) + self.processEvents() Logger.log("i", "Initializing container manager") self._container_manager = ContainerManager(self) + self.processEvents() Logger.log("i", "Initializing machine error checker") self._machine_error_checker = MachineErrorChecker(self) self._machine_error_checker.initialize() + self.processEvents() # Check if we should run as single instance or not. If so, set up a local socket server which listener which # coordinates multiple Cura instances and accepts commands. @@ -760,6 +773,7 @@ class CuraApplication(QtApplication): self.__setUpSingleInstanceServer() # Setup scene and build volume + self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Initializing build volume...")) root = self.getController().getScene().getRoot() self._volume = BuildVolume.BuildVolume(self, root) Arrange.build_volume = self._volume @@ -767,13 +781,13 @@ class CuraApplication(QtApplication): # initialize info objects self._print_information = PrintInformation.PrintInformation(self) self._cura_actions = CuraActions.CuraActions(self) - + self.processEvents() # Initialize setting visibility presets model. self._setting_visibility_presets_model = SettingVisibilityPresetsModel(self.getPreferences(), parent = self) # Initialize Cura API self._cura_API.initialize() - + self.processEvents() self._output_device_manager.start() self._welcome_pages_model.initialize() self._add_printer_pages_model.initialize() @@ -821,7 +835,7 @@ class CuraApplication(QtApplication): ## Run Cura with GUI (desktop mode). def runWithGUI(self): - self.showSplashMessage(self._i18n_catalog.i18nc("@info:progress", "Setting up scene...")) + self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Setting up scene...")) controller = self.getController() @@ -833,7 +847,7 @@ class CuraApplication(QtApplication): # Set default background color for scene self.getRenderer().setBackgroundColor(QColor(245, 245, 245)) - + self.processEvents() # Initialize platform physics self._physics = PlatformPhysics.PlatformPhysics(controller, self._volume) @@ -856,11 +870,12 @@ class CuraApplication(QtApplication): self._camera_animation = CameraAnimation.CameraAnimation() self._camera_animation.setCameraTool(self.getController().getTool("CameraTool")) - self.showSplashMessage(self._i18n_catalog.i18nc("@info:progress", "Loading interface...")) + self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Loading interface...")) # Initialize QML engine self.setMainQml(Resources.getPath(self.ResourceTypes.QmlFiles, "Cura.qml")) self._qml_import_paths.append(Resources.getPath(self.ResourceTypes.QmlFiles)) + self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Initializing engine...")) self.initializeEngine() # Initialize UI state @@ -1029,14 +1044,17 @@ class CuraApplication(QtApplication): super().registerObjects(engine) # global contexts + self.processEvents() engine.rootContext().setContextProperty("Printer", self) engine.rootContext().setContextProperty("CuraApplication", self) engine.rootContext().setContextProperty("PrintInformation", self._print_information) engine.rootContext().setContextProperty("CuraActions", self._cura_actions) engine.rootContext().setContextProperty("CuraSDKVersion", ApplicationMetadata.CuraSDKVersion) + self.processEvents() qmlRegisterUncreatableType(CuraApplication, "Cura", 1, 0, "ResourceTypes", "Just an Enum type") + self.processEvents() qmlRegisterSingletonType(CuraSceneController, "Cura", 1, 0, "SceneController", self.getCuraSceneController) qmlRegisterSingletonType(ExtruderManager, "Cura", 1, 0, "ExtruderManager", self.getExtruderManager) qmlRegisterSingletonType(MachineManager, "Cura", 1, 0, "MachineManager", self.getMachineManager) @@ -1045,16 +1063,16 @@ class CuraApplication(QtApplication): qmlRegisterSingletonType(SimpleModeSettingsManager, "Cura", 1, 0, "SimpleModeSettingsManager", self.getSimpleModeSettingsManager) qmlRegisterSingletonType(MachineActionManager.MachineActionManager, "Cura", 1, 0, "MachineActionManager", self.getMachineActionManager) + self.processEvents() qmlRegisterType(NetworkingUtil, "Cura", 1, 5, "NetworkingUtil") - qmlRegisterType(WelcomePagesModel, "Cura", 1, 0, "WelcomePagesModel") qmlRegisterType(WhatsNewPagesModel, "Cura", 1, 0, "WhatsNewPagesModel") qmlRegisterType(AddPrinterPagesModel, "Cura", 1, 0, "AddPrinterPagesModel") qmlRegisterType(TextManager, "Cura", 1, 0, "TextManager") qmlRegisterType(RecommendedMode, "Cura", 1, 0, "RecommendedMode") + self.processEvents() qmlRegisterType(NetworkMJPGImage, "Cura", 1, 0, "NetworkMJPGImage") - qmlRegisterType(ObjectsModel, "Cura", 1, 0, "ObjectsModel") qmlRegisterType(BuildPlateModel, "Cura", 1, 0, "BuildPlateModel") qmlRegisterType(MultiBuildPlateModel, "Cura", 1, 0, "MultiBuildPlateModel") @@ -1062,14 +1080,15 @@ class CuraApplication(QtApplication): qmlRegisterType(ExtrudersModel, "Cura", 1, 0, "ExtrudersModel") qmlRegisterType(GlobalStacksModel, "Cura", 1, 0, "GlobalStacksModel") + self.processEvents() qmlRegisterType(FavoriteMaterialsModel, "Cura", 1, 0, "FavoriteMaterialsModel") qmlRegisterType(GenericMaterialsModel, "Cura", 1, 0, "GenericMaterialsModel") qmlRegisterType(MaterialBrandsModel, "Cura", 1, 0, "MaterialBrandsModel") qmlRegisterSingletonType(QualityManagementModel, "Cura", 1, 0, "QualityManagementModel", self.getQualityManagementModel) qmlRegisterSingletonType(MaterialManagementModel, "Cura", 1, 5, "MaterialManagementModel", self.getMaterialManagementModel) + self.processEvents() qmlRegisterType(DiscoveredPrintersModel, "Cura", 1, 0, "DiscoveredPrintersModel") - qmlRegisterSingletonType(QualityProfilesDropDownMenuModel, "Cura", 1, 0, "QualityProfilesDropDownMenuModel", self.getQualityProfilesDropDownMenuModel) qmlRegisterSingletonType(CustomQualityProfilesDropDownMenuModel, "Cura", 1, 0, @@ -1078,6 +1097,7 @@ class CuraApplication(QtApplication): qmlRegisterType(IntentModel, "Cura", 1, 6, "IntentModel") qmlRegisterType(IntentCategoryModel, "Cura", 1, 6, "IntentCategoryModel") + self.processEvents() qmlRegisterType(MaterialSettingsVisibilityHandler, "Cura", 1, 0, "MaterialSettingsVisibilityHandler") qmlRegisterType(SettingVisibilityPresetsModel, "Cura", 1, 0, "SettingVisibilityPresetsModel") qmlRegisterType(QualitySettingsModel, "Cura", 1, 0, "QualitySettingsModel") @@ -1106,6 +1126,7 @@ class CuraApplication(QtApplication): continue qmlRegisterType(QUrl.fromLocalFile(path), "Cura", 1, 0, type_name) + self.processEvents() def onSelectionChanged(self): if Selection.hasSelection(): diff --git a/cura/UI/CuraSplashScreen.py b/cura/UI/CuraSplashScreen.py index 70df454e7d..4074020865 100644 --- a/cura/UI/CuraSplashScreen.py +++ b/cura/UI/CuraSplashScreen.py @@ -9,6 +9,7 @@ from UM.Resources import Resources from UM.Application import Application from cura import ApplicationMetadata +import time class CuraSplashScreen(QSplashScreen): def __init__(self): @@ -34,15 +35,20 @@ class CuraSplashScreen(QSplashScreen): self._change_timer.setSingleShot(False) self._change_timer.timeout.connect(self.updateLoadingImage) + self._last_update_time = None + def show(self): super().show() + self._last_update_time = time.time() self._change_timer.start() def updateLoadingImage(self): if self._to_stop: return - - self._loading_image_rotation_angle -= 10 + time_since_last_update = time.time() - self._last_update_time + self._last_update_time = time.time() + # Since we don't know how much time actually passed, check how many intervals of 50 we had. + self._loading_image_rotation_angle -= 10 * (time_since_last_update * 1000 / 50) self.repaint() # Override the mousePressEvent so the splashscreen doesn't disappear when clicked