From a0ed94cfa536025b1c51b6b1c4dffe1683ea2808 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 27 Nov 2010 11:32:13 +0000 Subject: ported .ui widgets to Qt4 --- muse2/synti/organ/CMakeLists.txt | 4 +- muse2/synti/organ/organgui.cpp | 16 +- muse2/synti/organ/organgui.h | 5 +- muse2/synti/organ/organguibase.ui | 2563 +++++++++++++++++++------------------ 4 files changed, 1359 insertions(+), 1229 deletions(-) (limited to 'muse2/synti/organ') diff --git a/muse2/synti/organ/CMakeLists.txt b/muse2/synti/organ/CMakeLists.txt index 40db20c1..07864e69 100644 --- a/muse2/synti/organ/CMakeLists.txt +++ b/muse2/synti/organ/CMakeLists.txt @@ -19,8 +19,8 @@ #============================================================================= QT4_WRAP_CPP ( organ_mocs organgui.h ) -# QT4_WRAP_UI ( organ_uis organgui.ui ) -QT4_WRAP_UI3 ( organ_uis organguibase.ui ) + +QT4_WRAP_UI ( organ_uis organguibase.ui ) add_library ( organ SHARED organ.cpp diff --git a/muse2/synti/organ/organgui.cpp b/muse2/synti/organ/organgui.cpp index 43b754aa..340c67f6 100644 --- a/muse2/synti/organ/organgui.cpp +++ b/muse2/synti/organ/organgui.cpp @@ -13,15 +13,11 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "organgui.h" #include "muse/midi.h" @@ -34,7 +30,7 @@ //--------------------------------------------------------- OrganGui::OrganGui() - : OrganGuiBase(0, "organgui", Qt::Window), MessGui() + : QWidget(0, Qt::Window), MessGui() { QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read); connect(s, SIGNAL(activated(int)), SLOT(readMessage(int))); diff --git a/muse2/synti/organ/organgui.h b/muse2/synti/organ/organgui.h index d612eece..f246198d 100644 --- a/muse2/synti/organ/organgui.h +++ b/muse2/synti/organ/organgui.h @@ -9,12 +9,13 @@ #ifndef __ORGANGUI_H__ #define __ORGANGUI_H__ -#include "organguibase.h" +#include "ui_organguibase.h" #include "organ.h" #include "libsynti/gui.h" //#include "libsynti/mpevent.h" #include "muse/mpevent.h" +class QWidget; class QSignalMapper; #define NUM_GUI_CONTROLLER 18 @@ -23,7 +24,7 @@ class QSignalMapper; // OrganGui //--------------------------------------------------------- -class OrganGui : public OrganGuiBase, public MessGui { +class OrganGui : public QWidget, public Ui::OrganGuiBase, public MessGui { Q_OBJECT QSignalMapper* map; diff --git a/muse2/synti/organ/organguibase.ui b/muse2/synti/organ/organguibase.ui index 1a87fee8..b7b400ac 100644 --- a/muse2/synti/organ/organguibase.ui +++ b/muse2/synti/organ/organguibase.ui @@ -1,1219 +1,1352 @@ - -OrganGuiBase - - - OrganGuiBase - - - - 0 - 0 - 534 - 366 - - - - - 7 - 5 - 0 - 0 + + + OrganGuiBase + + + + 0 + 0 + 534 + 366 + + + + + 0 + 0 + + + + MusE: Organ + + + + 4 + + + 6 + + + + + + 0 + 0 + + + + Drawbars + + + + 6 + + + 2 + + + + + 16' + + + false + + + + + + + 4' + + + false + + + + + + + 2 2/3' + + + false + + + + + + + 2' + + + false + + + + + + + 5 1/3' + + + false + + + + + + + 8' + + + false + + + + + + + -960 + + + 0 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 10 + + + + + + + -960 + + + 0 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 10 + + + + + + + -960 + + + 0 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 10 + + + + + + + -960 + + + 0 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 10 + + + + + + + -960 + + + 0 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 10 + + + + + + + + 0 + 0 + + + + -960 + + + 0 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 10 + + + + + + + -960 + + + 0 + + + + + + + -960 + + + 0 + + + 10 + + + + + + + -960 + + + 0 + + + 10 + + + + + + + -960 + + + 0 + + + 10 + + + + + + + -960 + + + 0 + + + 10 + + + + + + + -960 + + + 0 + + + 10 + + + + + + + + + + + 0 + 0 + + + + Envelope Hi + + + + 11 + + + 2 + + + + + Release + + + false + + + + + + + Sustain + + + false + + + + + + + Decay + + + false + + + + + + + + 0 + 0 + + + + Attack + + + false + + + + + + + 500 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 50 + + + + + + + -960 + + + 0 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 10 + + + + + + + 5000 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 500 + + + + + + + + 0 + 0 + + + + ms + + + 500 + + + + + + + + 0 + 0 + + + + 500 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 50 + + + + + + + + 0 + 0 + + + + ms + + + 5000 + + + + + + + + 0 + 0 + + + + cB + + + -960 + + + 0 + + + + + + + + 0 + 0 + + + + ms + + + 500 + + + + + + + + + + + 0 + 0 + + + + Envelope Lo + + + Qt::AlignLeading + + + + 11 + + + 2 + + + + + Attack + + + false + + + + + + + Decay + + + false + + + + + + + Sustain + + + false + + + + + + + Release + + + false + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + 500 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 50 + + + + + + + 5000 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 500 + + + + + + + -960 + + + 0 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 10 + + + + + + + 500 + + + 1 + + + Qt::Horizontal + + + QSlider::NoTicks + + + 50 + + + + + + + + 0 + 0 + + + + ms + + + 500 + + + + + + + + 0 + 0 + + + + ms + + + 5000 + + + + + + + + 0 + 0 + + + + cB + + + -960 + + + 0 + + + 0 + + + + + + + + 0 + 0 + + + + ms + + + 500 + + + + + + + + + + + + + 0 + 0 + + + + + 48 + + + + O-1 + + + Qt::AlignCenter + + + false + + + + + + + + 0 + 0 - - - - 198 - 205 - 220 - - - - MusE: Organ - - - - unnamed + + + Oscillator + + + + 2 - 4 + 11 - - 6 - - - - GroupBox1 - - - - 7 - 7 - 0 - 0 - - - - Drawbars - - - - unnamed - - - 6 - - - 2 - - - - TextLabel1 - - - 16' - - - - - TextLabel4 - - - 4' - - - - - TextLabel5 - - - 2 2/3' - - - - - TextLabel6 - - - 2' - - - - - TextLabel2 - - - 5 1/3' - - - - - TextLabel3 - - - 8' - - - - - p2 - - - - 0 - 0 - 0 - - - - - 170 - 85 - 0 - - - - -960 - - - 0 - - - 1 - - - Horizontal - - - NoMarks - - - 10 - - - - - p3 - - - - 255 - 255 - 255 - - - - -960 - - - 0 - - - 1 - - - Horizontal - - - NoMarks - - - 10 - - - - - p4 - - - - 255 - 255 - 255 - - - - -960 - - - 0 - - - 1 - - - Horizontal - - - NoMarks - - - 10 - - - - - p5 - - - - 255 - 255 - 255 - - - - - 0 - 0 - 0 - - - - -960 - - - 0 - - - 1 - - - Horizontal - - - NoMarks - - - 10 - - - - - p6 - - - - 255 - 255 - 255 - - - - -960 - - - 0 - - - 1 - - - Horizontal - - - NoMarks - - - 10 - - - - - p1 - - - - 7 - 0 - 0 - 0 - - - - - 170 - 85 - 0 - - - - -960 - - - 0 - - - 1 - - - Horizontal - - - NoMarks - - - 10 - - - - - lcd1 - - - 0 - - - -960 - - - - - lcd2 - - - 0 - - - -960 - - - 10 - - - - - lcd3 - - - 0 - - - -960 - - - 10 - - - - - lcd4 - - - 0 - - - -960 - - - 10 - - - - - lcd5 - - - 0 - - - -960 - - - 10 - - - - - lcd6 - - - 0 - - - -960 - - - 10 - - - - - - - GroupBox4 - - - - 7 - 7 - 0 - 0 - - - - Envelope Hi - - - - unnamed - - - 11 - - - 2 - - - - TextLabel14 - - - Release - - - - - TextLabel13 - - - Sustain - - - - - TextLabel12 - - - Decay - - - - - TextLabel11 - - - - 5 - 4 - 0 - 0 - - - - Attack - - - - - p14 - - - 500 - - - 1 - - - Horizontal - - - NoMarks - - - 50 - - - - - p13 - - - -960 - - - 0 - - - 1 - - - Horizontal - - - NoMarks - - - 10 - - - - - p12 - - - 5000 - - - 1 - - - Horizontal - - - NoMarks - - - 500 - - - - - lcd11 - - - - 5 - 0 - 0 - 0 - - - - ms - - - 500 - - - - - p11 - - - - 7 - 0 - 0 - 0 - - - - 500 - - - 1 - - - Horizontal - - - NoMarks - - - 50 - - - - - lcd12 - - - - 5 - 0 - 0 - 0 - - - - ms - - - 5000 - - - - - lcd13 - - - - 5 - 0 - 0 - 0 - - - - cB - - - 0 - - - -960 - - - - - lcd14 - - - - 5 - 0 - 0 - 0 - - - - ms - - - 500 - - - - - - - GroupBox2 - - - - 7 - 7 - 0 - 0 - - - - Envelope Lo - - - AlignLeft - - - - unnamed - - - 11 - - - 2 - - - - TextLabel7 - - - Attack - - - - - TextLabel8 - - - Decay - - - - - TextLabel9 - - - Sustain - - - - - TextLabel10 - - - Release - - - - - p7 - - - - 7 - 0 - 0 - 0 - - - - - 80 - 0 - - - - 500 - - - 1 - - - Horizontal - - - NoMarks - - - 50 - - - - - p8 - - - 5000 - - - 1 - - - Horizontal - - - NoMarks - - - 500 - - - - - p9 - - - -960 - - - 0 - - - 1 - - - Horizontal - - - NoMarks - - - 10 - - - - - p10 - - - 500 - - - 1 - - - Horizontal - - - NoMarks - - - 50 - - - - - lcd7 - - - - 1 - 0 - 0 - 0 - - - - ms - - - 500 - - - - - lcd8 - - - - 1 - 0 - 0 - 0 - - - - ms - - - 5000 - - - - - lcd9 - - - - 1 - 0 - 0 - 0 - - - - cB - - - 0 - - - -960 - - - 0 - - - - - lcd10 - - - - 1 - 0 - 0 - 0 - - - - ms - - - 500 - - - - - - - layout1 - - - - unnamed - - - - TextLabel1_2 - - - - 7 - 5 - 0 - 0 - - - - - 0 - 0 - 255 - - - - - 198 - 205 - 220 - - - - - 48 - - - - O-1 - - - AlignCenter - - - - - GroupBox3 - - - - 7 - 7 - 0 - 0 - - - - Oscillator - - - - unnamed - - - 11 - - - 2 - - - - sw1 - - - - 5 - 1 - 0 - 0 - - - - Brass - - - - - sw2 - - - - 5 - 1 - 0 - 0 - - - - Reed - - - - - sw3 - - - - 5 - 1 - 0 - 0 - - - - Flute - - - - - spacer1 - - - Vertical - - - Expanding - - - - 20 - 20 - - - - - - sw4 - - - Velocity - - - - - - - - - - - p11 - valueChanged(int) - lcd11 - setValue(int) - - - p12 - valueChanged(int) - lcd12 - setValue(int) - - - p13 - valueChanged(int) - lcd13 - setValue(int) - - - p14 - valueChanged(int) - lcd14 - setValue(int) - - - p7 - valueChanged(int) - lcd7 - setValue(int) - - - p8 - valueChanged(int) - lcd8 - setValue(int) - - - p9 - valueChanged(int) - lcd9 - setValue(int) - - - p10 - valueChanged(int) - lcd10 - setValue(int) - - - p1 - valueChanged(int) - lcd1 - setValue(int) - - - p2 - valueChanged(int) - lcd2 - setValue(int) - - - p3 - valueChanged(int) - lcd3 - setValue(int) - - - p4 - valueChanged(int) - lcd4 - setValue(int) - - - p5 - valueChanged(int) - lcd5 - setValue(int) - - - p6 - valueChanged(int) - lcd6 - setValue(int) - - - lcd1 - valueChanged(int) - p1 - setValue(int) - - - lcd2 - valueChanged(int) - p2 - setValue(int) - - - lcd3 - valueChanged(int) - p3 - setValue(int) - - - lcd4 - valueChanged(int) - p4 - setValue(int) - - - lcd5 - valueChanged(int) - p5 - setValue(int) - - - lcd6 - valueChanged(int) - p6 - setValue(int) - - - lcd7 - valueChanged(int) - p7 - setValue(int) - - - lcd8 - valueChanged(int) - p8 - setValue(int) - - - lcd9 - valueChanged(int) - p9 - setValue(int) - - - lcd10 - valueChanged(int) - p10 - setValue(int) - - - lcd11 - valueChanged(int) - p11 - setValue(int) - - - lcd12 - valueChanged(int) - p12 - setValue(int) - - - lcd13 - valueChanged(int) - p13 - setValue(int) - - - lcd14 - valueChanged(int) - p14 - setValue(int) - - - - p1 - p3 - p2 - p4 - p5 - p6 - p7 - p8 - p9 - p10 - p11 - p12 - p13 - p14 - sw1 - sw2 - sw3 - - - + + + + + 0 + 0 + + + + Brass + + + + + + + + 0 + 0 + + + + Reed + + + + + + + + 0 + 0 + + + + Flute + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 20 + + + + + + + + Velocity + + + + + + + + + + + + qPixmapFromMimeSource + + p1 + p3 + p2 + p4 + p5 + p6 + p7 + p8 + p9 + p10 + p11 + p12 + p13 + p14 + sw1 + sw2 + sw3 + + + + + p11 + valueChanged(int) + lcd11 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p12 + valueChanged(int) + lcd12 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p13 + valueChanged(int) + lcd13 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p14 + valueChanged(int) + lcd14 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p7 + valueChanged(int) + lcd7 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p8 + valueChanged(int) + lcd8 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p9 + valueChanged(int) + lcd9 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p10 + valueChanged(int) + lcd10 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p1 + valueChanged(int) + lcd1 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p2 + valueChanged(int) + lcd2 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p3 + valueChanged(int) + lcd3 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p4 + valueChanged(int) + lcd4 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p5 + valueChanged(int) + lcd5 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + p6 + valueChanged(int) + lcd6 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd1 + valueChanged(int) + p1 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd2 + valueChanged(int) + p2 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd3 + valueChanged(int) + p3 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd4 + valueChanged(int) + p4 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd5 + valueChanged(int) + p5 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd6 + valueChanged(int) + p6 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd7 + valueChanged(int) + p7 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd8 + valueChanged(int) + p8 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd9 + valueChanged(int) + p9 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd10 + valueChanged(int) + p10 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd11 + valueChanged(int) + p11 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd12 + valueChanged(int) + p12 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd13 + valueChanged(int) + p13 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + lcd14 + valueChanged(int) + p14 + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + -- cgit v1.2.3