| @@ -16,16 +16,11 @@ | |||||
| # | # | ||||
| # For a full copy of the GNU General Public License see the COPYING file | # For a full copy of the GNU General Public License see the COPYING file | ||||
| # FIXME - py3 later | |||||
| try: | |||||
| from commands import getoutput | |||||
| except: | |||||
| from subprocess import getoutput | |||||
| # Imports (Global) | # Imports (Global) | ||||
| from platform import architecture | from platform import architecture | ||||
| from PyQt4.QtCore import QThread | from PyQt4.QtCore import QThread | ||||
| from PyQt4.QtGui import QApplication, QLabel, QMainWindow, QSizePolicy | from PyQt4.QtGui import QApplication, QLabel, QMainWindow, QSizePolicy | ||||
| from subprocess import getoutput | |||||
| # Imports (Custom Stuff) | # Imports (Custom Stuff) | ||||
| import ui_cadence | import ui_cadence | ||||
| @@ -18,7 +18,7 @@ | |||||
| # Imports (Global) | # Imports (Global) | ||||
| import json | import json | ||||
| from PyQt4.QtCore import Qt, QThread | |||||
| from PyQt4.QtCore import QThread | |||||
| from PyQt4.QtGui import QApplication, QMainWindow, QTableWidgetItem | from PyQt4.QtGui import QApplication, QMainWindow, QTableWidgetItem | ||||
| # Imports (Custom Stuff) | # Imports (Custom Stuff) | ||||
| @@ -22,7 +22,7 @@ from liblo import make_method, Address, ServerError, ServerThread | |||||
| from liblo import send as lo_send | from liblo import send as lo_send | ||||
| # Imports (Custom) | # Imports (Custom) | ||||
| import ui_carla_about, ui_carla_control, ui_carla_edit, ui_carla_parameter, ui_carla_plugin | |||||
| import ui_carla_about, ui_carla_control | |||||
| from shared_carla import * | from shared_carla import * | ||||
| global carla_name, lo_target | global carla_name, lo_target | ||||
| @@ -45,7 +45,7 @@ class CustomInputDialog(QDialog, ui_inputdialog_value.Ui_Dialog): | |||||
| else: | else: | ||||
| text = "<table>" | text = "<table>" | ||||
| for scalePoint in scalePoints: | for scalePoint in scalePoints: | ||||
| text += "<tr><td align='right'>%f</td><td align='left'> - %s</td></tr>" % (scalePoint['value'], scalepoint['label']) | |||||
| text += "<tr><td align='right'>%f</td><td align='left'> - %s</td></tr>" % (scalePoint['value'], scalePoint['label']) | |||||
| text += "</table>" | text += "</table>" | ||||
| self.textBrowser.setText(text) | self.textBrowser.setText(text) | ||||
| self.resize(200, 300) | self.resize(200, 300) | ||||
| @@ -21,7 +21,7 @@ from PyQt4.QtGui import QColor, QFont, QPen, QPixmap | |||||
| class Theme(object): | class Theme(object): | ||||
| # enum PortType | # enum PortType | ||||
| THEME_PORT_SQUARE = 0 | |||||
| THEME_PORT_SQUARE = 0 | |||||
| THEME_PORT_POLYGON = 1 | THEME_PORT_POLYGON = 1 | ||||
| # enum List | # enum List | ||||
| @@ -20,7 +20,7 @@ | |||||
| import platform, sys | import platform, sys | ||||
| from copy import deepcopy | from copy import deepcopy | ||||
| from sip import unwrapinstance | from sip import unwrapinstance | ||||
| from PyQt4.QtCore import pyqtSlot, QSettings, QTimer | |||||
| from PyQt4.QtCore import pyqtSlot, Qt, QSettings, QTimer | |||||
| from PyQt4.QtGui import QColor, QCursor, QDialog, QFontMetrics, QFrame, QInputDialog, QMenu, QPainter, QVBoxLayout, QWidget | from PyQt4.QtGui import QColor, QCursor, QDialog, QFontMetrics, QFrame, QInputDialog, QMenu, QPainter, QVBoxLayout, QWidget | ||||
| from PyQt4.QtXml import QDomDocument | from PyQt4.QtXml import QDomDocument | ||||
| @@ -26,7 +26,7 @@ from shared import * | |||||
| from jacklib_helpers import * | from jacklib_helpers import * | ||||
| # Have JACK2 ? | # Have JACK2 ? | ||||
| if jacklib.JACK2: | |||||
| if jacklib.JACK2 and DEBUG: | |||||
| print("Using JACK2, version %s" % cString(jacklib.get_version_string())) | print("Using JACK2, version %s" % cString(jacklib.get_version_string())) | ||||
| # Can Render ? | # Can Render ? | ||||
| @@ -48,7 +48,7 @@ try: | |||||
| TrayEngine = "AppIndicator" | TrayEngine = "AppIndicator" | ||||
| elif getenv("KDE_FULL_SESSION") or getenv("DESKTOP_SESSION") == "kde-plasma": | |||||
| elif os.getenv("KDE_FULL_SESSION") or os.getenv("DESKTOP_SESSION") == "kde-plasma": | |||||
| from PyKDE4.kdeui import KAction, KIcon, KMenu, KStatusNotifierItem | from PyKDE4.kdeui import KAction, KIcon, KMenu, KStatusNotifierItem | ||||
| TrayEngine = "KDE" | TrayEngine = "KDE" | ||||
| @@ -628,7 +628,6 @@ class GlobalSysTray(object): | |||||
| #--------------- main ------------------ | #--------------- main ------------------ | ||||
| if __name__ == '__main__': | if __name__ == '__main__': | ||||
| import sys | |||||
| from PyQt4.QtGui import QApplication, QDialog, QMessageBox | from PyQt4.QtGui import QApplication, QDialog, QMessageBox | ||||
| class ExampleGUI(QDialog): | class ExampleGUI(QDialog): | ||||