3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 08:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix update should show logic

Browse source 
CURA-6447
This commit is contained in:
Lipu Fei 2019-04-10 10:52:08 +02:00
parent 0665076018
commit 01c0fe1ffb
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
cura/UI/WelcomePagesModel.py
View file

@ -202,29 +202,31 @@ class WelcomePagesModel(ListModel):
# FIXME: HACKs for optimization that we don't update the model every time the active machine gets changed. # FIXME: HACKs for optimization that we don't update the model every time the active machine gets changed.
def _onActiveMachineChanged(self) -> None: def _onActiveMachineChanged(self) -> None:
self._application.getMachineManager().globalContainerChanged.disconnect(self._onActiveMachineChanged) self._application.getMachineManager().globalContainerChanged.disconnect(self._onActiveMachineChanged)
self.initialize() self._initialize(update_should_show_flag = False)
def initialize(self) -> None: def initialize(self) -> None:
self._application.getMachineManager().globalContainerChanged.connect(self._onActiveMachineChanged) self._application.getMachineManager().globalContainerChanged.connect(self._onActiveMachineChanged)
self._initialize() self._initialize()
def _initialize(self) -> None: def _initialize(self, update_should_show_flag: bool = True) -> None:
has_active_machine = self._application.getMachineManager().activeMachine is not None show_whatsnew_only = False
has_app_just_upgraded = self._application.hasJustUpgradedToNewVersion() if update_should_show_flag:
has_active_machine = self._application.getMachineManager().activeMachine is not None
has_app_just_upgraded = self._application.hasJustUpgradedToNewVersion()
# Only show the what's new dialog if there's no machine and we have just upgraded # Only show the what's new dialog if there's no machine and we have just upgraded
show_complete_flow = not has_active_machine show_complete_flow = not has_active_machine
show_whatsnew_only = has_active_machine and has_app_just_upgraded show_whatsnew_only = has_active_machine and has_app_just_upgraded
# FIXME: This is a hack. Because of the circular dependency between MachineManager, ExtruderManager, and # FIXME: This is a hack. Because of the circular dependency between MachineManager, ExtruderManager, and
# possibly some others, setting the initial active machine is not done when the MachineManager gets initialized. # possibly some others, setting the initial active machine is not done when the MachineManager gets initialized.
# So at this point, we don't know if there will be an active machine or not. It could be that the active machine # So at this point, we don't know if there will be an active machine or not. It could be that the active machine
# files are corrupted so we cannot rely on Preferences either. This makes sure that once the active machine # files are corrupted so we cannot rely on Preferences either. This makes sure that once the active machine
# gets changed, this model updates the flags, so it can decide whether to show the welcome flow or not. # gets changed, this model updates the flags, so it can decide whether to show the welcome flow or not.
should_show_welcome_flow = show_complete_flow or show_whatsnew_only should_show_welcome_flow = show_complete_flow or show_whatsnew_only
if should_show_welcome_flow != self._should_show_welcome_flow: if should_show_welcome_flow != self._should_show_welcome_flow:
self._should_show_welcome_flow = should_show_welcome_flow self._should_show_welcome_flow = should_show_welcome_flow
self.shouldShowWelcomeFlowChanged.emit() self.shouldShowWelcomeFlowChanged.emit()
# All pages # All pages
all_pages_list = [{"id": "welcome", all_pages_list = [{"id": "welcome",