From 063d2b8adbf0fb326e638c26bc774efb19dd64c3 Mon Sep 17 00:00:00 2001 From: Hugo Posnic Date: Sat, 18 Nov 2017 15:45:04 +0100 Subject: [PATCH] Replace some old signals --- src/trimage/trimage.py | 9 +++++---- src/trimage/ui.py | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/trimage/trimage.py b/src/trimage/trimage.py index 063f35e..027eac2 100644 --- a/src/trimage/trimage.py +++ b/src/trimage/trimage.py @@ -66,11 +66,10 @@ class StartQT5(QMainWindow): self.ui.addfiles.clicked.connect(self.file_dialog) self.ui.recompress.clicked.connect(self.recompress_files) self.quit_shortcut.activated.connect(self.close) - # QObject.connect(self.ui.processedfiles, SIGNAL("fileDropEvent"), - # self.file_drop) + self.ui.processedfiles.drop_event_signal.connect(self.file_drop) # QObject.connect(self.thread, SIGNAL("finished()"), self.update_table) # QObject.connect(self.thread, SIGNAL("terminated()"), self.update_table) - # QObject.connect(self.thread, SIGNAL("updateUi"), self.update_table) + self.thread.update_ui_signal.connect(self.update_table) self.compressing_icon = QIcon(QPixmap(self.ui.get_image("pixmaps/compressing.gif"))) @@ -460,6 +459,8 @@ class Image: class Worker(QThread): + update_ui_signal = pyqtSignal() + def __init__(self, parent=None): QThread.__init__(self, parent) self.toDisplay = Queue() @@ -487,7 +488,7 @@ class Worker(QThread): tp._ThreadPool__jobs.empty()): image = self.toDisplay.get() - ##self.emit(SIGNAL("updateUi")) + self.update_ui_signal.emit() if not self.showapp and self.verbose: # we work via the commandline if image.retcode == 0: diff --git a/src/trimage/ui.py b/src/trimage/ui.py index f3bcd9b..53a2794 100644 --- a/src/trimage/ui.py +++ b/src/trimage/ui.py @@ -4,6 +4,9 @@ from PyQt5.QtWidgets import * from os import path class TrimageTableView(QTableView): + + drop_event_signal = pyqtSignal(list) + """Init the table drop event.""" def __init__(self, parent=None): super(TrimageTableView, self).__init__(parent) @@ -24,7 +27,7 @@ class TrimageTableView(QTableView): for url in event.mimeData().urls(): filelist.append(url.toLocalFile()) - self.emit(SIGNAL("fileDropEvent"), (filelist)) + self.drop_event_signal.emit(filelist) class Ui_trimage(object):