From 4b566601772a00e354e0f144bb3dc76ed043be4f Mon Sep 17 00:00:00 2001
From: DH4
Date: Sat, 3 Jun 2017 00:07:30 -0500
Subject: Changed encoding update to signal/slot.

---
 main.py         | 4 ++--
 mainwindow.ui   | 4 ++--
 video_thread.py | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/main.py b/main.py
index cba4ce7..e104b2b 100644
--- a/main.py
+++ b/main.py
@@ -260,7 +260,6 @@ class Main(QtCore.QObject):
     # create output video if mandatory settings are filled in
     if self.window.lineEdit_audioFile.text() and self.window.lineEdit_outputFile.text():
         self.canceled = False
-        self.changeEncodingStatus(True)
         self.progressBarUpdated(-1)
         ffmpeg_cmd = self.settings.value("ffmpeg_cmd", expanduser("~"))
         self.videoThread = QtCore.QThread(self)
@@ -269,7 +268,8 @@ class Main(QtCore.QObject):
         self.videoWorker.videoCreated.connect(self.videoCreated)
         self.videoWorker.progressBarUpdate.connect(self.progressBarUpdated)
         self.videoWorker.progressBarSetText.connect(self.progressBarSetText)
-        self.videoWorker.imageCreated.connect(self.showPreviewImage) 
+        self.videoWorker.imageCreated.connect(self.showPreviewImage)
+        self.videoWorker.encoding.connect(self.changeEncodingStatus)
         self.videoThread.start()
         self.videoTask.emit(self.window.lineEdit_background.text(),
           self.window.lineEdit_audioFile.text(),
diff --git a/mainwindow.ui b/mainwindow.ui
index 6119e63..42a22a6 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -240,7 +240,7 @@
          <enum>QTabWidget::Rounded</enum>
         </property>
         <property name="currentIndex">
-         <number>0</number>
+         <number>2</number>
         </property>
         <widget class="QWidget" name="tab">
          <attribute name="title">
@@ -712,7 +712,7 @@
             <item>
              <widget class="QPushButton" name="pushButton_Cancel">
               <property name="enabled">
-               <bool>false</bool>
+               <bool>true</bool>
               </property>
               <property name="text">
                <string>Cancel</string>
diff --git a/video_thread.py b/video_thread.py
index 64bbd5f..4032c27 100644
--- a/video_thread.py
+++ b/video_thread.py
@@ -19,6 +19,7 @@ class Worker(QtCore.QObject):
     videoCreated = pyqtSignal()
     progressBarUpdate = pyqtSignal(int)
     progressBarSetText = pyqtSignal(str)
+    encoding = pyqtSignal(bool)
 
     def __init__(self, parent=None):
         QtCore.QObject.__init__(self)
@@ -85,6 +86,7 @@ class Worker(QtCore.QObject):
 
     @pyqtSlot(str, str, str, list)
     def createVideo(self, backgroundImage, inputFile, outputFile, components):
+        self.encoding.emit(True)
         self.components = components
         self.outputFile = outputFile
         self.reset()
@@ -250,10 +252,8 @@ class Worker(QtCore.QObject):
         self.parent.drawPreview()
         self.core.deleteTempDir()
         self.stopped = True
+        self.encoding.emit(False)
         self.videoCreated.emit()
-        self.parent.changeEncodingStatus(False)
-
-        return
     
     def updateProgress(self, pStr, pVal):
         self.progressBarValue.emit(pVal)
@@ -273,7 +273,6 @@ class Worker(QtCore.QObject):
 
     def reset(self):
         self.core.reset()
-
         self.canceled = False
         for comp in self.components:
             comp.reset()
-- 
cgit v1.2.3