From 634e56304e084d528fafb8f8f9255ec84b19410a Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 30 Aug 2013 19:41:03 +0100 Subject: [PATCH] Make the notes plugin work, temporary PyQt4 fix --- source/modules/carla_native/resources/pluginpipe.py | 1 - .../carla_native/resources/ui_inputdialog_value.py | 1 + source/widgets/paramspinbox.py | 11 ++++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 source/modules/carla_native/resources/pluginpipe.py create mode 120000 source/modules/carla_native/resources/ui_inputdialog_value.py diff --git a/source/modules/carla_native/resources/pluginpipe.py b/source/modules/carla_native/resources/pluginpipe.py deleted file mode 100644 index 8d1c8b69c..000000000 --- a/source/modules/carla_native/resources/pluginpipe.py +++ /dev/null @@ -1 +0,0 @@ - diff --git a/source/modules/carla_native/resources/ui_inputdialog_value.py b/source/modules/carla_native/resources/ui_inputdialog_value.py new file mode 120000 index 000000000..8d0eab330 --- /dev/null +++ b/source/modules/carla_native/resources/ui_inputdialog_value.py @@ -0,0 +1 @@ +/home/falktx/Personal/FOSS/GIT/Carla/source/ui_inputdialog_value.py \ No newline at end of file diff --git a/source/widgets/paramspinbox.py b/source/widgets/paramspinbox.py index 8fa0302dd..08e906d87 100644 --- a/source/widgets/paramspinbox.py +++ b/source/widgets/paramspinbox.py @@ -19,9 +19,14 @@ # ------------------------------------------------------------------------------------------------------------ # Imports (Global) -from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QTimer -from PyQt5.QtGui import QCursor -from PyQt5.QtWidgets import QAbstractSpinBox, QApplication, QComboBox, QDialog, QMenu, QProgressBar +try: + from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QTimer + from PyQt5.QtGui import QCursor + from PyQt5.QtWidgets import QAbstractSpinBox, QApplication, QComboBox, QDialog, QMenu, QProgressBar +except: + from PyQt4.QtCore import pyqtSignal, pyqtSlot, Qt, QTimer + from PyQt4.QtGui import QAbstractSpinBox, QApplication, QComboBox, QCursor, QDialog, QMenu, QProgressBar + from math import isnan # ------------------------------------------------------------------------------------------------------------