macos fixes

ozmartian · Aug 18, 2018 · 8fcef6d · 8fcef6d
1 parent 7eeedbe
commit 8fcef6d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/_build/pyinstaller/build.pyinstaller.osx b/_build/pyinstaller/build.pyinstaller.osx
@@ -1,5 +1,4 @@
 #!/bin/bash
 
 rm -rf build dist
-python3 -m pip install pyopengl
 python3 -m PyInstaller --clean vidcutter.osx.spec
diff --git a/_build/pyinstaller/vidcutter.osx.spec b/_build/pyinstaller/vidcutter.osx.spec
@@ -25,7 +25,7 @@ a = Analysis(['../../vidcutter/__main__.py'],
                  ('../../README.md', '.'),
                  ('../../bin/*', 'bin')
              ],
-             hiddenimports=[],
+             hiddenimports=['PyQt5.sip'],
              hookspath=[],
              runtime_hooks=[],
              excludes=['numpy'],

diff --git a/vidcutter/__main__.py b/vidcutter/__main__.py
@@ -367,8 +367,8 @@ def main():
         QSurfaceFormat.setDefaultFormat(fmt)
         QGuiApplication.setAttribute(Qt.AA_ShareOpenGLContexts, True)
 
-    if sys.platform == 'darwin':
-        qApp.setStyle('Fusion')
+    # if sys.platform == 'darwin':
+    #     qApp.setStyle('Fusion')
 
     app = SingleApplication(vidcutter.__appid__, sys.argv)
     app.setApplicationName(vidcutter.__appname__)

diff --git a/vidcutter/settings.py b/vidcutter/settings.py
@@ -650,7 +650,7 @@ def __init__(self, service: VideoService, parent: QWidget, flags=Qt.WindowCloseB
         self.settings = self.parent.settings
         self.theme = self.parent.theme
         self.setObjectName('settingsdialog')
-        if sys.platform == 'win32':
+        if sys.platform in {'win32', 'darwin'}:
             self.setStyle(QStyleFactory.create('Fusion'))
         self.setWindowTitle('Settings')
         self.categories = QListWidget(self)

diff --git a/vidcutter/videocutter.py b/vidcutter/videocutter.py
@@ -319,8 +319,6 @@ def __init__(self, parent: QMainWindow):
         self.volSlider = VCVolumeSlider(orientation=Qt.Horizontal, toolTip='Volume', statusTip='Adjust volume level',
                                         cursor=Qt.PointingHandCursor, value=self.parent.startupvol, minimum=0,
                                         maximum=130, minimumHeight=22, sliderMoved=self.setVolume)
-        if sys.platform == 'darwin':
-            self.volSlider.setStyle(QStyleFactory.create('Macintosh'))
 
         # noinspection PyArgumentList
         self.fullscreenButton = QPushButton(objectName='fullscreenButton', icon=self.fullscreenIcon, flat=True,