From 0c394d77e388adb91beee210a9b66652db9d17cb Mon Sep 17 00:00:00 2001
From: tassaron
Date: Sun, 25 Jun 2017 23:05:44 -0400
Subject: an extra progress bar label for Mac

progressBar text is not visible in native Mac style
---
 src/mainwindow.py | 17 +++++++++++++++--
 src/mainwindow.ui | 18 +++++++++++++++++-
 2 files changed, 32 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.py b/src/mainwindow.py
index 42d2a50..a406a7d 100644
--- a/src/mainwindow.py
+++ b/src/mainwindow.py
@@ -13,7 +13,6 @@ import video_thread
 from presetmanager import PresetManager
 from main import LoadDefaultSettings, disableWhenEncoding
 
-
 class PreviewWindow(QtWidgets.QLabel):
     def __init__(self, parent, img):
         super(PreviewWindow, self).__init__()
@@ -88,6 +87,11 @@ class MainWindow(QtWidgets.QMainWindow):
         # Begin decorating the window and connecting events
         componentList = self.window.listWidget_componentList
 
+        if sys.platform == 'darwin':
+            window.progressBar_createVideo.setTextVisible(False)
+        else:
+            window.progressLabel.setHidden(True)
+
         window.toolButton_selectAudioFile.clicked.connect(
             self.openInputFileDialog)
 
@@ -487,6 +491,10 @@ class MainWindow(QtWidgets.QMainWindow):
             self.window.pushButton_listMoveUp.setEnabled(False)
             self.window.menuButton_newProject.setEnabled(False)
             self.window.menuButton_openProject.setEnabled(False)
+            if sys.platform == 'darwin':
+                self.window.progressLabel.setHidden(False)
+            else:
+                self.window.listWidget_componentList.setEnabled(False)
         else:
             self.window.pushButton_createVideo.setEnabled(True)
             self.window.pushButton_Cancel.setEnabled(False)
@@ -505,13 +513,18 @@ class MainWindow(QtWidgets.QMainWindow):
             self.window.pushButton_listMoveUp.setEnabled(True)
             self.window.menuButton_newProject.setEnabled(True)
             self.window.menuButton_openProject.setEnabled(True)
+            self.window.listWidget_componentList.setEnabled(True)
+            self.window.progressLabel.setHidden(True)
             self.drawPreview(True)
 
     def progressBarUpdated(self, value):
         self.window.progressBar_createVideo.setValue(value)
 
     def progressBarSetText(self, value):
-        self.window.progressBar_createVideo.setFormat(value)
+        if sys.platform == 'darwin':
+            self.window.progressLabel.setText(value)
+        else:
+            self.window.progressBar_createVideo.setFormat(value)
 
     def videoCreated(self):
         self.videoThread.quit()
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 4a12fd5..b491323 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -518,9 +518,26 @@
             </item>
            </layout>
           </item>
+          <item>
+           <widget class="QLabel" name="progressLabel">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="scaledContents">
+             <bool>true</bool>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="indent">
+             <number>-1</number>
+            </property>
+           </widget>
+          </item>
          </layout>
          <zorder></zorder>
          <zorder></zorder>
+         <zorder>progressLabel</zorder>
         </widget>
         <widget class="QWidget" name="tab_encoderSettings">
          <attribute name="title">
@@ -802,7 +819,6 @@
     </item>
    </layout>
   </widget>
-  <widget class="QStatusBar" name="statusbar"/>
  </widget>
  <resources/>
  <connections/>
-- 
cgit v1.2.3