From c78f8f241423e16df682d77f2b9cb4080d492774 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 20 Nov 2010 04:30:21 +0000 Subject: Ported .ui widgets to Qt4 --- muse2/ChangeLog | 3 +- muse2/muse/app.cpp | 2 +- muse2/muse/arranger/arranger.cpp | 1 - muse2/muse/arranger/arranger.h | 19 +- muse2/muse/arranger/trackinfo.cpp | 1 - muse2/muse/mplugins/CMakeLists.txt | 4 +- muse2/muse/mplugins/midifilter.ui | 1609 ++++++++++++-------------- muse2/muse/mplugins/midifilterimpl.cpp | 8 +- muse2/muse/mplugins/midifilterimpl.h | 23 +- muse2/muse/widgets/CMakeLists.txt | 4 +- muse2/muse/widgets/ctrlcombo.cpp | 4 +- muse2/muse/widgets/ctrlcombo.h | 4 +- muse2/muse/widgets/metronome.cpp | 36 +- muse2/muse/widgets/metronome.h | 21 +- muse2/muse/widgets/metronomebase.ui | 1159 +++++++++---------- muse2/muse/widgets/mtrackinfobase.ui | 1995 +++++++++++++++----------------- muse2/muse/widgets/noteinfo.cpp | 2 +- muse2/muse/widgets/pitchedit.cpp | 7 +- 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 @@ - -MidiFilterConfigBase - - - MidiFilterConfigBase - - - - 0 - 0 - 348 - 431 - - - - - 3 - 5 - 0 - 0 - - - - MusE: Midi Input Filter - - - - unnamed - - - 11 - - - 6 - - - - GroupBoxx - - - - 3 - 5 - 0 - 0 - - - - Record Filter - - - - - - unnamed - - - 11 - - - 6 - - - - rf1 - - - - 7 - 0 - 0 - 0 - - - - Note On - - - - - rf2 - - - - 7 - 0 - 0 - 0 - - - - Poly Pressure - - - - - rf3 - - - - 7 - 0 - 0 - 0 - - - - Controller - - - - - rf4 - - - - 7 - 0 - 0 - 0 - - - - Program Change - - - - - rf5 - - - - 7 - 0 - 0 - 0 - - - - After Touch - - - - - rf6 - - - - 7 - 0 - 0 - 0 - - - - Pitch Bend - - - - - rf7 - - - - 7 - 0 - 0 - 0 - - - - Sysex - - - - - - - GroupBox2 - - - - 7 - 5 - 0 - 0 - - - - Thru Filter - - - - unnamed - - - 11 - - - 6 - - - - tf1 - - - - 5 - 5 - 0 - 0 - - - - Note On - - - - - tf2 - - - - 7 - 0 - 0 - 0 - - - - Poly Pressure - - - - - tf3 - - - - 7 - 0 - 0 - 0 - - - - Controller - - - - - tf4 - - - - 1 - 5 - 0 - 0 - - - - Program Change - - - - - tf5 - - - - 7 - 0 - 0 - 0 - - - - After Touch - - - - - tf6 - - - - 7 - 0 - 0 - 0 - - - - Pitch Bend - - - - - tf7 - - - - 7 - 0 - 0 - 0 - - - - Sysex - - - - - - - GroupBox4 - - - - 7 - 7 - 0 - 0 - - - - Controller Filter - - - - unnamed - - - 11 - - - 6 - - - - cb1 - - - - - cb2 - - - - - cb3 - - - - - cb4 - - - - - - - ButtonGroup1 - - - - 5 - 7 - 0 - 0 - - - - Channel Filter - - - - - - unnamed - - - 11 - - - 3 - - - - cf14 - - - - 0 - 0 - 0 - 0 - - - - - 30 - 32767 - - - - 14 - - - true - - - - - cf10 - - - - 5 - 0 - 0 - 0 - - - - - 30 - 32767 - - - - 10 - - - true - - - - - cf6 - - - - 5 - 5 - 0 - 0 - - - - - 30 - 32767 - - - - 6 - - - true - - - - - cf12 - - - - 5 - 0 - 0 - 0 - - - - - 30 - 32767 - - - - 12 - - - true - - - - - cf4 - - - - 5 - 0 - 0 - 0 - - - - - 25 - 0 - - - - - 30 - 32767 - - - - 4 - - - true - - - - - cf2 - - - - 5 - 0 - 0 - 0 - - - - - 25 - 0 - - - - - 30 - 32767 - - - - 2 - - - true - - - - - cf9 - - - - 0 - 0 - 0 - 0 - - - - - 30 - 32767 - - - - 9 - - - true - - - - - cf8 - - - - 5 - 5 - 0 - 0 - - - - - 30 - 32767 - - - - 8 - - - true - - - - - cf3 - - - - 5 - 0 - 0 - 0 - - - - - 25 - 0 - - - - - 30 - 32767 - - - - 3 - - - true - - - - - cf13 - - - - 0 - 0 - 0 - 0 - - - - - 30 - 32767 - - - - 13 - - - true - - - - - cf15 - - - - 0 - 0 - 0 - 0 - - - - - 30 - 32767 - - - - 15 - - - true - - - - - cf16 - - - - 0 - 0 - 0 - 0 - - - - - 30 - 32767 - - - - 16 - - - true - - - - - cf7 - - - - 5 - 5 - 0 - 0 - - - - - 30 - 32767 - - - - 7 - - - true - - - - - cf11 - - - - 5 - 0 - 0 - 0 - - - - - 30 - 32767 - - - - 11 - - - true - - - - - cf5 - - - - 0 - 0 - 0 - 0 - - - - - 30 - 32767 - - - - 5 - - - true - - - - - cf1 - - - - 0 - 0 - 0 - 0 - - - - - 25 - 0 - - - - - 30 - 32767 - - - - 1 - - - true - - - - - - - - - CtrlComboBox -
ctrlcombo.h
- - 50 - 20 - - 0 - - 5 - 5 - 0 - 0 - - image0 - activated(int index) - activated(const QString&) - - - - - 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 - - - - rf1 - rf2 - rf3 - rf4 - rf5 - rf6 - rf7 - tf1 - tf2 - tf3 - tf4 - tf5 - tf6 - tf7 - cf1 - cf2 - cf3 - cf4 - cf5 - cf6 - cf7 - cf8 - cf9 - cf10 - cf11 - cf12 - cf13 - cf14 - cf15 - cf16 - - - - ctrlcombo.h - - + + + MidiFilterConfigBase + + + + 0 + 0 + 348 + 431 + + + + + 0 + 0 + + + + MusE: Midi Input Filter + + + + 11 + + + 6 + + + + + + 0 + 0 + + + + Record Filter + + + + 6 + + + 11 + + + + + + 0 + 0 + + + + Note On + + + + + + + + 0 + 0 + + + + Poly Pressure + + + + + + + + 0 + 0 + + + + Controller + + + + + + + + 0 + 0 + + + + Program Change + + + + + + + + 0 + 0 + + + + After Touch + + + + + + + + 0 + 0 + + + + Pitch Bend + + + + + + + + 0 + 0 + + + + Sysex + + + + + + + + + + + 0 + 0 + + + + Thru Filter + + + + 6 + + + 11 + + + + + + 0 + 0 + + + + Note On + + + + + + + + 0 + 0 + + + + Poly Pressure + + + + + + + + 0 + 0 + + + + Controller + + + + + + + + 0 + 0 + + + + Program Change + + + + + + + + 0 + 0 + + + + After Touch + + + + + + + + 0 + 0 + + + + Pitch Bend + + + + + + + + 0 + 0 + + + + Sysex + + + + + + + + + + + 0 + 0 + + + + Controller Filter + + + + 6 + + + 11 + + + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + Channel Filter + + + + 11 + + + 3 + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 14 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 10 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 6 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 12 + + + true + + + + + + + + 0 + 0 + + + + + 25 + 0 + + + + + 30 + 32767 + + + + 4 + + + true + + + + + + + + 0 + 0 + + + + + 25 + 0 + + + + + 30 + 32767 + + + + 2 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 9 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 8 + + + true + + + + + + + + 0 + 0 + + + + + 25 + 0 + + + + + 30 + 32767 + + + + 3 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 13 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 15 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 16 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 7 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 11 + + + true + + + + + + + + 0 + 0 + + + + + 30 + 32767 + + + + 5 + + + true + + + + + + + + 0 + 0 + + + + + 25 + 0 + + + + + 30 + 32767 + + + + 1 + + + true + + + + + + + + + + + + CtrlComboBox + QWidget +
ctrlcombo.h
+ + + + rf1 + rf2 + rf3 + rf4 + rf5 + rf6 + rf7 + tf1 + tf2 + tf3 + tf4 + tf5 + tf6 + tf7 + cf1 + cf2 + cf3 + cf4 + cf5 + cf6 + cf7 + cf8 + cf9 + cf10 + cf11 + cf12 + cf13 + cf14 + cf15 + cf16 + + + ctrlcombo.h + + + + 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 -#include -//Added by qt3to4: +#include #include //--------------------------------------------------------- @@ -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 +#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 +#include 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 #include "metronome.h" -#include -#include -#include -#include -//Added by qt3to4: -#include + +#include #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 @@ - -MetronomeConfigBase - - - MetronomeConfigBase - - - - 0 - 0 - 557 - 347 - - - - MusE: Metronome Config - - - true - - - - unnamed - + + + MetronomeConfigBase + + + + 0 + 0 + 557 + 363 + + + + MusE: Metronome Config + + + true + + + + 11 + + + 6 + + + + + + + Metronome + + - 11 + 11 - 6 + 6 - - - layout20 + + + + + + + + Audio Beep + + + + + + + Choose outputs... + + + true + + + + + + + + + + + 0 + + + 100 + + + 1 + + + 10 + + + 50 + + + Qt::Horizontal + + + + + + + 50 + + + false + + + + + + + % Audio volume + + + false + + + + + + + + + MIDI Click + + + true + + + + + + + 6 - - - unnamed + + 0 + + + + + 0 + + + 6 + + + + + Midi Channel + + + false + + + + + + + Measure Note + + + false + + + + + + + 1 + + + 16 + + + + + + + Measure Velocity + + + false + + + + + + + Beat Velocity - - - GroupBox1 - - - Metronome - - - - unnamed - - - 11 - - - 6 - - - - layout18 - - - - unnamed - - - - audioBeepLayout - - - - unnamed - - - - audioBeep - - - Audio Beep - - - - - audioBeepRoutesButton - - - Choose outputs... - - - true - - - - - - - layout17 - - - - unnamed - - - - volumeSlider - - - 0 - - - 100 - - - 1 - - - 10 - - - 50 - - - Horizontal - - - - - volumeLabel - - - 50 - - - - - textLabel1 - - - % Audio volume - - - - - - - midiClick - - - MIDI Click - - - true - - - - - Layout11 - - - - unnamed - - - 0 - - - 6 - - - - Layout10 - - - - unnamed - - - 0 - - - 6 - - - - TextLabel5 - - - Midi Channel - - - - - TextLabel1 - - - Measure Note - - - - - midiChannel - - - 16 - - - 1 - - - - - TextLabel2 - - - Measure Velocity - - - - - TextLabel4 - - - Beat Velocity - - - - - midiPort - - - 16 - - - 1 - - - - - TextLabel3 - - - Beat Note - - - - - beatNote - - - - - measureVelocity - - - 127 - - - - - measureNote - - - - - TextLabel6 - - - Midi Port - - - - - beatVelocity - - - 127 - - - - - - - Spacer10 - - - Horizontal - - - Expanding - - - - 20 - 20 - - - - - - - - - - - - GroupBox2 - - - Precount - - - - unnamed - - - 11 - - - 6 - - - - precountEnable - - - false - - - enable - - - false - - - - - Layout6 - - - - unnamed - - - 0 - - - 6 - - - - precountBars - - - false - - - 10 - - - 1 - - - 2 - - - - - TextLabel7 - - - Bars - - - - - - - precountFromMastertrack - - - false - - - From Mastertrack - - - true - - - - - Layout5 - - - - unnamed - - - 0 - - - 6 - - - - precountSigZ - - - false - - - 32 - - - 1 - - - 4 - - - - - TextLabel8 - - - / - - - - - precountSigN - - - false - - - 64 - - - 2 - - - 4 - - - - - TextLabel9 - - - Signature - - - - - - - precountPrerecord - - - false - - - Prerecord - - - - - precountPreroll - - - false - - - Preroll - - - - - - - layout19 - - - - unnamed - - - - textLabel3 - - - Hint: Enable metronome in Transportpanel - - - - - Horizontal Spacing2 - - - Horizontal - - - Expanding - - - - 8 - 20 - - - - - - buttonApply - - - &Apply - - - Alt+A - - - true - - - - - buttonOk - - - &OK - - - Alt+O - - - true - - - true - - - - - buttonCancel - - - &Cancel - - - Alt+C - - - true - - - - - + + false + + + + + + + 1 + + + 16 + + + + + + + Beat Note + + + false + + + + + + + + + + 127 + + + + + + + + + + Midi Port + + + false + + + + + + + 127 + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 20 + 20 + + + + + + + + + + + + + + + Precount + + + + 6 + + + 11 + + + + + false + + + enable + + + false + + + + + + + 6 + + + 0 + + + + + false + + + 1 + + + 10 + + + 2 + + + + + + + Bars + + + false + + + + + + + + + false + + + From Mastertrack + + + true + + + + + + + 6 + + + 0 + + + + + false + + + 1 + + + 32 + + + 4 + + + + + + + / + + + false + + + + + + + false + + + 2 + + + 64 + + + 4 + + + + + + + Signature + + + false + + + + + + + + + false + + + Prerecord + + + + + + + false + + + Preroll + + + + + + + + + + + + Hint: Enable metronome in Transportpanel + + + false + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 8 + 20 + + + + + + + + &Apply + + + Alt+A + + + true + + + + + + + &OK + + + Alt+O + + + true + + + true + + + + + + + &Cancel + + + Alt+C + + + true + - - - - - buttonOk - clicked() - MetronomeConfigBase - accept() - - - buttonCancel - clicked() - MetronomeConfigBase - reject() - - - volumeSlider - valueChanged(int) - volumeLabel - setNum(int) - - - - audioBeep - audioBeepRoutesButton - midiClick - measureNote - measureVelocity - beatNote - beatVelocity - midiChannel - midiPort - precountEnable - precountBars - precountFromMastertrack - precountSigZ - precountPrerecord - precountPreroll - precountSigN - buttonApply - buttonOk - buttonCancel - - - + + + + + + + + + qPixmapFromMimeSource + + audioBeep + audioBeepRoutesButton + midiClick + measureNote + measureVelocity + beatNote + beatVelocity + midiChannel + midiPort + precountEnable + precountBars + precountFromMastertrack + precountSigZ + precountPrerecord + precountPreroll + precountSigN + buttonApply + buttonOk + buttonCancel + + + + + buttonOk + clicked() + MetronomeConfigBase + accept() + + + 20 + 20 + + + 20 + 20 + + + + + buttonCancel + clicked() + MetronomeConfigBase + reject() + + + 20 + 20 + + + 20 + 20 + + + + + volumeSlider + valueChanged(int) + volumeLabel + setNum(int) + + + 20 + 20 + + + 20 + 20 + + + + + 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 @@ - -MidiTrackInfoBase - - - MidiTrackInfoBase - - - - 0 - 0 - 149 - 555 - - - - - 5 - 3 - 0 - 0 + + + MidiTrackInfoBase + + + + 0 + 0 + 149 + 555 + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 32767 + 32767 + + + + MusE: TrackInfo + + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + output channel + + + all midi events are sent to this output channel + + + 16 + + + 1 + + + + + + + + 0 + 0 + + + + true + + + + + + + + 0 + 0 + + + + % + + + 200 + + + 25 + + + 100 + + + + + + + + 0 + 0 + + + + output port + + + + + + + + 0 + 0 + + + + Out ch + + + false + + + 0 + + + 1 + + + + + + + + 0 + 0 + + + + off + + + 1000 + + + -1000 + + + + + + + + 0 + 0 + + + + 127 + + + -127 + + + 0 + + + + + + + + 0 + 0 + + + + + + + % + + + 200 + + + 25 + + + 100 + + + + + + + + 0 + 0 + + + + off + + + 127 + + + -127 + + + 1 + + + + + + + + 0 + 0 + + + + Transp. + + + false + + + 2 + + + + + + + + 0 + 0 + + + + Delay + + + false + + + 2 + + + + + + + + 0 + 0 + + + + Compr. + + + false + + + 2 + + + + + + + + 0 + 0 + + + + Velocity + + + false + + + 0 + + + + + + + + 0 + 0 + + + + Length + + + false + + + 2 + + + + + + + + + + 0 + 0 - - + + + input routing + + + iR + + + + + + + + 0 + 0 + + + + output routing + + + oR + + + + + + + + + + + + 0 + 0 + + + + input detect + + + 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. + + + W + + + Qt::AlignCenter + + + false + + + + + + + + 0 + 0 + + + - 0 - 0 + 14 + 32767 - - + + + Echo + + + Echo recording events to output. + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + - 32767 - 32767 + 4 + 2 - - - MusE: TrackInfo - - - - - - - - - - unnamed - - - 0 - - - 0 - - - Minimum - - - - iOutputChannel - - - - 5 - 0 - 0 - 0 - - - - 16 - - - 1 - - - output channel - - - all midi events are sent to this output channel - - - - - trackNameLabel - - - - 2 - 1 - 0 - 0 - - - - AlignCenter | WordBreak - - - - - iLen - - - - 5 - 0 - 0 - 0 - - - - % - - - 200 - - - 25 - - - 100 - - - - - iOutput - - - - 7 - 0 - 0 - 0 - - - - output port - - - - - TextLabel2 - - - - 5 - 0 - 0 - 0 - - - - 0 - - - 1 - - - Out ch - - - - - iVerz - - - - 5 - 0 - 0 - 0 - - - - off - - - 1000 - - - -1000 - - - - - iAnschl - - - - 5 - 0 - 0 - 0 - - - - 127 - - - -127 - - - 0 - - - - - iKompr - - - - 5 - 0 - 0 - 0 - - - - - - - % - - - 200 - - - 25 - - - 100 - - - - - iTransp - - - - 1 - 0 - 0 - 0 - - - - off - - - 127 - - - -127 - - - 1 - - - - - TextLabel9 - - - - 5 - 0 - 0 - 0 - - - - Transp. - - - 2 - - - - - TextLabel10 - - - - 5 - 0 - 0 - 0 - - - - Delay - - - 2 - - - - - TextLabel13 - - - - 5 - 0 - 0 - 0 - - - - Compr. - - - 2 - - - - - TextLabel12 - - - - 5 - 0 - 0 - 0 - - - - Velocity - - - 0 - - - - - TextLabel11 - - - - 5 - 0 - 0 - 0 - - - - Length - - - 2 - - - - - routingLayout - - - - - iRButton - - - - 1 - 1 - 0 - 0 - - - - iR - - - input routing - - - - - oRButton - - - - 1 - 1 - 0 - 0 - - - - oR - - - output routing - - - - - - - routingLayout2 - - - - - iChanDetectLabel - - - - 5 - 0 - 0 - 0 - - - - W - - - AlignCenter - - - input detect - - - 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. - - - - - recEchoButton - - - - 14 - 32767 - - - - - 1 - 1 - 0 - 0 - - - - true - - - Echo recording events to output. - - - Echo - - - - - echoSpacer - - - Horizontal - - - Maximum - - - - 4 - 2 - - - - - - - - TextLabel1_2 - - - - 7 - 4 - 0 - 0 - - - - WinPanel - - - Raised - - - 1 - - - 1 - - - Channel Info - - - AlignCenter - - - - - iPatch - - - - 7 - 0 - 0 - 0 - - - - <unknown> - - - Select instrument patch - - - - - textLabel1 - - - - 5 - 0 - 0 - 0 - - - - Record: - - - AlignVCenter|AlignRight - - - - - recLayout - - - - unnamed - - - - recSpacer - - - Horizontal - - - Maximum - - - - 4 - 2 - - - - - - recordButton - - - - 1 - 1 - 0 - 0 - - - - All - - - Add all settings to song - - - - - allRecSpacer - - - Horizontal - - - Maximum - - - - 4 - 2 - - - - - - - - iHBank - - - - 5 - 0 - 0 - 0 - - - - off - - - 128 - - - 0 - - - 0 - - - Bank Select MSB. Double-click on/off. - - - - - TextLabel4 - - - - 5 - 0 - 0 - 0 - - - - 1 - - - 0 - - - H-Bank - - - 2 - - - - - iLBank - - - - 5 - 0 - 0 - 0 - - - - off - - - 128 - - - 0 - - - 0 - - - Bank Select LSB. Double-click on/off. - - - - - TextLabel5 - - - - 5 - 0 - 0 - 0 - - - - 1 - - - 0 - - - L-Bank - - - 2 - - - - - iProgram - - - - 5 - 0 - 0 - 0 - - - - off - - - 128 - - - 0 - - - 0 - - - Program. Double-click on/off. - - - - - progLayout - - - - unnamed - - - 0 - - - 0 - - - - progSpacer - - - Horizontal - - - Maximum - - - - 4 - 2 - - - - - - progRecButton - - - - 1 - 1 - 0 - 0 - - - - Prog. - - - Add bank + prog settings to song - - - - - progRecSpacer - - - Horizontal - - - Maximum - - - - 4 - 2 - - - - - - - - iLautst - - - - 5 - 0 - 0 - 0 - - - - off - - - 127 - - - -1 - - - -1 - - - Volume. Double-click on/off. - - - - - volLayout - - - - unnamed - - - 0 - - - 0 - - - - volSpacer - - - Horizontal - - - Maximum - - - - 4 - 2 - - - - - - volRecButton - - - - 1 - 1 - 0 - 0 - - - - Vol. - - - Add vol setting to song - - - - - volRecSpacer - - - Horizontal - - - Maximum - - - - 4 - 2 - - - - - - - - iPan - - - - 5 - 0 - 0 - 0 - - - - off - - - 63 - - - -65 - - - -65 - - - Change stereo position. Double-click on/off. - - - Change stereo position. Double-click on/off. - - - - - panLayout - - - - unnamed - - - 0 - - - 0 - - - - panSpacer - - - Horizontal - - - Maximum - - - - 4 - 2 - - - - - - panRecButton - - - - 1 - 1 - 0 - 0 - - - - Pan - - - Add pan setting to song - - - - - panRecSpacer - - - Horizontal - - - Maximum - - - - 4 - 2 - - - - - - - - spacer5 - - - Vertical - - - Expanding - - - - 20 - 40 - - - - - - - - SpinBox -
spinbox.h
- - 50 - 20 - - 0 - - 5 - 5 - 0 - 0 + + + + + + + + + + 0 + 0 + + + + QFrame::WinPanel + + + QFrame::Raised + + + 1 + + + 1 + + + Channel Info + + + Qt::AlignCenter + + + false + + + + + + + + 0 + 0 + + + + Select instrument patch + + + <unknown> + + + + + + + + 0 + 0 + + + + Record: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 4 + 2 + + + + + + + + + 0 + 0 + + + + Add all settings to song + + + All + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 4 + 2 + + + + + + + + + + + 0 + 0 + + + + Bank Select MSB. Double-click on/off. + + + off + + + 128 + + + 0 + + + 0 + + + + + + + + 0 + 0 + + + + 1 + + + H-Bank + + + false + + + 0 + + + 2 + + + + + + + + 0 + 0 + + + + Bank Select LSB. Double-click on/off. + + + off + + + 128 + + + 0 + + + 0 + + + + + + + + 0 + 0 + + + + 1 + + + L-Bank + + + false + + + 0 + + + 2 + + + + + + + + 0 + 0 + + + + Program. Double-click on/off. + + + off + + + 128 + + + 0 + + + 0 + + + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 4 + 2 + + + + + + + + + 0 + 0 - image0 - - - - - 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - - - - iOutput - iOutputChannel - iTransp - iVerz - iLen - iAnschl - iKompr - iPatch - iHBank - iLBank - iProgram - iLautst - iPan - - - + + + Add bank + prog settings to song + + + Prog. + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 4 + 2 + + + + + + + + + + + 0 + 0 + + + + Volume. Double-click on/off. + + + off + + + 127 + + + -1 + + + -1 + + + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 4 + 2 + + + + + + + + + 0 + 0 + + + + Add vol setting to song + + + Vol. + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 4 + 2 + + + + + + + + + + + 0 + 0 + + + + Change stereo position. Double-click on/off. + + + Change stereo position. Double-click on/off. + + + off + + + 63 + + + -65 + + + -65 + + + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 4 + 2 + + + + + + + + + 0 + 0 + + + + Add pan setting to song + + + Pan + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 4 + 2 + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 40 + + + + + + + + + + SpinBox + QWidget +
spinbox.h
+ + + + iOutput + iOutputChannel + iTransp + iVerz + iLen + iAnschl + iKompr + iPatch + iHBank + iLBank + iProgram + iLautst + iPan + + + + 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 -#include - //--------------------------------------------------------- // 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 +#include //--------------------------------------------------------- // 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); }; -- cgit v1.2.3