From 38c82614ff8126ac445eb270172d7bcf137a6e63 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 30 Jul 2011 12:03:09 +0100 Subject: [PATCH] Cleanup --- DOCUMENTATION | 2 +- src/klaudia.py | 2 -- src/w_klaudia.py | 10 +++------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/DOCUMENTATION b/DOCUMENTATION index 12bbb71..40a7c7e 100644 --- a/DOCUMENTATION +++ b/DOCUMENTATION @@ -1,4 +1,4 @@ -Klaudia depends on some documentation (pdf, html and text files) that is not included with this source code, +Klaudia recommends some documentation (pdf, html and text files) that is not included with this source code, (FLOSS manuals and tutorials from the app authors' web-page). Some apps include documentation on their own, so Klaudia will use it. diff --git a/src/klaudia.py b/src/klaudia.py index 1994914..0a688af 100644 --- a/src/klaudia.py +++ b/src/klaudia.py @@ -1,13 +1,11 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- - # Imports import dbus, os, signal, sys from PyQt4.QtGui import QApplication, QMessageBox from w_klaudia import KlaudiaMainW, DBus - #--------------- main ------------------ if __name__ == '__main__': diff --git a/src/w_klaudia.py b/src/w_klaudia.py index ebad27e..49f58ed 100644 --- a/src/w_klaudia.py +++ b/src/w_klaudia.py @@ -26,11 +26,9 @@ DBus = DBus() # QLineEdit and QPushButtom combo def getAndSetPath(parent, current_path, lineEdit): - print current_path new_path = QFileDialog.getExistingDirectory(parent, parent.tr("Set Path"), current_path, QFileDialog.ShowDirsOnly) if not new_path.isEmpty(): lineEdit.setText(new_path) - return new_path # Properly convert QString to str @@ -48,7 +46,7 @@ class KlaudiaMainW(QMainWindow, ui_klaudia.Ui_KlaudiaMainW): try: DBus.jackBus.StartServer() except: - QMessageBox.critical(self, self.tr("Error"), self.tr("Jack is not started!\n" + QMessageBox.critical(self, self.tr("Error"), self.tr("JACK is not started!\n" "Please start it first, then run Klaudia again")) exit(-1) @@ -69,7 +67,7 @@ class KlaudiaMainW(QMainWindow, ui_klaudia.Ui_KlaudiaMainW): self.MyIcons = XIcon() self.MyIcons.addIconPath("/usr/share/klaudia/icons/") self.MyIcons.addThemeName(QStringStr(QIcon.themeName())) - self.MyIcons.addThemeName("oxygen") #Just in case... + self.MyIcons.addThemeName("oxygen") # Just in case... # Set-up GUI self.setWindowIcon(QIcon.fromTheme("klaudia", QIcon(self.MyIcons.getIconPath("klaudia")))) @@ -188,16 +186,14 @@ class KlaudiaMainW(QMainWindow, ui_klaudia.Ui_KlaudiaMainW): def checkSelectedRoom(self, co_n): if (co_n == -1 or not DBus.controlBus): - print "going -1" + pass elif (co_n == 0): - print "selected studio room" DBus.studioBus = DBus.loopBus.get_object("org.ladish", "/org/ladish/Studio") DBus.appBus = dbus.Interface(DBus.studioBus, 'org.ladish.AppSupervisor') self.b_open.setEnabled(True) self.le_url.setEnabled(True) self.le_url.setText(self.studio_root_folder) else: - print "selected a room", co_n room_name = "/org/ladish/Room"+QStringStr(self.co_ladi_room.currentText().split(" ")[0]) DBus.studioBus = DBus.loopBus.get_object("org.ladish", room_name) DBus.appBus = dbus.Interface(DBus.studioBus, 'org.ladish.AppSupervisor') -- 2.11.4.GIT