From 88d1588362af3fb0cb16b4ba289596dc23e68fdc Mon Sep 17 00:00:00 2001 From: debug Date: Wed, 15 Jan 2020 11:46:11 +0800 Subject: [PATCH] Switched PySide imports to qtpy and changed she bang to be platform agnostic --- scripts/ingestIt | 5 +++-- scripts/mrFilmOut | 4 ++-- scripts/noteBao | 4 ++-- scripts/vfxConfigManager | 4 ++-- scripts/vfxTray | 4 +--- vfxClientToolkit/ui/about.py | 2 +- vfxClientToolkit/ui/utils.py | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/ingestIt b/scripts/ingestIt index ea0b99e..af03a50 100755 --- a/scripts/ingestIt +++ b/scripts/ingestIt @@ -1,4 +1,5 @@ -#! /usr/local/bin/python3 +#!/usr/bin/env python + import os import sys import re @@ -6,7 +7,7 @@ from pathlib import Path import json from enum import Enum -from PySide2 import QtGui, QtWidgets, QtCore +from qtpy import QtGui, QtWidgets, QtCore import qtmodern.styles import qtmodern.windows diff --git a/scripts/mrFilmOut b/scripts/mrFilmOut index cdad4e0..342099c 100755 --- a/scripts/mrFilmOut +++ b/scripts/mrFilmOut @@ -1,4 +1,4 @@ -#! /usr/local/bin/python3 +#!/usr/bin/env python import sys import os @@ -6,7 +6,7 @@ import re import shutil import xlsxwriter -from PySide2 import QtGui, QtWidgets, QtCore +from qtpy import QtGui, QtWidgets, QtCore import qtmodern.styles import qtmodern.windows diff --git a/scripts/noteBao b/scripts/noteBao index 5b03398..df75513 100755 --- a/scripts/noteBao +++ b/scripts/noteBao @@ -1,9 +1,9 @@ -#! /usr/local/bin/python3 +#!/usr/bin/env python import sys import os from os.path import expanduser -from PySide2 import QtWidgets, QtGui, QtCore +from qtpy import QtWidgets, QtGui, QtCore import qtmodern.styles import qtmodern.windows diff --git a/scripts/vfxConfigManager b/scripts/vfxConfigManager index a236bba..afac4aa 100644 --- a/scripts/vfxConfigManager +++ b/scripts/vfxConfigManager @@ -1,6 +1,6 @@ -#! /usr/local/bin/python3 +#!/usr/bin/env python -from PySide2 import QtWidgets, QtCore +from qtpy import QtWidgets, QtCore import qtmodern.styles import qtmodern.windows import sys diff --git a/scripts/vfxTray b/scripts/vfxTray index c69c4d1..4f974b7 100644 --- a/scripts/vfxTray +++ b/scripts/vfxTray @@ -1,4 +1,4 @@ -#! /usr/local/bin/python3 +#!/usr/bin/env python import os import subprocess @@ -22,8 +22,6 @@ def openFilmOut(): def openConfigManager(): subprocess.call(["python3", os.path.join(LOCATION, "vfxConfigManager")]) - - def main(): app = QtWidgets.QApplication([]) app.setQuitOnLastWindowClosed(False) diff --git a/vfxClientToolkit/ui/about.py b/vfxClientToolkit/ui/about.py index 2b3022b..fd412ac 100644 --- a/vfxClientToolkit/ui/about.py +++ b/vfxClientToolkit/ui/about.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QMessageBox +from qtpy.QtWidgets import QMessageBox #QMessageBox.about(self, "About PySide, Platform and version.", #""" about.py version %s diff --git a/vfxClientToolkit/ui/utils.py b/vfxClientToolkit/ui/utils.py index e59a125..4d98cb1 100644 --- a/vfxClientToolkit/ui/utils.py +++ b/vfxClientToolkit/ui/utils.py @@ -1,4 +1,4 @@ -from PySide2 import QtGui +from qtpy import QtGui def centerWidget(parent): frame = parent.frameGeometry()