diff options
| -rw-r--r-- | muse2/ChangeLog | 3 | ||||
| -rw-r--r-- | muse2/muse/app.cpp | 2 | ||||
| -rw-r--r-- | muse2/muse/arranger/arranger.cpp | 1 | ||||
| -rw-r--r-- | muse2/muse/arranger/arranger.h | 19 | ||||
| -rw-r--r-- | muse2/muse/arranger/trackinfo.cpp | 1 | ||||
| -rw-r--r-- | muse2/muse/mplugins/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | muse2/muse/mplugins/midifilter.ui | 1609 | ||||
| -rw-r--r-- | muse2/muse/mplugins/midifilterimpl.cpp | 8 | ||||
| -rw-r--r-- | muse2/muse/mplugins/midifilterimpl.h | 23 | ||||
| -rw-r--r-- | muse2/muse/widgets/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | muse2/muse/widgets/ctrlcombo.cpp | 4 | ||||
| -rw-r--r-- | muse2/muse/widgets/ctrlcombo.h | 4 | ||||
| -rw-r--r-- | muse2/muse/widgets/metronome.cpp | 36 | ||||
| -rw-r--r-- | muse2/muse/widgets/metronome.h | 21 | ||||
| -rw-r--r-- | muse2/muse/widgets/metronomebase.ui | 1159 | ||||
| -rw-r--r-- | muse2/muse/widgets/mtrackinfobase.ui | 1995 | ||||
| -rw-r--r-- | muse2/muse/widgets/noteinfo.cpp | 2 | ||||
| -rw-r--r-- | muse2/muse/widgets/pitchedit.cpp | 7 | ||||
| -rw-r--r-- | muse2/muse/widgets/pitchedit.h | 4 |
19 files changed, 2313 insertions, 2593 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index cb453a5a..64036d4b 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -3,7 +3,8 @@ - More icon conversion work (Orcan) - Move global, user, project .xpm files into the xpm/ directory. Handle them the same way in filedialog.cpp as we handle other pixmaps elsewhere. (Orcan) - - Ported the following .ui widgets to Qt4: commentbase (Orcan) + - Ported the following .ui widgets to Qt4: commentbase, metronomebase, mtrackinfobase, + midifilter (Orcan) 18.11.2010 - Updated build part README file - read it! Tell user to specify Release build type. (Tim) - Added printout of build type in top level cmake. (Tim) diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index 234897be..457726e8 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -4106,7 +4106,7 @@ void MusE::changeConfig(bool writeFlag) void MusE::configMetronome() { if (!metronomeConfig) - metronomeConfig = new MetronomeConfig(this, "metronome"); + metronomeConfig = new MetronomeConfig; if(metronomeConfig->isVisible()) { metronomeConfig->raise(); diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp index df1d5ded..c0f7c1cd 100644 --- a/muse2/muse/arranger/arranger.cpp +++ b/muse2/muse/arranger/arranger.cpp @@ -54,7 +54,6 @@ #include "globals.h" #include "tlist.h" #include "icons.h" -#include "mtrackinfobase.h" #include "header.h" #include "utils.h" #include "alayout.h" diff --git a/muse2/muse/arranger/arranger.h b/muse2/muse/arranger/arranger.h index 34aa5c68..c223b0d6 100644 --- a/muse2/muse/arranger/arranger.h +++ b/muse2/muse/arranger/arranger.h @@ -19,7 +19,7 @@ #include "midieditor.h" #include "pcanvas.h" -#include "mtrackinfobase.h" +#include "ui_mtrackinfobase.h" #include "trackautomationview.h" class QMainWindow; @@ -77,14 +77,27 @@ class WidgetStack : public QWidget { QSize minimumSizeHint() const; }; + +//--------------------------------------------------------- +// MidiTrackInfoBaseWidget +// Wrapper around Ui::MidiTrackInfoBase +//--------------------------------------------------------- +class MidiTrackInfoBaseWidget : public QWidget, public Ui::MidiTrackInfoBase +{ + Q_OBJECT + + public: + MidiTrackInfoBaseWidget(QWidget *parent = 0) : QWidget(parent) { setupUi(this); } +}; + //--------------------------------------------------------- // MidiTrackInfo //--------------------------------------------------------- -class MidiTrackInfo : public MidiTrackInfoBase { +class MidiTrackInfo : public MidiTrackInfoBaseWidget { public: bool _midiDetect; - MidiTrackInfo(QWidget* parent) : MidiTrackInfoBase(parent) { _midiDetect = false; } + MidiTrackInfo(QWidget* parent) : MidiTrackInfoBaseWidget(parent) { _midiDetect = false; } }; //--------------------------------------------------------- diff --git a/muse2/muse/arranger/trackinfo.cpp b/muse2/muse/arranger/trackinfo.cpp index ff74ff93..20053d45 100644 --- a/muse2/muse/arranger/trackinfo.cpp +++ b/muse2/muse/arranger/trackinfo.cpp @@ -35,7 +35,6 @@ #include "mididev.h" #include "utils.h" #include "tlist.h" -//#include "mtrackinfobase.h" #include "alayout.h" #include "audio.h" #include "mixer/amixer.h" diff --git a/muse2/muse/mplugins/CMakeLists.txt b/muse2/muse/mplugins/CMakeLists.txt index 242540a5..bd8366f5 100644 --- a/muse2/muse/mplugins/CMakeLists.txt +++ b/muse2/muse/mplugins/CMakeLists.txt @@ -40,8 +40,8 @@ QT4_WRAP_CPP ( mplugins_mocs mittranspose.h midiitransform.h midifilterimpl.h mrconfig.h rhythm.h ) # QT4_WRAP_UI ( mplugins_uis transform.ui ) -QT4_WRAP_UI ( mplugins_UIC mrconfigbase.ui ) -QT4_WRAP_UI3 ( mplugins_uis midifilter.ui rhythmbase.ui ) +QT4_WRAP_UI ( mplugins_UIC midifilter.ui mrconfigbase.ui ) +QT4_WRAP_UI3 ( mplugins_uis rhythmbase.ui ) # add_library ( mplugins SHARED add_library ( mplugins STATIC diff --git a/muse2/muse/mplugins/midifilter.ui b/muse2/muse/mplugins/midifilter.ui index 412e735d..529f893a 100644 --- a/muse2/muse/mplugins/midifilter.ui +++ b/muse2/muse/mplugins/midifilter.ui @@ -1,879 +1,730 @@ -<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> -<class>MidiFilterConfigBase</class> -<widget class="QDialog"> - <property name="name"> - <cstring>MidiFilterConfigBase</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>348</width> - <height>431</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="caption"> - <string>MusE: Midi Input Filter</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QGroupBox" row="0" column="0"> - <property name="name"> - <cstring>GroupBoxx</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Record Filter</string> - </property> - <property name="layoutSpacing" stdset="0"> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QCheckBox"> - <property name="name"> - <cstring>rf1</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Note On</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>rf2</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Poly Pressure</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>rf3</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Controller</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>rf4</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Program Change</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>rf5</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>After Touch</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>rf6</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Pitch Bend</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>rf7</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Sysex</string> - </property> - </widget> - </vbox> - </widget> - <widget class="QGroupBox" row="0" column="1"> - <property name="name"> - <cstring>GroupBox2</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Thru Filter</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QCheckBox"> - <property name="name"> - <cstring>tf1</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Note On</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>tf2</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Poly Pressure</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>tf3</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Controller</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>tf4</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Program Change</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>tf5</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>After Touch</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>tf6</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Pitch Bend</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>tf7</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Sysex</string> - </property> - </widget> - </vbox> - </widget> - <widget class="QGroupBox" row="1" column="1"> - <property name="name"> - <cstring>GroupBox4</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>7</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Controller Filter</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="CtrlComboBox"> - <property name="name"> - <cstring>cb1</cstring> - </property> - </widget> - <widget class="CtrlComboBox"> - <property name="name"> - <cstring>cb2</cstring> - </property> - </widget> - <widget class="CtrlComboBox"> - <property name="name"> - <cstring>cb3</cstring> - </property> - </widget> - <widget class="CtrlComboBox"> - <property name="name"> - <cstring>cb4</cstring> - </property> - </widget> - </vbox> - </widget> - <widget class="QButtonGroup" row="1" column="0"> - <property name="name"> - <cstring>ButtonGroup1</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>7</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Channel Filter</string> - </property> - <property name="layoutSpacing" stdset="0"> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>3</number> - </property> - <widget class="QPushButton" row="3" column="1"> - <property name="name"> - <cstring>cf14</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>14</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="2" column="1"> - <property name="name"> - <cstring>cf10</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>10</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="1" column="1"> - <property name="name"> - <cstring>cf6</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>6</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="2" column="3"> - <property name="name"> - <cstring>cf12</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>12</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="0" column="3"> - <property name="name"> - <cstring>cf4</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>25</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>4</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="0" column="1"> - <property name="name"> - <cstring>cf2</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>25</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>2</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="2" column="0"> - <property name="name"> - <cstring>cf9</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>9</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="1" column="3"> - <property name="name"> - <cstring>cf8</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>8</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="0" column="2"> - <property name="name"> - <cstring>cf3</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>25</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>3</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="3" column="0"> - <property name="name"> - <cstring>cf13</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>13</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="3" column="2"> - <property name="name"> - <cstring>cf15</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>15</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="3" column="3"> - <property name="name"> - <cstring>cf16</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>16</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="1" column="2"> - <property name="name"> - <cstring>cf7</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>7</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="2" column="2"> - <property name="name"> - <cstring>cf11</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>11</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="1" column="0"> - <property name="name"> - <cstring>cf5</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>5</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" row="0" column="0"> - <property name="name"> - <cstring>cf1</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>25</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>30</width> - <height>32767</height> - </size> - </property> - <property name="text"> - <string>1</string> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - </widget> - </grid> - </widget> - </grid> -</widget> -<customwidgets> - <customwidget> - <class>CtrlComboBox</class> - <header location="global">ctrlcombo.h</header> - <sizehint> - <width>50</width> - <height>20</height> - </sizehint> - <container>0</container> - <sizepolicy> - <hordata>5</hordata> - <verdata>5</verdata> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - <pixmap>image0</pixmap> - <signal>activated(int index)</signal> - <signal>activated(const QString&)</signal> - </customwidget> -</customwidgets> -<images> - <image name="image0"> - <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> - </image> -</images> -<tabstops> - <tabstop>rf1</tabstop> - <tabstop>rf2</tabstop> - <tabstop>rf3</tabstop> - <tabstop>rf4</tabstop> - <tabstop>rf5</tabstop> - <tabstop>rf6</tabstop> - <tabstop>rf7</tabstop> - <tabstop>tf1</tabstop> - <tabstop>tf2</tabstop> - <tabstop>tf3</tabstop> - <tabstop>tf4</tabstop> - <tabstop>tf5</tabstop> - <tabstop>tf6</tabstop> - <tabstop>tf7</tabstop> - <tabstop>cf1</tabstop> - <tabstop>cf2</tabstop> - <tabstop>cf3</tabstop> - <tabstop>cf4</tabstop> - <tabstop>cf5</tabstop> - <tabstop>cf6</tabstop> - <tabstop>cf7</tabstop> - <tabstop>cf8</tabstop> - <tabstop>cf9</tabstop> - <tabstop>cf10</tabstop> - <tabstop>cf11</tabstop> - <tabstop>cf12</tabstop> - <tabstop>cf13</tabstop> - <tabstop>cf14</tabstop> - <tabstop>cf15</tabstop> - <tabstop>cf16</tabstop> -</tabstops> -<layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>ctrlcombo.h</includehint> -</includehints> -</UI> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>MidiFilterConfigBase</class> + <widget class="QDialog" name="MidiFilterConfigBase"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>348</width> + <height>431</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="windowTitle"> + <string>MusE: Midi Input Filter</string> + </property> + <layout class="QGridLayout"> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <item row="0" column="0"> + <widget class="QGroupBox" name="GroupBoxx"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Record Filter</string> + </property> + <layout class="QVBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>11</number> + </property> + <item> + <widget class="QCheckBox" name="rf1"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Note On</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="rf2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Poly Pressure</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="rf3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Controller</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="rf4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Program Change</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="rf5"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>After Touch</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="rf6"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Pitch Bend</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="rf7"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Sysex</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="0" column="1"> + <widget class="QGroupBox" name="GroupBox2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Thru Filter</string> + </property> + <layout class="QVBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>11</number> + </property> + <item> + <widget class="QCheckBox" name="tf1"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Note On</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tf2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Poly Pressure</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tf3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Controller</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tf4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Program Change</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tf5"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>After Touch</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tf6"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Pitch Bend</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tf7"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Sysex</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="1"> + <widget class="QGroupBox" name="GroupBox4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Controller Filter</string> + </property> + <layout class="QVBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>11</number> + </property> + <item> + <widget class="CtrlComboBox" name="cb1" native="true"/> + </item> + <item> + <widget class="CtrlComboBox" name="cb2" native="true"/> + </item> + <item> + <widget class="CtrlComboBox" name="cb3" native="true"/> + </item> + <item> + <widget class="CtrlComboBox" name="cb4" native="true"/> + </item> + </layout> + </widget> + </item> + <item row="1" column="0"> + <widget class="QGroupBox" name="ButtonGroup1"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Channel Filter</string> + </property> + <layout class="QGridLayout"> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>3</number> + </property> + <item row="3" column="1"> + <widget class="QPushButton" name="cf14"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>14</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QPushButton" name="cf10"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>10</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="cf6"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>6</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="QPushButton" name="cf12"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>12</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="QPushButton" name="cf4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>25</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>4</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="cf2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>25</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>2</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QPushButton" name="cf9"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>9</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="QPushButton" name="cf8"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>8</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QPushButton" name="cf3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>25</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>3</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QPushButton" name="cf13"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>13</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QPushButton" name="cf15"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>15</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="3"> + <widget class="QPushButton" name="cf16"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>16</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="cf7"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>7</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QPushButton" name="cf11"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>11</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QPushButton" name="cf5"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>5</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QPushButton" name="cf1"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>25</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>30</width> + <height>32767</height> + </size> + </property> + <property name="text"> + <string>1</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <customwidgets> + <customwidget> + <class>CtrlComboBox</class> + <extends>QWidget</extends> + <header location="global">ctrlcombo.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>rf1</tabstop> + <tabstop>rf2</tabstop> + <tabstop>rf3</tabstop> + <tabstop>rf4</tabstop> + <tabstop>rf5</tabstop> + <tabstop>rf6</tabstop> + <tabstop>rf7</tabstop> + <tabstop>tf1</tabstop> + <tabstop>tf2</tabstop> + <tabstop>tf3</tabstop> + <tabstop>tf4</tabstop> + <tabstop>tf5</tabstop> + <tabstop>tf6</tabstop> + <tabstop>tf7</tabstop> + <tabstop>cf1</tabstop> + <tabstop>cf2</tabstop> + <tabstop>cf3</tabstop> + <tabstop>cf4</tabstop> + <tabstop>cf5</tabstop> + <tabstop>cf6</tabstop> + <tabstop>cf7</tabstop> + <tabstop>cf8</tabstop> + <tabstop>cf9</tabstop> + <tabstop>cf10</tabstop> + <tabstop>cf11</tabstop> + <tabstop>cf12</tabstop> + <tabstop>cf13</tabstop> + <tabstop>cf14</tabstop> + <tabstop>cf15</tabstop> + <tabstop>cf16</tabstop> + </tabstops> + <includes> + <include location="local">ctrlcombo.h</include> + </includes> + <resources/> + <connections/> +</ui> diff --git a/muse2/muse/mplugins/midifilterimpl.cpp b/muse2/muse/mplugins/midifilterimpl.cpp index 56d5caf5..d02296ba 100644 --- a/muse2/muse/mplugins/midifilterimpl.cpp +++ b/muse2/muse/mplugins/midifilterimpl.cpp @@ -9,9 +9,7 @@ #include "midifilterimpl.h" #include "ctrlcombo.h" -#include <qpushbutton.h> -#include <qcheckbox.h> -//Added by qt3to4: +#include <QDialog> #include <QCloseEvent> //--------------------------------------------------------- @@ -40,8 +38,8 @@ void MidiFilterConfig::setCtrl4(int n) // MidiFilterConfig //--------------------------------------------------------- -MidiFilterConfig::MidiFilterConfig(QWidget* parent, const char* name) - : MidiFilterConfigBase(parent, name) +MidiFilterConfig::MidiFilterConfig(QDialog* parent) + : MidiFilterConfigBaseWidget(parent) { cb1->setCurrentItem(midiFilterCtrl1); cb2->setCurrentItem(midiFilterCtrl2); diff --git a/muse2/muse/mplugins/midifilterimpl.h b/muse2/muse/mplugins/midifilterimpl.h index 4ab722c1..aec17ada 100644 --- a/muse2/muse/mplugins/midifilterimpl.h +++ b/muse2/muse/mplugins/midifilterimpl.h @@ -10,15 +10,28 @@ #define __MIDIFILTERIMP_H__ #include "globals.h" -#include "midifilter.h" -//Added by qt3to4: -#include <QCloseEvent> +#include "ui_midifilter.h" + +class QCloseEvent; + +//--------------------------------------------------------- +// MidiFilterConfigBaseWidget +// Wrapper around Ui::MidiFilterConfigBase +//--------------------------------------------------------- + +class MidiFilterConfigBaseWidget : public QDialog, public Ui::MidiFilterConfigBase +{ + Q_OBJECT + + public: + MidiFilterConfigBaseWidget(QDialog *parent = 0) : QDialog(parent) { setupUi(this); } +}; //--------------------------------------------------------- // MidiFilterConfig //--------------------------------------------------------- -class MidiFilterConfig : public MidiFilterConfigBase { +class MidiFilterConfig : public MidiFilterConfigBaseWidget { Q_OBJECT void rChanged(bool f, int val) { @@ -84,7 +97,7 @@ class MidiFilterConfig : public MidiFilterConfigBase { void setCtrl4(int); public: - MidiFilterConfig(QWidget* parent=0, const char* name=0); + MidiFilterConfig(QDialog* parent=0); }; #endif diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt index f8056dad..f5592990 100644 --- a/muse2/muse/widgets/CMakeLists.txt +++ b/muse2/muse/widgets/CMakeLists.txt @@ -135,7 +135,9 @@ QT4_WRAP_UI (UIC commentbase.ui fdialogbuttons.ui itransformbase.ui + metronomebase.ui mittransposebase.ui + mtrackinfobase.ui songinfo.ui transformbase.ui velocitybase.ui @@ -151,8 +153,6 @@ QT4_WRAP_UI3 (widget_ui_headers appearancebase.ui synthconfigbase.ui gatetimebase.ui - metronomebase.ui - mtrackinfobase.ui wtrackinfobase.ui editctrl7dialogbase.ui editmetadialogbase.ui diff --git a/muse2/muse/widgets/ctrlcombo.cpp b/muse2/muse/widgets/ctrlcombo.cpp index 26512639..93fdf3a9 100644 --- a/muse2/muse/widgets/ctrlcombo.cpp +++ b/muse2/muse/widgets/ctrlcombo.cpp @@ -12,8 +12,8 @@ // CtrlComboBox //--------------------------------------------------------- -CtrlComboBox::CtrlComboBox(QWidget* parent, const char* name) - : QComboBox(parent, name) +CtrlComboBox::CtrlComboBox(QWidget* parent) + : QComboBox(parent) { const char* ctxt[] = { "No Ctrl", "BankSelMSB", "Modulation", "BreathCtrl", diff --git a/muse2/muse/widgets/ctrlcombo.h b/muse2/muse/widgets/ctrlcombo.h index 8aa134e3..2feff096 100644 --- a/muse2/muse/widgets/ctrlcombo.h +++ b/muse2/muse/widgets/ctrlcombo.h @@ -9,12 +9,12 @@ #ifndef __CTRLGRP_H__ #define __CTRLGRP_H__ -#include <qcombobox.h> +#include <QComboBox> class CtrlComboBox : public QComboBox { Q_OBJECT public: - CtrlComboBox(QWidget* parent, const char* name = 0); + CtrlComboBox(QWidget* parent); }; diff --git a/muse2/muse/widgets/metronome.cpp b/muse2/muse/widgets/metronome.cpp index 091a8a56..da854450 100644 --- a/muse2/muse/widgets/metronome.cpp +++ b/muse2/muse/widgets/metronome.cpp @@ -8,12 +8,8 @@ #include <stdio.h> #include "metronome.h" -#include <QtGui> -#include <qpushbutton.h> -#include <qspinbox.h> -#include <qcheckbox.h> -//Added by qt3to4: -#include <Q3PopupMenu> + +#include <QMenu> #include "globals.h" #include "song.h" #include "track.h" @@ -23,8 +19,8 @@ // MetronomeConfig //--------------------------------------------------------- -MetronomeConfig::MetronomeConfig(QWidget* parent, const char* name) - : MetronomeConfigBase(parent, name) +MetronomeConfig::MetronomeConfig(QDialog* parent) + : MetronomeConfigBaseWidget(parent) { connect(buttonApply, SIGNAL(clicked()), SLOT(apply())); connect(midiClick, SIGNAL(toggled(bool)), SLOT(midiClickChanged(bool))); @@ -64,38 +60,38 @@ void MetronomeConfig::audioBeepRoutesClicked() if(song->outputs()->size() == 0) return; - //QPopupMenu* pup = new QPopupMenu(audioBeepRoutesButton); - Q3PopupMenu* pup = new Q3PopupMenu(this); - pup->setCheckable(true); + QMenu* pup = new QMenu; OutputList* ol = song->outputs(); int nn = 0; for(iAudioOutput iao = ol->begin(); iao != ol->end(); ++iao) { - int id = pup->insertItem(QT_TR_NOOP((*iao)->name()), nn); + QAction* action = pup->addAction(QT_TR_NOOP((*iao)->name())); + action->setCheckable(true); + action->setData(nn); if((*iao)->sendMetronome()) - pup->setItemChecked(id, true); + action->setChecked(true); ++nn; } - int n = pup->exec(QCursor::pos()); - if(n != -1) + QAction* clickaction = pup->exec(QCursor::pos()); + if (clickaction) { //QString s(pup->text(n)); nn = 0; for(iAudioOutput iao = ol->begin(); iao != ol->end(); ++iao) { //if(((*iao)->name() == s) && (n == nn)) - if(n == nn) + if (nn == clickaction->data()) { //(*iao)->setSendMetronome(); - audio->msgSetSendMetronome(*iao, !pup->isItemChecked(n)); + audio->msgSetSendMetronome(*iao, clickaction->isChecked()); //song->update(SC_ROUTE); break; } ++nn; - } + } } delete pup; @@ -109,7 +105,7 @@ void MetronomeConfig::audioBeepRoutesClicked() void MetronomeConfig::accept() { apply(); - MetronomeConfigBase::accept(); + MetronomeConfigBaseWidget::accept(); } //--------------------------------------------------------- @@ -144,7 +140,7 @@ void MetronomeConfig::apply() void MetronomeConfig::reject() { - MetronomeConfigBase::reject(); + MetronomeConfigBaseWidget::reject(); } //--------------------------------------------------------- diff --git a/muse2/muse/widgets/metronome.h b/muse2/muse/widgets/metronome.h index 200d1875..57d04f52 100644 --- a/muse2/muse/widgets/metronome.h +++ b/muse2/muse/widgets/metronome.h @@ -9,13 +9,28 @@ #ifndef __METRONOME_H__ #define __METRONOME_H__ -#include "metronomebase.h" +#include "ui_metronomebase.h" + +class QDialog; + +//--------------------------------------------------------- +// MetronomeConfigBaseWidget +// Wrapper around Ui::MetronomeConfigBase +//--------------------------------------------------------- + +class MetronomeConfigBaseWidget : public QDialog, public Ui::MetronomeConfigBase +{ + Q_OBJECT + + public: + MetronomeConfigBaseWidget(QDialog *parent = 0) : QDialog(parent) { setupUi(this); } +}; //--------------------------------------------------------- // MetronomeConfig //--------------------------------------------------------- -class MetronomeConfig : public MetronomeConfigBase { +class MetronomeConfig : public MetronomeConfigBaseWidget { Q_OBJECT private slots: @@ -29,6 +44,6 @@ class MetronomeConfig : public MetronomeConfigBase { void beepVolumeChanged(int); public: - MetronomeConfig(QWidget* parent, const char* name = 0); + MetronomeConfig(QDialog* parent=0); }; #endif diff --git a/muse2/muse/widgets/metronomebase.ui b/muse2/muse/widgets/metronomebase.ui index c30f5bf1..22a8fb96 100644 --- a/muse2/muse/widgets/metronomebase.ui +++ b/muse2/muse/widgets/metronomebase.ui @@ -1,604 +1,569 @@ -<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>MetronomeConfigBase</class> -<widget class="QDialog"> - <property name="name"> - <cstring>MetronomeConfigBase</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>557</width> - <height>347</height> - </rect> - </property> - <property name="caption"> - <string>MusE: Metronome Config</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>MetronomeConfigBase</class> + <widget class="QDialog" name="MetronomeConfigBase"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>557</width> + <height>363</height> + </rect> + </property> + <property name="windowTitle"> + <string>MusE: Metronome Config</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout"> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <item row="0" column="0"> + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QGroupBox" name="GroupBox1"> + <property name="title"> + <string>Metronome</string> + </property> + <layout class="QGridLayout"> <property name="margin"> - <number>11</number> + <number>11</number> </property> <property name="spacing"> - <number>6</number> + <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> - <property name="name"> - <cstring>layout20</cstring> + <item row="0" column="0"> + <layout class="QVBoxLayout"> + <item> + <layout class="QHBoxLayout"> + <item> + <widget class="QCheckBox" name="audioBeep"> + <property name="text"> + <string>Audio Beep</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="audioBeepRoutesButton"> + <property name="text"> + <string>Choose outputs...</string> + </property> + <property name="autoDefault"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout"> + <item> + <widget class="QSlider" name="volumeSlider"> + <property name="minimum"> + <number>0</number> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="singleStep"> + <number>1</number> + </property> + <property name="pageStep"> + <number>10</number> + </property> + <property name="value"> + <number>50</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="volumeLabel"> + <property name="text"> + <string>50</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="textLabel1"> + <property name="text"> + <string>% Audio volume</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="midiClick"> + <property name="text"> + <string>MIDI Click</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>6</number> </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> + <property name="margin"> + <number>0</number> + </property> + <item> + <layout class="QGridLayout"> + <property name="margin"> + <number>0</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <item row="4" column="1"> + <widget class="QLabel" name="TextLabel5"> + <property name="text"> + <string>Midi Channel</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="TextLabel1"> + <property name="text"> + <string>Measure Note</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QSpinBox" name="midiChannel"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>16</number> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="TextLabel2"> + <property name="text"> + <string>Measure Velocity</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLabel" name="TextLabel4"> + <property name="text"> + <string>Beat Velocity</string> </property> - <widget class="QGroupBox" row="0" column="0"> - <property name="name"> - <cstring>GroupBox1</cstring> - </property> - <property name="title"> - <string>Metronome</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QLayoutWidget" row="0" column="0"> - <property name="name"> - <cstring>layout18</cstring> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>audioBeepLayout</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QCheckBox"> - <property name="name"> - <cstring>audioBeep</cstring> - </property> - <property name="text"> - <string>Audio Beep</string> - </property> - </widget> - <widget class="QPushButton"> - <property name="name"> - <cstring>audioBeepRoutesButton</cstring> - </property> - <property name="text"> - <string>Choose outputs...</string> - </property> - <property name="autoDefault"> - <bool>true</bool> - </property> - </widget> - </hbox> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout17</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QSlider"> - <property name="name"> - <cstring>volumeSlider</cstring> - </property> - <property name="minValue"> - <number>0</number> - </property> - <property name="maxValue"> - <number>100</number> - </property> - <property name="lineStep"> - <number>1</number> - </property> - <property name="pageStep"> - <number>10</number> - </property> - <property name="value"> - <number>50</number> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>volumeLabel</cstring> - </property> - <property name="text"> - <string>50</string> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>textLabel1</cstring> - </property> - <property name="text"> - <string>% Audio volume</string> - </property> - </widget> - </hbox> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>midiClick</cstring> - </property> - <property name="text"> - <string>MIDI Click</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>Layout11</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>Layout10</cstring> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QLabel" row="4" column="1"> - <property name="name"> - <cstring>TextLabel5</cstring> - </property> - <property name="text"> - <string>Midi Channel</string> - </property> - </widget> - <widget class="QLabel" row="0" column="1"> - <property name="name"> - <cstring>TextLabel1</cstring> - </property> - <property name="text"> - <string>Measure Note</string> - </property> - </widget> - <widget class="QSpinBox" row="4" column="0"> - <property name="name"> - <cstring>midiChannel</cstring> - </property> - <property name="maxValue"> - <number>16</number> - </property> - <property name="minValue"> - <number>1</number> - </property> - </widget> - <widget class="QLabel" row="1" column="1"> - <property name="name"> - <cstring>TextLabel2</cstring> - </property> - <property name="text"> - <string>Measure Velocity</string> - </property> - </widget> - <widget class="QLabel" row="3" column="1"> - <property name="name"> - <cstring>TextLabel4</cstring> - </property> - <property name="text"> - <string>Beat Velocity</string> - </property> - </widget> - <widget class="QSpinBox" row="5" column="0"> - <property name="name"> - <cstring>midiPort</cstring> - </property> - <property name="maxValue"> - <number>16</number> - </property> - <property name="minValue"> - <number>1</number> - </property> - </widget> - <widget class="QLabel" row="2" column="1"> - <property name="name"> - <cstring>TextLabel3</cstring> - </property> - <property name="text"> - <string>Beat Note</string> - </property> - </widget> - <widget class="QSpinBox" row="2" column="0"> - <property name="name"> - <cstring>beatNote</cstring> - </property> - </widget> - <widget class="QSpinBox" row="1" column="0"> - <property name="name"> - <cstring>measureVelocity</cstring> - </property> - <property name="maxValue"> - <number>127</number> - </property> - </widget> - <widget class="QSpinBox" row="0" column="0"> - <property name="name"> - <cstring>measureNote</cstring> - </property> - </widget> - <widget class="QLabel" row="5" column="1"> - <property name="name"> - <cstring>TextLabel6</cstring> - </property> - <property name="text"> - <string>Midi Port</string> - </property> - </widget> - <widget class="QSpinBox" row="3" column="0"> - <property name="name"> - <cstring>beatVelocity</cstring> - </property> - <property name="maxValue"> - <number>127</number> - </property> - </widget> - </grid> - </widget> - <spacer> - <property name="name"> - <cstring>Spacer10</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </hbox> - </widget> - </vbox> - </widget> - </grid> - </widget> - <widget class="QGroupBox" row="0" column="1"> - <property name="name"> - <cstring>GroupBox2</cstring> - </property> - <property name="title"> - <string>Precount</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QCheckBox"> - <property name="name"> - <cstring>precountEnable</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>enable</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>Layout6</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QSpinBox"> - <property name="name"> - <cstring>precountBars</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="maxValue"> - <number>10</number> - </property> - <property name="minValue"> - <number>1</number> - </property> - <property name="value"> - <number>2</number> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>TextLabel7</cstring> - </property> - <property name="text"> - <string>Bars</string> - </property> - </widget> - </hbox> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>precountFromMastertrack</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>From Mastertrack</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>Layout5</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QSpinBox"> - <property name="name"> - <cstring>precountSigZ</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="maxValue"> - <number>32</number> - </property> - <property name="minValue"> - <number>1</number> - </property> - <property name="value"> - <number>4</number> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>TextLabel8</cstring> - </property> - <property name="text"> - <string>/</string> - </property> - </widget> - <widget class="QSpinBox"> - <property name="name"> - <cstring>precountSigN</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="maxValue"> - <number>64</number> - </property> - <property name="minValue"> - <number>2</number> - </property> - <property name="value"> - <number>4</number> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>TextLabel9</cstring> - </property> - <property name="text"> - <string>Signature</string> - </property> - </widget> - </hbox> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>precountPrerecord</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Prerecord</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>precountPreroll</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Preroll</string> - </property> - </widget> - </vbox> - </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>layout19</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QLabel"> - <property name="name"> - <cstring>textLabel3</cstring> - </property> - <property name="text"> - <string>Hint: Enable metronome in Transportpanel</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>Horizontal Spacing2</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>8</width> - <height>20</height> - </size> - </property> - </spacer> - <widget class="QPushButton"> - <property name="name"> - <cstring>buttonApply</cstring> - </property> - <property name="text"> - <string>&Apply</string> - </property> - <property name="accel"> - <string>Alt+A</string> - </property> - <property name="autoDefault"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton"> - <property name="name"> - <cstring>buttonOk</cstring> - </property> - <property name="text"> - <string>&OK</string> - </property> - <property name="accel"> - <string>Alt+O</string> - </property> - <property name="autoDefault"> - <bool>true</bool> - </property> - <property name="default"> - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton"> - <property name="name"> - <cstring>buttonCancel</cstring> - </property> - <property name="text"> - <string>&Cancel</string> - </property> - <property name="accel"> - <string>Alt+C</string> - </property> - <property name="autoDefault"> - <bool>true</bool> - </property> - </widget> - </hbox> - </widget> - </grid> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QSpinBox" name="midiPort"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>16</number> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="TextLabel3"> + <property name="text"> + <string>Beat Note</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QSpinBox" name="beatNote"/> + </item> + <item row="1" column="0"> + <widget class="QSpinBox" name="measureVelocity"> + <property name="maximum"> + <number>127</number> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QSpinBox" name="measureNote"/> + </item> + <item row="5" column="1"> + <widget class="QLabel" name="TextLabel6"> + <property name="text"> + <string>Midi Port</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QSpinBox" name="beatVelocity"> + <property name="maximum"> + <number>127</number> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer name="Spacer10"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item row="0" column="1"> + <widget class="QGroupBox" name="GroupBox2"> + <property name="title"> + <string>Precount</string> + </property> + <layout class="QVBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>11</number> + </property> + <item> + <widget class="QCheckBox" name="precountEnable"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>enable</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QSpinBox" name="precountBars"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>10</number> + </property> + <property name="value"> + <number>2</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="TextLabel7"> + <property name="text"> + <string>Bars</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="precountFromMastertrack"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>From Mastertrack</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QSpinBox" name="precountSigZ"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>32</number> + </property> + <property name="value"> + <number>4</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="TextLabel8"> + <property name="text"> + <string>/</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="precountSigN"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="minimum"> + <number>2</number> + </property> + <property name="maximum"> + <number>64</number> + </property> + <property name="value"> + <number>4</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="TextLabel9"> + <property name="text"> + <string>Signature</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="precountPrerecord"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Prerecord</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="precountPreroll"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Preroll</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <layout class="QHBoxLayout"> + <item> + <widget class="QLabel" name="textLabel3"> + <property name="text"> + <string>Hint: Enable metronome in Transportpanel</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="Horizontal Spacing2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>8</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="buttonApply"> + <property name="text"> + <string>&Apply</string> + </property> + <property name="shortcut"> + <string>Alt+A</string> + </property> + <property name="autoDefault"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="buttonOk"> + <property name="text"> + <string>&OK</string> + </property> + <property name="shortcut"> + <string>Alt+O</string> + </property> + <property name="autoDefault"> + <bool>true</bool> + </property> + <property name="default"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="buttonCancel"> + <property name="text"> + <string>&Cancel</string> + </property> + <property name="shortcut"> + <string>Alt+C</string> + </property> + <property name="autoDefault"> + <bool>true</bool> + </property> </widget> - </grid> -</widget> -<connections> - <connection> - <sender>buttonOk</sender> - <signal>clicked()</signal> - <receiver>MetronomeConfigBase</receiver> - <slot>accept()</slot> - </connection> - <connection> - <sender>buttonCancel</sender> - <signal>clicked()</signal> - <receiver>MetronomeConfigBase</receiver> - <slot>reject()</slot> - </connection> - <connection> - <sender>volumeSlider</sender> - <signal>valueChanged(int)</signal> - <receiver>volumeLabel</receiver> - <slot>setNum(int)</slot> - </connection> -</connections> -<tabstops> - <tabstop>audioBeep</tabstop> - <tabstop>audioBeepRoutesButton</tabstop> - <tabstop>midiClick</tabstop> - <tabstop>measureNote</tabstop> - <tabstop>measureVelocity</tabstop> - <tabstop>beatNote</tabstop> - <tabstop>beatVelocity</tabstop> - <tabstop>midiChannel</tabstop> - <tabstop>midiPort</tabstop> - <tabstop>precountEnable</tabstop> - <tabstop>precountBars</tabstop> - <tabstop>precountFromMastertrack</tabstop> - <tabstop>precountSigZ</tabstop> - <tabstop>precountPrerecord</tabstop> - <tabstop>precountPreroll</tabstop> - <tabstop>precountSigN</tabstop> - <tabstop>buttonApply</tabstop> - <tabstop>buttonOk</tabstop> - <tabstop>buttonCancel</tabstop> -</tabstops> -<layoutdefaults spacing="6" margin="11"/> -</UI> + </item> + </layout> + </item> + </layout> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>audioBeep</tabstop> + <tabstop>audioBeepRoutesButton</tabstop> + <tabstop>midiClick</tabstop> + <tabstop>measureNote</tabstop> + <tabstop>measureVelocity</tabstop> + <tabstop>beatNote</tabstop> + <tabstop>beatVelocity</tabstop> + <tabstop>midiChannel</tabstop> + <tabstop>midiPort</tabstop> + <tabstop>precountEnable</tabstop> + <tabstop>precountBars</tabstop> + <tabstop>precountFromMastertrack</tabstop> + <tabstop>precountSigZ</tabstop> + <tabstop>precountPrerecord</tabstop> + <tabstop>precountPreroll</tabstop> + <tabstop>precountSigN</tabstop> + <tabstop>buttonApply</tabstop> + <tabstop>buttonOk</tabstop> + <tabstop>buttonCancel</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonOk</sender> + <signal>clicked()</signal> + <receiver>MetronomeConfigBase</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonCancel</sender> + <signal>clicked()</signal> + <receiver>MetronomeConfigBase</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>volumeSlider</sender> + <signal>valueChanged(int)</signal> + <receiver>volumeLabel</receiver> + <slot>setNum(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/muse2/muse/widgets/mtrackinfobase.ui b/muse2/muse/widgets/mtrackinfobase.ui index 06e881d5..d354cd9e 100644 --- a/muse2/muse/widgets/mtrackinfobase.ui +++ b/muse2/muse/widgets/mtrackinfobase.ui @@ -1,1067 +1,940 @@ -<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> -<class>MidiTrackInfoBase</class> -<widget class="QWidget"> - <property name="name"> - <cstring>MidiTrackInfoBase</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>149</width> - <height>555</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>3</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>MidiTrackInfoBase</class> + <widget class="QWidget" name="MidiTrackInfoBase"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>149</width> + <height>555</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>32767</width> + <height>32767</height> + </size> + </property> + <property name="windowTitle"> + <string>MusE: TrackInfo</string> + </property> + <property name="toolTip"> + <string/> + </property> + <property name="whatsThis"> + <string/> + </property> + <layout class="QGridLayout"> + <property name="margin"> + <number>0</number> + </property> + <property name="spacing"> + <number>0</number> + </property> + <item row="2" column="0"> + <widget class="SpinBox" name="iOutputChannel" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>output channel</string> + </property> + <property name="whatsThis"> + <string>all midi events are sent to this output channel</string> + </property> + <property name="maxValue" stdset="0"> + <number>16</number> + </property> + <property name="minValue" stdset="0"> + <number>1</number> + </property> + </widget> + </item> + <item row="0" column="0" colspan="2"> + <widget class="QLabel" name="trackNameLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Ignored" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="7" column="0"> + <widget class="SpinBox" name="iLen" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="suffix" stdset="0"> + <string>%</string> + </property> + <property name="maxValue" stdset="0"> + <number>200</number> + </property> + <property name="minValue" stdset="0"> + <number>25</number> + </property> + <property name="value" stdset="0"> + <number>100</number> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <widget class="QComboBox" name="iOutput"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>output port</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="TextLabel2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Out ch</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="margin"> + <number>0</number> + </property> + <property name="indent"> + <number>1</number> + </property> + </widget> + </item> + <item row="6" column="0"> + <widget class="SpinBox" name="iVerz" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="specialValueText" stdset="0"> + <string>off</string> + </property> + <property name="maxValue" stdset="0"> + <number>1000</number> + </property> + <property name="minValue" stdset="0"> + <number>-1000</number> + </property> + </widget> + </item> + <item row="8" column="0"> + <widget class="SpinBox" name="iAnschl" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maxValue" stdset="0"> + <number>127</number> + </property> + <property name="minValue" stdset="0"> + <number>-127</number> + </property> + <property name="value" stdset="0"> + <number>0</number> + </property> + </widget> + </item> + <item row="9" column="0"> + <widget class="SpinBox" name="iKompr" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="prefix" stdset="0"> + <string/> + </property> + <property name="suffix" stdset="0"> + <string>%</string> + </property> + <property name="maxValue" stdset="0"> + <number>200</number> + </property> + <property name="minValue" stdset="0"> + <number>25</number> + </property> + <property name="value" stdset="0"> + <number>100</number> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="SpinBox" name="iTransp" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="specialValueText" stdset="0"> + <string>off</string> + </property> + <property name="maxValue" stdset="0"> + <number>127</number> + </property> + <property name="minValue" stdset="0"> + <number>-127</number> + </property> + <property name="value" stdset="0"> + <number>1</number> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="QLabel" name="TextLabel9"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Transp.</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="indent"> + <number>2</number> + </property> + </widget> + </item> + <item row="6" column="1"> + <widget class="QLabel" name="TextLabel10"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Delay</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="indent"> + <number>2</number> + </property> + </widget> + </item> + <item row="9" column="1"> + <widget class="QLabel" name="TextLabel13"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Compr.</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="indent"> + <number>2</number> + </property> + </widget> + </item> + <item row="8" column="1"> + <widget class="QLabel" name="TextLabel12"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Velocity</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="indent"> + <number>0</number> + </property> + </widget> + </item> + <item row="7" column="1"> + <widget class="QLabel" name="TextLabel11"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Length</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="indent"> + <number>2</number> + </property> + </widget> + </item> + <item row="3" column="0"> + <layout class="QHBoxLayout"> + <item> + <widget class="QToolButton" name="iRButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> </sizepolicy> - </property> - <property name="minimumSize"> + </property> + <property name="toolTip"> + <string>input routing</string> + </property> + <property name="text"> + <string>iR</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="oRButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>output routing</string> + </property> + <property name="text"> + <string>oR</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="3" column="1"> + <layout class="QHBoxLayout"> + <item> + <widget class="QLabel" name="iChanDetectLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>input detect</string> + </property> + <property name="whatsThis"> + <string>Input detect indicator. Detects all note on-off, controller, aftertouch, + program change, and pitchbend (but not sysex or realtime) events + on the selected channels, on the selected midi ports.</string> + </property> + <property name="text"> + <string>W</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="recEchoButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> <size> - <width>0</width> - <height>0</height> + <width>14</width> + <height>32767</height> </size> - </property> - <property name="maximumSize"> + </property> + <property name="toolTip"> + <string>Echo</string> + </property> + <property name="whatsThis"> + <string>Echo recording events to output.</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer name="echoSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> <size> - <width>32767</width> - <height>32767</height> + <width>4</width> + <height>2</height> </size> - </property> - <property name="caption"> - <string>MusE: TrackInfo</string> - </property> - <property name="toolTip" stdset="0"> - <string></string> - </property> - <property name="whatsThis" stdset="0"> - <string></string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>0</number> - </property> - <property name="resizeMode"> - <enum>Minimum</enum> - </property> - <widget class="SpinBox" row="2" column="0"> - <property name="name"> - <cstring>iOutputChannel</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maxValue"> - <number>16</number> - </property> - <property name="minValue"> - <number>1</number> - </property> - <property name="toolTip" stdset="0"> - <string>output channel</string> - </property> - <property name="whatsThis" stdset="0"> - <string>all midi events are sent to this output channel</string> - </property> - </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>trackNameLabel</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>2</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="alignment"> - <set>AlignCenter | WordBreak</set> - </property> - </widget> - <widget class="SpinBox" row="7" column="0"> - <property name="name"> - <cstring>iLen</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="suffix"> - <string>%</string> - </property> - <property name="maxValue"> - <number>200</number> - </property> - <property name="minValue"> - <number>25</number> - </property> - <property name="value"> - <number>100</number> - </property> - </widget> - <widget class="QComboBox" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>iOutput</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip" stdset="0"> - <string>output port</string> - </property> - </widget> - <widget class="QLabel" row="2" column="1"> - <property name="name"> - <cstring>TextLabel2</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="indent"> - <number>1</number> - </property> - <property name="text"> - <string>Out ch</string> - </property> - </widget> - <widget class="SpinBox" row="6" column="0"> - <property name="name"> - <cstring>iVerz</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="specialValueText"> - <string>off</string> - </property> - <property name="maxValue"> - <number>1000</number> - </property> - <property name="minValue"> - <number>-1000</number> - </property> - </widget> - <widget class="SpinBox" row="8" column="0"> - <property name="name"> - <cstring>iAnschl</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maxValue"> - <number>127</number> - </property> - <property name="minValue"> - <number>-127</number> - </property> - <property name="value"> - <number>0</number> - </property> - </widget> - <widget class="SpinBox" row="9" column="0"> - <property name="name"> - <cstring>iKompr</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="prefix"> - <string></string> - </property> - <property name="suffix"> - <string>%</string> - </property> - <property name="maxValue"> - <number>200</number> - </property> - <property name="minValue"> - <number>25</number> - </property> - <property name="value"> - <number>100</number> - </property> - </widget> - <widget class="SpinBox" row="5" column="0"> - <property name="name"> - <cstring>iTransp</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="specialValueText"> - <string>off</string> - </property> - <property name="maxValue"> - <number>127</number> - </property> - <property name="minValue"> - <number>-127</number> - </property> - <property name="value"> - <number>1</number> - </property> - </widget> - <widget class="QLabel" row="5" column="1"> - <property name="name"> - <cstring>TextLabel9</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Transp.</string> - </property> - <property name="indent"> - <number>2</number> - </property> - </widget> - <widget class="QLabel" row="6" column="1"> - <property name="name"> - <cstring>TextLabel10</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Delay</string> - </property> - <property name="indent"> - <number>2</number> - </property> - </widget> - <widget class="QLabel" row="9" column="1"> - <property name="name"> - <cstring>TextLabel13</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Compr.</string> - </property> - <property name="indent"> - <number>2</number> - </property> - </widget> - <widget class="QLabel" row="8" column="1"> - <property name="name"> - <cstring>TextLabel12</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Velocity</string> - </property> - <property name="indent"> - <number>0</number> - </property> - </widget> - <widget class="QLabel" row="7" column="1"> - <property name="name"> - <cstring>TextLabel11</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Length</string> - </property> - <property name="indent"> - <number>2</number> - </property> - </widget> - <widget class="QLayoutWidget" row="3" column="0"> - <property name="name"> - <cstring>routingLayout</cstring> - </property> - <hbox> - <widget class="QToolButton"> - <property name="name"> - <cstring>iRButton</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>iR</string> - </property> - <property name="toolTip" stdset="0"> - <string>input routing</string> - </property> - </widget> - <widget class="QToolButton"> - <property name="name"> - <cstring>oRButton</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>oR</string> - </property> - <property name="toolTip" stdset="0"> - <string>output routing</string> - </property> - </widget> - </hbox> - </widget> - <widget class="QLayoutWidget" row="3" column="1"> - <property name="name"> - <cstring>routingLayout2</cstring> - </property> - <hbox> - <widget class="QLabel"> - <property name="name"> - <cstring>iChanDetectLabel</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>W</string> - </property> - <property name="alignment"> - <set>AlignCenter</set> - </property> - <property name="toolTip" stdset="0"> - <string>input detect</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Input detect indicator. Detects all note on-off, controller, aftertouch, - program change, and pitchbend (but not sysex or realtime) events - on the selected channels, on the selected midi ports.</string> - </property> - </widget> - <widget class="QToolButton"> - <property name="name"> - <cstring>recEchoButton</cstring> - </property> - <property name="maximumSize"> - <size> - <width>14</width> - <height>32767</height> - </size> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toggleButton"> - <bool>true</bool> - </property> - <property name="whatsThis" stdset="0"> - <string>Echo recording events to output.</string> - </property> - <property name="toolTip" stdset="0"> - <string>Echo</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>echoSpacer</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Maximum</enum> - </property> - <property name="sizeHint"> - <size> - <width>4</width> - <height>2</height> - </size> - </property> - </spacer> - </hbox> - </widget> - <widget class="QLabel" row="10" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>TextLabel1_2</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>4</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>WinPanel</enum> - </property> - <property name="frameShadow"> - <enum>Raised</enum> - </property> - <property name="lineWidth"> - <number>1</number> - </property> - <property name="midLineWidth"> - <number>1</number> - </property> - <property name="text"> - <string>Channel Info</string> - </property> - <property name="alignment"> - <set>AlignCenter</set> - </property> - </widget> - <widget class="QPushButton" row="11" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>iPatch</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string><unknown></string> - </property> - <property name="toolTip" stdset="0"> - <string>Select instrument patch</string> - </property> - </widget> - <widget class="QLabel" row="12" column="0"> - <property name="name"> - <cstring>textLabel1</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Record:</string> - </property> - <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> - <widget class="QLayoutWidget" row="12" column="1"> - <property name="name"> - <cstring>recLayout</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <spacer> - <property name="name"> - <cstring>recSpacer</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Maximum</enum> - </property> - <property name="sizeHint"> - <size> - <width>4</width> - <height>2</height> - </size> - </property> - </spacer> - <widget class="QToolButton"> - <property name="name"> - <cstring>recordButton</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>All</string> - </property> - <property name="toolTip" stdset="0"> - <string>Add all settings to song</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>allRecSpacer</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Maximum</enum> - </property> - <property name="sizeHint"> - <size> - <width>4</width> - <height>2</height> - </size> - </property> - </spacer> - </hbox> - </widget> - <widget class="SpinBox" row="13" column="0"> - <property name="name"> - <cstring>iHBank</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="specialValueText"> - <string>off</string> - </property> - <property name="maxValue"> - <number>128</number> - </property> - <property name="minValue"> - <number>0</number> - </property> - <property name="value"> - <number>0</number> - </property> - <property name="toolTip" stdset="0"> - <string>Bank Select MSB. Double-click on/off.</string> - </property> - </widget> - <widget class="QLabel" row="13" column="1"> - <property name="name"> - <cstring>TextLabel4</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="lineWidth"> - <number>1</number> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="text"> - <string>H-Bank</string> - </property> - <property name="indent"> - <number>2</number> - </property> - </widget> - <widget class="SpinBox" row="14" column="0"> - <property name="name"> - <cstring>iLBank</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="specialValueText"> - <string>off</string> - </property> - <property name="maxValue"> - <number>128</number> - </property> - <property name="minValue"> - <number>0</number> - </property> - <property name="value"> - <number>0</number> - </property> - <property name="toolTip" stdset="0"> - <string>Bank Select LSB. Double-click on/off.</string> - </property> - </widget> - <widget class="QLabel" row="14" column="1"> - <property name="name"> - <cstring>TextLabel5</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="lineWidth"> - <number>1</number> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="text"> - <string>L-Bank</string> - </property> - <property name="indent"> - <number>2</number> - </property> - </widget> - <widget class="SpinBox" row="15" column="0"> - <property name="name"> - <cstring>iProgram</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="specialValueText"> - <string>off</string> - </property> - <property name="maxValue"> - <number>128</number> - </property> - <property name="minValue"> - <number>0</number> - </property> - <property name="value"> - <number>0</number> - </property> - <property name="toolTip" stdset="0"> - <string>Program. Double-click on/off.</string> - </property> - </widget> - <widget class="QLayoutWidget" row="15" column="1"> - <property name="name"> - <cstring>progLayout</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>0</number> - </property> - <spacer> - <property name="name"> - <cstring>progSpacer</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Maximum</enum> - </property> - <property name="sizeHint"> - <size> - <width>4</width> - <height>2</height> - </size> - </property> - </spacer> - <widget class="QToolButton"> - <property name="name"> - <cstring>progRecButton</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Prog.</string> - </property> - <property name="toolTip" stdset="0"> - <string>Add bank + prog settings to song</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>progRecSpacer</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Maximum</enum> - </property> - <property name="sizeHint"> - <size> - <width>4</width> - <height>2</height> - </size> - </property> - </spacer> - </hbox> - </widget> - <widget class="SpinBox" row="16" column="0"> - <property name="name"> - <cstring>iLautst</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="specialValueText"> - <string>off</string> - </property> - <property name="maxValue"> - <number>127</number> - </property> - <property name="minValue"> - <number>-1</number> - </property> - <property name="value"> - <number>-1</number> - </property> - <property name="toolTip" stdset="0"> - <string>Volume. Double-click on/off.</string> - </property> - </widget> - <widget class="QLayoutWidget" row="16" column="1"> - <property name="name"> - <cstring>volLayout</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>0</number> - </property> - <spacer> - <property name="name"> - <cstring>volSpacer</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Maximum</enum> - </property> - <property name="sizeHint"> - <size> - <width>4</width> - <height>2</height> - </size> - </property> - </spacer> - <widget class="QToolButton"> - <property name="name"> - <cstring>volRecButton</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Vol.</string> - </property> - <property name="toolTip" stdset="0"> - <string>Add vol setting to song</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>volRecSpacer</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Maximum</enum> - </property> - <property name="sizeHint"> - <size> - <width>4</width> - <height>2</height> - </size> - </property> - </spacer> - </hbox> - </widget> - <widget class="SpinBox" row="17" column="0"> - <property name="name"> - <cstring>iPan</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="specialValueText"> - <string>off</string> - </property> - <property name="maxValue"> - <number>63</number> - </property> - <property name="minValue"> - <number>-65</number> - </property> - <property name="value"> - <number>-65</number> - </property> - <property name="toolTip" stdset="0"> - <string>Change stereo position. Double-click on/off.</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Change stereo position. Double-click on/off.</string> - </property> - </widget> - <widget class="QLayoutWidget" row="17" column="1"> - <property name="name"> - <cstring>panLayout</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>0</number> - </property> - <spacer> - <property name="name"> - <cstring>panSpacer</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Maximum</enum> - </property> - <property name="sizeHint"> - <size> - <width>4</width> - <height>2</height> - </size> - </property> - </spacer> - <widget class="QToolButton"> - <property name="name"> - <cstring>panRecButton</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Pan</string> - </property> - <property name="toolTip" stdset="0"> - <string>Add pan setting to song</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>panRecSpacer</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Maximum</enum> - </property> - <property name="sizeHint"> - <size> - <width>4</width> - <height>2</height> - </size> - </property> - </spacer> - </hbox> - </widget> - <spacer row="18" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>spacer5</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </grid> -</widget> -<customwidgets> - <customwidget> - <class>SpinBox</class> - <header location="global">spinbox.h</header> - <sizehint> - <width>50</width> - <height>20</height> - </sizehint> - <container>0</container> - <sizepolicy> - <hordata>5</hordata> - <verdata>5</verdata> - <horstretch>0</horstretch> - <verstretch>0</verstretch> + </property> + </spacer> + </item> + </layout> + </item> + <item row="10" column="0" colspan="2"> + <widget class="QLabel" name="TextLabel1_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::WinPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <property name="lineWidth"> + <number>1</number> + </property> + <property name="midLineWidth"> + <number>1</number> + </property> + <property name="text"> + <string>Channel Info</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="11" column="0" colspan="2"> + <widget class="QPushButton" name="iPatch"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select instrument patch</string> + </property> + <property name="text"> + <string><unknown></string> + </property> + </widget> + </item> + <item row="12" column="0"> + <widget class="QLabel" name="textLabel1"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Record:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="12" column="1"> + <layout class="QHBoxLayout"> + <item> + <spacer name="recSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>4</width> + <height>2</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QToolButton" name="recordButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Add all settings to song</string> + </property> + <property name="text"> + <string>All</string> + </property> + </widget> + </item> + <item> + <spacer name="allRecSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>4</width> + <height>2</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="13" column="0"> + <widget class="SpinBox" name="iHBank" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Bank Select MSB. Double-click on/off.</string> + </property> + <property name="specialValueText" stdset="0"> + <string>off</string> + </property> + <property name="maxValue" stdset="0"> + <number>128</number> + </property> + <property name="minValue" stdset="0"> + <number>0</number> + </property> + <property name="value" stdset="0"> + <number>0</number> + </property> + </widget> + </item> + <item row="13" column="1"> + <widget class="QLabel" name="TextLabel4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="lineWidth"> + <number>1</number> + </property> + <property name="text"> + <string>H-Bank</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="margin"> + <number>0</number> + </property> + <property name="indent"> + <number>2</number> + </property> + </widget> + </item> + <item row="14" column="0"> + <widget class="SpinBox" name="iLBank" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Bank Select LSB. Double-click on/off.</string> + </property> + <property name="specialValueText" stdset="0"> + <string>off</string> + </property> + <property name="maxValue" stdset="0"> + <number>128</number> + </property> + <property name="minValue" stdset="0"> + <number>0</number> + </property> + <property name="value" stdset="0"> + <number>0</number> + </property> + </widget> + </item> + <item row="14" column="1"> + <widget class="QLabel" name="TextLabel5"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="lineWidth"> + <number>1</number> + </property> + <property name="text"> + <string>L-Bank</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="margin"> + <number>0</number> + </property> + <property name="indent"> + <number>2</number> + </property> + </widget> + </item> + <item row="15" column="0"> + <widget class="SpinBox" name="iProgram" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Program. Double-click on/off.</string> + </property> + <property name="specialValueText" stdset="0"> + <string>off</string> + </property> + <property name="maxValue" stdset="0"> + <number>128</number> + </property> + <property name="minValue" stdset="0"> + <number>0</number> + </property> + <property name="value" stdset="0"> + <number>0</number> + </property> + </widget> + </item> + <item row="15" column="1"> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <spacer name="progSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>4</width> + <height>2</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QToolButton" name="progRecButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> </sizepolicy> - <pixmap>image0</pixmap> - </customwidget> -</customwidgets> -<images> - <image name="image0"> - <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> - </image> -</images> -<tabstops> - <tabstop>iOutput</tabstop> - <tabstop>iOutputChannel</tabstop> - <tabstop>iTransp</tabstop> - <tabstop>iVerz</tabstop> - <tabstop>iLen</tabstop> - <tabstop>iAnschl</tabstop> - <tabstop>iKompr</tabstop> - <tabstop>iPatch</tabstop> - <tabstop>iHBank</tabstop> - <tabstop>iLBank</tabstop> - <tabstop>iProgram</tabstop> - <tabstop>iLautst</tabstop> - <tabstop>iPan</tabstop> -</tabstops> -<layoutdefaults spacing="6" margin="11"/> -</UI> + </property> + <property name="toolTip"> + <string>Add bank + prog settings to song</string> + </property> + <property name="text"> + <string>Prog.</string> + </property> + </widget> + </item> + <item> + <spacer name="progRecSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>4</width> + <height>2</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="16" column="0"> + <widget class="SpinBox" name="iLautst" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Volume. Double-click on/off.</string> + </property> + <property name="specialValueText" stdset="0"> + <string>off</string> + </property> + <property name="maxValue" stdset="0"> + <number>127</number> + </property> + <property name="minValue" stdset="0"> + <number>-1</number> + </property> + <property name="value" stdset="0"> + <number>-1</number> + </property> + </widget> + </item> + <item row="16" column="1"> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <spacer name="volSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>4</width> + <height>2</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QToolButton" name="volRecButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Add vol setting to song</string> + </property> + <property name="text"> + <string>Vol.</string> + </property> + </widget> + </item> + <item> + <spacer name="volRecSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>4</width> + <height>2</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="17" column="0"> + <widget class="SpinBox" name="iPan" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Change stereo position. Double-click on/off.</string> + </property> + <property name="whatsThis"> + <string>Change stereo position. Double-click on/off.</string> + </property> + <property name="specialValueText" stdset="0"> + <string>off</string> + </property> + <property name="maxValue" stdset="0"> + <number>63</number> + </property> + <property name="minValue" stdset="0"> + <number>-65</number> + </property> + <property name="value" stdset="0"> + <number>-65</number> + </property> + </widget> + </item> + <item row="17" column="1"> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <spacer name="panSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>4</width> + <height>2</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QToolButton" name="panRecButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Add pan setting to song</string> + </property> + <property name="text"> + <string>Pan</string> + </property> + </widget> + </item> + <item> + <spacer name="panRecSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>4</width> + <height>2</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="18" column="0" colspan="2"> + <spacer name="spacer5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <customwidgets> + <customwidget> + <class>SpinBox</class> + <extends>QWidget</extends> + <header location="global">spinbox.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>iOutput</tabstop> + <tabstop>iOutputChannel</tabstop> + <tabstop>iTransp</tabstop> + <tabstop>iVerz</tabstop> + <tabstop>iLen</tabstop> + <tabstop>iAnschl</tabstop> + <tabstop>iKompr</tabstop> + <tabstop>iPatch</tabstop> + <tabstop>iHBank</tabstop> + <tabstop>iLBank</tabstop> + <tabstop>iProgram</tabstop> + <tabstop>iLautst</tabstop> + <tabstop>iPan</tabstop> + </tabstops> + <resources/> + <connections/> +</ui> diff --git a/muse2/muse/widgets/noteinfo.cpp b/muse2/muse/widgets/noteinfo.cpp index 4e3a0304..91e63df9 100644 --- a/muse2/muse/widgets/noteinfo.cpp +++ b/muse2/muse/widgets/noteinfo.cpp @@ -53,7 +53,7 @@ NoteInfo::NoteInfo(QWidget* parent) label->setIndent(3); addWidget(label); //selPitch = new PitchEdit(this, "selPitch"); - selPitch = new PitchEdit(0, "selPitch"); + selPitch = new PitchEdit; addWidget(selPitch); //label = new QLabel(tr("Velo On"), this, "Velocity On"); diff --git a/muse2/muse/widgets/pitchedit.cpp b/muse2/muse/widgets/pitchedit.cpp index 6ecdc4a0..510c993c 100644 --- a/muse2/muse/widgets/pitchedit.cpp +++ b/muse2/muse/widgets/pitchedit.cpp @@ -9,15 +9,12 @@ #include "pitchedit.h" #include "helper.h" -#include <qstyle.h> -#include <qapplication.h> - //--------------------------------------------------------- // PitchEdit //--------------------------------------------------------- -PitchEdit::PitchEdit(QWidget* parent, const char* name) - : QSpinBox(0, 127, 1, parent, name) +PitchEdit::PitchEdit(QWidget* parent) + : QSpinBox(0, 127, 1, parent) { deltaMode = false; } diff --git a/muse2/muse/widgets/pitchedit.h b/muse2/muse/widgets/pitchedit.h index 9c474f08..8d2c8789 100644 --- a/muse2/muse/widgets/pitchedit.h +++ b/muse2/muse/widgets/pitchedit.h @@ -8,7 +8,7 @@ #ifndef __PITCHEDIT_H__ #define __PITCHEDIT_H__ -#include <qspinbox.h> +#include <QSpinBox> //--------------------------------------------------------- // PitchEdit @@ -24,7 +24,7 @@ class PitchEdit : public QSpinBox { virtual int mapTextToValue(bool* ok); public: - PitchEdit(QWidget* parent, const char* name = 0); + PitchEdit(QWidget* parent=0); void setDeltaMode(bool); }; |