From 1be8f6c4343c6dea8bf33f404298c621c28ea793 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr> Date: Fri, 22 Mar 2024 11:17:18 +0100 Subject: [PATCH] MainWindow: Add status at save/backup. --- src/View/MainWindow.py | 33 +++++++++++++++++++++++++++------ src/View/ui/MainWindow.ui | 11 ++++++++++- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index edd68cb1..ac38f1e9 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -557,11 +557,18 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): progress.setWindowModality(Qt.WindowModal) progress.setValue(0) - logger.info(f"Save ({self._study.filename})...") + status = f"Save ({self._study.filename})..." + self.statusbar.showMessage(status, 3000) + logger.info(status) + self._study.save( progress=lambda: progress.setValue(progress.value() + 1) ) - logger.info("Done") + + status += " Done" + logger.info(status) + self.statusbar.showMessage(status, 3000) + self.conf.set_last_study(self._study.filename) def save_as_study(self): @@ -604,11 +611,18 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): progress.setWindowModality(Qt.WindowModal) progress.setValue(0) - logger.info(f"Save ({self._study.filename})...") + status = f"Save ({self._study.filename})..." + self.statusbar.showMessage(status, 3000) + logger.info(status) + self._study.save( progress=lambda: progress.setValue(progress.value() + 1) ) - logger.info("Done") + + status += " Done" + logger.info(status) + self.statusbar.showMessage(status, 3000) + self.conf.set_last_study(self._study.filename) def _backup(self): @@ -646,11 +660,18 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): progress.setWindowModality(Qt.WindowModal) progress.setValue(0) - logger.info(f"Backup ({self._study.filename})...") + status = f"Backup ({file_name})..." + logger.info(status) + self.statusbar.showMessage(status, 3000) + self._study.save( progress=lambda: progress.setValue(progress.value() + 1) ) - logger.info("Done") + + status += " Done" + logger.info(status) + self.statusbar.showMessage(status, 3000) + except Exception as e: logger_exception(e) diff --git a/src/View/ui/MainWindow.ui b/src/View/ui/MainWindow.ui index bb9f0ad7..3f6d6bdd 100644 --- a/src/View/ui/MainWindow.ui +++ b/src/View/ui/MainWindow.ui @@ -215,7 +215,16 @@ <addaction name="menu_windows"/> <addaction name="menu_help"/> </widget> - <widget class="QStatusBar" name="statusbar"/> + <widget class="QStatusBar" name="statusbar"> + <property name="font"> + <font> + <family>Ubuntu</family> + <weight>50</weight> + <bold>false</bold> + <kerning>false</kerning> + </font> + </property> + </widget> <widget class="QToolBar" name="toolBar"> <property name="enabled"> <bool>true</bool> -- GitLab