diff --git a/gitutility/async_tasks/async_result_handler.py b/gitutility/async_tasks/async_result_handler.py index 1971152..fc608ed 100644 --- a/gitutility/async_tasks/async_result_handler.py +++ b/gitutility/async_tasks/async_result_handler.py @@ -192,7 +192,7 @@ class AsyncResultHandler: elif status == "error": if result_data.get("conflict"): self.main_frame.show_error("Merge Conflict", f"Conflict during bundle fetch. Resolve in:\n{result_data.get('repo_path')}") - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return True, False else: self.main_frame.show_error("Fetch Bundle Error", f"Failed:\n{message}") @@ -239,7 +239,7 @@ class AsyncResultHandler: return True, True elif result_data.get("status") == "error": self.main_frame.show_error("Checkout Tag Error", f"Failed:\n{result_data.get('message')}") - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return False, False def _handle_create_branch_result(self, result_data: Dict[str, Any], context: Dict[str, Any]) -> Tuple[bool, bool]: @@ -258,7 +258,7 @@ class AsyncResultHandler: return True, True elif result_data.get("status") == "error": self.main_frame.show_error("Checkout Branch Error", f"Failed:\n{result_data.get('message')}") - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return False, False def _handle_delete_local_branch_result(self, result_data: Dict[str, Any], context: Dict[str, Any]) -> Tuple[bool, bool]: @@ -274,11 +274,11 @@ class AsyncResultHandler: return True, True elif status == "conflict": self.main_frame.show_error("Merge Conflict", result_data.get("message")) - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return True, False elif status == "error": self.main_frame.show_error("Merge Error", result_data.get("message")) - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return False, False def _handle_check_connection_result(self, result_data: Dict[str, Any], context: Dict[str, Any]) -> Tuple[bool, bool]: @@ -303,7 +303,7 @@ class AsyncResultHandler: {"context": "interactive_auth", "original_context": context} ) else: - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() elif status == "error": error_type = result_data.get("result", "unknown_error") self.app._update_gui_auth_status(error_type) @@ -317,7 +317,7 @@ class AsyncResultHandler: else: self.app._update_gui_auth_status("failed") self.main_frame.show_warning("Authentication Failed", result_data.get("message")) - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return False, False def _handle_apply_remote_config_result(self, result_data: Dict[str, Any], context: Dict[str, Any]) -> Tuple[bool, bool]: @@ -343,7 +343,7 @@ class AsyncResultHandler: return True, True elif status == "conflict": self.main_frame.show_error("Merge Conflict", result_data.get("message")) - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return True, False else: self.main_frame.show_error("Pull Error", f"Failed:\n{result_data.get('message')}") @@ -378,7 +378,7 @@ class AsyncResultHandler: self.app.profile_handler.create_profile_after_clone(context.get("clone_success_data")) else: self.main_frame.show_error("Clone Error", result_data.get("message")) - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return False, False def _handle_checkout_tracking_branch_result(self, result_data: Dict[str, Any], context: Dict[str, Any]) -> Tuple[bool, bool]: @@ -386,7 +386,7 @@ class AsyncResultHandler: return True, True else: self.main_frame.show_error("Checkout Error", result_data.get("message")) - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return False, False def _handle_compare_branches_result(self, result_data: Dict[str, Any], context: Dict[str, Any]) -> Tuple[bool, bool]: @@ -420,10 +420,10 @@ class AsyncResultHandler: self.app.window_handler.handle_purge_confirmation(context.get("repo_path"), purgeable_files) else: self.main_frame.show_info("Analysis Complete", result_data.get("message")) - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() else: self.main_frame.show_error("Analysis Error", f"Failed to analyze repository history:\n{result_data.get('message')}") - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return False, False def _handle_purge_history_result(self, result_data: Dict[str, Any], context: Dict[str, Any]) -> Tuple[bool, bool]: @@ -432,7 +432,7 @@ class AsyncResultHandler: return True, True else: self.main_frame.show_error("Purge Failed", f"The history cleaning process failed:\n\n{result_data.get('message')}") - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return False, False def _handle_refresh_submodules_result(self, result_data: Dict[str, Any], context: Dict[str, Any]) -> Tuple[bool, bool]: @@ -492,7 +492,7 @@ class AsyncResultHandler: def _trigger_post_action_refreshes(self, sync_refresh_needed: bool): repo_path = self.app._get_and_validate_svn_path("Post-Action Refresh") if not repo_path or not self.app._is_repo_ready(repo_path): - self._reenable_widgets_after_modal() + self.app._reenable_widgets_if_ready() return refresh_funcs = [ @@ -510,4 +510,4 @@ class AsyncResultHandler: self.app.master.after(delay, self.app.refresh_remote_status) delay += 75 - self.app.master.after(delay + 50, self._reenable_widgets_if_ready) \ No newline at end of file + self.app.master.after(delay + 50, self.app._reenable_widgets_if_ready) \ No newline at end of file