From 7a9040e746b0ecd67137abc4a14ee643d7c4b1b4 Mon Sep 17 00:00:00 2001 From: Andrey Lebedev Date: Wed, 5 Aug 2020 00:00:50 +0300 Subject: [PATCH] More consistent cancellation message --- src/ovshell_fileman/backupapp.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ovshell_fileman/backupapp.py b/src/ovshell_fileman/backupapp.py index 9af1803..57b7877 100644 --- a/src/ovshell_fileman/backupapp.py +++ b/src/ovshell_fileman/backupapp.py @@ -140,16 +140,15 @@ def activate(self) -> None: self.rsync_task = self.shell.screen.spawn_task(self, self._progress.start()) def _on_cancel(self, w: urwid.Widget) -> None: - self.shell.screen.pop_activity() - if self.rsync_task is None: return if not self.rsync_task.done(): self.rsync_task.cancel() - self.shell.screen.push_dialog( - "Backup cancelled", urwid.Text("Backup was not completed.") + self.status_msg.set_text( + ["\n", ("error message", f"Backup was cancelled."), "\n"] ) + self._show_close_button() def _on_close(self, w: urwid.Widget) -> None: self.shell.screen.pop_activity() @@ -158,12 +157,15 @@ def _on_sync_done(self, w: urwid.Widget) -> None: self.status_msg.set_text( ["\n", ("success message", "Backup has completed."), "\n"] ) - self._button_row.contents = [(self._b_close, ("given", 16))] + self._show_close_button() def _on_sync_failed(self, w: urwid.Widget, res: int) -> None: self.status_msg.set_text( ["\n", ("error message", f"Backup has failed (error code: {res})."), "\n"] ) + self._show_close_button() + + def _show_close_button(self) -> None: self._button_row.contents = [(self._b_close, ("given", 16))]