falkTX
/
Cadence
mirror of https://github.com/falkTX/Cadence
1
0
Fork 0
Code Releases 3 Activity
Browse Source

Update jacksettings code; misc changes

tags/v0.9.0
falkTX 12 years ago
parent
c7dd814ddb
commit
a6845fc5a3
5 changed files with 392 additions and 332 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +30
    -3
      src/catarina.py
  2. +7
    -3
      src/claudia.py
  3. +12
    -0
      src/claudia_launcher.py
  4. +5
    -1
      src/clickablelabel.py
  5. +338
    -325
      src/jacksettings.py

+ 30
- 3
src/catarina.py View File

@@ -16,16 +16,25 @@
# #
# 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


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

from PyQt4.QtCore import pyqtSlot, QSettings from PyQt4.QtCore import pyqtSlot, QSettings
from PyQt4.QtGui import QApplication, QDialog, QDialogButtonBox, QTableWidgetItem from PyQt4.QtGui import QApplication, QDialog, QDialogButtonBox, QTableWidgetItem
from PyQt4.QtXml import QDomDocument from PyQt4.QtXml import QDomDocument


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

import ui_catarina import ui_catarina
import ui_catarina_addgroup, ui_catarina_removegroup, ui_catarina_renamegroup
import ui_catarina_addport, ui_catarina_removeport, ui_catarina_renameport
import ui_catarina_connectports, ui_catarina_disconnectports
import ui_catarina_addgroup
import ui_catarina_removegroup
import ui_catarina_renamegroup
import ui_catarina_addport
import ui_catarina_removeport
import ui_catarina_renameport
import ui_catarina_connectports
import ui_catarina_disconnectports
from shared_canvasjack import * from shared_canvasjack import *
from shared_settings import * from shared_settings import *


@@ -56,7 +65,9 @@ iConnId = 0
iConnOutput = 1 iConnOutput = 1
iConnInput = 2 iConnInput = 2


# ------------------------------------------------------------------------------------------------------------
# Add Group Dialog # Add Group Dialog

class CatarinaAddGroupW(QDialog, ui_catarina_addgroup.Ui_CatarinaAddGroupW): class CatarinaAddGroupW(QDialog, ui_catarina_addgroup.Ui_CatarinaAddGroupW):
def __init__(self, parent, group_list): def __init__(self, parent, group_list):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
@@ -89,7 +100,9 @@ class CatarinaAddGroupW(QDialog, ui_catarina_addgroup.Ui_CatarinaAddGroupW):
QDialog.done(self, r) QDialog.done(self, r)
self.close() self.close()


# ------------------------------------------------------------------------------------------------------------
# Remove Group Dialog # Remove Group Dialog

class CatarinaRemoveGroupW(QDialog, ui_catarina_removegroup.Ui_CatarinaRemoveGroupW): class CatarinaRemoveGroupW(QDialog, ui_catarina_removegroup.Ui_CatarinaRemoveGroupW):
def __init__(self, parent, group_list): def __init__(self, parent, group_list):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
@@ -128,7 +141,9 @@ class CatarinaRemoveGroupW(QDialog, ui_catarina_removegroup.Ui_CatarinaRemoveGro
QDialog.done(self, r) QDialog.done(self, r)
self.close() self.close()


# ------------------------------------------------------------------------------------------------------------
# Rename Group Dialog # Rename Group Dialog

class CatarinaRenameGroupW(QDialog, ui_catarina_renamegroup.Ui_CatarinaRenameGroupW): class CatarinaRenameGroupW(QDialog, ui_catarina_renamegroup.Ui_CatarinaRenameGroupW):
def __init__(self, parent, group_list): def __init__(self, parent, group_list):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
@@ -169,7 +184,9 @@ class CatarinaRenameGroupW(QDialog, ui_catarina_renamegroup.Ui_CatarinaRenameGro
QDialog.done(self, r) QDialog.done(self, r)
self.close() self.close()


# ------------------------------------------------------------------------------------------------------------
# Add Port Dialog # Add Port Dialog

class CatarinaAddPortW(QDialog, ui_catarina_addport.Ui_CatarinaAddPortW): class CatarinaAddPortW(QDialog, ui_catarina_addport.Ui_CatarinaAddPortW):
def __init__(self, parent, group_list, port_id): def __init__(self, parent, group_list, port_id):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
@@ -206,7 +223,9 @@ class CatarinaAddPortW(QDialog, ui_catarina_addport.Ui_CatarinaAddPortW):
QDialog.done(self, r) QDialog.done(self, r)
self.close() self.close()


# ------------------------------------------------------------------------------------------------------------
# Remove Port Dialog # Remove Port Dialog

class CatarinaRemovePortW(QDialog, ui_catarina_removeport.Ui_CatarinaRemovePortW): class CatarinaRemovePortW(QDialog, ui_catarina_removeport.Ui_CatarinaRemovePortW):
def __init__(self, parent, group_list, port_list): def __init__(self, parent, group_list, port_list):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
@@ -286,7 +305,9 @@ class CatarinaRemovePortW(QDialog, ui_catarina_removeport.Ui_CatarinaRemovePortW
QDialog.done(self, r) QDialog.done(self, r)
self.close() self.close()


# ------------------------------------------------------------------------------------------------------------
# Rename Port Dialog # Rename Port Dialog

class CatarinaRenamePortW(QDialog, ui_catarina_renameport.Ui_CatarinaRenamePortW): class CatarinaRenamePortW(QDialog, ui_catarina_renameport.Ui_CatarinaRenamePortW):
def __init__(self, parent, group_list, port_list): def __init__(self, parent, group_list, port_list):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
@@ -375,7 +396,9 @@ class CatarinaRenamePortW(QDialog, ui_catarina_renameport.Ui_CatarinaRenamePortW
QDialog.done(self, r) QDialog.done(self, r)
self.close() self.close()


# ------------------------------------------------------------------------------------------------------------
# Connect Ports Dialog # Connect Ports Dialog

class CatarinaConnectPortsW(QDialog, ui_catarina_connectports.Ui_CatarinaConnectPortsW): class CatarinaConnectPortsW(QDialog, ui_catarina_connectports.Ui_CatarinaConnectPortsW):
def __init__(self, parent, group_list, port_list): def __init__(self, parent, group_list, port_list):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
@@ -466,7 +489,9 @@ class CatarinaConnectPortsW(QDialog, ui_catarina_connectports.Ui_CatarinaConnect
QDialog.done(self, r) QDialog.done(self, r)
self.close() self.close()


# ------------------------------------------------------------------------------------------------------------
# Disconnect Ports Dialog # Disconnect Ports Dialog

class CatarinaDisconnectPortsW(QDialog, ui_catarina_disconnectports.Ui_CatarinaDisconnectPortsW): class CatarinaDisconnectPortsW(QDialog, ui_catarina_disconnectports.Ui_CatarinaDisconnectPortsW):
def __init__(self, parent, group_list, port_list, connection_list): def __init__(self, parent, group_list, port_list, connection_list):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
@@ -562,7 +587,9 @@ class CatarinaDisconnectPortsW(QDialog, ui_catarina_disconnectports.Ui_CatarinaD
QDialog.done(self, r) QDialog.done(self, r)
self.close() self.close()


# ------------------------------------------------------------------------------------------------------------
# Main Window # Main Window

class CatarinaMainW(AbstractCanvasJackClass, ui_catarina.Ui_CatarinaMainW): class CatarinaMainW(AbstractCanvasJackClass, ui_catarina.Ui_CatarinaMainW):
def __init__(self, parent=None): def __init__(self, parent=None):
AbstractCanvasJackClass.__init__(self, parent, "Catarina") AbstractCanvasJackClass.__init__(self, parent, "Catarina")


+ 7
- 3
src/claudia.py View File

@@ -26,10 +26,14 @@ from PyQt4.QtGui import QAction, QApplication, QVBoxLayout, QTableWidgetItem, QT
# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Imports (Custom Stuff) # Imports (Custom Stuff)


import claudia_launcher, systray
import claudia_launcher
import systray
import ui_claudia import ui_claudia
import ui_claudia_studioname, ui_claudia_studiolist
import ui_claudia_createroom, ui_claudia_projectname, ui_claudia_projectproperties
import ui_claudia_studioname
import ui_claudia_studiolist
import ui_claudia_createroom
import ui_claudia_projectname
import ui_claudia_projectproperties
import ui_claudia_runcustom import ui_claudia_runcustom
from shared_canvasjack import * from shared_canvasjack import *
from shared_settings import * from shared_settings import *


+ 12
- 0
src/claudia_launcher.py View File

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


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

from PyQt4.QtCore import pyqtSlot, Qt, QTimer, QSettings from PyQt4.QtCore import pyqtSlot, Qt, QTimer, QSettings
from PyQt4.QtGui import QMainWindow, QTableWidgetItem, QWidget from PyQt4.QtGui import QMainWindow, QTableWidgetItem, QWidget
from subprocess import getoutput from subprocess import getoutput
from random import randint from random import randint


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

import claudia_database as database import claudia_database as database
import ui_claudia_launcher import ui_claudia_launcher
from shared import * from shared import *


# ------------------------------------------------------------------------------------------------------------
# Debug Mode # Debug Mode

SHOW_ALL = False SHOW_ALL = False


# ------------------------------------------------------------------------------------------------------------
# Tab Indexes # Tab Indexes

iTabDAW = 0 iTabDAW = 0
iTabHost = 1 iTabHost = 1
iTabInstrument = 2 iTabInstrument = 2
@@ -30,7 +38,9 @@ EXTRA_ICON_PATHS = [
"/usr/local/share/pixmaps" "/usr/local/share/pixmaps"
] ]


# ------------------------------------------------------------------------------------------------------------
# XIcon class # XIcon class

class XIcon(object): class XIcon(object):
def __init__(self): def __init__(self):
object.__init__(self) object.__init__(self)
@@ -62,7 +72,9 @@ class XIcon(object):


return icon return icon


# ------------------------------------------------------------------------------------------------------------
# Launcher object # Launcher object

class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW):
def __init__(self, parent): def __init__(self, parent):
QWidget.__init__(self, parent) QWidget.__init__(self, parent)


+ 5
- 1
src/clickablelabel.py View File

@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-


# Clickable Label, a custom Qt4 widget # Clickable Label, a custom Qt4 widget
# Copyright (C) 2011-2012 Filipe Coelho <falktx@falktx.com>
# Copyright (C) 2011-2013 Filipe Coelho <falktx@falktx.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -16,11 +16,15 @@
# #
# 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


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

from PyQt4.QtCore import pyqtSlot, Qt, QTimer, SIGNAL, SLOT from PyQt4.QtCore import pyqtSlot, Qt, QTimer, SIGNAL, SLOT
from PyQt4.QtGui import QLabel from PyQt4.QtGui import QLabel


# ------------------------------------------------------------------------------------------------------------
# Widget Class # Widget Class

class ClickableLabel(QLabel): class ClickableLabel(QLabel):
def __init__(self, parent): def __init__(self, parent):
QLabel.__init__(self, parent) QLabel.__init__(self, parent)


+ 338
- 325
src/jacksettings.py
File diff suppressed because it is too large
View File


Write Preview
Loading…
Cancel
Save