signal slot stuff

3 files changed, 6 insertions, 2 deletions

diff --git a/module/gui/CaptchaDock.py b/module/gui/CaptchaDock.py
index 193bac6fa..3dc9441a4 100644
--- a/module/gui/CaptchaDock.py
+++ b/module/gui/CaptchaDock.py
@@ -31,6 +31,7 @@ class CaptchaDock(QDockWidget):
         self.hide()
         self.processing = False
         self.currentID = None
+        self.connect(self, SIGNAL("setTask"), self.setTask)
     
     def isFree(self):
         return not self.processing
@@ -54,6 +55,7 @@ class CaptchaDockWidget(QWidget):
         okayButton = QPushButton("OK")
         cancelButton = QPushButton("Cancel")
         
+        layout.addStretch()
         layout.addWidget(imgLabel)
         layout.addWidget(captchaInput)
         layout.addWidget(okayButton)
diff --git a/module/plugins/decrypter/SerienjunkiesOrg.py b/module/plugins/decrypter/SerienjunkiesOrg.py
index 407d14c53..46f380857 100644
--- a/module/plugins/decrypter/SerienjunkiesOrg.py
+++ b/module/plugins/decrypter/SerienjunkiesOrg.py
@@ -51,9 +51,11 @@ class SerienjunkiesOrg(Plugin):
                 task.setWaiting()
                 while not task.getStatus() == "done":
                     if not self.parent.core.isGUIConnected():
+                        task.removeTask()
                         return False
                     sleep(1)
                 result = task.getResult()
+                task.removeTask()
                 url = "http://download.serienjunkies.org"+form["action"]
                 sinp = form.find(attrs={"name":"s"})
                 
diff --git a/pyLoadGui.py b/pyLoadGui.py
index 8fff8e8c9..9e04cc003 100755
--- a/pyLoadGui.py
+++ b/pyLoadGui.py
@@ -574,10 +574,10 @@ class main(QObject):
     def checkCaptcha(self):
         if self.connector.captchaWaiting() and self.mainWindow.captchaDock.isFree():
             cid, img, imgType = self.connector.getCaptcha()
-            self.mainWindow.captchaDock.setTask(cid, str(img), imgType)
+            self.mainWindow.captchaDock.emit(SIGNAL("setTask"), cid, str(img), imgType)
     
     def slotCaptchaDone(self, cid, result):
-        print self.connector.setCaptchaResult(str(cid), str(result))
+        self.connector.setCaptchaResult(str(cid), str(result))
     
     class Loop(QThread):
         """