Browse Source

Cleanup

tags/1.9.4
falkTX 11 years ago
parent
commit
da425efa84
4 changed files with 11 additions and 20 deletions
  1. +0
    -5
      source/carla-plugin
  2. +6
    -0
      source/carla_style.py
  3. +1
    -7
      source/modules/native-plugins/resources/bigmeter-ui
  4. +4
    -8
      source/modules/native-plugins/resources/notes-ui

+ 0
- 5
source/carla-plugin View File

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


# ------------------------------------------------------------------------------------------------------------
# Imports (Global)

from time import sleep

# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Imports (Custom Stuff) # Imports (Custom Stuff)




+ 6
- 0
source/carla_style.py View File

@@ -27,6 +27,9 @@ from PyQt4.QtGui import QApplication, QColor, QPalette


from carla_shared import * from carla_shared import *


# Make sure resources are good
import resources_rc

# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------


class CarlaApplication(object): class CarlaApplication(object):
@@ -204,6 +207,9 @@ class CarlaApplication(object):
def exec_(self): def exec_(self):
return self.fApp.exec_() return self.fApp.exec_()


def exit_exec(self):
return sys.exit(self.fApp.exec_())

def getApp(self): def getApp(self):
return self.fApp return self.fApp




+ 1
- 7
source/modules/native-plugins/resources/bigmeter-ui View File

@@ -16,11 +16,6 @@
# #
# 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 (Global)

from sys import exit

# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
# Imports (ExternalUI) # Imports (ExternalUI)


@@ -88,7 +83,6 @@ class DistrhoUIBigMeter(DigitalPeakMeter, ExternalUI):
def timerEvent(self, event): def timerEvent(self, event):
if event.timerId() == self.fIdleTimer and not self.idleExternalUI(): if event.timerId() == self.fIdleTimer and not self.idleExternalUI():
self.d_uiQuit() self.d_uiQuit()

DigitalPeakMeter.timerEvent(self, event) DigitalPeakMeter.timerEvent(self, event)


def closeEvent(self, event): def closeEvent(self, event):
@@ -100,4 +94,4 @@ if __name__ == '__main__':
app = CarlaApplication("BigMeter") app = CarlaApplication("BigMeter")
#app... #app...
gui = DistrhoUIBigMeter() gui = DistrhoUIBigMeter()
exit(app.exec_())
app.exit_exec()

+ 4
- 8
source/modules/native-plugins/resources/notes-ui View File

@@ -1,8 +1,8 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-


# DISTRHO Notes Plugin
# Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
# Carla Native Plugins
# Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as # modify it under the terms of the GNU General Public License as
@@ -14,14 +14,12 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# For a full copy of the GNU General Public License see the GPL.txt file
# For a full copy of the GNU General Public License see the doc/GPL.txt file.


# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Imports (Global) # Imports (Global)


from numpy import rint from numpy import rint
from sys import argv, exit

from PyQt4.QtCore import pyqtSlot from PyQt4.QtCore import pyqtSlot
from PyQt4.QtGui import QApplication, QGridLayout, QLabel, QPushButton, QTextEdit, QWidget from PyQt4.QtGui import QApplication, QGridLayout, QLabel, QPushButton, QTextEdit, QWidget


@@ -32,8 +30,6 @@ from carla_style import CarlaApplication
from externalui import ExternalUI from externalui import ExternalUI
from paramspinbox import ParamSpinBox from paramspinbox import ParamSpinBox


import resources_rc

# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
# External UI # External UI


@@ -231,4 +227,4 @@ if __name__ == '__main__':
app = CarlaApplication("Notes") app = CarlaApplication("Notes")
#app... #app...
gui = DistrhoUINotes() gui = DistrhoUINotes()
exit(app.exec_())
app.exit_exec()

Loading…
Cancel
Save