From 453c91a5211910bdf6690e04d5bac8c1bac8b8ba Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 25 Jul 2010 15:34:03 +0100 Subject: [PATCH] More apps and fixes --- src/find_plugins.py | 5 ++++- src/tb_apps.py | 5 ++++- src/tb_main.py | 21 ++++++++++++++++++++- templates/Ardour/Ardour.history | 2 -- templates/jack-mixer.xml | 4 ++++ 5 files changed, 32 insertions(+), 5 deletions(-) delete mode 100644 templates/Ardour/Ardour.history create mode 100644 templates/jack-mixer.xml diff --git a/src/find_plugins.py b/src/find_plugins.py index 031b510..17b65b1 100755 --- a/src/find_plugins.py +++ b/src/find_plugins.py @@ -49,16 +49,19 @@ listOfApps = [ ("EQinox", "eqinox", "eqinox", "", "0", "Effect"), ("Guitarix", "guitarix", "guitarix", "", "0", "Effect"), ("Jamin", "jamin", "jamin", "jamin -h | head -n 1 | awk '{printf$2}'", "0", "Effect"), - ("Jack%20Mixer", "jack_mixer", "jack_mixer", "", "0", "Effect"), + ("Jack%20Mixer", "jack_mixer", "jack_mixer", "", "1", "Effect"), ("Rakarrack", "rakarrack", "/usr/share/pixmaps/icono_rakarrack_32x32.png", "", "0", "Effect"), ("ALSA-to-Jack%20MIDI", "a2j%20-e", "audio-midi", "", "0", "Tool"), ("Arpage", "arpage", "arpage", "", "0", "Tool"), + ("Gmerlin%20Visualizer", "gmerlin_visualizer", "video-x-generic", "", "0", "Tool"), ("Jack%20Keyboard", "jack-keyboard", "jack-keyboard", "jack-keyboard -V | awk '{printf$2}'", "0", "Tool"), ("JKmeter", "jkmeter", "audio-x-generic", "", "0", "Tool"), ("LADI%20Patchage", "lpatchage", "lpatchage", "", "0", "Tool"), ("mhWaveEdit", "mhwaveedit", "mhwaveedit", "mhwaveedit --version | awk '{printf$2}'", "0", "Tool"), ("Patchage", "patchage", "patchage", "", "0", "Tool"), + ("VLC%20[Audio%20Visualizations]", "vlc%20--aout%20jack%20--no-jack-auto-connect%20--audio-visual%20projectM%20jack://", "vlc", "", "0", "Tool"), + ("VLC%20[Audio%20Visualizations]%20(1.1.x)", "vlc-110%20--aout%20jack%20--no-jack-auto-connect%20--audio-visual%20projectM%20jack://", "vlc", "", "0", "Tool"), ("Hammond%20B3", "startBristol", "b3", "", "1", "Bristol"), ("Moog%20Voyager", "startBristol", "explorer", "", "1", "Bristol"), diff --git a/src/tb_apps.py b/src/tb_apps.py index 558981f..dd2dc5f 100755 --- a/src/tb_apps.py +++ b/src/tb_apps.py @@ -149,7 +149,10 @@ class AppsW(QWidget, ui_tb_apps.Ui_AppsW): if (app == "Jamin"): self.NIY() elif (app == "Jack Mixer"): - self.NIY() + ran_check = str(randint(1, 99999)) + proj_file = "jack-mixer_"+ran_check+".xml" + os.system("cp "+shared.Path+"/../templates/jack-mixer.xml "+shared.p_folder+"/"+proj_file) + shared.appBus.RunCustom(False, "jack_mixer -c "+shared.p_folder+"/"+proj_file, str(app), 1) else: shared.appBus.RunCustom(False, str(self.listEffects.item(self.listEffects.currentRow(), 3).text()), str(app), 0) elif (tab == 4): #Tool diff --git a/src/tb_main.py b/src/tb_main.py index 48b16bf..f516077 100755 --- a/src/tb_main.py +++ b/src/tb_main.py @@ -8,6 +8,7 @@ from functools import partial from PyQt4.QtCore import Qt, QThread, QTime, QTimer, SIGNAL from PyQt4.QtGui import QCursor, QDialog, QDialogButtonBox, QMenu, QTableWidgetItem, QWidget from PyKDE4.kdecore import i18n +from PyKDE4.kdeui import KMessageBox import ui_tb_main, ui_dia_properties, shared global global_n @@ -51,6 +52,7 @@ class MainW(QWidget, ui_tb_main.Ui_MainW): self.connect(self.timeStart, SIGNAL("timeChanged(const QTime)"), self.updateTotalTime) self.connect(self.timeEnd, SIGNAL("timeChanged(const QTime)"), self.updateTotalTime) self.connect(self.listLadish, SIGNAL("customContextMenuRequested(QPoint)"), self.showLadishMenu) + self.connect(self.listLadish, SIGNAL("cellDoubleClicked(int, int)"), self.startApp) self.connect(self.lp_name, SIGNAL("textChanged(const QString)"), self.updateSharedVars) self.connect(self.lp_author, SIGNAL("textChanged(const QString)"), self.updateSharedVars) @@ -144,6 +146,12 @@ class MainW(QWidget, ui_tb_main.Ui_MainW): if (self.listLadish.item(g, 0) == None): self.listLadish.removeRow(g) + def startApp(self, row, column): + n = int(self.listLadish.item(row, 0).text()) + s = self.listLadish.item(row, 2).text() + if (s != i18n("Yes")): + shared.appBus.StartApp(n) + def showLadishMenu(self, pos): # Create Menu cMenu = QMenu() @@ -153,10 +161,13 @@ class MainW(QWidget, ui_tb_main.Ui_MainW): act_x_properties = cMenu.addAction("&Properties") act_x_separator1 = cMenu.addSeparator() act_x_remove = cMenu.addAction("&Remove") + act_x_remove_all = cMenu.addAction("Re&move All") act_x_separator2 = cMenu.addSeparator() act_x_add = cMenu.addAction("&Add New...") row = self.listLadish.currentRow() + if (self.listLadish.rowCount() <= 0): + act_x_remove_all.setVisible(False) if (row >= 0): ladn = int(self.listLadish.item(self.listLadish.currentRow(), 0).text()) @@ -169,7 +180,6 @@ class MainW(QWidget, ui_tb_main.Ui_MainW): act_x_kill.setVisible(False) act_x_properties.setVisible(False) act_x_separator1.setVisible(False) - act_x_separator2.setVisible(False) act_x_remove.setVisible(False) else: if (self.listLadish.item(row, 2).text() == i18n("Yes")): @@ -185,6 +195,7 @@ class MainW(QWidget, ui_tb_main.Ui_MainW): self.connect(act_x_kill, SIGNAL("triggered()"), partial(self.func_x_kill, ladn)) self.connect(act_x_properties, SIGNAL("triggered()"), partial(self.func_x_properties, ladn)) self.connect(act_x_remove, SIGNAL("triggered()"), partial(self.func_x_remove, ladn)) + self.connect(act_x_remove_all, SIGNAL("triggered()"), self.func_x_remove_all) # Show Menu at cursor position newPos = QCursor.pos() @@ -211,6 +222,14 @@ class MainW(QWidget, ui_tb_main.Ui_MainW): def func_x_remove(self, n): shared.appBus.RemoveApp(n) + def func_x_remove_all(self): + ask = KMessageBox.questionYesNo(self, i18n("Remove All Applications from this project?"), i18n("Are you sure?")) + if (ask == KMessageBox.Yes): + app_list = [] + for i in range(self.listLadish.rowCount()): + app_list.append(int(self.listLadish.item(i, 0).text())) + for a in range(len(app_list)): + shared.appBus.RemoveApp(app_list[a]) class NewAppW(QDialog, ui_dia_properties.Ui_PropertiesW): def __init__(self, *args): diff --git a/templates/Ardour/Ardour.history b/templates/Ardour/Ardour.history deleted file mode 100644 index 6dd2506..0000000 --- a/templates/Ardour/Ardour.history +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/templates/jack-mixer.xml b/templates/jack-mixer.xml new file mode 100644 index 0000000..03d490e --- /dev/null +++ b/templates/jack-mixer.xml @@ -0,0 +1,4 @@ + + + + -- 2.11.4.GIT