public/kcc
1
0
Fork 0
mirror of https://github.com/ciromattia/kcc synced 2026-05-27 17:53:28 +00:00
Code Issues Releases Wiki Activity

Not using Pixmaps outside GUI thread anymore

Browse Source
This commit is contained in:
Paweł Jastrzębski
2013-06-13 12:36:34 +02:00
parent 37e42b2f0b
commit 21a8001f56
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kcc/KCC_gui.py
+23 -22
View File
@@ -99,11 +99,11 @@ class WorkerThread(QtCore.QThread):
GUI.JobList.clear() GUI.JobList.clear()
for job in currentJobs: for job in currentJobs:
errors = False errors = False
self.emit(QtCore.SIGNAL("addMessage"), 'Source: ' + job, icons.info) self.emit(QtCore.SIGNAL("addMessage"), 'Source: ' + job, 'info')
if str(GUI.FormatBox.currentText()) == 'CBZ': if str(GUI.FormatBox.currentText()) == 'CBZ':
self.emit(QtCore.SIGNAL("addMessage"), 'Creating CBZ file...', icons.info) self.emit(QtCore.SIGNAL("addMessage"), 'Creating CBZ file...', 'info')
else: else:
self.emit(QtCore.SIGNAL("addMessage"), 'Creating EPUB file...', icons.info) self.emit(QtCore.SIGNAL("addMessage"), 'Creating EPUB file...', 'info')
jobargv = list(argv) jobargv = list(argv)
jobargv.append(job) jobargv.append(job)
try: try:
@@ -116,16 +116,16 @@ class WorkerThread(QtCore.QThread):
"Error on file %s:\n%s\nTraceback:\n%s" "Error on file %s:\n%s\nTraceback:\n%s"
% (jobargv[-1], str(err), traceback.format_tb(traceback_)), % (jobargv[-1], str(err), traceback.format_tb(traceback_)),
QtGui.QMessageBox.Ok) QtGui.QMessageBox.Ok)
self.emit(QtCore.SIGNAL("addMessage"), 'KCC failed to create EPUB!', icons.error) self.emit(QtCore.SIGNAL("addMessage"), 'KCC failed to create EPUB!', 'error')
continue continue
if not errors: if not errors:
if str(GUI.FormatBox.currentText()) == 'CBZ': if str(GUI.FormatBox.currentText()) == 'CBZ':
self.emit(QtCore.SIGNAL("addMessage"), 'Creating CBZ file... Done!', icons.info, True) self.emit(QtCore.SIGNAL("addMessage"), 'Creating CBZ file... Done!', 'info', True)
else: else:
self.emit(QtCore.SIGNAL("addMessage"), 'Creating EPUB file... Done!', icons.info, True) self.emit(QtCore.SIGNAL("addMessage"), 'Creating EPUB file... Done!', 'info', True)
if str(GUI.FormatBox.currentText()) == 'MOBI': if str(GUI.FormatBox.currentText()) == 'MOBI':
if not os.path.getsize(outputPath) > 314572800: if not os.path.getsize(outputPath) > 314572800:
self.emit(QtCore.SIGNAL("addMessage"), 'Creating MOBI file...', icons.info) self.emit(QtCore.SIGNAL("addMessage"), 'Creating MOBI file...', 'info')
self.emit(QtCore.SIGNAL("progressBarTick"), 1) self.emit(QtCore.SIGNAL("progressBarTick"), 1)
try: try:
retcode = call('kindlegen "' + outputPath + '"', shell=True) retcode = call('kindlegen "' + outputPath + '"', shell=True)
@@ -133,8 +133,8 @@ class WorkerThread(QtCore.QThread):
continue continue
self.emit(QtCore.SIGNAL("hideProgressBar")) self.emit(QtCore.SIGNAL("hideProgressBar"))
if retcode == 0: if retcode == 0:
self.emit(QtCore.SIGNAL("addMessage"), 'Creating MOBI file... Done!', icons.info, True) self.emit(QtCore.SIGNAL("addMessage"), 'Creating MOBI file... Done!', 'info', True)
self.emit(QtCore.SIGNAL("addMessage"), 'Removing SRCS header...', icons.info) self.emit(QtCore.SIGNAL("addMessage"), 'Removing SRCS header...', 'info')
os.remove(outputPath) os.remove(outputPath)
mobiPath = outputPath.replace('.epub', '.mobi') mobiPath = outputPath.replace('.epub', '.mobi')
shutil.move(mobiPath, mobiPath + '_tostrip') shutil.move(mobiPath, mobiPath + '_tostrip')
@@ -146,27 +146,27 @@ class WorkerThread(QtCore.QThread):
if not errors: if not errors:
os.remove(mobiPath + '_tostrip') os.remove(mobiPath + '_tostrip')
self.emit(QtCore.SIGNAL("addMessage"), 'Removing SRCS header... Done!', self.emit(QtCore.SIGNAL("addMessage"), 'Removing SRCS header... Done!',
icons.info, True) 'info', True)
else: else:
shutil.move(mobiPath + '_tostrip', mobiPath) shutil.move(mobiPath + '_tostrip', mobiPath)
self.emit(QtCore.SIGNAL("addMessage"), self.emit(QtCore.SIGNAL("addMessage"),
'KindleStrip failed to remove SRCS header!', icons.warning) 'KindleStrip failed to remove SRCS header!', 'warning')
self.emit(QtCore.SIGNAL("addMessage"), self.emit(QtCore.SIGNAL("addMessage"),
'MOBI file will work correctly but it will be highly oversized.', 'MOBI file will work correctly but it will be highly oversized.',
icons.warning) 'warning')
else: else:
os.remove(outputPath) os.remove(outputPath)
os.remove(outputPath.replace('.epub', '.mobi')) os.remove(outputPath.replace('.epub', '.mobi'))
self.emit(QtCore.SIGNAL("addMessage"), 'KindleGen failed to create MOBI!', icons.error) self.emit(QtCore.SIGNAL("addMessage"), 'KindleGen failed to create MOBI!', 'error')
self.emit(QtCore.SIGNAL("addMessage"), 'Try converting smaller batch.', icons.error) self.emit(QtCore.SIGNAL("addMessage"), 'Try converting smaller batch.', 'error')
else: else:
os.remove(outputPath) os.remove(outputPath)
self.emit(QtCore.SIGNAL("addMessage"), 'Created EPUB file is too big for KindleGen!', self.emit(QtCore.SIGNAL("addMessage"), 'Created EPUB file is too big for KindleGen!',
icons.error) 'error')
self.emit(QtCore.SIGNAL("addMessage"), 'Try converting smaller batch.', self.emit(QtCore.SIGNAL("addMessage"), 'Try converting smaller batch.',
icons.error) 'error')
self.parent.needClean = True self.parent.needClean = True
self.emit(QtCore.SIGNAL("addMessage"), 'All jobs completed.', icons.warning) self.emit(QtCore.SIGNAL("addMessage"), 'All jobs completed.', 'warning')
self.emit(QtCore.SIGNAL("modeConvert"), True) self.emit(QtCore.SIGNAL("modeConvert"), True)
@@ -308,6 +308,7 @@ class Ui_KCC(object):
def addMessage(self, message, icon=None, replace=False): def addMessage(self, message, icon=None, replace=False):
if icon: if icon:
icon = eval('icons.' + icon)
item = QtGui.QListWidgetItem(icon, message) item = QtGui.QListWidgetItem(icon, message)
else: else:
item = QtGui.QListWidgetItem(message) item = QtGui.QListWidgetItem(message)
@@ -332,7 +333,7 @@ class Ui_KCC(object):
self.needClean = False self.needClean = False
GUI.JobList.clear() GUI.JobList.clear()
if GUI.JobList.count() == 0: if GUI.JobList.count() == 0:
self.addMessage('No files selected! Please choose files to convert.', icons.error) self.addMessage('No files selected! Please choose files to convert.', 'error')
self.needClean = True self.needClean = True
return return
self.thread.start() self.thread.start()
@@ -359,20 +360,20 @@ class Ui_KCC(object):
self.needClean = True self.needClean = True
self.GammaValue = 0 self.GammaValue = 0
self.addMessage('Welcome!', icons.info) self.addMessage('Welcome!', 'info')
self.addMessage('Remember: All options have additional informations in tooltips.', icons.info) self.addMessage('Remember: All options have additional informations in tooltips.', 'info')
if call('kindlegen', stdout=PIPE, stderr=STDOUT, shell=True) == 0: if call('kindlegen', stdout=PIPE, stderr=STDOUT, shell=True) == 0:
self.KindleGen = True self.KindleGen = True
formats = ['MOBI', 'EPUB', 'CBZ'] formats = ['MOBI', 'EPUB', 'CBZ']
else: else:
self.KindleGen = False self.KindleGen = False
formats = ['EPUB', 'CBZ'] formats = ['EPUB', 'CBZ']
self.addMessage('Not found KindleGen! Creating MOBI files is disabled.', icons.warning) self.addMessage('Not found KindleGen! Creating MOBI files is disabled.', 'warning')
if call('unrar', stdout=PIPE, stderr=STDOUT, shell=True) == 0: if call('unrar', stdout=PIPE, stderr=STDOUT, shell=True) == 0:
self.UnRAR = True self.UnRAR = True
else: else:
self.UnRAR = False self.UnRAR = False
self.addMessage('Not found UnRAR! Processing of CBR/RAR files is disabled.', icons.warning) self.addMessage('Not found UnRAR! Processing of CBR/RAR files is disabled.', 'warning')
GUI.BasicModeButton.clicked.connect(self.modeBasic) GUI.BasicModeButton.clicked.connect(self.modeBasic)
GUI.AdvModeButton.clicked.connect(self.modeAdvanced) GUI.AdvModeButton.clicked.connect(self.modeAdvanced)