Browse Source

fix notes-ui for pyqt5

tags/1.9.4
falkTX 10 years ago
parent
commit
231d3d1b2a
2 changed files with 12 additions and 3 deletions
  1. +1
    -1
      Makefile
  2. +11
    -2
      source/modules/native-plugins/resources/notes-ui

+ 1
- 1
Makefile View File

@@ -58,7 +58,7 @@ discovery:
plugin: plugin:
$(MAKE) -C source/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/carla-plugin source/modules/native-plugins/resources/
$(LINK) $(CURDIR)/source/*.py source/modules/native-plugins/resources/ $(LINK) $(CURDIR)/source/*.py source/modules/native-plugins/resources/




+ 11
- 2
source/modules/native-plugins/resources/notes-ui View File

@@ -16,11 +16,20 @@
# #
# For a full copy of the GNU General Public License see the doc/GPL.txt file. # For a full copy of the GNU General Public License see the doc/GPL.txt file.


# ------------------------------------------------------------------------------------------------------------
# Imports (Config)

from carla_config import *

# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Imports (Global) # 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) # Imports (ExternalUI)


Loading…
Cancel
Save