Add back about-juce dialog

Signed-off-by: falkTX <falktx@gmail.com>

Makefile

@@ -571,6 +571,7 @@ endif
 	$(LINK) ../externalui.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_juce.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_edit.py            $(DESTDIR)$(DATADIR)/carla/resources

resources/resources.qrc

@@ -39,6 +39,7 @@
 
         <file>48x48/canvas.png</file>
         <file>48x48/jack.png</file>
+        <file>48x48/juce.png</file>
         <file>48x48/folder.png</file>
         <file>48x48/warning.png</file>
         <file>48x48/wine.png</file>

resources/ui/carla_about_juce.ui

@@ -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>

resources/ui/carla_host.ui

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

source/frontend/Makefile

@@ -25,6 +25,7 @@ endif
 
 UIs = \
 	ui_carla_about.py \
+	ui_carla_about_juce.py \
 	ui_carla_add_jack.py \
 	ui_carla_database.py \
 	ui_carla_edit.py \
@@ -62,6 +63,7 @@ RES = \
 	$(BINDIR)/resources/externalui.py \
 	$(BINDIR)/resources/resources_rc.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_database.py \
 	$(BINDIR)/resources/ui_carla_edit.py \

source/frontend/carla_host.py

@@ -452,6 +452,7 @@ class HostWindow(QMainWindow):
         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_juce.triggered.connect(self.slot_aboutJuce)
         self.ui.act_help_about_qt.triggered.connect(self.slot_aboutQt)
 
         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.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
         if self.host.isPlugin or self.host.isRemote:
             self.startTimers()
@@ -1680,6 +1685,10 @@ class HostWindow(QMainWindow):
     def slot_aboutCarla(self):
         CarlaAboutW(self.fParentOrSelf, self.host).exec_()
 
+    @pyqtSlot()
+    def slot_aboutJuce(self):
+        JuceAboutW(self.fParentOrSelf).exec_()
+
     @pyqtSlot()
     def slot_aboutQt(self):
         QApplication.instance().aboutQt()

source/frontend/carla_widgets.py

@@ -27,6 +27,7 @@ from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit, QMenu, QVBoxLayout
 # Imports (Custom)
 
 import ui_carla_about
+import ui_carla_about_juce
 import ui_carla_edit
 import ui_carla_parameter
 
@@ -184,6 +185,27 @@ class CarlaAboutW(QDialog):
         QDialog.done(self, r)
         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