From ec8f17779d74ee0050332e22540ce84950d25aa6 Mon Sep 17 00:00:00 2001 From: Urban Wallasch Date: Fri, 21 May 2021 16:54:16 +0200 Subject: [PATCH] * Added default arguments for load_cfgfile(), use correct file name in success message, fixed GUI error message. --- ffpreview.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffpreview.py b/ffpreview.py index 661853c..51e1d5b 100755 --- a/ffpreview.py +++ b/ffpreview.py @@ -295,7 +295,7 @@ class ffConfig: return cls.set(cfg) @classmethod - def load_cfgfile(cls, cfg, fname, vo): + def load_cfgfile(cls, cfg=cls.cfg, fname=cls.cfg['conffile'], vo=1): fconf = ConfigParser(allow_no_value=True, defaults=cfg) try: cf = fconf.read(fname) @@ -305,7 +305,7 @@ class ffConfig: eprint(1, str(e), '(config file', fname, 'missing or corrupt)', vo=vo) return False else: - eprint(1, 'read config from', cfg['conffile'], vo=vo) + eprint(1, 'read config from', fname, vo=vo) # fix up types of non-string options cfg['force'] = str2bool(cfg['force']) cfg['reuse'] = str2bool(cfg['reuse']) @@ -831,7 +831,7 @@ class cfgDialog(QDialog): mbox.setWindowTitle('Load Preferences Failed') mbox.setIcon(QMessageBox.Critical) mbox.setStandardButtons(QMessageBox.Ok) - mbox.setText(str(e)) + mbox.setText('%s:\nFile inaccessible or corrupt.' % fname) mbox.exec_() self.changed() -- 2.30.2