public/kcc
1
0
Fork 0
mirror of https://github.com/ciromattia/kcc synced 2025-12-13 01:36:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'Gokuroro-master' into dev

Browse Source
This commit is contained in:
Paweł Jastrzębski
2018-04-21 09:26:48 +02:00
parent a63a46a741 2591b53a09
commit a2a405e5f5
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kindlecomicconverter/KCC_gui.py
View File

@@ -812,16 +812,11 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
if self.needClean: if self.needClean:
self.needClean = False self.needClean = False
GUI.jobList.clear() GUI.jobList.clear()
formats = ['.cbz', '.zip', '.pdf']
if self.UnRAR: if self.UnRAR:
if self.sevenza: formats.extend(['.cbr', '.rar'])
formats = ['.cbz', '.cbr', '.cb7', '.zip', '.rar', '.7z', '.pdf'] if self.sevenza:
else: formats.extend(['.cb7', '.7z'])
formats = ['.cbz', '.cbr', '.zip', '.rar', '.pdf']
else:
if self.sevenza:
formats = ['.cbz', '.cb7', '.zip', '.7z', '.pdf']
else:
formats = ['.cbz', '.zip', '.pdf']
if os.path.isdir(message): if os.path.isdir(message):
GUI.jobList.addItem(message) GUI.jobList.addItem(message)
GUI.jobList.scrollToBottom() GUI.jobList.scrollToBottom()
@@ -831,7 +826,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
GUI.jobList.addItem(message) GUI.jobList.addItem(message)
GUI.jobList.scrollToBottom() GUI.jobList.scrollToBottom()
else: else:
self.addMessage('This file type is unsupported!', 'error') self.addMessage('Unsupported file type for ' + message, 'error')
def dragAndDrop(self, e): def dragAndDrop(self, e):
e.accept() e.accept()

8
kindlecomicconverter/startup.py
View File

@@ -30,15 +30,15 @@ def start():
os.environ['QT_AUTO_SCREEN_SCALE_FACTOR'] = "1" os.environ['QT_AUTO_SCREEN_SCALE_FACTOR'] = "1"
KCCAplication = KCC_gui.QApplicationMessaging(sys.argv) KCCAplication = KCC_gui.QApplicationMessaging(sys.argv)
if KCCAplication.isRunning(): if KCCAplication.isRunning():
if len(sys.argv) > 1: for i in range (1, len(sys.argv)):
KCCAplication.sendMessage(sys.argv[1]) KCCAplication.sendMessage(sys.argv[i])
else: else:
KCCAplication.sendMessage('ARISE') KCCAplication.sendMessage('ARISE')
else: else:
KCCWindow = KCC_gui.QMainWindowKCC() KCCWindow = KCC_gui.QMainWindowKCC()
KCCUI = KCC_gui.KCCGUI(KCCAplication, KCCWindow) KCCUI = KCC_gui.KCCGUI(KCCAplication, KCCWindow)
if len(sys.argv) > 1: for i in range (1, len(sys.argv)):
KCCUI.handleMessage(sys.argv[1]) KCCUI.handleMessage(sys.argv[i])
sys.exit(KCCAplication.exec_()) sys.exit(KCCAplication.exec_())