Merge branch 'ladi-cadence' into 'ladi-claudia'
This commit is contained in:
commit
423f580388
|
@ -49,10 +49,15 @@ from shared_i18n import *
|
|||
|
||||
try:
|
||||
import dbus
|
||||
from dbus.mainloop.pyqt5 import DBusQtMainLoop
|
||||
from dbus.mainloop.pyqt5 import DBusMainLoop
|
||||
haveDBus = True
|
||||
except:
|
||||
haveDBus = False
|
||||
try:
|
||||
# Try falling back to GMainLoop
|
||||
from dbus.mainloop.glib import DBusGMainLoop as DBusMainLoop
|
||||
haveDBus = True
|
||||
except:
|
||||
haveDBus = False
|
||||
|
||||
# ------------------------------------------------------------------------------------------------------------
|
||||
# Try Import OpenGL
|
||||
|
@ -2741,7 +2746,7 @@ if __name__ == '__main__':
|
|||
app = QApplication(sys.argv)
|
||||
app.setApplicationName("Claudia")
|
||||
app.setApplicationVersion(VERSION)
|
||||
app.setOrganizationName("Cadence")
|
||||
app.setOrganizationName("LADI")
|
||||
app.setWindowIcon(QIcon(":/scalable/claudia.svg"))
|
||||
setup_i18n()
|
||||
|
||||
|
@ -2750,7 +2755,7 @@ if __name__ == '__main__':
|
|||
"DBus is not available, Claudia cannot start without it!"))
|
||||
sys.exit(1)
|
||||
|
||||
gDBus.loop = DBusQtMainLoop(set_as_default=True)
|
||||
gDBus.loop = DBusMainLoop(set_as_default=True)
|
||||
gDBus.bus = dbus.SessionBus(mainloop=gDBus.loop)
|
||||
gDBus.jack = gDBus.bus.get_object("org.jackaudio.service", "/org/jackaudio/Controller")
|
||||
gDBus.ladish_control = gDBus.bus.get_object("org.ladish", "/org/ladish/Control")
|
||||
|
|
|
@ -700,9 +700,11 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW):
|
|||
elif os.path.exists("/usr/bin/dpkg"):
|
||||
pkg_out = getoutput("env LANG=C LC_ALL=C /usr/bin/dpkg --get-selections 2>/dev/null").split("\n")
|
||||
for pkg_info in pkg_out:
|
||||
package, installed = pkg_info.rsplit("\t", 1)
|
||||
if installed == "install":
|
||||
pkglist.append(package.strip())
|
||||
pkg_info = pkg_info.strip()
|
||||
if pkg_info:
|
||||
package, installed = pkg_info.rsplit("\t", 1)
|
||||
if installed == "install":
|
||||
pkglist.append(package.strip())
|
||||
|
||||
elif os.path.exists("/bin/rpm"):
|
||||
pkg_out = getoutput("env LANG=C /bin/rpm -qa --qf \"%{NAME}\n\" 2>/dev/null").split("\n")
|
||||
|
@ -1356,7 +1358,7 @@ if __name__ == '__main__':
|
|||
app = QApplication(sys.argv)
|
||||
app.setApplicationName("Claudia-Launcher")
|
||||
app.setApplicationVersion(VERSION)
|
||||
app.setOrganizationName("Cadence")
|
||||
app.setOrganizationName("LADI")
|
||||
app.setWindowIcon(QIcon(":/scalable/claudia-launcher.svg"))
|
||||
setup_i18n()
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
# For a full copy of the GNU General Public License see the COPYING file
|
||||
|
||||
from PyQt5.QtCore import pyqtSlot, QTimer
|
||||
from PyQt5.QtCore import pyqtSignal
|
||||
from PyQt5.QtGui import QCursor, QFontMetrics, QImage, QPainter
|
||||
from PyQt5.QtWidgets import QMainWindow, QMenu
|
||||
|
||||
|
|
Loading…
Reference in New Issue