From 231d3d1b2a3fc9a52cad63ddff5d2bb0234a964d Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 25 Feb 2014 21:54:35 +0000 Subject: [PATCH] fix notes-ui for pyqt5 --- Makefile | 2 +- source/modules/native-plugins/resources/notes-ui | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6806cb874..579f79dce 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ discovery: plugin: $(MAKE) -C source/plugin -plugin_ui: source/carla-plugin source/*.py RES UI WIDGETS +plugin_ui: source/carla-plugin source/carla_config.py source/*.py RES UI WIDGETS $(LINK) $(CURDIR)/source/carla-plugin source/modules/native-plugins/resources/ $(LINK) $(CURDIR)/source/*.py source/modules/native-plugins/resources/ diff --git a/source/modules/native-plugins/resources/notes-ui b/source/modules/native-plugins/resources/notes-ui index e8c52d696..7c70e0851 100755 --- a/source/modules/native-plugins/resources/notes-ui +++ b/source/modules/native-plugins/resources/notes-ui @@ -16,11 +16,20 @@ # # For a full copy of the GNU General Public License see the doc/GPL.txt file. +# ------------------------------------------------------------------------------------------------------------ +# Imports (Config) + +from carla_config import * + # ------------------------------------------------------------------------------------------------------------ # Imports (Global) -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QGridLayout, QLabel, QPushButton, QTextEdit, QWidget +if config_UseQt5: + from PyQt5.QtCore import pyqtSlot + from PyQt5.QtWidgets import QGridLayout, QLabel, QPushButton, QTextEdit, QWidget +else: + from PyQt4.QtCore import pyqtSlot + from PyQt4.QtGui import QGridLayout, QLabel, QPushButton, QTextEdit, QWidget # ----------------------------------------------------------------------- # Imports (ExternalUI)