From a83212434a30b3f0a8ba08556700875307663884 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 22 Jan 2019 16:47:14 +0100 Subject: [PATCH] Add back about-juce dialog Signed-off-by: falkTX --- Makefile | 1 + resources/48x48/juce.png | Bin 0 -> 3304 bytes resources/resources.qrc | 1 + resources/ui/carla_about_juce.ui | 189 +++++++++++++++++++++++++++++++ resources/ui/carla_host.ui | 6 + source/frontend/Makefile | 2 + source/frontend/carla_host.py | 9 ++ source/frontend/carla_widgets.py | 22 ++++ 8 files changed, 230 insertions(+) create mode 100644 resources/48x48/juce.png create mode 100644 resources/ui/carla_about_juce.ui diff --git a/Makefile b/Makefile index 67225db02..cd39b8e5c 100644 --- a/Makefile +++ b/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 diff --git a/resources/48x48/juce.png b/resources/48x48/juce.png new file mode 100644 index 0000000000000000000000000000000000000000..365d3d54207dc79cddef243613b744ebb081224e GIT binary patch literal 3304 zcmVWi>P)A)+iYBTGUc0YMTW`||SkcWeH5VKYEB=-*%O z)xCA=`>9*?t6%-<3i@dCHqX<=$2i6)93=B-J}Z@^M)*BY}^!trr|qV zis#s;XwBc>v~I*N|BSz`1aH|pH)&muKH&ij0~R1cpRAgc zzrR-iOVkqCP<&{OLM==P8^BZPi-|QS5or7lcj+1ejo)?o=DGy92E@>R4u+J+KJ*xozj{i3{>`e&8F%)fBQQ?VKv!#cEo=Y9TKkt?Sp?VnsHCJ02b}dnWYeKCRtK=Dq}G^ zp%1=gY2Y7X0r!=k;YKS9GvB~s2oKk!`t<2Nv!ZVa@Lb_+yF#oBGlYw$hrfnNhT#4F zIR4tR=wj0_jhuf+wF`Y1rp(ua9G-GC|3zX$6M5pU-y#r62BE!oO8}wwybUDGO??KN zDTcP)>uGp@A$56=(|+Kum`2VgWX$7tM!X>c)2LizL>jJ!6*w;bD{VE;5b#tm%r=UN ziL(%>xr>Tt%()@Jb0xDz0gn&2k7aahHr}&GaFqVJW0EOacdo!uvI%3xtlJJD3=x>J z-a=Xi;;dVW*YQP1yFQ%t%TSt&M^c_7DkKi2)Z2@8=9oGGNELWZ3Mqe*@+*|zOY_#H zpsrsG+ln^eJovW`h$n8N_@zio3a*CL_?-K$pV(Au;><}n4}D6Y=>{Q*Qncj%7mj@&Va%9G$k-?P5)WP@en3ahe}2RJJZ;<2 z{FfLVJDHf!ekj2UOVkp11waV>lYnkwzgZ}s8%OD%ZrN~K;W`|pf5MnPlaR5G_X1o2#dyWyf;bzy1rxw5f!Q?;eCOMg_f1STe4L6?h#5-E7W{-+2IwA(E8H zbU@?)NKJ}~0BN=?l+TT)>QE0t07dJr)i}S|fpKWp5JBlJd06oP>fY4~a?Q9e%(;~0&W?YStwhp=%!1qAM|)`3zt?s;=!N6&xJ z<9QSClmUA*_E#D6NL+Q4ER>4Q^=zEwz1!C>5;*s}ROe%vsZsp^+dBNJ}cFk-ra$ zZ(Mg%SJ{1tS}exFm~^3d0oVLGrRbB#fDlN_KxEiJ z+|3{0ZQIr-@zRitG$a9FF+`xirU$}|x)1;i2}6ndZQmNXnVG^L!DxB7PYD#MkG2}%Ffs8Xld8=UcL|{Mtg_~59!!*DFpcS zfWsSbM*+Ct=7THGZbvbMj;;`lZ`&IE@ z-*_<$D8;`O1R>&VW**4uk52Y1ij9v71E8|`C_upH_wJK=zuXU~iso-YNtN5a9Uwsf8_a<%8QUAt*UgTY{zn zgiN}xdp#c?i!Jwe2x}x?y|=qd@z+AUTu{NziaPq)Ele4ijO@mnFozh3wVJ7QRR{B^ zLTtIRp;55K;cKD1=?KP=85lFuyL6RNYkrT6i{ZffBF=qvx@X=*DPAr(NnvF@{bR$K zcF%w=htu6D(Fg&DFYOJk15#ZD2-E351e(7%za#NTrBf_um`FH<-Oo-*+hP|9A?wk1Q-b8*GyQ>;V zNr+@hRx(9Mz4M|_>eY+R^AuNaN7`*fytEMX zI&?`1L@j>}8DsAdUw&HyJzqfa;*K(ksu~y=7s34_64B`-5oROzr3XX(PpkeLujcV+ zD)7v8p77c~c3f-gFfZ78=6}WyiWtVAiT4t}d&`yU-+Wkl+r?iC@xqQWR?JLi%3wRG ziC5R7eKq+UsoRG@y^)vwS>;Vri%YWi`VC6^g{A_{8_RQP@m|eNTsl$Bsn3qy(cGvn zpm=HLNm||hD`jU}%lUiN`v8UZN#mAwnVnvdz3V$Ac%;!?>sfp3bzJ`TU^E#Sis(Zi z*6lqJaCr*UIxn#P_#5~%?=cagetM&Gvl}XUchb%hrTFy)#~GD-IrOniT9C>!Ty5^mB{)_9oQBQN0awbqJ&n!Wnog4XVz&;ajd?|fefF}L3JgKOpg zy-a2EG2%xgle6?^q)Z%!km9xp7r>m1c>eb2C^8em*;kX#h7)h%3AoDjN*lNOfr6@= zu1mLi@WG9z%f~!6_-l{me)v#rQJ7L1snH|oKPHv__om`)_t0A1bmai@$CfdBG^ZP# z6jnCeRQS{((JY^F7xOa{a0i;%baFXG7ygc>v?3wZ%vFTtI>gQ0J-ot&jVqpHElBb&Y48x48/canvas.png 48x48/jack.png + 48x48/juce.png 48x48/folder.png 48x48/warning.png 48x48/wine.png diff --git a/resources/ui/carla_about_juce.ui b/resources/ui/carla_about_juce.ui new file mode 100644 index 000000000..3f6c28502 --- /dev/null +++ b/resources/ui/carla_about_juce.ui @@ -0,0 +1,189 @@ + + + JuceAboutW + + + + 0 + 0 + 463 + 244 + + + + About JUCE + + + + + + + + + 48 + 48 + + + + + 48 + 48 + + + + + + + :/48x48/juce.png + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + <b>About JUCE</b> + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 10 + 10 + + + + + + + + This program uses JUCE version 3.x.x. + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 10 + 10 + + + + + + + + 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. + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 0 + 0 + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + + + + + + + + + + buttonBox + accepted() + JuceAboutW + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + JuceAboutW + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/resources/ui/carla_host.ui b/resources/ui/carla_host.ui index e3ae00e84..4339e457b 100644 --- a/resources/ui/carla_host.ui +++ b/resources/ui/carla_host.ui @@ -328,6 +328,7 @@ &Help + @@ -1113,6 +1114,11 @@ &About + + + About &JUCE + + About &Qt diff --git a/source/frontend/Makefile b/source/frontend/Makefile index 83c685f67..437a63282 100644 --- a/source/frontend/Makefile +++ b/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 \ diff --git a/source/frontend/carla_host.py b/source/frontend/carla_host.py index ec425f556..237a7f650 100644 --- a/source/frontend/carla_host.py +++ b/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() diff --git a/source/frontend/carla_widgets.py b/source/frontend/carla_widgets.py index e67416422..949fa6345 100755 --- a/source/frontend/carla_widgets.py +++ b/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