From 8b6b67a63a3d238bb0884d92a88529ac17e2df8b Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 19 Dec 2012 23:33:28 +0000 Subject: [PATCH] Cadence: Minor UI update (thicker lines) --- c++/carla-engine/carla_engine_osc.cpp | 4 + c++/carla-engine/carla_engine_thread.cpp | 6 + resources/ui/cadence.ui | 158 ++++++++++++++++++++--- 3 files changed, 149 insertions(+), 19 deletions(-) diff --git a/c++/carla-engine/carla_engine_osc.cpp b/c++/carla-engine/carla_engine_osc.cpp index 077cd1f..d6a4bb2 100644 --- a/c++/carla-engine/carla_engine_osc.cpp +++ b/c++/carla-engine/carla_engine_osc.cpp @@ -20,6 +20,8 @@ CARLA_BACKEND_START_NAMESPACE +// ----------------------------------------------------------------------- + void osc_error_handlerTCP(const int num, const char* const msg, const char* const path) { qCritical("CarlaEngineOsc::osc_error_handlerTCP(%i, \"%s\", \"%s\")", num, msg, path); @@ -55,6 +57,8 @@ CarlaEngineOsc::~CarlaEngineOsc() qDebug("CarlaEngineOsc::~CarlaEngineOsc()"); } +// ----------------------------------------------------------------------- + void CarlaEngineOsc::init(const char* const name) { qDebug("CarlaEngineOsc::init(\"%s\")", name); diff --git a/c++/carla-engine/carla_engine_thread.cpp b/c++/carla-engine/carla_engine_thread.cpp index bd07d65..bf4e79b 100644 --- a/c++/carla-engine/carla_engine_thread.cpp +++ b/c++/carla-engine/carla_engine_thread.cpp @@ -20,6 +20,8 @@ CARLA_BACKEND_START_NAMESPACE +// ----------------------------------------------------------------------- + CarlaEngineThread::CarlaEngineThread(CarlaEngine* const engine_, QObject* const parent) : QThread(parent), engine(engine_) @@ -36,6 +38,8 @@ CarlaEngineThread::~CarlaEngineThread() CARLA_ASSERT(m_stopNow); } +// ----------------------------------------------------------------------- + void CarlaEngineThread::startNow() { qDebug("CarlaEngineThread::startNow()"); @@ -66,6 +70,8 @@ void CarlaEngineThread::stopNow() } } +// ----------------------------------------------------------------------- + void CarlaEngineThread::run() { qDebug("CarlaEngineThread::run()"); diff --git a/resources/ui/cadence.ui b/resources/ui/cadence.ui index 2d6a2ad..5d94c5a 100644 --- a/resources/ui/cadence.ui +++ b/resources/ui/cadence.ui @@ -7,7 +7,7 @@ 0 0 739 - 529 + 564 @@ -44,6 +44,12 @@ + + 0 + + + 1 + Qt::Horizontal @@ -51,6 +57,12 @@ + + 0 + + + 1 + Qt::Vertical @@ -196,6 +208,12 @@ + + 0 + + + 1 + Qt::Horizontal @@ -431,6 +449,12 @@ + + 0 + + + 1 + Qt::Horizontal @@ -531,13 +555,25 @@ 0 + + QFrame::Panel + + + QFrame::Sunken + + + 0 + + + 1 + 0 0 - 366 - 100 + 364 + 98 @@ -684,8 +720,8 @@ 0 0 - 366 - 97 + 364 + 96 @@ -825,8 +861,8 @@ 0 0 - 366 - 97 + 364 + 96 @@ -1003,6 +1039,12 @@ + + 0 + + + 1 + Qt::Horizontal @@ -1123,12 +1165,12 @@ Qt::Vertical - QSizePolicy::Preferred + QSizePolicy::Fixed 20 - 20 + 10 @@ -1152,6 +1194,12 @@ + + 0 + + + 1 + Qt::Horizontal @@ -1305,6 +1353,12 @@ + + 0 + + + 1 + Qt::Horizontal @@ -1473,7 +1527,7 @@ - 2 + 0 @@ -1525,22 +1579,46 @@ - + + QFrame::Panel + + + QFrame::Sunken + + 0 + + 1 + + + 3 + 0 0 - 94 - 76 + 409 + 322 LADSPA + + 2 + + + 0 + + + 2 + + + 2 + @@ -1551,14 +1629,26 @@ 0 0 - 94 - 76 + 409 + 322 DSSI + + 2 + + + 0 + + + 2 + + + 2 + @@ -1569,14 +1659,26 @@ 0 0 - 94 - 76 + 409 + 322 LV2 + + 2 + + + 0 + + + 2 + + + 2 + @@ -1587,14 +1689,26 @@ 0 0 - 94 - 76 + 409 + 322 VST + + 2 + + + 0 + + + 2 + + + 2 + @@ -1823,6 +1937,12 @@ + + 0 + + + 1 + Qt::Horizontal