From 3ddb338cd16ffeaa139a3ced14c5e2b9326bd2a0 Mon Sep 17 00:00:00 2001 From: Rebecca Breu Date: Sun, 16 May 2021 14:56:27 +0200 Subject: [PATCH] Fix lingering progress bar --- beeref/__main__.py | 6 +++++- beeref/config.py | 1 - beeref/view.py | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/beeref/__main__.py b/beeref/__main__.py index 356935e..2eea0fe 100755 --- a/beeref/__main__.py +++ b/beeref/__main__.py @@ -22,7 +22,7 @@ import sys from PyQt6 import QtCore, QtWidgets from beeref.assets import BeeAssets -from beeref.config import CommandlineArgs +from beeref.config import CommandlineArgs, BeeSettings, logfile_name from beeref import constants from beeref.view import BeeGraphicsView @@ -77,8 +77,12 @@ sys.excepthook = handle_uncaught_exception def main(): logger.info(f'Starting {constants.APPNAME} version {constants.VERSION}') + settings = BeeSettings() + logger.info(f'Using settings: {settings.fileName()}') + logger.info(f'Logging to: {logfile_name}') CommandlineArgs(with_check=True) # Force checking app = QtWidgets.QApplication(sys.argv) + bee = BeeRefMainWindow(app) # NOQA:F841 signal.signal(signal.SIGINT, handle_sigint) diff --git a/beeref/config.py b/beeref/config.py index f5b1d87..d415645 100644 --- a/beeref/config.py +++ b/beeref/config.py @@ -106,7 +106,6 @@ class BeeSettings(QtCore.QSettings): settings_scope, constants.APPNAME, constants.APPNAME) - logger.info(f'Using settings: {self.fileName()}') def get_settings_dir(self): # pragma: no cover args = CommandlineArgs() diff --git a/beeref/view.py b/beeref/view.py index 6853f12..c230a2f 100644 --- a/beeref/view.py +++ b/beeref/view.py @@ -276,6 +276,7 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin): else: self.scene.add_queued_items() self.on_action_fit_scene() + self.progress.deleteLater() def open_from_file(self, filename): logger.info(f'Opening file {filename}') @@ -309,6 +310,7 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin): 'Problem saving file', ('

Problem saving file %s

' '

File/directory not accessible

') % filename) + self.progress.deleteLater() def do_save(self, filename, create_new): if not filename.endswith('.bee'): @@ -372,6 +374,7 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin): self.scene.add_queued_items() self.scene.arrange_optimal() self.undo_stack.endMacro() + self.progress.deleteLater() def do_insert_images(self, filenames, pos=None): if not pos: