diff options
Diffstat (limited to 'muse2')
-rw-r--r-- | muse2/muse/waveedit/CMakeLists.txt | 3 | ||||
-rw-r--r-- | muse2/muse/waveedit/editgain.cpp | 6 | ||||
-rw-r--r-- | muse2/muse/waveedit/editgain.h | 6 | ||||
-rw-r--r-- | muse2/muse/waveedit/editgainbase.ui | 557 |
4 files changed, 267 insertions, 305 deletions
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 <qslider.h> -#include <qpushbutton.h> +#include <QDialog> #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 @@ -<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> -<class>EditGainBase</class> -<widget class="QDialog"> - <property name="name"> - <cstring>EditGainBase</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>284</width> - <height>367</height> - </rect> - </property> - <property name="caption"> - <string>MusE: Modify gain</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QGroupBox"> - <property name="name"> - <cstring>groupBox2</cstring> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>EditGainBase</class> + <widget class="QDialog" name="EditGainBase"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>284</width> + <height>367</height> + </rect> + </property> + <property name="windowTitle"> + <string>MusE: Modify gain</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QGroupBox" name="groupBox2"> + <property name="title"> + <string>Gain</string> + </property> + <layout class="QVBoxLayout"> + <item> + <layout class="QHBoxLayout"> + <item> + <spacer name="spacer6"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>90</width> + <height>41</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QSlider" name="sliderGain"> + <property name="minimumSize"> + <size> + <width>40</width> + <height>150</height> + </size> + </property> + <property name="maximum"> + <number>200</number> + </property> + <property name="value"> + <number>100</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="tickPosition"> + <enum>QSlider::TicksBothSides</enum> + </property> + <property name="tickInterval"> + <number>10</number> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout"> + <item> + <widget class="QLabel" name="textLabel2"> + <property name="text"> + <string>200%</string> </property> - <property name="title"> - <string>Gain</string> + <property name="wordWrap"> + <bool>false</bool> </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout14</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <spacer> - <property name="name"> - <cstring>spacer6</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>90</width> - <height>41</height> - </size> - </property> - </spacer> - <widget class="QSlider"> - <property name="name"> - <cstring>sliderGain</cstring> - </property> - <property name="minimumSize"> - <size> - <width>40</width> - <height>150</height> - </size> - </property> - <property name="maxValue"> - <number>200</number> - </property> - <property name="value"> - <number>100</number> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="tickmarks"> - <enum>Both</enum> - </property> - <property name="tickInterval"> - <number>10</number> - </property> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout13</cstring> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QLabel"> - <property name="name"> - <cstring>textLabel2</cstring> - </property> - <property name="text"> - <string>200%</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>spacer4</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>30</width> - <height>109</height> - </size> - </property> - </spacer> - <widget class="QLabel"> - <property name="name"> - <cstring>textLabel1</cstring> - </property> - <property name="text"> - <string>100%</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>spacer3</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>30</width> - <height>108</height> - </size> - </property> - </spacer> - <widget class="QLabel"> - <property name="name"> - <cstring>textLabel3</cstring> - </property> - <property name="text"> - <string>0%</string> - </property> - </widget> - </vbox> - </widget> - <spacer> - <property name="name"> - <cstring>spacer7</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>51</width> - <height>31</height> - </size> - </property> - </spacer> - </hbox> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout16</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <spacer> - <property name="name"> - <cstring>spacer11</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>70</width> - <height>31</height> - </size> - </property> - </spacer> - <widget class="QPushButton"> - <property name="name"> - <cstring>buttonReset</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>&Reset</string> - </property> - <property name="accel"> - <string>Alt+R</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>spacer12</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>71</width> - <height>31</height> - </size> - </property> - </spacer> - </hbox> - </widget> - </vbox> - </widget> - <widget class="QButtonGroup"> - <property name="name"> - <cstring>buttonGroup2</cstring> + </widget> + </item> + <item> + <spacer name="spacer4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - <property name="title"> - <string></string> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout6</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QPushButton"> - <property name="name"> - <cstring>buttonApply</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>&Apply</string> - </property> - <property name="accel"> - <string>Alt+A</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>spacer5</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>61</width> - <height>31</height> - </size> - </property> - </spacer> - <widget class="QPushButton"> - <property name="name"> - <cstring>buttonCancel</cstring> - </property> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>&Cancel</string> - </property> - <property name="accel"> - <string>Alt+C</string> - </property> - </widget> - </hbox> - </widget> - </vbox> - </widget> - </vbox> -</widget> -<layoutdefaults spacing="6" margin="11"/> -</UI> + <property name="sizeHint" stdset="0"> + <size> + <width>30</width> + <height>109</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="textLabel1"> + <property name="text"> + <string>100%</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="spacer3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>30</width> + <height>108</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="textLabel3"> + <property name="text"> + <string>0%</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer name="spacer7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>51</width> + <height>31</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout"> + <item> + <spacer name="spacer11"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>70</width> + <height>31</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="buttonReset"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>&Reset</string> + </property> + <property name="shortcut"> + <string>Alt+R</string> + </property> + </widget> + </item> + <item> + <spacer name="spacer12"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>71</width> + <height>31</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="buttonGroup2"> + <property name="title"> + <string/> + </property> + <layout class="QVBoxLayout"> + <item> + <layout class="QHBoxLayout"> + <item> + <widget class="QPushButton" name="buttonApply"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>&Apply</string> + </property> + <property name="shortcut"> + <string>Alt+A</string> + </property> + </widget> + </item> + <item> + <spacer name="spacer5"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>61</width> + <height>31</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="buttonCancel"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>&Cancel</string> + </property> + <property name="shortcut"> + <string>Alt+C</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <resources/> + <connections/> +</ui> |