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

Add back about-juce dialog 

Signed-off-by: falkTX <falktx@gmail.com>
tags/v2.1-alpha1-winvst
falkTX 6 years ago
parent
284a74b2f5
commit
a83212434a
8 changed files with 230 additions and 0 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      Makefile
  2. BIN
      resources/48x48/juce.png
  3. +1
    -0
      resources/resources.qrc
  4. +189
    -0
      resources/ui/carla_about_juce.ui
  5. +6
    -0
      resources/ui/carla_host.ui
  6. +2
    -0
      source/frontend/Makefile
  7. +9
    -0
      source/frontend/carla_host.py
  8. +22
    -0
      source/frontend/carla_widgets.py

+ 1
- 0
Makefile View File

@@ -571,6 +571,7 @@ endif
$(LINK) ../externalui.py $(DESTDIR)$(DATADIR)/carla/resources $(LINK) ../externalui.py $(DESTDIR)$(DATADIR)/carla/resources
$(LINK) ../resources_rc.py $(DESTDIR)$(DATADIR)/carla/resources $(LINK) ../resources_rc.py $(DESTDIR)$(DATADIR)/carla/resources
$(LINK) ../ui_carla_about.py $(DESTDIR)$(DATADIR)/carla/resources $(LINK) ../ui_carla_about.py $(DESTDIR)$(DATADIR)/carla/resources
$(LINK) ../ui_carla_about_juce.py $(DESTDIR)$(DATADIR)/carla/resources
$(LINK) ../ui_carla_add_jack.py $(DESTDIR)$(DATADIR)/carla/resources $(LINK) ../ui_carla_add_jack.py $(DESTDIR)$(DATADIR)/carla/resources
$(LINK) ../ui_carla_database.py $(DESTDIR)$(DATADIR)/carla/resources $(LINK) ../ui_carla_database.py $(DESTDIR)$(DATADIR)/carla/resources
$(LINK) ../ui_carla_edit.py $(DESTDIR)$(DATADIR)/carla/resources $(LINK) ../ui_carla_edit.py $(DESTDIR)$(DATADIR)/carla/resources


BIN
resources/48x48/juce.png View File

Before After
Width: 48  |  Height: 48  |  Size: 3.2KB

+ 1
- 0
resources/resources.qrc View File

@@ -39,6 +39,7 @@


<file>48x48/canvas.png</file> <file>48x48/canvas.png</file>
<file>48x48/jack.png</file> <file>48x48/jack.png</file>
<file>48x48/juce.png</file>
<file>48x48/folder.png</file> <file>48x48/folder.png</file>
<file>48x48/warning.png</file> <file>48x48/warning.png</file>
<file>48x48/wine.png</file> <file>48x48/wine.png</file>


+ 189
- 0
resources/ui/carla_about_juce.ui View File

@@ -0,0 +1,189 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>JuceAboutW</class>
<widget class="QDialog" name="JuceAboutW">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>463</width>
<height>244</height>
</rect>
</property>
<property name="windowTitle">
<string>About JUCE</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="icon">
<property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../resources.qrc">:/48x48/juce.png</pixmap>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="l_text1">
<property name="text">
<string>&lt;b&gt;About JUCE&lt;/b&gt;</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="l_text2">
<property name="text">
<string>This program uses JUCE version 3.x.x.</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="l_text3">
<property name="text">
<string>JUCE (Jules' Utility Class Extensions) is an all-encompassing C++ class library for developing cross-platform software.

It contains pretty much everything you're likely to need to create most applications, and is particularly well-suited for building highly-customised GUIs, and for handling graphics and sound.

JUCE is licensed under the GNU Public Licence version 2.0.
One module (juce_core) is permissively licensed under the ISC.

Copyright (C) 2017 ROLI Ltd.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources>
<include location="../resources.qrc"/>
<include location="../resources.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>JuceAboutW</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>JuceAboutW</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

+ 6
- 0
resources/ui/carla_host.ui View File

@@ -328,6 +328,7 @@
<string>&amp;Help</string> <string>&amp;Help</string>
</property> </property>
<addaction name="act_help_about"/> <addaction name="act_help_about"/>
<addaction name="act_help_about_juce"/>
<addaction name="act_help_about_qt"/> <addaction name="act_help_about_qt"/>
</widget> </widget>
<addaction name="menu_File"/> <addaction name="menu_File"/>
@@ -1113,6 +1114,11 @@
<string>&amp;About</string> <string>&amp;About</string>
</property> </property>
</action> </action>
<action name="act_help_about_juce">
<property name="text">
<string>About &amp;JUCE</string>
</property>
</action>
<action name="act_help_about_qt"> <action name="act_help_about_qt">
<property name="text"> <property name="text">
<string>About &amp;Qt</string> <string>About &amp;Qt</string>


+ 2
- 0
source/frontend/Makefile View File

@@ -25,6 +25,7 @@ endif


UIs = \ UIs = \
ui_carla_about.py \ ui_carla_about.py \
ui_carla_about_juce.py \
ui_carla_add_jack.py \ ui_carla_add_jack.py \
ui_carla_database.py \ ui_carla_database.py \
ui_carla_edit.py \ ui_carla_edit.py \
@@ -62,6 +63,7 @@ RES = \
$(BINDIR)/resources/externalui.py \ $(BINDIR)/resources/externalui.py \
$(BINDIR)/resources/resources_rc.py \ $(BINDIR)/resources/resources_rc.py \
$(BINDIR)/resources/ui_carla_about.py \ $(BINDIR)/resources/ui_carla_about.py \
$(BINDIR)/resources/ui_carla_about_juce.py \
$(BINDIR)/resources/ui_carla_add_jack.py \ $(BINDIR)/resources/ui_carla_add_jack.py \
$(BINDIR)/resources/ui_carla_database.py \ $(BINDIR)/resources/ui_carla_database.py \
$(BINDIR)/resources/ui_carla_edit.py \ $(BINDIR)/resources/ui_carla_edit.py \


+ 9
- 0
source/frontend/carla_host.py View File

@@ -452,6 +452,7 @@ class HostWindow(QMainWindow):
self.ui.act_settings_configure.triggered.connect(self.slot_configureCarla) self.ui.act_settings_configure.triggered.connect(self.slot_configureCarla)


self.ui.act_help_about.triggered.connect(self.slot_aboutCarla) self.ui.act_help_about.triggered.connect(self.slot_aboutCarla)
self.ui.act_help_about_juce.triggered.connect(self.slot_aboutJuce)
self.ui.act_help_about_qt.triggered.connect(self.slot_aboutQt) self.ui.act_help_about_qt.triggered.connect(self.slot_aboutQt)


self.ui.cb_disk.currentIndexChanged.connect(self.slot_diskFolderChanged) self.ui.cb_disk.currentIndexChanged.connect(self.slot_diskFolderChanged)
@@ -532,6 +533,10 @@ class HostWindow(QMainWindow):
self.ui.cb_transport_link.setEnabled(False) self.ui.cb_transport_link.setEnabled(False)
self.ui.cb_transport_link.setVisible(False) self.ui.cb_transport_link.setVisible(False)


if "juce" not in features:
self.ui.act_help_about_juce.setEnabled(False)
self.ui.act_help_about_juce.setVisible(False)

# Plugin needs to have timers always running so it receives messages # Plugin needs to have timers always running so it receives messages
if self.host.isPlugin or self.host.isRemote: if self.host.isPlugin or self.host.isRemote:
self.startTimers() self.startTimers()
@@ -1680,6 +1685,10 @@ class HostWindow(QMainWindow):
def slot_aboutCarla(self): def slot_aboutCarla(self):
CarlaAboutW(self.fParentOrSelf, self.host).exec_() CarlaAboutW(self.fParentOrSelf, self.host).exec_()


@pyqtSlot()
def slot_aboutJuce(self):
JuceAboutW(self.fParentOrSelf).exec_()

@pyqtSlot() @pyqtSlot()
def slot_aboutQt(self): def slot_aboutQt(self):
QApplication.instance().aboutQt() QApplication.instance().aboutQt()


+ 22
- 0
source/frontend/carla_widgets.py View File

@@ -27,6 +27,7 @@ from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit, QMenu, QVBoxLayout
# Imports (Custom) # Imports (Custom)


import ui_carla_about import ui_carla_about
import ui_carla_about_juce
import ui_carla_edit import ui_carla_edit
import ui_carla_parameter import ui_carla_parameter


@@ -184,6 +185,27 @@ class CarlaAboutW(QDialog):
QDialog.done(self, r) QDialog.done(self, r)
self.close() self.close()


# ------------------------------------------------------------------------------------------------------------
# JUCE About dialog

class JuceAboutW(QDialog):
def __init__(self, parent):
QDialog.__init__(self, parent)
self.ui = ui_carla_about_juce.Ui_JuceAboutW()
self.ui.setupUi(self)

self.ui.l_text2.setText(self.tr("This program uses JUCE version %s." % gCarla.utils.get_juce_version()))

self.adjustSize()
self.setFixedSize(self.size())

if WINDOWS:
self.setWindowFlags(self.windowFlags()|Qt.MSWindowsFixedSizeDialogHint)

def done(self, r):
QDialog.done(self, r)
self.close()

# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Plugin Parameter # Plugin Parameter




Write Preview
Loading…
Cancel
Save