From c8b54c0ecd080eae628520bc670cbb40a472da21 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Mon, 22 Nov 2010 08:43:09 +0000 Subject: ported .ui widget to Qt4 --- muse2/muse/waveedit/CMakeLists.txt | 3 +- muse2/muse/waveedit/editgain.cpp | 6 +- muse2/muse/waveedit/editgain.h | 6 +- muse2/muse/waveedit/editgainbase.ui | 557 +++++++++++++++++------------------- 4 files changed, 267 insertions(+), 305 deletions(-) (limited to 'muse2') diff --git a/muse2/muse/waveedit/CMakeLists.txt b/muse2/muse/waveedit/CMakeLists.txt index 075aadff..1c36c138 100644 --- a/muse2/muse/waveedit/CMakeLists.txt +++ b/muse2/muse/waveedit/CMakeLists.txt @@ -24,8 +24,7 @@ QT4_WRAP_CPP ( waveedit_mocs editgain.h ) -# QT4_WRAP_UI (waveedit_ui_headers -QT4_WRAP_UI3 (waveedit_ui_headers +QT4_WRAP_UI (waveedit_ui_headers editgainbase.ui ) diff --git a/muse2/muse/waveedit/editgain.cpp b/muse2/muse/waveedit/editgain.cpp index ef9b781c..f93430a0 100644 --- a/muse2/muse/waveedit/editgain.cpp +++ b/muse2/muse/waveedit/editgain.cpp @@ -10,14 +10,14 @@ // // -#include -#include +#include #include "editgain.h" EditGain::EditGain(QWidget* parent, int initGainValue) - : EditGainBase(parent, "editgain", false) + : QDialog(parent) { + setupUi(this); sliderGain->setValue(sliderGain->maxValue() - initGainValue); connect(buttonReset, SIGNAL(pressed()), this, SLOT(resetPressed())); connect(buttonApply, SIGNAL(pressed()), this, SLOT(applyPressed())); diff --git a/muse2/muse/waveedit/editgain.h b/muse2/muse/waveedit/editgain.h index 2094388b..9cbc1d79 100644 --- a/muse2/muse/waveedit/editgain.h +++ b/muse2/muse/waveedit/editgain.h @@ -13,9 +13,11 @@ #ifndef EDITGAIN_H #define EDITGAIN_H -#include "editgainbase.h" +#include "ui_editgainbase.h" -class EditGain : public EditGainBase +class QDialog; + +class EditGain : public QDialog, public Ui::EditGainBase { Q_OBJECT public: diff --git a/muse2/muse/waveedit/editgainbase.ui b/muse2/muse/waveedit/editgainbase.ui index b23cd70e..973c3d81 100644 --- a/muse2/muse/waveedit/editgainbase.ui +++ b/muse2/muse/waveedit/editgainbase.ui @@ -1,302 +1,263 @@ - -EditGainBase - - - EditGainBase - - - - 0 - 0 - 284 - 367 - - - - MusE: Modify gain - - - - unnamed - - - - groupBox2 + + + EditGainBase + + + + 0 + 0 + 284 + 367 + + + + MusE: Modify gain + + + + + + Gain + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 90 + 41 + + + + + + + + + 40 + 150 + + + + 200 + + + 100 + + + Qt::Vertical + + + QSlider::TicksBothSides + + + 10 + + + + + + + + + 200% - - Gain + + false - - - unnamed - - - - layout14 - - - - unnamed - - - - spacer6 - - - Horizontal - - - Expanding - - - - 90 - 41 - - - - - - sliderGain - - - - 40 - 150 - - - - 200 - - - 100 - - - Vertical - - - Both - - - 10 - - - - - layout13 - - - - unnamed - - - - textLabel2 - - - 200% - - - - - spacer4 - - - Vertical - - - Expanding - - - - 30 - 109 - - - - - - textLabel1 - - - 100% - - - - - spacer3 - - - Vertical - - - Expanding - - - - 30 - 108 - - - - - - textLabel3 - - - 0% - - - - - - - spacer7 - - - Horizontal - - - Expanding - - - - 51 - 31 - - - - - - - - layout16 - - - - unnamed - - - - spacer11 - - - Horizontal - - - Expanding - - - - 70 - 31 - - - - - - buttonReset - - - false - - - &Reset - - - Alt+R - - - - - spacer12 - - - Horizontal - - - Expanding - - - - 71 - 31 - - - - - - - - - - buttonGroup2 + + + + + + Qt::Vertical - - + + QSizePolicy::Expanding - - - unnamed - - - - layout6 - - - - unnamed - - - - buttonApply - - - false - - - &Apply - - - Alt+A - - - - - spacer5 - - - Horizontal - - - Expanding - - - - 61 - 31 - - - - - - buttonCancel - - - true - - - &Cancel - - - Alt+C - - - - - - - - - - + + + 30 + 109 + + + + + + + + 100% + + + false + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 30 + 108 + + + + + + + + 0% + + + false + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 51 + 31 + + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 70 + 31 + + + + + + + + false + + + &Reset + + + Alt+R + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 71 + 31 + + + + + + + + + + + + + + + + + + + + + false + + + &Apply + + + Alt+A + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 61 + 31 + + + + + + + + true + + + &Cancel + + + Alt+C + + + + + + + + + + + + qPixmapFromMimeSource + + + -- cgit v1.2.3