Merge branch 'master' into feature-commandline

1 files changed, 5 insertions, 1 deletions

diff --git a/main.py b/main.py
index b9263b2..e4f4a64 100644
--- a/main.py
+++ b/main.py
@@ -191,7 +191,7 @@ class Main(QtCore.QObject):
     backgroundDir = self.settings.value("backgroundDir", expanduser("~"))
 
     fileName = QtGui.QFileDialog.getOpenFileName(self.window,
-       "Open Background Image", backgroundDir, "Image Files (*.jpg *.png)");
+       "Open Background Image", backgroundDir, "Image Files (*.jpg *.png);; Video Files (*.mp4)");
 
     if not fileName == "": 
       self.settings.setValue("backgroundDir", os.path.dirname(fileName))
@@ -207,6 +207,7 @@ class Main(QtCore.QObject):
     self.videoWorker.moveToThread(self.videoThread)
     self.videoWorker.videoCreated.connect(self.videoCreated)
     self.videoWorker.progressBarUpdate.connect(self.progressBarUpdated)
+    self.videoWorker.progressBarSetText.connect(self.progressBarSetText)
     
     self.videoThread.start()
     self.videoTask.emit(self.window.label_background.text(),
@@ -223,6 +224,9 @@ class Main(QtCore.QObject):
   def progressBarUpdated(self, value):
     self.window.progressBar_create.setValue(value)
 
+  def progressBarSetText(self, value):
+    self.window.progressBar_create.setFormat(value)
+
   def videoCreated(self):
     self.videoThread.quit()
     self.videoThread.wait()