diff --git a/Makefile b/Makefile
index 4e57824..a7e1783 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,44 @@ all: build
build: UI RES LANG
-UI: tools
+UI: catarina tools
+
+catarina: src/ui_catarina.py \
+ src/ui_catarina_addgroup.py src/ui_catarina_removegroup.py src/ui_catarina_renamegroup.py \
+ src/ui_catarina_addport.py src/ui_catarina_removeport.py src/ui_catarina_renameport.py \
+ src/ui_catarina_connectports.py src/ui_catarina_disconnectports.py
tools: \
src/ui_logs.py src/ui_render.py src/ui_xycontroller.py \
src/ui_settings_jack.py
+src/ui_catarina.py: src/ui/catarina.ui
+ $(PYUIC) -o src/ui_catarina.py $<
+
+src/ui_catarina_addgroup.py: src/ui/catarina_addgroup.ui
+ $(PYUIC) -o src/ui_catarina_addgroup.py $<
+
+src/ui_catarina_removegroup.py: src/ui/catarina_removegroup.ui
+ $(PYUIC) -o src/ui_catarina_removegroup.py $<
+
+src/ui_catarina_renamegroup.py: src/ui/catarina_renamegroup.ui
+ $(PYUIC) -o src/ui_catarina_renamegroup.py $<
+
+src/ui_catarina_addport.py: src/ui/catarina_addport.ui
+ $(PYUIC) -o src/ui_catarina_addport.py $<
+
+src/ui_catarina_removeport.py: src/ui/catarina_removeport.ui
+ $(PYUIC) -o src/ui_catarina_removeport.py $<
+
+src/ui_catarina_renameport.py: src/ui/catarina_renameport.ui
+ $(PYUIC) -o src/ui_catarina_renameport.py $<
+
+src/ui_catarina_connectports.py: src/ui/catarina_connectports.ui
+ $(PYUIC) -o src/ui_catarina_connectports.py $<
+
+src/ui_catarina_disconnectports.py: src/ui/catarina_disconnectports.ui
+ $(PYUIC) -o src/ui_catarina_disconnectports.py $<
+
src/ui_logs.py: src/ui/logs.ui
$(PYUIC) -o src/ui_logs.py $<
diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 51da77c..300aa86 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -10,6 +10,7 @@
48x48/media-record.png
+ scalable/catarina.svg
scalable/jack.svg
bitmaps/dial_01.png
diff --git a/src/icons/scalable/catarina.svg b/src/icons/scalable/catarina.svg
new file mode 100644
index 0000000..2503fee
--- /dev/null
+++ b/src/icons/scalable/catarina.svg
@@ -0,0 +1,1291 @@
+
+
+
+
diff --git a/src/ui/catarina.ui b/src/ui/catarina.ui
new file mode 100644
index 0000000..4422ddb
--- /dev/null
+++ b/src/ui/catarina.ui
@@ -0,0 +1,798 @@
+
+
+ CatarinaMainW
+
+
+
+ 0
+ 0
+ 651
+ 487
+
+
+
+ Catarina
+
+
+
+ -
+
+
+
+ 4
+
+
+ 0
+
+
-
+
+
+ Project
+
+
+
-
+
+
+
+ 23
+ 16777215
+
+
+
+ New Project
+
+
+
+
+
+
+ :/16x16/document-new.png:/16x16/document-new.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Open Project
+
+
+
+
+
+
+ :/16x16/document-open.png:/16x16/document-open.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Save Project
+
+
+
+
+
+
+ :/16x16/document-save.png:/16x16/document-save.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Save Project As
+
+
+
+
+
+
+ :/16x16/document-save-as.png:/16x16/document-save-as.png
+
+
+
+
+
+
+ -
+
+
+ Patchbay
+
+
+
-
+
+
+
+ 23
+ 16777215
+
+
+
+ Add Group
+
+
+
+
+
+
+ :/16x16/list-add.png:/16x16/list-add.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Remove Group
+
+
+
+
+
+
+ :/16x16/edit-delete.png:/16x16/edit-delete.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Rename Group
+
+
+
+
+
+
+ :/16x16/edit-rename.png:/16x16/edit-rename.png
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Add Port
+
+
+
+
+
+
+ :/16x16/list-add.png:/16x16/list-add.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Remove Port
+
+
+
+
+
+
+ :/16x16/list-remove.png:/16x16/list-remove.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Rename Port
+
+
+
+
+
+
+ :/16x16/edit-rename.png:/16x16/edit-rename.png
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Connect Ports
+
+
+
+
+
+
+ :/16x16/network-connect.png:/16x16/network-connect.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Disconnect Ports
+
+
+
+
+
+
+ :/16x16/network-disconnect.png:/16x16/network-disconnect.png
+
+
+
+
+
+
+ -
+
+
+ Canvas
+
+
+
-
+
+
+
+ 23
+ 16777215
+
+
+
+ Zoom Auto-Fit
+
+
+
+
+
+
+ :/16x16/zoom-fit-best.png:/16x16/zoom-fit-best.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Zoom In
+
+
+
+
+
+
+ :/16x16/zoom-in.png:/16x16/zoom-in.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Zoom Out
+
+
+
+
+
+
+ :/16x16/zoom-out.png:/16x16/zoom-out.png
+
+
+
+ -
+
+
+
+ 23
+ 16777215
+
+
+
+ Zoom 100%
+
+
+
+
+
+
+ :/16x16/zoom-original.png:/16x16/zoom-original.png
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 163
+ 20
+
+
+
+
+
+
+
+ -
+
+
+ Qt::ScrollBarAlwaysOn
+
+
+ Qt::ScrollBarAlwaysOn
+
+
+
+
+
+
+
+
+
+ :/16x16/document-save.png:/16x16/document-save.png
+
+
+ &Save Positions
+
+
+ Ctrl+S
+
+
+
+
+
+ :/16x16/application-exit.png:/16x16/application-exit.png
+
+
+ &Quit
+
+
+ Ctrl+Q
+
+
+
+
+
+ :/16x16/list-add.png:/16x16/list-add.png
+
+
+ Add Group...
+
+
+
+
+
+ :/16x16/edit-delete.png:/16x16/edit-delete.png
+
+
+ Remove Group...
+
+
+
+
+
+ :/16x16/list-add.png:/16x16/list-add.png
+
+
+ Add Port...
+
+
+
+
+
+ :/16x16/list-remove.png:/16x16/list-remove.png
+
+
+ Remove Port...
+
+
+
+
+
+ :/16x16/edit-rename.png:/16x16/edit-rename.png
+
+
+ Rename Port...
+
+
+
+
+
+ :/16x16/network-connect.png:/16x16/network-connect.png
+
+
+ &Connect Ports...
+
+
+
+
+
+ :/16x16/network-disconnect.png:/16x16/network-disconnect.png
+
+
+ &Disconnect Ports...
+
+
+
+
+
+ :/16x16/view-refresh.png:/16x16/view-refresh.png
+
+
+ &Refresh
+
+
+ Ctrl+R
+
+
+
+
+
+ :/16x16/zoom-fit-best.png:/16x16/zoom-fit-best.png
+
+
+ Auto-Fit
+
+
+
+
+
+ :/16x16/zoom-original.png:/16x16/zoom-original.png
+
+
+ Zoom 100%
+
+
+ Ctrl+1
+
+
+
+
+
+ :/16x16/zoom-out.png:/16x16/zoom-out.png
+
+
+ Zoom Out
+
+
+ Ctrl+-
+
+
+
+
+
+ :/16x16/zoom-in.png:/16x16/zoom-in.png
+
+
+ Zoom In
+
+
+ Ctrl++
+
+
+
+
+ true
+
+
+ Show Toolbar
+
+
+
+
+ About Qt
+
+
+
+
+ About Catarina
+
+
+
+
+ true
+
+
+ Show Patchbay Toolbar
+
+
+
+
+
+ :/16x16/view-sort-ascending.png:/16x16/view-sort-ascending.png
+
+
+ &Arrange
+
+
+ Ctrl+G
+
+
+
+
+
+ :/16x16/document-print.png:/16x16/document-print.png
+
+
+ Print...
+
+
+
+
+ Save Image...
+
+
+
+
+
+ :/16x16/configure.png:/16x16/configure.png
+
+
+ Configure Catarina
+
+
+ Ctrl+P
+
+
+
+
+
+ :/16x16/document-new.png:/16x16/document-new.png
+
+
+ &New
+
+
+ Ctrl+N
+
+
+
+
+
+ :/16x16/document-open.png:/16x16/document-open.png
+
+
+ &Open...
+
+
+ Ctrl+O
+
+
+
+
+
+ :/16x16/document-save.png:/16x16/document-save.png
+
+
+ &Save
+
+
+ Ctrl+S
+
+
+
+
+
+ :/16x16/document-save-as.png:/16x16/document-save-as.png
+
+
+ Save &As...
+
+
+ Ctrl+Shift+S
+
+
+
+
+
+ :/16x16/edit-rename.png:/16x16/edit-rename.png
+
+
+ Rename Group...
+
+
+
+
+
+
+
+
+ act_quit
+ triggered()
+ CatarinaMainW
+ close()
+
+
+ -1
+ -1
+
+
+ 325
+ 243
+
+
+
+
+ act_settings_show_toolbar
+ toggled(bool)
+ frame_toolbar
+ setVisible(bool)
+
+
+ -1
+ -1
+
+
+ 325
+ 60
+
+
+
+
+
diff --git a/src/ui/catarina_addgroup.ui b/src/ui/catarina_addgroup.ui
new file mode 100644
index 0000000..838b2c7
--- /dev/null
+++ b/src/ui/catarina_addgroup.ui
@@ -0,0 +1,94 @@
+
+
+ CatarinaAddGroupW
+
+
+
+ 0
+ 0
+ 302
+ 144
+
+
+
+ Add Group
+
+
+ -
+
+
+ New Group
+
+
+
-
+
+
-
+
+
+ Group Name:
+
+
+
+ -
+
+
+
+
+ -
+
+
+ Hardware Mode (Split Input/Outputs)
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ CatarinaAddGroupW
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ CatarinaAddGroupW
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/ui/catarina_addport.ui b/src/ui/catarina_addport.ui
new file mode 100644
index 0000000..f28f39e
--- /dev/null
+++ b/src/ui/catarina_addport.ui
@@ -0,0 +1,217 @@
+
+
+ CatarinaAddPortW
+
+
+
+ 0
+ 0
+ 273
+ 424
+
+
+
+ Add Port
+
+
+ -
+
+
+ Parent
+
+
+
-
+
+
+ Port Group:
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+ Port Info
+
+
+
-
+
+
+ Port ID:
+
+
+
+ -
+
+
+ true
+
+
+ 9999
+
+
+
+ -
+
+
+ Port Name
+
+
+
+ -
+
+
+ -
+
+
+ Port Type:
+
+
+
+ -
+
+
-
+
+ JACK Audio
+
+
+ -
+
+ JACK MIDI
+
+
+ -
+
+ A2J MIDI
+
+
+ -
+
+ ALSA MIDI
+
+
+
+
+
+
+
+ -
+
+
+ Port Flags
+
+
+
-
+
+
+ Input
+
+
+ true
+
+
+
+ -
+
+
+ Output
+
+
+
+ -
+
+
+ Physical
+
+
+
+ -
+
+
+ Can Monitor
+
+
+
+ -
+
+
+ Terminal
+
+
+
+ -
+
+
+ Active
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+ le_port_name
+ cb_port_type
+ rb_flags_input
+ rb_flags_output
+ cb_flags_physical
+ checkBox_2
+ checkBox_3
+ checkBox_4
+ cb_group
+ sb_port_id
+ buttonBox
+
+
+
+
+ buttonBox
+ accepted()
+ CatarinaAddPortW
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ CatarinaAddPortW
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/ui/catarina_connectports.ui b/src/ui/catarina_connectports.ui
new file mode 100644
index 0000000..b13eb09
--- /dev/null
+++ b/src/ui/catarina_connectports.ui
@@ -0,0 +1,128 @@
+
+
+ CatarinaConnectPortsW
+
+
+
+ 0
+ 0
+ 592
+ 308
+
+
+
+ Connect Ports
+
+
+ -
+
+
+ Outputs
+
+
+
-
+
+
+
+
+
+ -
+
+
+ Inputs
+
+
+
-
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+ -
+
+
+ Connection Type
+
+
+
-
+
+
+ Audio
+
+
+ true
+
+
+
+ -
+
+
+ JACK MIDI
+
+
+
+ -
+
+
+ A2J MIDI
+
+
+
+ -
+
+
+ ALSA MIDI
+
+
+
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ CatarinaConnectPortsW
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ CatarinaConnectPortsW
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/ui/catarina_disconnectports.ui b/src/ui/catarina_disconnectports.ui
new file mode 100644
index 0000000..446f6f5
--- /dev/null
+++ b/src/ui/catarina_disconnectports.ui
@@ -0,0 +1,154 @@
+
+
+ CatarinaDisconnectPortsW
+
+
+
+ 0
+ 0
+ 521
+ 300
+
+
+
+ Disconnect Ports
+
+
+ -
+
+
+ Connection Type
+
+
+
-
+
+
+ JACK Audio
+
+
+ true
+
+
+
+ -
+
+
+ JACK MIDI
+
+
+
+ -
+
+
+ A2J MIDI
+
+
+
+ -
+
+
+ ALSA MIDI
+
+
+
+
+
+
+ -
+
+
+ Connection List
+
+
+
-
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ false
+
+
+ false
+
+
+ QAbstractItemView::NoDragDrop
+
+
+ QAbstractItemView::SingleSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ true
+
+
+ false
+
+
+ 22
+
+
+
+ Output
+
+
+
+
+ Input
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ CatarinaDisconnectPortsW
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ CatarinaDisconnectPortsW
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/ui/catarina_removegroup.ui b/src/ui/catarina_removegroup.ui
new file mode 100644
index 0000000..7968e68
--- /dev/null
+++ b/src/ui/catarina_removegroup.ui
@@ -0,0 +1,116 @@
+
+
+ CatarinaRemoveGroupW
+
+
+
+ 0
+ 0
+ 383
+ 393
+
+
+
+ Remove Group
+
+
+ -
+
+
+ Remove Group
+
+
+
-
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ false
+
+
+ false
+
+
+ true
+
+
+ QAbstractItemView::SingleSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ true
+
+
+ false
+
+
+
+ ID
+
+
+
+
+ Name
+
+
+
+
+ Split
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ CatarinaRemoveGroupW
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ CatarinaRemoveGroupW
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/ui/catarina_removeport.ui b/src/ui/catarina_removeport.ui
new file mode 100644
index 0000000..b73e0aa
--- /dev/null
+++ b/src/ui/catarina_removeport.ui
@@ -0,0 +1,186 @@
+
+
+ CatarinaRemovePortW
+
+
+
+ 0
+ 0
+ 442
+ 389
+
+
+
+ Remove Port
+
+
+ -
+
+
+ Port Mode
+
+
+
-
+
+
+ Input
+
+
+ true
+
+
+
+ -
+
+
+ Output
+
+
+
+
+
+
+ -
+
+
+ Port Type
+
+
+
-
+
+
+ JACK Audio
+
+
+ true
+
+
+
+ -
+
+
+ JACK MIDI
+
+
+
+ -
+
+
+ A2J MIDI
+
+
+
+ -
+
+
+ ALSA MIDI
+
+
+
+
+
+
+ -
+
+
+ Port List
+
+
+
-
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ false
+
+
+ false
+
+
+ true
+
+
+ QAbstractItemView::SingleSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+ 22
+
+
+
+ #
+
+
+ AlignRight|AlignVCenter
+
+
+
+
+ Full Port Name
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ CatarinaRemovePortW
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ CatarinaRemovePortW
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/ui/catarina_renamegroup.ui b/src/ui/catarina_renamegroup.ui
new file mode 100644
index 0000000..101e47e
--- /dev/null
+++ b/src/ui/catarina_renamegroup.ui
@@ -0,0 +1,90 @@
+
+
+ CatarinaRenameGroupW
+
+
+
+ 0
+ 0
+ 400
+ 102
+
+
+
+ Rename Group
+
+
+ -
+
+
+ Group to Rename:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ -
+
+
+ New Group Name:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ CatarinaRenameGroupW
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ CatarinaRenameGroupW
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/ui/catarina_renameport.ui b/src/ui/catarina_renameport.ui
new file mode 100644
index 0000000..56645ca
--- /dev/null
+++ b/src/ui/catarina_renameport.ui
@@ -0,0 +1,191 @@
+
+
+ CatarinaRenamePortW
+
+
+
+ 0
+ 0
+ 303
+ 471
+
+
+
+ Rename Port
+
+
+ -
+
+
+ Port Mode
+
+
+
-
+
+
+ Input
+
+
+ true
+
+
+
+ -
+
+
+ Output
+
+
+
+
+
+
+ -
+
+
+ Port Type
+
+
+
-
+
+
+ Audio
+
+
+ true
+
+
+
+ -
+
+
+ MIDI
+
+
+
+ -
+
+
+ Outro
+
+
+
+
+
+
+ -
+
+
+ Port List
+
+
+
-
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ false
+
+
+ false
+
+
+ true
+
+
+ QAbstractItemView::SingleSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+ 22
+
+
+
+ #
+
+
+ AlignRight|AlignVCenter
+
+
+
+
+ Full Port Name
+
+
+
+
+
+
+
+ -
+
+
+ New Name
+
+
+
-
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ CatarinaRenamePortW
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ CatarinaRenamePortW
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/xycontroller.py b/src/xycontroller.py
index 3066bb0..89abaf6 100755
--- a/src/xycontroller.py
+++ b/src/xycontroller.py
@@ -208,7 +208,7 @@ class XYGraphicsScene(QGraphicsScene):
# XY Controller Window
class XYControllerW(QMainWindow, ui_xycontroller.Ui_XYControllerW):
- def __init__(self, parent):
+ def __init__(self, parent=None):
QMainWindow.__init__(self, parent)
self.setupUi(self)
@@ -589,7 +589,7 @@ if __name__ == '__main__':
jacklib.activate(jack_client)
# Show GUI
- gui = XYControllerW(None)
+ gui = XYControllerW()
gui.show()
# Set-up custom signal handling