diff options
| author | Paweł Jastrzębski <[email protected]> | 2018-04-21 09:26:48 +0200 |
|---|---|---|
| committer | Paweł Jastrzębski <[email protected]> | 2018-04-21 09:26:48 +0200 |
| commit | a2a405e5f599f9bebd7487abf2756b1aff4ff81d (patch) | |
| tree | aea2d21ff40585b94b7bdadd8a5b3183bba53628 /kindlecomicconverter/KCC_gui.py | |
| parent | Use more standard __version__ rather than PILLOW_VERSION (diff) | |
| parent | Make file type error more informative (display file name) (diff) | |
| download | kcc-a2a405e5f599f9bebd7487abf2756b1aff4ff81d.tar.gz kcc-a2a405e5f599f9bebd7487abf2756b1aff4ff81d.tar.bz2 kcc-a2a405e5f599f9bebd7487abf2756b1aff4ff81d.zip | |
Merge branch 'Gokuroro-master' into dev
Diffstat (limited to 'kindlecomicconverter/KCC_gui.py')
| -rw-r--r-- | kindlecomicconverter/KCC_gui.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index 7959b40..d3e6f10 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -812,16 +812,11 @@ class KCCGUI(KCC_ui.Ui_mainWindow): if self.needClean: self.needClean = False GUI.jobList.clear() + formats = ['.cbz', '.zip', '.pdf'] if self.UnRAR: - if self.sevenza: - formats = ['.cbz', '.cbr', '.cb7', '.zip', '.rar', '.7z', '.pdf'] - else: - formats = ['.cbz', '.cbr', '.zip', '.rar', '.pdf'] - else: - if self.sevenza: - formats = ['.cbz', '.cb7', '.zip', '.7z', '.pdf'] - else: - formats = ['.cbz', '.zip', '.pdf'] + formats.extend(['.cbr', '.rar']) + if self.sevenza: + formats.extend(['.cb7', '.7z']) if os.path.isdir(message): GUI.jobList.addItem(message) GUI.jobList.scrollToBottom() @@ -831,7 +826,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): GUI.jobList.addItem(message) GUI.jobList.scrollToBottom() else: - self.addMessage('This file type is unsupported!', 'error') + self.addMessage('Unsupported file type for ' + message, 'error') def dragAndDrop(self, e): e.accept() |