From e44f833ee975ed1194cf6b694940f6e621d65491 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 6 Jan 2016 23:21:48 +0000 Subject: [PATCH] Small update to about dialog --- resources/ui/carla_about.ui | 240 +++++++++++++++++++++++++++++----- source/backend/CarlaUtils.cpp | 3 +- source/carla_widgets.py | 24 +++- 3 files changed, 228 insertions(+), 39 deletions(-) diff --git a/resources/ui/carla_about.ui b/resources/ui/carla_about.ui index a527dbe5c..15ab8e7cd 100644 --- a/resources/ui/carla_about.ui +++ b/resources/ui/carla_about.ui @@ -113,30 +113,71 @@ Features - - + + + + + 0 + 0 + + - LADSPA: + TextLabel + + + Qt::PlainText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + VST2: + + + Qt::PlainText Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - + + - TextLabel + AudioUnit: + + + Qt::PlainText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - + + - DSSI: + VST3: + + + Qt::PlainText Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing @@ -144,57 +185,173 @@ + + + DSSI: + + + Qt::PlainText + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + + + + + 0 + 0 + + TextLabel + + Qt::PlainText + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + - LV2: + LADSPA: + + + Qt::PlainText Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - + + + + + 0 + 0 + + TextLabel + + Qt::PlainText + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + - VST: + LV2: + + + Qt::PlainText Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - + + + + + 0 + 0 + + + + TextLabel + + + Qt::PlainText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + TextLabel + + Qt::RichText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + TextLabel + + + Qt::PlainText + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 1 + 1 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 1 + 1 + + + + + + 0 @@ -206,8 +363,8 @@ - - + + 0 @@ -219,8 +376,8 @@ - - + + 0 @@ -232,18 +389,31 @@ - - + + + + 0 + + + 1 + - Qt::Vertical + Qt::Horizontal - - - 20 - 40 - + + + + + + 0 - + + 1 + + + Qt::Horizontal + + diff --git a/source/backend/CarlaUtils.cpp b/source/backend/CarlaUtils.cpp index 7477551eb..015ac26be 100644 --- a/source/backend/CarlaUtils.cpp +++ b/source/backend/CarlaUtils.cpp @@ -1,6 +1,6 @@ /* * Carla Plugin Host - * Copyright (C) 2011-2014 Filipe Coelho + * Copyright (C) 2011-2016 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -120,6 +120,7 @@ const char* carla_get_complete_license_text() "
  • MIDI Sequencer UI code by Perry Nguyen
    • " "
  • MVerb plugin code by Martin Eastwood
    • " "
  • Nekobi plugin code based on nekobee by Sean Bolton and others
    • " + "
  • VectorJuice and WobbleJuice plugin code by Andre Sklenar
    • " #ifdef HAVE_ZYN_DEPS "
  • ZynAddSubFX plugin code by Mark McCurry and Nasca Octavian Paul
    • " #endif diff --git a/source/carla_widgets.py b/source/carla_widgets.py index cb4704871..143d1c914 100755 --- a/source/carla_widgets.py +++ b/source/carla_widgets.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Carla widgets code -# Copyright (C) 2011-2014 Filipe Coelho +# Copyright (C) 2011-2016 Filipe Coelho # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -77,7 +77,7 @@ class CarlaAboutW(QDialog): self.ui.l_about.setText(self.tr("" "
    Version %s" "
    Carla is a fully-featured audio plugin host%s.
    " - "
    Copyright (C) 2011-2014 falkTX
    " + "
    Copyright (C) 2011-2016 falkTX
    " "" % (VERSION, extraInfo))) if host.isControl: @@ -150,7 +150,25 @@ class CarlaAboutW(QDialog): "
  • http://ll-plugins.nongnu.org/lv2/ext/midimap
    • " "
  • http://ll-plugins.nongnu.org/lv2/ext/miditype
    • " "")) - self.ui.l_vst.setText(self.tr("

    About 85% complete (missing vst bank/presets and some minor stuff)

    ")) + if MACOS or WINDOWS: + self.ui.l_vst2.setText(self.tr("Using Juce host")) + self.ui.l_vst3.setText(self.tr("Using Juce host")) + + if MACOS: + self.ui.l_au.setText(self.tr("Using Juce host")) + else: + self.ui.line_vst3.hide() + self.ui.l_au.hide() + self.ui.lid_au.hide() + + else: + self.ui.l_vst2.setText(self.tr("About 85% complete (missing vst bank/presets and some minor stuff)")) + self.ui.line_vst2.hide() + self.ui.l_vst3.hide() + self.ui.lid_vst3.hide() + self.ui.line_vst3.hide() + self.ui.l_au.hide() + self.ui.lid_au.hide() # 2nd tab is usually longer than the 1st # adjust appropriately